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

Mikolaj Zalewski : Polish should ignore sublang
by Alexandre Julliard June 19, 2009

June 19, 2009

Module: tools Branch: master Commit: c661e8d4bd1b72a8877b89a652b2b12b1f5b4b33 URL: http://source.winehq.org/git/tools.git/?a=commit;h=c661e8d4bd1b72a8877b89a6… Author: Mikolaj Zalewski <mikolajz(a)tygrys.dom> Date: Sun Jun 7 11:48:20 2009 +0200 Polish should ignore sublang --- scripts/conf/015:00 | 1 + scripts/conf/015:01 | 1 - 2 files changed, 1 insertions(+), 1 deletions(-) diff --git a/scripts/conf/015:00 b/scripts/conf/015:00 new file mode 100644 index 0000000..f8e03c0 --- /dev/null +++ b/scripts/conf/015:00 @@ -0,0 +1 @@ +Polish[ignore-sublang] \ No newline at end of file diff --git a/scripts/conf/015:01 b/scripts/conf/015:01 deleted file mode 100644 index e88b597..0000000 --- a/scripts/conf/015:01 +++ /dev/null @@ -1 +0,0 @@ -Polish \ No newline at end of file

1 0

Mikolaj Zalewski : If needed, run configure in wrc tree
by Alexandre Julliard June 19, 2009

June 19, 2009

Module: tools Branch: master Commit: 53aa16671d8ed4a7a6c96d1cf884eb404a5d8a17 URL: http://source.winehq.org/git/tools.git/?a=commit;h=53aa16671d8ed4a7a6c96d1c… Author: Mikolaj Zalewski <mikolajz(a)tygrys.dom> Date: Sat Feb 21 17:27:41 2009 +0100 If needed, run configure in wrc tree --- scripts/Master.sh | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/scripts/Master.sh b/scripts/Master.sh index c936830..ee7a27c 100755 --- a/scripts/Master.sh +++ b/scripts/Master.sh @@ -26,6 +26,9 @@ if [ "$PREPARE_TREES" -eq 1 ]; then if [ "x$NOVERBOSE" = "x" ]; then echo -n "Preparing tree(s)..." fi + if [ ! -f "$WRCROOT/Makefile" ]; then + $WRCROOT/configure + 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"

1 0

Mikolaj Zalewski : Add Lithuanian language
by Alexandre Julliard June 19, 2009

June 19, 2009

Module: tools Branch: master Commit: cad9351655fc254a2cadcb7c3122d19f9445c11b URL: http://source.winehq.org/git/tools.git/?a=commit;h=cad9351655fc254a2cadcb7c… Author: Mikolaj Zalewski <mikolajz(a)tygrys.dom> Date: Sat Feb 21 17:28:02 2009 +0100 Add Lithuanian language --- php/conf/027:00 | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/php/conf/027:00 b/php/conf/027:00 new file mode 100644 index 0000000..52a59e5 --- /dev/null +++ b/php/conf/027:00 @@ -0,0 +1 @@ +Lithuanian[ignore-sublang] \ No newline at end of file

1 0

Mikolaj Zalewski : inform about warnings on the language page
by Alexandre Julliard June 19, 2009

June 19, 2009

Module: tools Branch: master Commit: 132b5b741bc019a914bb7fe4de348949656e0eb5 URL: http://source.winehq.org/git/tools.git/?a=commit;h=132b5b741bc019a914bb7fe4… Author: Mikolaj Zalewski <mikolajz(a)tygrys.dom> Date: Sun Dec 7 00:44:46 2008 +0100 inform about warnings on the language page --- php/lang.php | 24 ++++++++++++++++++++---- 1 files changed, 20 insertions(+), 4 deletions(-) diff --git a/php/lang.php b/php/lang.php index 167cf2f..a743deb 100644 --- a/php/lang.php +++ b/php/lang.php @@ -8,23 +8,36 @@ $file = fopen("$DATAROOT/langs/$lang", "r"); $transl = array(); $notransl = array(); $partial = array(); +$curr_file = ""; while ($line = fgets($file, 4096)) { if (preg_match("/FILE ([A-Z]+) (.*) ([0-9]+) ([0-9]+) ([0-9]+)/", $line, $m)) { + $curr_file = $m[2]; if ($m[1] == "NONE") { - $notransl[$m[2]] = array($m[3], $m[4], $m[5], $m[2]); + $notransl[$curr_file] = array($m[3], $m[4], $m[5], 0); continue; } if ($m[4]>0 || $m[5]>0) { - $partial[$m[2]] = array($m[3], $m[4], $m[5], $m[2]); + $partial[$curr_file] = array($m[3], $m[4], $m[5], 0); continue; } - $transl[$m[2]] = array($m[3], $m[4], $m[5], $m[2]); + $transl[$curr_file] = array($m[3], $m[4], $m[5], 0); + } + if (preg_match(",$curr_file: Warning: ,", $line, $m)) + { + if (array_key_exists($curr_file, $transl)) + { + $partial[$curr_file] = $transl[$curr_file]; + unset($transl[$curr_file]); + } + + if (array_key_exists($curr_file, $partial)) /* should be true - warning for $notransl shouldn't happen */ + $partial[$curr_file][3]++; } if (preg_match("/LOCALE ([0-9a-f]{3}:[0-9a-f]{2}) (.*) ([0-9]+) ([0-9]+) ([0-9]+)/", $line, $m)) { @@ -54,7 +67,10 @@ 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>".gen_resfile_a($lang, $value[3]).$key."</a></td>"; + $extra = ""; + if ($value[3] > 0) + $extra = "(<img src=\"img/icon-warning.png\" height=\"16\"> warnings: ".$value[3].")"; + echo "<tr><td>".gen_resfile_a($lang, $key).$key."</a> $extra</td>"; echo "<td>".$value[0]."</td>"; echo "<td>".$value[1]."</td>"; echo "<td>".$value[2]."</td>";

1 0

Mikolaj Zalewski : add README file
by Alexandre Julliard June 19, 2009

June 19, 2009

Module: tools Branch: master Commit: bdb8582c80314c6dd0eb8e30cb95f0bd6be7fa57 URL: http://source.winehq.org/git/tools.git/?a=commit;h=bdb8582c80314c6dd0eb8e30… Author: Mikolaj Zalewski <mikolajz(a)tygrys.dom> Date: Sun Dec 7 01:13:35 2008 +0100 add README file --- README | 12 ++++++++++++ 1 files changed, 12 insertions(+), 0 deletions(-) diff --git a/README b/README new file mode 100644 index 0000000..7c66b10 --- /dev/null +++ b/README @@ -0,0 +1,12 @@ +To run the scripts, copy scripts/config-example to scripts/config and edit it +to setup the paths. Then, in scripts/, run ./Master.sh to generate the +statistics. If, in scripts/config, you have set to store results in the +directory with PHP scripts from php/, they should be able to display the +statistics. If you want to keep the generated data in a different directory +than the PHP scripts, edit php/config.php so that they can to find it. + +You can create files scripts/local-prehook.sh and scripts/local-posthook.sh if +you want to automate e.g. fetching the Git tree before generating the statistics +or push the results to a server after it. Running the scripts with the +environment variable NOVERBOSE set should make them silent enough to make them +usable as a cron job.

1 0

Mikolaj Zalewski : Move some styles to CSS file.
by Alexandre Julliard June 19, 2009

June 19, 2009

Module: tools Branch: master Commit: b8963059aee5dd26a9f38ee11d30c8e9e307f9a1 URL: http://source.winehq.org/git/tools.git/?a=commit;h=b8963059aee5dd26a9f38ee1… Author: Mikolaj Zalewski <mikolajz(a)tygrys.dom> Date: Sun Jun 7 12:20:47 2009 +0200 Move some styles to CSS file. --- php/index.php | 4 ++-- php/lib_res.php | 2 +- php/resource.php | 12 ++++++------ php/style.css | 30 +++++++++++++++++++++++++++++- 4 files changed, 38 insertions(+), 10 deletions(-) diff --git a/php/index.php b/php/index.php index 379e10b..2993994 100644 --- a/php/index.php +++ b/php/index.php @@ -35,7 +35,7 @@ it needs to be found manually by the translators. If you would like to read abou improve Wine translations check <?php echo $WINE_WIKI_TRANSLATIONS ?>. </p> -<table border="1"> +<table border="1" class="index"> <tr><th></th><th>Language</th><th>Translated</th><th>Missing</th><th>Errors</th><th> </th></tr> <?php function draw_bar($tr, $err, $sum) @@ -49,7 +49,7 @@ function draw_bar($tr, $err, $sum) $tr_len--; } $miss_len = 300 - $tr_len - $err_len; - echo '<td style="background-color: #D1DAF9">'; + echo '<td class="bar">'; if ($tr_len > 0) echo "<img src=\"img/bar0.gif\" height=\"15\" width=\"$tr_len\">"; if ($err_len > 0) diff --git a/php/lib_res.php b/php/lib_res.php index 9505c23..0f963ed 100644 --- a/php/lib_res.php +++ b/php/lib_res.php @@ -174,7 +174,7 @@ function dump_resource_row($id, &$resource, &$master, $method_name, $diff_method $extra = ""; if ($master && $diff_method_name) if ($resource->$diff_method_name($master, $lparam, $master_lparam)) - $extra = " style=\"background-color: #ffb8d0\""; + $extra = " class=\"diff\""; if ($master_lparam == NULL) $master_lparam = $lparam; diff --git a/php/resource.php b/php/resource.php index f1fe085..3a7eb72 100644 --- a/php/resource.php +++ b/php/resource.php @@ -58,25 +58,25 @@ if ($compare) ?> -<table style="background-color: #f0f0ff" cellpadding="0" cellspacing="0"> -<tr style="background-color: #e0e0ff"><th colspan="5"><?php echo get_resource_name($type, $id) ?></th></tr> +<table class="resource" cellpadding="0" cellspacing="0"> +<tr class="header"><th colspan="5"><?php echo get_resource_name($type, $id) ?></th></tr> <?php if (!$compare) { - echo "<tr style=\"background-color: #e8e8ff\"><td colspan=\"3\" style=\"text-align: right\">"; + echo "<tr class=\"subheader\"><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=\"5\" style=\"text-align: right\">"; + echo "<tr class=\"subheader\"><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 "<< Hide compare with ".$MASTER_LANGUAGE_NAME."</a></small>"; echo "</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>"; + echo "<tr class=\"subheader\"><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/php/style.css b/php/style.css index ef053ce..808597a 100644 --- a/php/style.css +++ b/php/style.css @@ -20,4 +20,32 @@ p.note border-style: solid; border-color: black; padding: 2px; -} \ No newline at end of file +} + +/* summary table on index page, bars column*/ +table.index td.bar +{ + background-color: #d1daf9; +} + +/* table with a standard resource dump */ +table.resource +{ + background-color: #f0f0ff; +} + +table.resource tr.header +{ + background-color: #e0e0ff; +} + +table.resource tr.subheader +{ + background-color: #e8e8ff; +} + +/* rows are different (in resource comparision mode) */ +table.resource tr.diff +{ + background-color: #ffb8d0; +}

1 0

Mikolaj Zalewski : add support for dumping/comparing dialogs
by Alexandre Julliard June 19, 2009

June 19, 2009

Module: tools Branch: master Commit: c6ff763755f4bb93609bdc1d62f7c522036a498c URL: http://source.winehq.org/git/tools.git/?a=commit;h=c6ff763755f4bb93609bdc1d… Author: Mikolaj Zalewski <mikolajz(a)tygrys.dom> Date: Sun Nov 30 16:43:52 2008 +0100 add support for dumping/comparing dialogs --- php/lib.php | 2 +- php/lib_res.php | 398 +++++++++++++++++++++++++++++++++++++++++++++++++++++- php/resource.php | 7 +- 3 files changed, 400 insertions(+), 7 deletions(-) Diff: http://source.winehq.org/git/tools.git/?a=commitdiff;h=c6ff763755f4bb93609b…

1 0

Mikolaj Zalewski : use common function to compute the longest common subsequence
by Alexandre Julliard June 19, 2009

June 19, 2009

Module: tools Branch: master Commit: 8253bad185cbebd7d8101240eacd16a8c94764b1 URL: http://source.winehq.org/git/tools.git/?a=commit;h=8253bad185cbebd7d8101240… Author: Mikolaj Zalewski <mikolajz(a)tygrys.dom> Date: Sun Dec 7 00:19:23 2008 +0100 use common function to compute the longest common subsequence --- php/lib_res.php | 204 ++++++++++++++++++++----------------------------------- 1 files changed, 74 insertions(+), 130 deletions(-) diff --git a/php/lib_res.php b/php/lib_res.php index 8dd5bc1..279323e 100644 --- a/php/lib_res.php +++ b/php/lib_res.php @@ -188,6 +188,70 @@ function dump_resource_row($id, &$resource, &$master, $method_name, $diff_method echo "</td></tr>\n\n"; } +/* Longest common subsequence - simple O(n^2) time and O(n^2) space algorithm, + * but resources are small so this should be OK */ +function diff_sequences(&$res1, $count1, &$res2, $count2, $compare_method) +{ + $mincount = min($count1, $count2); + for ($start = 0; $start < $mincount; $start++) + if (!$res1->$compare_method($res2, $start, $start)) + break; + + if (($start == $mincount) && $count1 == $count2) + return array_fill(0, $mincount, 3); + + for ($end = 0; $end < $mincount - $start; $end++) + if (!$res1->$compare_method($res2, $count1 - 1 - $end, $count2 - 1 - $end)) + break; + + $out = array(); + $tabdyn = array_fill(0, $count1 - $start - $end + 1, + array_fill(0, $count2 - $start - $end + 1, 0)); + + for ($i = 1; $i <= $count1 - $start - $end; $i++) + { + for ($j = 1; $j <= $count2 - $start - $end; $j++) + { + if ($res1->$compare_method($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]; + } + } + + /* backtrack (produces results in reverse order) */ + $out = ($end > 0 ? array_fill(0, $end, 3) : array()); + $i = $count1 - $start - $end; + $j = $count2 - $start - $end; + while ($i > 0 || $j > 0) { + if ($i == 0) + $step = 2; + else if ($j == 0) + $step = 1; + else + { + if ($res1->$compare_method($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; + + if ($step & 1) + $i--; + if ($step & 2) + $j--; + } + if ($start > 0) + $out += array_fill(count($out), $start, 3); + return array_reverse($out); +} + class ResFile { @@ -443,70 +507,6 @@ class MenuResource extends Resource ($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) - $start - $end + 1, - array_fill(0, count($res2->items) - $start - $end + 1, 0)); - - for ($i = 1; $i <= count($this->items) - $start - $end; $i++) - { - for ($j = 1; $j <= count($res2->items) - $start - $end; $j++) - { - 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]; - } - } - - /* backtrack (produces results in reverse order) */ - $out = ($end > 0 ? array_fill(0, $end, 3) : array()); - $i = count($this->items) - $start - $end; - $j = count($res2->items) - $start - $end; - while ($i > 0 || $j > 0) { - if ($i == 0) - $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; - - if ($step & 1) - $i--; - if ($step & 2) - $j--; - } - if ($start > 0) - $out += array_fill(count($out), $start, 3); - return array_reverse($out); - } function handle_indent(&$tstate, $resinfo) { @@ -586,7 +586,11 @@ class MenuResource extends Resource function dump($master_res = NULL) { if ($master_res) - $show = $this->diff_menus($master_res); + { + $show = diff_sequences($this, count($this->items), + $master_res, count($master_res->items), + 'menuitem_equals'); + } else $show = array_fill(0, count($this->items), 1); @@ -725,70 +729,6 @@ class DialogResource extends Resource $other_ctrl = $res2->items[$res2_i]; return ($this_ctrl['id'] == $other_ctrl['id']); } - - /* 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_dialogs(&$res2) - { - $mincount = min(count($this->items), count($res2->items)); - for ($start = 0; $start < $mincount; $start++) - if (!$this->control_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->control_equals($res2, count($this->items) - 1 - $end, count($res2->items) - 1 - $end)) - break; - - $out = array(); - $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) - $start - $end; $i++) - { - for ($j = 1; $j <= count($res2->items) - $start - $end; $j++) - { - if ($this->control_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]; - } - } - - /* backtrack (produces results in reverse order) */ - $out = ($end > 0 ? array_fill(0, $end, 3) : array()); - $i = count($this->items) - $start - $end; - $j = count($res2->items) - $start - $end; - while ($i > 0 || $j > 0) { - if ($i == 0) - $step = 2; - else if ($j == 0) - $step = 1; - else - { - if ($this->control_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; - - if ($step & 1) - $i--; - if ($step & 2) - $j--; - } - if ($start > 0) - $out += array_fill(count($out), $start, 3); - return array_reverse($out); - } function dump_header() { @@ -876,7 +816,11 @@ class DialogResource extends Resource function dump($master_res = NULL) { if ($master_res) - $show = $this->diff_dialogs($master_res); + { + $show = diff_sequences($this, count($this->items), + $master_res, count($master_res->items), + 'control_equals'); + } else $show = array_fill(0, count($this->items), 1);

1 0

Mikolaj Zalewski : use dump_resource_row in stringtables and menus
by Alexandre Julliard June 19, 2009

June 19, 2009

Module: tools Branch: master Commit: 0247e4e117cf919b7a77f42ea1bba76bf37b4a39 URL: http://source.winehq.org/git/tools.git/?a=commit;h=0247e4e117cf919b7a77f42e… Author: Mikolaj Zalewski <mikolajz(a)tygrys.dom> Date: Sun Nov 30 17:06:12 2008 +0100 use dump_resource_row in stringtables and menus --- php/lib_res.php | 106 +++++++++++++++++++++++++----------------------------- 1 files changed, 49 insertions(+), 57 deletions(-) diff --git a/php/lib_res.php b/php/lib_res.php index 8af65f8..8dd5bc1 100644 --- a/php/lib_res.php +++ b/php/lib_res.php @@ -169,7 +169,7 @@ function is_equal_unicode_or_id($unistr_or_int1, $unistr_or_int2) return TRUE; } -function dump_resource_row($id, $resource, $master, $method_name, $diff_method_name, $lparam, $master_lparam = NULL) +function dump_resource_row($id, &$resource, &$master, $method_name, $diff_method_name, $lparam, $master_lparam = NULL) { $extra = ""; if ($master && $diff_method_name) @@ -355,32 +355,23 @@ class StringTable extends Resource return $this->strings[$id]; } - function dump($master_res = NULL) + function dump_string($lparam) { - for ($i=0; $i<16; $i++) { - $extra = ""; - - $uni_str = $this->strings[$i]; - if ($master_res) - { - $master_uni_str = $master_res->strings[$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><td> </td>"; - echo "<td>"; - - dump_unicode_or_empty($uni_str); + dump_unicode_or_empty($this->strings[$lparam]); + } - if ($master_res) - { - echo "</td><td></td><td>"; - dump_unicode_or_empty($master_uni_str); - } - echo "</td></tr>\n"; - } + function is_string_different(&$other, $lparam) + { + $uni_str = $this->strings[$lparam]; + $other_uni_str = $other->strings[$lparam]; + return ((!$other_uni_str && $uni_str) || ($other_uni_str && !$uni_str)); + } + function dump($master_res = NULL) + { + for ($i=0; $i<16; $i++) + dump_resource_row(($this->table_id-1)*16+$i, $this, $master_res, + "dump_string", "is_string_different", $i); } } @@ -567,6 +558,31 @@ class MenuResource extends Resource echo "</span>"; } + function dump_menuitem($lparam) + { + $pos = $lparam[0]; + $do_show = $lparam[1]; + $tstate =& $lparam[2]; + if (!$do_show) + { + $this->handle_indent($tstate, NULL); + return; + } + + $this->handle_indent($tstate, $this->items[$pos]["resinfo"]); + $this->dump_title($this->items[$pos]); + } + + function is_menuitem_different(&$other, $lparam, $other_lparam) + { + if (!$lparam[1] || !$other_lparam[1]) /* one of the items is not shown */ + return TRUE; + + $pos = $lparam[0]; + $other_pos = $other_lparam[0]; + return $this->items[$pos]["state"] != $other->items[$other_pos]["state"]; + } + function dump($master_res = NULL) { if ($master_res) @@ -579,40 +595,16 @@ class MenuResource extends Resource $pos = 0; $master_pos = 0; for ($i=0; $i<count($show); $i++) { - $extra = ""; - - if ($master_res) - { - if ($show[$i] != 3 || $this->items[$pos]["state"] != $master_res->items[$master_pos]["state"]) - $extra = " style=\"background-color: #ffb8d0\""; - } - $id = ($show[$i] & 1 ? $this->items[$pos]["id"] : $master_res->items[$master_pos]["id"]); - echo "<tr$extra><td valign=\"top\">$id</td><td> </td>"; - echo "<td>"; + dump_resource_row($id, $this, $master_res, + "dump_menuitem", "is_menuitem_different", + array($pos, $show[$i] & 1, &$tstate), + array($master_pos, $show[$i] & 2, &$tstate)); if ($show[$i] & 1) - { - $this->handle_indent($tstate, $this->items[$pos]["resinfo"]); - $this->dump_title($this->items[$pos]); $pos++; - } - else - $this->handle_indent($tstate, NULL); - - if ($master_res) - { - echo "</td><td></td><td>"; - if ($show[$i] & 2) - { - $this->handle_indent($tstate_master, $master_res->items[$master_pos]["resinfo"]); - $this->dump_title($master_res->items[$master_pos]); - $master_pos++; - } - else - $this->handle_indent($tstate_master, NULL); - } - echo "</td></tr>\n"; + if ($show[$i] & 2) + $master_pos++; } } @@ -813,7 +805,7 @@ class DialogResource extends Resource printf("$keyword 0x%x", $this->$field); } - function is_hex_different($other, $lparam) + function is_hex_different(&$other, $lparam) { $field = $lparam[0]; return ($this->$field != $other->$field); @@ -827,7 +819,7 @@ class DialogResource extends Resource dump_unicode_or_id($this->$field); } - function is_string_different($other, $lparam) + function is_string_different(&$other, $lparam) { $field = $lparam[0]; return !is_equal_unicode_or_id($this->$field, $other->$field); @@ -862,7 +854,7 @@ class DialogResource extends Resource } /* check if the row should be in red */ - function is_control_different($other, $lparam, $other_lparam) + function is_control_different(&$other, $lparam, $other_lparam) { global $CONSTS; if (!$lparam[1] || !$other_lparam[1]) /* one item is missing */

1 0

Mikolaj Zalewski : there may be no space between RC_SRCS and =
by Alexandre Julliard June 19, 2009

June 19, 2009

Module: tools Branch: master Commit: feb0dc10fb095d48d231542682217d1c1bf83d0f URL: http://source.winehq.org/git/tools.git/?a=commit;h=feb0dc10fb095d48d2315426… Author: Mikolaj Zalewski <mikolajz(a)tygrys.dom> Date: Thu Jun 5 23:05:48 2008 +0200 there may be no space between RC_SRCS and = --- scripts/checkmakefile.pl | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/checkmakefile.pl b/scripts/checkmakefile.pl index cc5064f..c13c31f 100755 --- a/scripts/checkmakefile.pl +++ b/scripts/checkmakefile.pl @@ -113,7 +113,7 @@ $ARGV[0] =~ m,^(.*/)[^/]*$,; $path = $1; while (<MAKEFILE>) { - if (m/^RC_SRCS +=/) + if (m/^RC_SRCS *=/) { while (m/\\$/) { @@ -121,7 +121,7 @@ while (<MAKEFILE>) chop; $_ .= <MAKEFILE>; } - m/^RC_SRCS += (.*)$/; + m/^RC_SRCS *=(.*)$/; @file = split(/ /, $1); foreach (@file) {

1 0