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

Mikolaj Zalewski : strip the "note: "
by Alexandre Julliard 19 Jun '09

19 Jun '09

Module: tools Branch: master Commit: 82ed9f28ae4f27e507491f80d522e39c47a6b9d8 URL: http://source.winehq.org/git/tools.git/?a=commit;h=82ed9f28ae4f27e507491f80… Author: Mikolaj Zalewski <mikolajz(a)tygrys.dom> Date: Sat Mar 1 21:51:19 2008 +0100 strip the "note: " --- php/resfile.php | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/php/resfile.php b/php/resfile.php index 1f6cfd5..341a556 100644 --- a/php/resfile.php +++ b/php/resfile.php @@ -67,6 +67,9 @@ foreach ($msgs as $value) .$MASTER_LANGUAGE_NAME." resource</a>)"; } } + + if (strpos($value, "note: ") === 0) + $value = substr($value, 6); echo "</td><td>".$value."</td></tr>\n"; }

1 0

Mikolaj Zalewski : add links to the Wiki
by Alexandre Julliard 19 Jun '09

19 Jun '09

Module: tools Branch: master Commit: 540debc9c088f3f5dce667e2b47c23cbe5a063cb URL: http://source.winehq.org/git/tools.git/?a=commit;h=540debc9c088f3f5dce667e2… Author: Mikolaj Zalewski <mikolajz(a)tygrys.dom> Date: Sat Mar 1 23:37:53 2008 +0100 add links to the Wiki --- php/index.php | 9 +++++++++ php/lib.php | 2 ++ php/resfile.php | 12 ++++++++++++ 3 files changed, 23 insertions(+), 0 deletions(-) diff --git a/php/index.php b/php/index.php index bb98636..e9beaba 100644 --- a/php/index.php +++ b/php/index.php @@ -21,6 +21,15 @@ while ($line = fgets($summary, 1024)) ?> <html> <h1>Wine translation statistics</h1> + +<p>This page shows the state of the translations of <a href="http://www.winehq.org/">Wine</a>. +Note that some resources marked as translated may be in fact in English - sometimes developers +adds new English resources into every language file. This automatic tool doesn't detect this - +this needs to be found manually by the translators. If you want to read about how to translate +Wine or just want to know why adding English stringtable strings into every language file is +recommended check <?php echo $WINE_WIKI_TRANSLATIONS ?>. +</p> + <table border="1"> <tr><th></th><th>Language</th><th>Translated</th><th>Missing</th><th>Errors</th><th> </th></tr> <?php diff --git a/php/lib.php b/php/lib.php index e4e0e56..336b935 100644 --- a/php/lib.php +++ b/php/lib.php @@ -4,6 +4,8 @@ $MASTER_LANGUAGE = "009:01"; $MASTER_LANGUAGE_BINID = 1033; $MASTER_LANGUAGE_NAME = "English (US)"; +$WINE_WIKI_TRANSLATIONS = "<a href=\"TODO\">[TODO: Wiki translations page]</a>"; + function validate_lang($id) { global $DATAROOT; diff --git a/php/resfile.php b/php/resfile.php index 341a556..0ed577d 100644 --- a/php/resfile.php +++ b/php/resfile.php @@ -22,6 +22,18 @@ while ($line = fgets($file, 4096)) } } +if (count($msgs) == 0) { + echo "<p>This file is not translated into ".get_lang_name($lang).".</p>\n"; + echo "<ul><li>If you want to see what resources are in this file, check the " + .gen_resfile_a($MASTER_LANGUAGE, $resfile)."English (US) version</a>" + ." of this file</li>\n"; + echo "<li>If you want to translate this file you should check the $resfile\n"; + echo "file in the Wine source tree and make it include a new language file for\n"; + echo get_lang_name($lang)." (see $WINE_WIKI_TRANSLATIONS for a guide to\n"; + echo "translating)</li>"; + exit(); +} + echo "<table>\n"; sort($msgs); foreach ($msgs as $value)

1 0

Mikolaj Zalewski : move styles to styles.css
by Alexandre Julliard 19 Jun '09

19 Jun '09

Module: tools Branch: master Commit: 936e4469ee4b733ff88e46fbb507b2fbe03fb911 URL: http://source.winehq.org/git/tools.git/?a=commit;h=936e4469ee4b733ff88e46fb… Author: Mikolaj Zalewski <mikolajz(a)tygrys.dom> Date: Sun Mar 2 13:47:25 2008 +0100 move styles to styles.css --- php/resource.php | 13 +------------ php/style.css | 13 +++++++++++++ 2 files changed, 14 insertions(+), 12 deletions(-) diff --git a/php/resource.php b/php/resource.php index 5d6edbe..e17fbaa 100644 --- a/php/resource.php +++ b/php/resource.php @@ -12,18 +12,7 @@ $compare = isset($_REQUEST['compare']); ?> <html> <head> - <style> - .resmeta - { - color: #7f7fff; - font-style: italic; - } - .resdisabled - { - color: grey; - font-style: italic; - } - </style> + <link rel="stylesheet" href="style.css" type="text/css"/> </head> <body> <?php dump_menu_root() ?> &gt <?php dump_menu_lang($lang) ?> &gt <?php dump_menu_resfile($lang, $resfile) ?> &gt diff --git a/php/style.css b/php/style.css new file mode 100644 index 0000000..aed2948 --- /dev/null +++ b/php/style.css @@ -0,0 +1,13 @@ +/* used to mark resource parts that are not literaly in the string, like \0, \n etc*/ +.resmeta +{ + color: #7f7fff; + font-style: italic; +} + +/* used to mark disabled menu options */ +.resdisabled +{ + color: grey; + font-style: italic; +}

1 0

Mikolaj Zalewski : - put an error when an erronous resource is inherited from neutral
by Alexandre Julliard 19 Jun '09

19 Jun '09

Module: tools Branch: master Commit: f84692680008529283715e63c98321924c96db02 URL: http://source.winehq.org/git/tools.git/?a=commit;h=f84692680008529283715e63… Author: Mikolaj Zalewski <mikolajz(a)tygrys.dom> Date: Sun Mar 2 15:13:36 2008 +0100 - put an error when an erronous resource is inherited from neutral - how a warning when viewing the Portugese (Neutral) locale --- php/lang.php | 8 ++++++++ php/lib.php | 12 ++++++++++++ php/resfile.php | 9 ++++++++- php/resource.php | 3 ++- php/style.css | 10 ++++++++++ scripts/ver.pl | 12 ++++++++++-- 6 files changed, 50 insertions(+), 4 deletions(-) diff --git a/php/lang.php b/php/lang.php index fd212a7..008ba45 100644 --- a/php/lang.php +++ b/php/lang.php @@ -37,6 +37,11 @@ ksort($partial); ksort($notransl); ?> <html> +<head> + <link rel="stylesheet" href="style.css" type="text/css"/> + <title>Language <?php echo get_lang_name($lang) ?> - Wine translations</title> +</head> + <?php function dump_table($table) { @@ -61,6 +66,9 @@ 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> + +<?php warn_if_lang_hidden($lang) ?> + <h2>Partialy translanted files</h2> <?php dump_table($partial) ?> diff --git a/php/lib.php b/php/lib.php index 336b935..74d3807 100644 --- a/php/lib.php +++ b/php/lib.php @@ -79,6 +79,18 @@ function get_lang_binid($lang) return hexdec($m[1]) + (hexdec($m[2]) << 10); } +/* Make sure people are not suprised if they see Portugese (Neutral) has nearly + * no resources */ +function warn_if_lang_hidden($lang) +{ + if (has_lang_flag($lang, "hide")) + { + echo "<p class=\"note\"><b>Note:</b> this is the ".get_lang_name($lang)." locale which\n". + "is not supposed to be used directly but only to have some resources\n". + "inherited by sublanguages.</p>"; + } +} + function get_locale_name($localeid) { global $LOCALE_NAMES; diff --git a/php/resfile.php b/php/resfile.php index 0ed577d..4044d80 100644 --- a/php/resfile.php +++ b/php/resfile.php @@ -9,11 +9,18 @@ $file = fopen("$DATAROOT/langs/$lang", "r"); $msgs = array(); ?> <html> +<head> + <link rel="stylesheet" href="style.css" type="text/css"/> + <title>File <?php echo $resfile?> - Wine translations</title> +</head> + <?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 +warn_if_lang_hidden($lang); + while ($line = fgets($file, 4096)) { if (preg_match("@$resfile: (.*)@", $line, $m)) @@ -86,4 +93,4 @@ foreach ($msgs as $value) echo "</td><td>".$value."</td></tr>\n"; } ?> -</html> \ No newline at end of file +</html> diff --git a/php/resource.php b/php/resource.php index e17fbaa..0ed81a4 100644 --- a/php/resource.php +++ b/php/resource.php @@ -12,7 +12,8 @@ $compare = isset($_REQUEST['compare']); ?> <html> <head> - <link rel="stylesheet" href="style.css" type="text/css"/> + <link rel="stylesheet" href="style.css" type="text/css"/> + <title><?php echo get_resource_name($type, $id) ?> from <?php echo $resfile?> - Wine translation</title> </head> <body> <?php dump_menu_root() ?> &gt <?php dump_menu_lang($lang) ?> &gt <?php dump_menu_resfile($lang, $resfile) ?> &gt diff --git a/php/style.css b/php/style.css index aed2948..ef053ce 100644 --- a/php/style.css +++ b/php/style.css @@ -11,3 +11,13 @@ color: grey; font-style: italic; } + +/* a note e.g. that you are watching a hidden language */ +p.note +{ + background-color: #ffff7f; + border-width: 2px; + border-style: solid; + border-color: black; + padding: 2px; +} \ No newline at end of file diff --git a/scripts/ver.pl b/scripts/ver.pl index 05475b4..33ba451 100755 --- a/scripts/ver.pl +++ b/scripts/ver.pl @@ -177,8 +177,16 @@ foreach $resource (@resources) } } else { - push @{$notes_rl{$resource}{$lang}}, "Translation inherited from \@LANG($basic_lang)"; - $transl_count{$lang}++; + if (@{$errs_rl{$resource}{$basic_lang}}) + { + push @{$errs_rl{$resource}{$lang}}, "Translation inherited from \@LANG($basic_lang): translation out of sync"; + $err_count{$langs}++; + print "Inheritance error\n"; + } else + { + push @{$notes_rl{$resource}{$lang}}, "Translation inherited from \@LANG($basic_lang)"; + $transl_count{$lang}++; + } } } else

1 0

Mikolaj Zalewski : speedup menu diff
by Alexandre Julliard 19 Jun '09

19 Jun '09

Module: tools Branch: master Commit: 43162ecbb0cd6fbeeeef99c24a97e714c73ee87a URL: http://source.winehq.org/git/tools.git/?a=commit;h=43162ecbb0cd6fbeeeef99c2… Author: Mikolaj Zalewski <mikolajz(a)tygrys.dom> Date: Sun Mar 2 21:44:25 2008 +0100 speedup menu diff --- php/lib_res.php | 78 ++++++++++++++++++++++++++++++++++-------------------- php/resource.php | 2 + scripts/ver.pl | 3 +- 3 files changed, 52 insertions(+), 31 deletions(-) diff --git a/php/lib_res.php b/php/lib_res.php index b1c1a1d..92fb274 100644 --- a/php/lib_res.php +++ b/php/lib_res.php @@ -1,7 +1,5 @@ <?php -//include_once("stopwatch.php"); - $CONSTS["RT_MENU"] = 4; $CONSTS["RT_STRING"] = 6; @@ -353,42 +351,64 @@ class MenuResource extends Resource echo "<img src=\"img/tree-$name.png\" align=\"center\" height=\"28\"/>"; } - /* O(n^2) time and O(n^2) space algorithm. Menus are small so this should be OK */ + function menuitem_equals(&$res2, $i, $j) + { + return (($this->items[$i]["id"] == $res2->items[$j]["id"]) && + ($this->items[$i]["level"] == $res2->items[$j]["level"]) && + (($this->items[$i]["resinfo"]&1) == ($res2->items[$j]["resinfo"]&1))); + } + + /* Longest common subsequence - simple O(n^2) time and O(n^2) space algorithm, + * but nenus are small so this should be OK */ function diff_menus(&$res2) { + $mincount = min(count($this->items), count($res2->items)); + for ($start = 0; $start < $mincount; $start++) + if (!$this->menuitem_equals($res2, $start, $start)) + break; + + if (($start == $mincount) && (count($this->items) == count($res2->items))) + return array_fill(0, $mincount, 3); + + for ($end = 0; $end < $mincount; $end++) + if (!$this->menuitem_equals($res2, count($this->items) - 1 - $end, count($res2->items) - 1 - $end)) + break; + $out = array(); - $tabdyn = array_fill(0, count($this->items) + 1, - array_fill(0, count($res2->items) + 1, - array(0, 0))); + $tabdyn = array_fill(0, count($this->items) - $start - $end + 1, + array_fill(0, count($res2->items) - $start - $end + 1, 0)); - for ($i = 1; $i <= count($this->items); $i++) + for ($i = 1; $i <= count($this->items) - $start - $end; $i++) { - for ($j = 1; $j <= count($res2->items); $j++) + for ($j = 1; $j <= count($res2->items) - $start - $end; $j++) { - if (($this->items[$i-1]["id"] == $res2->items[$j-1]["id"]) && - ($this->items[$i-1]["level"] == $res2->items[$j-1]["level"]) && - (($this->items[$i-1]["resinfo"]&1) == ($res2->items[$j-1]["resinfo"]&1))) - { - $tabdyn[$i][$j] = array($tabdyn[$i-1][$j-1][0] + 1, 3); - } else - { - if ($tabdyn[$i][$j-1][0] > $tabdyn[$i-1][$j][0]) - $tabdyn[$i][$j] = array($tabdyn[$i][$j-1][0], 2); - else - $tabdyn[$i][$j] = array($tabdyn[$i-1][$j][0], 1); - - } + if ($this->menuitem_equals($res2, $start + $i - 1, $start + $j - 1)) + $tabdyn[$i][$j] = $tabdyn[$i-1][$j-1] + 1; + else if ($tabdyn[$i][$j-1] > $tabdyn[$i-1][$j]) + $tabdyn[$i][$j] = $tabdyn[$i][$j-1]; + else + $tabdyn[$i][$j] = $tabdyn[$i-1][$j]; } } - - $i = count($this->items); - $j = count($res2->items); + + /* backtrack (produces results in reverse order) */ + $out = array_fill(0, $end, 3); + $i = count($this->items) - $start - $end; + $j = count($res2->items) - $start - $end; while ($i > 0 || $j > 0) { - $step = $tabdyn[$i][$j][1]; if ($i == 0) - $step |= 2; - if ($j == 0) - $step |= 1; + $step = 2; + else if ($j == 0) + $step = 1; + else + { + if ($this->menuitem_equals($res2, $start + $i - 1, $start + $j - 1)) + $step = 3; + else if ($tabdyn[$i][$j-1] > $tabdyn[$i-1][$j]) + $step = 2; + else + $step = 1; + } $out[] = $step; @@ -397,6 +417,7 @@ class MenuResource extends Resource if ($step & 2) $j--; } + $out += array_fill(count($out), $start, 3); return array_reverse($out); } @@ -427,7 +448,6 @@ class MenuResource extends Resource array_pop($tstate); while (count($tstate) > 0 && $tstate[count($tstate) - 1] === FALSE) array_pop($tstate); -// $tstate[] = TRUE; } } diff --git a/php/resource.php b/php/resource.php index 0ed81a4..e6dadb8 100644 --- a/php/resource.php +++ b/php/resource.php @@ -22,6 +22,8 @@ $compare = isset($_REQUEST['compare']); <?php +//include_once("stopwatch.php"); + function load_resource(&$resources, $type, $id, $langid, &$res) { $resdata = $resources->loadResource($type, $id, get_lang_binid($langid), is_lang_ignore_sublang($langid)); diff --git a/scripts/ver.pl b/scripts/ver.pl index 33ba451..bafd8bb 100755 --- a/scripts/ver.pl +++ b/scripts/ver.pl @@ -180,8 +180,7 @@ foreach $resource (@resources) if (@{$errs_rl{$resource}{$basic_lang}}) { push @{$errs_rl{$resource}{$lang}}, "Translation inherited from \@LANG($basic_lang): translation out of sync"; - $err_count{$langs}++; - print "Inheritance error\n"; + $err_count{$lang}++; } else { push @{$notes_rl{$resource}{$lang}}, "Translation inherited from \@LANG($basic_lang)";

1 0

Mikolaj Zalewski : store new languages in the run log
by Alexandre Julliard 19 Jun '09

19 Jun '09

Module: tools Branch: master Commit: aa8bab7c97717a930f84a154af6e206883a24572 URL: http://source.winehq.org/git/tools.git/?a=commit;h=aa8bab7c97717a930f84a154… Author: Mikolaj Zalewski <mikolajz(a)tygrys.dom> Date: Sun Mar 2 21:57:54 2008 +0100 store new languages in the run log --- scripts/Master.sh | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/scripts/Master.sh b/scripts/Master.sh index adcd046..a618b9d 100755 --- a/scripts/Master.sh +++ b/scripts/Master.sh @@ -49,7 +49,11 @@ find $SOURCEROOT/ -name Makefile.in -exec ./checkmakefile.pl \{\} \; ./summary.pl "$WORKDIR" # Check for a new languages -ls $WORKDIR/new-langs +for i in $WORKDIR/new-langs/*; do + if [ -f "$i" ]; then + echo "note: New language:" `basename "$i"` | tee -a $WORKDIR/run.log + fi +done # Show any changes in the log diff -u $WORKDIR/run.log.old $WORKDIR/run.log

1 0

Mikolaj Zalewski : improve introduction text
by Alexandre Julliard 19 Jun '09

19 Jun '09

Module: tools Branch: master Commit: d6a445d67ad467a075cbfef089f40c6fec188598 URL: http://source.winehq.org/git/tools.git/?a=commit;h=d6a445d67ad467a075cbfef0… Author: Mikolaj Zalewski <mikolajz(a)tygrys.dom> Date: Sun Mar 2 22:02:53 2008 +0100 improve introduction text --- php/index.php | 13 ++++++++----- 1 files changed, 8 insertions(+), 5 deletions(-) diff --git a/php/index.php b/php/index.php index e9beaba..bad3274 100644 --- a/php/index.php +++ b/php/index.php @@ -20,14 +20,17 @@ while ($line = fgets($summary, 1024)) } ?> <html> +<head> + <link rel="stylesheet" href="style.css" type="text/css"/> + <title>Wine translation statistics</title> +</head> <h1>Wine translation statistics</h1> <p>This page shows the state of the translations of <a href="http://www.winehq.org/">Wine</a>. Note that some resources marked as translated may be in fact in English - sometimes developers -adds new English resources into every language file. This automatic tool doesn't detect this - -this needs to be found manually by the translators. If you want to read about how to translate -Wine or just want to know why adding English stringtable strings into every language file is -recommended check <?php echo $WINE_WIKI_TRANSLATIONS ?>. +add new English resources into every language file. This automatic tool doesn't detect this - +this needs to be found manually by the translators. If you would like to read about how to +improve Wine translations check <?php echo $WINE_WIKI_TRANSLATIONS ?>. </p> <table border="1"> @@ -97,4 +100,4 @@ if ($time = filemtime("$DATAROOT/langs/summary")) echo "<p><small>Generated on ".gmdate("j M Y, G:i:s T", $time)." (see <a href=\"runlog.php\">run log</a>)</small></p>"; } ?> -</html> \ No newline at end of file +</html>

1 0

Mikolaj Zalewski : small fixes
by Alexandre Julliard 19 Jun '09

19 Jun '09

Module: tools Branch: master Commit: e4e36ba14b3ba87b6392e14293a827d0d4c917d6 URL: http://source.winehq.org/git/tools.git/?a=commit;h=e4e36ba14b3ba87b6392e142… Author: Mikolaj Zalewski <mikolajz(a)tygrys.dom> Date: Wed Mar 5 21:11:51 2008 +0100 small fixes --- php/index.php | 2 +- php/lang.php | 2 +- scripts/Master.sh | 4 ++-- scripts/checkmakefile.pl | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/php/index.php b/php/index.php index bad3274..b8f0f7d 100644 --- a/php/index.php +++ b/php/index.php @@ -29,7 +29,7 @@ while ($line = fgets($summary, 1024)) <p>This page shows the state of the translations of <a href="http://www.winehq.org/">Wine</a>. Note that some resources marked as translated may be in fact in English - sometimes developers add new English resources into every language file. This automatic tool doesn't detect this - -this needs to be found manually by the translators. If you would like to read about how to +it needs to be found manually by the translators. If you would like to read about how to improve Wine translations check <?php echo $WINE_WIKI_TRANSLATIONS ?>. </p> diff --git a/php/lang.php b/php/lang.php index 008ba45..ef92883 100644 --- a/php/lang.php +++ b/php/lang.php @@ -39,7 +39,7 @@ ksort($notransl); <html> <head> <link rel="stylesheet" href="style.css" type="text/css"/> - <title>Language <?php echo get_lang_name($lang) ?> - Wine translations</title> + <title><?php echo get_lang_name($lang) ?> language - Wine translations</title> </head> <?php diff --git a/scripts/Master.sh b/scripts/Master.sh index a618b9d..c936830 100755 --- a/scripts/Master.sh +++ b/scripts/Master.sh @@ -23,14 +23,14 @@ mv -f $WORKDIR/run.log $WORKDIR/run.log.old if [ "$PREPARE_TREES" -eq 1 ]; then # Prepare the trees (they may be the same or different) - if [ "x$NO_VERBOSE" = "x" ]; then + if [ "x$NOVERBOSE" = "x" ]; then echo -n "Preparing tree(s)..." fi make -C "$WRCROOT" depend >/dev/null 2>>"$WORKDIR/run.log" || die "make depend in wrc tree failed" make -C "$WRCROOT" tools >/dev/null 2>>"$WORKDIR/run.log" || die "make tools in wrc tree failed" make -C "$SOURCEROOT" depend >/dev/null 2>>"$WORKDIR/run.log" || die "make depend in source tree failed" make -C "$SOURCEROOT" include/stdole2.tlb >/dev/null 2>>"$WORKDIR/run.log" || die "make depend in source tree failed" - if [ "x$NO_VERBOSE" = "x" ]; then + if [ "x$NOVERBOSE" = "x" ]; then echo " done" fi fi diff --git a/scripts/checkmakefile.pl b/scripts/checkmakefile.pl index a2b3ecd..6119eca 100755 --- a/scripts/checkmakefile.pl +++ b/scripts/checkmakefile.pl @@ -1,7 +1,7 @@ #!/usr/bin/perl # Helper script - analyze one Makefile, run wrc --verify-translation -# on resource files and call ver.sh to parse the results +# on resource files and call ver.pl to parse the results use Cwd;

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