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

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 : - 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 : Show run log to the user
by Alexandre Julliard 19 Jun '09

19 Jun '09

Module: tools Branch: master Commit: 62e378418a67a7da0623d3b6bbb448530f6c5ab0 URL: http://source.winehq.org/git/tools.git/?a=commit;h=62e378418a67a7da0623d3b6… Author: Mikolaj Zalewski <mikolajz(a)tygrys.dom> Date: Sat Mar 1 21:22:14 2008 +0100 Show run log to the user --- php/index.php | 2 +- php/runlog.php | 7 +++++++ scripts/Master.sh | 1 + 3 files changed, 9 insertions(+), 1 deletions(-) diff --git a/php/index.php b/php/index.php index 47366fc..bb98636 100644 --- a/php/index.php +++ b/php/index.php @@ -85,7 +85,7 @@ for ($i = 0; $i < count($transl); $i++) <?php if ($time = filemtime("$DATAROOT/langs/summary")) { - echo "<p><small>Generated on ".gmdate("j M Y, G:i:s T", $time)."</small></p>"; + 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 diff --git a/php/runlog.php b/php/runlog.php new file mode 100644 index 0000000..f6e0591 --- /dev/null +++ b/php/runlog.php @@ -0,0 +1,7 @@ +<?php +include("config.php"); + +header("Content-type: text/plain"); +$f = fopen("$DATAROOT/dumps/run.log", "r"); +fpassthru($f); +?> \ No newline at end of file diff --git a/scripts/Master.sh b/scripts/Master.sh index 11dbb75..adcd046 100755 --- a/scripts/Master.sh +++ b/scripts/Master.sh @@ -59,6 +59,7 @@ mv -f $DESTDIR/langs $DESTDIR/langs.old mv -f $DESTDIR/dumps $DESTDIR/dumps.old mv -f $WORKDIR/langs $DESTDIR/langs mv -f $WORKDIR/dumps $DESTDIR/dumps +cp -f $WORKDIR/run.log $DESTDIR/dumps/run.log rsync -r --delete conf $DESTDIR

1 0

Mikolaj Zalewski : show a link to master language resource if possible
by Alexandre Julliard 19 Jun '09

19 Jun '09

Module: tools Branch: master Commit: 79b20df3dde764601a695b92d919a0dd0028dc4c URL: http://source.winehq.org/git/tools.git/?a=commit;h=79b20df3dde764601a695b92… Author: Mikolaj Zalewski <mikolajz(a)tygrys.dom> Date: Sat Mar 1 21:49:51 2008 +0100 show a link to master language resource if possible --- php/resfile.php | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/php/resfile.php b/php/resfile.php index 402808b..1f6cfd5 100644 --- a/php/resfile.php +++ b/php/resfile.php @@ -60,7 +60,12 @@ foreach ($msgs as $value) $value); } else + { $value = preg_replace("/@RES$([^:$]+):([^:\)]+)\)/", get_resource_name($m[1], $m[2]), $value); + if (is_dumpable_type($m[1]) && (strpos($value, "Missing: ") === 0)) + $value .= " (see ".gen_resource_a($MASTER_LANGUAGE, $resfile, $m[1], $m[2]) + .$MASTER_LANGUAGE_NAME." resource</a>)"; + } } echo "</td><td>".$value."</td></tr>\n";

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 : 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 : 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 a local prehook
by Alexandre Julliard 19 Jun '09

19 Jun '09

Module: tools Branch: master Commit: 3e03aff51d1a7c66936673b83ff18437f9fc898f URL: http://source.winehq.org/git/tools.git/?a=commit;h=3e03aff51d1a7c66936673b8… Author: Mikolaj Zalewski <mikolajz(a)tygrys.dom> Date: Wed Feb 13 11:36:46 2008 +0100 add a local prehook --- .gitignore | 1 + scripts/Master.sh | 4 ++++ 2 files changed, 5 insertions(+), 0 deletions(-) diff --git a/.gitignore b/.gitignore index 8485d8d..af334cb 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,7 @@ /work/* /scripts/config /scripts/local-posthook.sh +/scripts/local-prehook.sh /php/conf /php/dumps /php/langs \ No newline at end of file diff --git a/scripts/Master.sh b/scripts/Master.sh index dace16c..addb75a 100755 --- a/scripts/Master.sh +++ b/scripts/Master.sh @@ -9,6 +9,10 @@ fi . ./config +if [ -x ./local-prehook.sh ]; then + ./local-prehook.sh +fi + function die { echo $1 >>"$WORKDIR/run.log" cat "$WORKDIR/run.log"

1 0

Mikolaj Zalewski : refactor some common functions
by Alexandre Julliard 19 Jun '09

19 Jun '09

Module: tools Branch: master Commit: 51d572561e614d94f59c9181ac9064d66dea4d21 URL: http://source.winehq.org/git/tools.git/?a=commit;h=51d572561e614d94f59c9181… Author: Mikolaj Zalewski <mikolajz(a)tygrys.dom> Date: Wed Feb 13 19:02:45 2008 +0100 refactor some common functions --- php/lang.php | 11 +++++------ php/lib.php | 22 ++++++++++++++++++++++ php/resfile.php | 7 +++---- php/resource.php | 7 +++---- 4 files changed, 33 insertions(+), 14 deletions(-) diff --git a/php/lang.php b/php/lang.php index ab0394f..c16aab7 100644 --- a/php/lang.php +++ b/php/lang.php @@ -1,10 +1,9 @@ <?php include_once("config.php") ; +include_once("lib.php"); + +$lang = validate_lang($_REQUEST['lang']); -$lang = preg_replace("/[^0-9a-f:]/", "-", $_REQUEST['lang']); -if (!file_exists("$DATAROOT/langs/$lang")) - die("Invalid lang parameter"); - $file = fopen("$DATAROOT/langs/$lang", "r"); $transl = array(); $notransl = array(); @@ -56,7 +55,7 @@ function dump_table($table) } ?> -<h1><?php echo "Language: ".file_get_contents("$DATAROOT/conf/$lang") ?></h1> +<h1><?php echo "Language: ".get_lang_name($lang) ?></h1> <h2>Partialy translanted files</h2> <?php dump_table($partial) ?> @@ -66,4 +65,4 @@ function dump_table($table) <h2>Fully translated files</h2> <?php dump_table($transl) ?> -</html> \ No newline at end of file +</html> diff --git a/php/lib.php b/php/lib.php new file mode 100644 index 0000000..e5e68b7 --- /dev/null +++ b/php/lib.php @@ -0,0 +1,22 @@ +<?php + +$MASTER_LANGUAGE = "009:01"; + +function validate_lang($id) +{ + global $DATAROOT; + + $lang = preg_replace("/[^0-9a-f:]/", "-", $_REQUEST['lang']); + if (!file_exists("$DATAROOT/conf/$lang") || !file_exists("$DATAROOT/langs/$lang")) + die("Invalid lang parameter"); + return $lang; +} + +function get_lang_name($id) +{ + global $DATAROOT; + + return file_get_contents("$DATAROOT/conf/$id"); +} + +?> diff --git a/php/resfile.php b/php/resfile.php index 35f693f..6685c50 100644 --- a/php/resfile.php +++ b/php/resfile.php @@ -1,16 +1,15 @@ <?php include("config.php"); +include("lib.php"); -$lang = preg_replace("/[^0-9a-f:]/", "-", $_REQUEST['lang']); +$lang = validate_lang($_REQUEST['lang']); $resfile = $_REQUEST['resfile']; -if (!file_exists("$DATAROOT/langs/$lang")) - die("Invalid lang parameter"); $file = fopen("$DATAROOT/langs/$lang", "r"); $msgs = array(); ?> <html> -<h1>File <?php echo $resfile?> - <?php echo file_get_contents("$DATAROOT/conf/$lang") ?> language</h1> +<h1>File <?php echo $resfile?> - <?php echo get_lang_name($lang) ?> language</h1> <?php while ($line = fgets($file, 4096)) diff --git a/php/resource.php b/php/resource.php index a3361d0..5c7cbba 100644 --- a/php/resource.php +++ b/php/resource.php @@ -1,12 +1,11 @@ <?php include("config.php"); +include("lib.php"); -$lang = $_REQUEST['lang']; +$lang = validate_lang($_REQUEST['lang']); $resfile = $_REQUEST['resfile']; $type = $_REQUEST['type']; $id = $_REQUEST['id']; -if (!file_exists("$DATAROOT/langs/$lang")) - die("Invalid lang parameter"); $norm_fn = preg_replace("/[^A-Za-z0-9]/", "-", $resfile); $file = fopen("$DATAROOT/dumps/$norm_fn/$lang-$type-$id", "r"); @@ -14,7 +13,7 @@ $msgs = array(); ?> <html> <body> -<h1>File <?php echo $resfile?> - <?php echo file_get_contents("$DATAROOT/conf/$lang") ?> language - Resource <?php echo "$id ($type)"?></h1> +<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>

1 0

Mikolaj Zalewski : validate input data
by Alexandre Julliard 19 Jun '09

19 Jun '09

Module: tools Branch: master Commit: f2025b7ccbc06e57180926c337b2ac82a42c741d URL: http://source.winehq.org/git/tools.git/?a=commit;h=f2025b7ccbc06e57180926c3… Author: Mikolaj Zalewski <mikolajz(a)tygrys.dom> Date: Wed Feb 13 20:06:21 2008 +0100 validate input data --- php/lib.php | 21 +++++++++++++++++++++ php/resfile.php | 2 +- php/resource.php | 6 +++--- 3 files changed, 25 insertions(+), 4 deletions(-) diff --git a/php/lib.php b/php/lib.php index e5e68b7..8b6a95e 100644 --- a/php/lib.php +++ b/php/lib.php @@ -12,6 +12,27 @@ function validate_lang($id) return $lang; } +function validate_type($type) +{ + if (!preg_match("/^[0-9]+$/", $type)) + die("Invalid type"); + return $type; +} + +function validate_resfile($resfile) +{ + if (!preg_match("*^[a-zA-Z0-9/.-_]+$*", $resfile)) + die("Invalid resource file"); + return $resfile; +} + +function validate_id($id) +{ + if (!preg_match("/^[a-zA-Z0-9_]+$/", $id)) + die("Invalid resource file"); + return $id; +} + function get_lang_name($id) { global $DATAROOT; diff --git a/php/resfile.php b/php/resfile.php index 6685c50..facf721 100644 --- a/php/resfile.php +++ b/php/resfile.php @@ -3,7 +3,7 @@ include("config.php"); include("lib.php"); $lang = validate_lang($_REQUEST['lang']); -$resfile = $_REQUEST['resfile']; +$resfile = validate_resfile($_REQUEST['resfile']); $file = fopen("$DATAROOT/langs/$lang", "r"); $msgs = array(); diff --git a/php/resource.php b/php/resource.php index 5c7cbba..2d9602d 100644 --- a/php/resource.php +++ b/php/resource.php @@ -3,9 +3,9 @@ include("config.php"); include("lib.php"); $lang = validate_lang($_REQUEST['lang']); -$resfile = $_REQUEST['resfile']; -$type = $_REQUEST['type']; -$id = $_REQUEST['id']; +$resfile = validate_resfile($_REQUEST['resfile']); +$type = validate_type($_REQUEST['type']); +$id = validate_id($_REQUEST['id']); $norm_fn = preg_replace("/[^A-Za-z0-9]/", "-", $resfile); $file = fopen("$DATAROOT/dumps/$norm_fn/$lang-$type-$id", "r");

1 0