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

Paul Vriens : transl: Remove last references to the conf directory.
by Alexandre Julliard July 22, 2009

July 22, 2009

Module: tools Branch: master Commit: 9f08477739cfe9dbb3765092929789a1465c09a7 URL: http://source.winehq.org/git/tools.git/?a=commit;h=9f08477739cfe9dbb3765092… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Tue Jul 21 18:01:03 2009 +0200 transl: Remove last references to the conf directory. --- transl/php/lib.php | 25 ------------------------- transl/php/lib_res.php | 4 ++-- transl/php/resource.php | 2 +- 3 files changed, 3 insertions(+), 28 deletions(-) diff --git a/transl/php/lib.php b/transl/php/lib.php index 48f1b65..4255905 100644 --- a/transl/php/lib.php +++ b/transl/php/lib.php @@ -93,19 +93,6 @@ function validate_id($id) return $id; } -function get_raw_lang_name($id) -{ - static $lang_cache = array(); - if (empty($lang_cache[$id])) - { - global $DATAROOT; - - $name = file_get_contents("$DATAROOT/conf/$id"); - $lang_cache[$id] = $name; - } - return $lang_cache[$id]; -} - function get_lang_name($id) { return get_locale_name($id); @@ -154,18 +141,6 @@ function show_sublangs($id) echo "</div>"; } -function has_lang_flag($id, $flag) -{ - return is_int(strpos(get_raw_lang_name($id), "[".$flag."]")); -} - -function is_lang_ignore_sublang($lang) -{ - if (!preg_match("/:00/", $lang)) - return FALSE; - return has_lang_flag($lang, "ignore-sublang"); -} - function get_lang_binid($lang) { if (!preg_match("/([0-9a-f]{3}):([0-9a-f]{2})/", $lang, $m)) diff --git a/transl/php/lib_res.php b/transl/php/lib_res.php index c62e3ce..c19087f 100644 --- a/transl/php/lib_res.php +++ b/transl/php/lib_res.php @@ -305,7 +305,7 @@ class ResFile return FALSE; } - function loadResource($type, $name, $language, $ignore_sublang = FALSE) + function loadResource($type, $name, $language) { fseek($this->file, 0); $pos = 0; @@ -336,7 +336,7 @@ class ResFile $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 */ + $curr_lang = $header["language"]; if ($curr_lang == $language) { fseek($this->file, $pos + $headerSize); diff --git a/transl/php/resource.php b/transl/php/resource.php index 656d5bf..b88e30d 100644 --- a/transl/php/resource.php +++ b/transl/php/resource.php @@ -27,7 +27,7 @@ $compare = isset($_REQUEST['compare']); function load_resource(&$resources, $type, $id, $langid, &$res) { $file_type = $type & 0xff; /* wrc adds 0x100 for *EX resource*/ - $resdata = $resources->loadResource($file_type, $id, get_lang_binid($langid), is_lang_ignore_sublang($langid)); + $resdata = $resources->loadResource($file_type, $id, get_lang_binid($langid)); if (!$resdata) die("Resource not found in *.res file\n"); switch ($type)

1 0

Paul Vriens : transl: Add (Neutral) to the neutral languages.
by Alexandre Julliard July 22, 2009

July 22, 2009

Module: tools Branch: master Commit: cd1392893db4844c06e1c460c1161107f033c4f7 URL: http://source.winehq.org/git/tools.git/?a=commit;h=cd1392893db4844c06e1c460… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Tue Jul 21 17:53:40 2009 +0200 transl: Add (Neutral) to the neutral languages. --- transl/php/lib.php | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/transl/php/lib.php b/transl/php/lib.php index 7fc4ae5..48f1b65 100644 --- a/transl/php/lib.php +++ b/transl/php/lib.php @@ -42,7 +42,7 @@ function res_enum($header, $f) else if ($header["name"] == 257) { $baseid = get_lang_base($langid); - $LOCALE_NAMES[$baseid] = convert_to_unicode($str->getString(1)); + $LOCALE_NAMES[$baseid] = convert_to_unicode($str->getString(1))." (Neutral)"; } }

1 0

Paul Vriens : transl: Remove unused file.
by Alexandre Julliard July 22, 2009

July 22, 2009

Module: tools Branch: master Commit: 84895677e96f2839cf9ec8ebcd54790b85f39824 URL: http://source.winehq.org/git/tools.git/?a=commit;h=84895677e96f2839cf9ec8eb… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Tue Jul 21 17:52:47 2009 +0200 transl: Remove unused file. --- transl/php/lib_res.php | 20 -------------------- transl/php/resource.php | 2 -- transl/php/stopwatch.php | 46 ---------------------------------------------- 3 files changed, 0 insertions(+), 68 deletions(-) diff --git a/transl/php/lib_res.php b/transl/php/lib_res.php index cbb60a8..c62e3ce 100644 --- a/transl/php/lib_res.php +++ b/transl/php/lib_res.php @@ -305,27 +305,8 @@ class ResFile return FALSE; } - function load_resource_helper($header, $f, $params) - { - $curr_lang = ($params[5] ? ($header["language"] & 0x3ff) : $header["language"]); /* check the ignore_sublang */ - if ($header["type"] == $params[0] && $header["name"] == $params[1] && $curr_lang == $params[2]) - { - $params[3] = $header; - $params[4] = fread($f, $header["resSize"]); - return TRUE; - } - return FALSE; - } - function loadResource($type, $name, $language, $ignore_sublang = FALSE) { -// $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; @@ -360,7 +341,6 @@ class ResFile { fseek($this->file, $pos + $headerSize); $out = fread($this->file, $resSize); -// $sw->stop(); return array($header, $out); } } diff --git a/transl/php/resource.php b/transl/php/resource.php index 493e9f1..656d5bf 100644 --- a/transl/php/resource.php +++ b/transl/php/resource.php @@ -24,8 +24,6 @@ $compare = isset($_REQUEST['compare']); <?php -//include_once("stopwatch.php"); - function load_resource(&$resources, $type, $id, $langid, &$res) { $file_type = $type & 0xff; /* wrc adds 0x100 for *EX resource*/ diff --git a/transl/php/stopwatch.php b/transl/php/stopwatch.php deleted file mode 100644 index ba227c9..0000000 --- a/transl/php/stopwatch.php +++ /dev/null @@ -1,46 +0,0 @@ -<?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

Paul Vriens : transl: Fix some php warnings while trying to deal with non-existing files.
by Alexandre Julliard July 22, 2009

July 22, 2009

Module: tools Branch: master Commit: a5a9aac761af96eff4a3b6d5d77a1dad94ab1e66 URL: http://source.winehq.org/git/tools.git/?a=commit;h=a5a9aac761af96eff4a3b6d5… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Tue Jul 21 17:29:52 2009 +0200 transl: Fix some php warnings while trying to deal with non-existing files. --- transl/php/lang.php | 85 ++++++++++++++++++++++++++++----------------------- 1 files changed, 47 insertions(+), 38 deletions(-) diff --git a/transl/php/lang.php b/transl/php/lang.php index 2dfb7c7..5ee2ca8 100644 --- a/transl/php/lang.php +++ b/transl/php/lang.php @@ -4,55 +4,56 @@ include_once("lib.php"); $lang = validate_lang($_REQUEST['lang']); -$file = fopen("$DATAROOT/langs/$lang", "r"); $transl = array(); $notransl = array(); $partial = array(); -$curr_file = ""; -while ($line = fgets($file, 4096)) + +function parse_file($lang) { - if (preg_match("/FILE ([A-Z]+) (.*) ([0-9]+) ([0-9]+) ([0-9]+)/", $line, $m)) + global $transl, $partial, $notransl; + global $DATAROOT; + if (!file_exists("$DATAROOT/langs/$lang")) + return; + + $file = fopen("$DATAROOT/langs/$lang", "r"); + $curr_file = ""; + while ($line = fgets($file, 4096)) { - $curr_file = $m[2]; - if ($m[1] == "NONE") + if (preg_match("/FILE ([A-Z]+) (.*) ([0-9]+) ([0-9]+) ([0-9]+)/", $line, $m)) { - $notransl[$curr_file] = array($m[3], $m[4], $m[5], 0); - continue; + $curr_file = $m[2]; + if ($m[1] == "NONE") + { + $notransl[$curr_file] = array($m[3], $m[4], $m[5], 0); + continue; + } + + if ($m[4]>0 || $m[5]>0) + { + $partial[$curr_file] = array($m[3], $m[4], $m[5], 0); + continue; + } + + $transl[$curr_file] = array($m[3], $m[4], $m[5], 0); } - - if ($m[4]>0 || $m[5]>0) + if (preg_match(",$curr_file: Warning: ,", $line, $m)) { - $partial[$curr_file] = array($m[3], $m[4], $m[5], 0); - continue; - } - - $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, $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 (array_key_exists($curr_file, $partial)) /* should be true - warning for $notransl shouldn't happen */ + $partial[$curr_file][3]++; + } } + fclose($file); + ksort($transl); + ksort($partial); + ksort($notransl); } -fclose($file); -ksort($transl); -ksort($partial); -ksort($notransl); -?> -<html> -<head> - <link rel="stylesheet" href="style.css" type="text/css"/> - <meta http-equiv="Content-Type" content="text/html; charset=utf-8"> - <title><?php echo get_lang_name($lang) ?> language - Wine translations</title> -</head> -<?php function dump_table($table) { global $lang; @@ -75,13 +76,21 @@ function dump_table($table) } echo "</table>\n"; } - ?> + +<html> +<head> + <link rel="stylesheet" href="style.css" type="text/css"> + <meta http-equiv="Content-Type" content="text/html; charset=utf-8"> + <title><?php echo get_lang_name($lang) ?> language - Wine translations</title> +</head> + <p><?php dump_menu_root() ?> > <?php dump_menu_lang($lang, FALSE)?> </p> <div class="main"> <h1><?php echo "Language: ".get_lang_name($lang) ?></h1> <?php +parse_file($lang); $translations = count($partial) + count($transl); if (preg_match("/:00/", $lang) && $translations == 0) {

1 0

Alexander Nicolaysen Sørnes : objectManager: Show a note when the parent entry as an id of 0
by Alexander Nicolaysen Sørnes July 21, 2009

July 21, 2009

Module: appdb Branch: master Commit: 561682cd231bdc676d822f7c3b1497de007007ef URL: http://source.winehq.org/git/appdb.git/?a=commit;h=561682cd231bdc676d822f7c… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Tue Jul 21 17:14:19 2009 +0200 objectManager: Show a note when the parent entry as an id of 0 --- include/objectManager.php | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/include/objectManager.php b/include/objectManager.php index d8ad2e2..0e1f0df 100644 --- a/include/objectManager.php +++ b/include/objectManager.php @@ -1217,10 +1217,11 @@ class ObjectManager if($sLinkText == 'default') { $oParent = $oObject->objectGetParent(); - if(!$oParent) + if(!$oParent || !$oParent->objectGetId()) { echo html_note('Failed to find parent entry', 'No parent entry could be found, even though it is supposed to exist.'); - } else + } + if($oParent) { $oParentOM = new objectManager(get_class($oParent), '', $oParent->objectGetId()); $sClassName = $oParentOM->getOptionalSetting('objectGetClassDisplayName', false);

1 0

Alexander Nicolaysen Sørnes : version: Make sure we always return a valid object in objectGetParent()
by Alexander Nicolaysen Sørnes July 21, 2009

July 21, 2009

Module: appdb Branch: master Commit: 8f6927f603e260b403f9153324ad688336b4d940 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=8f6927f603e260b403f91533… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Tue Jul 21 17:11:57 2009 +0200 version: Make sure we always return a valid object in objectGetParent() --- include/version.php | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/include/version.php b/include/version.php index b1bceae..ae0bc3e 100644 --- a/include/version.php +++ b/include/version.php @@ -786,7 +786,7 @@ class version { public function objectGetParent($sClass = '') { /* No id so we can't query the DB, but perhaps an entry is cached? */ - if(!$this->iAppId) + if(!$this->iAppId && $this->oApp) return $this->oApp; return new application($this->iAppId);

1 0

Alexander Nicolaysen Sørnes : objectManager: Show a note if a parent entry is missing
by Alexander Nicolaysen Sørnes July 21, 2009

July 21, 2009

Module: appdb Branch: master Commit: 00f9a20596bf14a5b72b697016a999fbaced0318 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=00f9a20596bf14a5b72b6970… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Tue Jul 21 17:04:11 2009 +0200 objectManager: Show a note if a parent entry is missing --- include/objectManager.php | 18 ++++++++++++------ 1 files changed, 12 insertions(+), 6 deletions(-) diff --git a/include/objectManager.php b/include/objectManager.php index 5153941..d8ad2e2 100644 --- a/include/objectManager.php +++ b/include/objectManager.php @@ -1217,12 +1217,18 @@ class ObjectManager if($sLinkText == 'default') { $oParent = $oObject->objectGetParent(); - $oParentOM = new objectManager(get_class($oParent), '', $oParent->objectGetId()); - $sClassName = $oParentOM->getOptionalSetting('objectGetClassDisplayName', false); - if($sClassName) - $sLinkText = "Move to another $sClassName"; - else - $sLinkText = 'Move to another parent entry'; + if(!$oParent) + { + echo html_note('Failed to find parent entry', 'No parent entry could be found, even though it is supposed to exist.'); + } else + { + $oParentOM = new objectManager(get_class($oParent), '', $oParent->objectGetId()); + $sClassName = $oParentOM->getOptionalSetting('objectGetClassDisplayName', false); + if($sClassName) + $sLinkText = "Move to another $sClassName"; + else + $sLinkText = 'Move to another parent entry'; + } } echo "<a href=\"".$this->makeUrl("showChangeParent", $this->iId, "Move to another parent entry")."\">$sLinkText</a>\n";

1 0

Rein Klazes : user32/tests: Fix for a test failure on win98/NT4.
by Alexandre Julliard July 21, 2009

July 21, 2009

Module: wine Branch: master Commit: da86ab71fa5d21ef3d6d8e358005df757b79f3e5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=da86ab71fa5d21ef3d6d8e358… Author: Rein Klazes <wijn(a)online.nl> Date: Tue Jul 21 15:28:45 2009 +0200 user32/tests: Fix for a test failure on win98/NT4. --- dlls/user32/tests/menu.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/user32/tests/menu.c b/dlls/user32/tests/menu.c index 878decf..7382ec0 100644 --- a/dlls/user32/tests/menu.c +++ b/dlls/user32/tests/menu.c @@ -3057,7 +3057,7 @@ static void test_menu_circref(void) ret = ModifyMenuA( menu1, (UINT_PTR)menu2, MF_POPUP, (UINT_PTR)menu2, "menu 2"); todo_wine ok( !ret || - broken( 0), /* win98, NT */ + broken( ret), /* win98, NT */ "ModifyMenu should have failed.\n"); if( !ret) { /* will probably stack fault if the ModifyMenu succeeded */ ret = GetMenuState( menu1, 123, 0);

1 0

Paul Vriens : wordpad: Align resources with the English ones.
by Alexandre Julliard July 21, 2009

July 21, 2009

Module: wine Branch: master Commit: a607df2b69cfac125f856648f3224c42453446fd URL: http://source.winehq.org/git/wine.git/?a=commit;h=a607df2b69cfac125f856648f… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Tue Jul 21 13:03:21 2009 +0200 wordpad: Align resources with the English ones. --- programs/wordpad/Nl.rc | 20 ++++++-------------- 1 files changed, 6 insertions(+), 14 deletions(-) diff --git a/programs/wordpad/Nl.rc b/programs/wordpad/Nl.rc index c9ce64a..10729e4 100644 --- a/programs/wordpad/Nl.rc +++ b/programs/wordpad/Nl.rc @@ -180,10 +180,14 @@ END STRINGTABLE DISCARDABLE BEGIN - STRING_RICHTEXT_FILES_RTF, "Rich text formaat (*.rtf)" + STRING_ALL_FILES, "Alle documenten (*.*)" STRING_TEXT_FILES_TXT, "Tekst documenten (*.txt)" STRING_TEXT_FILES_UNICODE_TXT, "Unicode tekst document (*.txt)" - STRING_ALL_FILES, "Alle documenten (*.*)" + STRING_RICHTEXT_FILES_RTF, "Rich text formaat (*.rtf)" + STRING_NEWFILE_RICHTEXT, "Rich tekst document" + STRING_NEWFILE_TXT, "Tekst document" + STRING_NEWFILE_TXT_UNICODE, "Unicode tekst document" + STRING_PRINTER_FILES_PRN, "Printer bestanden (*.PRN)" END STRINGTABLE DISCARDABLE @@ -195,18 +199,6 @@ END STRINGTABLE DISCARDABLE BEGIN - STRING_NEWFILE_RICHTEXT, "Rich tekst document" - STRING_NEWFILE_TXT, "Tekst document" - STRING_NEWFILE_TXT_UNICODE, "Unicode tekst document" -END - -STRINGTABLE DISCARDABLE -BEGIN - STRING_PRINTER_FILES_PRN, "Printer bestanden (*.PRN)" -END - -STRINGTABLE DISCARDABLE -BEGIN STRING_VIEWPROPS_TITLE, "Opties" STRING_VIEWPROPS_TEXT, "Tekst" STRING_VIEWPROPS_RICHTEXT, "Rich tekst"

1 0

Paul Vriens : shdoclc: Fix Portuguese (Portugal) translation.
by Alexandre Julliard July 21, 2009

July 21, 2009

Module: wine Branch: master Commit: bd999ee48940870a202a9fc3931176311eb95b02 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bd999ee48940870a202a9fc39… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Tue Jul 21 12:47:17 2009 +0200 shdoclc: Fix Portuguese (Portugal) translation. --- dlls/shdoclc/Pt.rc | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/shdoclc/Pt.rc b/dlls/shdoclc/Pt.rc index d0bd1b7..7377473 100644 --- a/dlls/shdoclc/Pt.rc +++ b/dlls/shdoclc/Pt.rc @@ -192,8 +192,8 @@ IDR_BROWSE_CONTEXT_MENU MENU MENUITEM SEPARATOR MENUITEM "Adicionar aos &Favoritos...", IDM_ADDFAVORITES MENUITEM SEPARATOR - MENUITEM "I&niciar", IDM_DYNSRCPLAY - MENUITEM "&Parar", IDM_DYNSRCSTOP + MENUITEM "I&niciar", IDM_IMGARTPLAY + MENUITEM "&Parar", IDM_IMGARTSTOP MENUITEM "&Recomeçar", IDM_IMGARTREWIND MENUITEM SEPARATOR MENUITEM SEPARATOR

1 0