October 2014 - Wine-commits

Jonathan Vollebregt : reg/tests: Add REG_DWORD_BIG_ENDIAN tests for reg add.
by Alexandre Julliard 24 Oct '14

24 Oct '14

Module: wine Branch: master Commit: d2e6e210ac23cba8e3f82af6cdb31c66d57ad2ef URL: http://source.winehq.org/git/wine.git/?a=commit;h=d2e6e210ac23cba8e3f82af6c… Author: Jonathan Vollebregt <jnvsor(a)gmail.com> Date: Thu Oct 23 17:03:53 2014 +0200 reg/tests: Add REG_DWORD_BIG_ENDIAN tests for reg add. --- programs/reg/tests/reg.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/programs/reg/tests/reg.c b/programs/reg/tests/reg.c index 0e5be50..3ba1e3a 100644 --- a/programs/reg/tests/reg.c +++ b/programs/reg/tests/reg.c @@ -246,6 +246,14 @@ static void test_add(void) dword = 456; verify_reg(hkey, "DWORD_LE", REG_DWORD_LITTLE_ENDIAN, &dword, sizeof(dword), 0); + /* REG_DWORD_BIG_ENDIAN */ + run_reg_exe("reg add HKCU\\" KEY_BASE " /v DWORD_BE /t REG_DWORD_BIG_ENDIAN /d 456 /f", &r); + ok(r == REG_EXIT_SUCCESS, "got exit code %u\n", r); + dword = 456; + verify_reg(hkey, "DWORD_BE", REG_DWORD_BIG_ENDIAN, &dword, sizeof(dword), TODO_REG_SIZE); + /* REG_DWORD_BIG_ENDIAN is broken in every version of windows. It behaves like + * an ordinary REG_DWORD - that is little endian. GG */ + /* REG_MULTI_SZ */ run_reg_exe("reg add HKCU\\" KEY_BASE " /v multi0 /t REG_MULTI_SZ /d \"three\\0little\\0strings\" /f", &r); ok(r == REG_EXIT_SUCCESS, "got exit code %u\n", r);

1 0

Jonathan Vollebregt : reg/tests: Add negative DWORD tests.
by Alexandre Julliard 24 Oct '14

24 Oct '14

Module: wine Branch: master Commit: b2c99522a6927b0ce00a69e1650884a8b90320d4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b2c99522a6927b0ce00a69e16… Author: Jonathan Vollebregt <jnvsor(a)gmail.com> Date: Thu Oct 23 17:03:49 2014 +0200 reg/tests: Add negative DWORD tests. --- programs/reg/tests/reg.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/programs/reg/tests/reg.c b/programs/reg/tests/reg.c index 5b79aed..f79c124 100644 --- a/programs/reg/tests/reg.c +++ b/programs/reg/tests/reg.c @@ -180,6 +180,11 @@ static void test_add(void) verify_reg(hkey, "dword8", REG_DWORD, &dword, sizeof(dword), (sizeof(long) > sizeof(DWORD)) ? 0 : TODO_REG_DATA); + run_reg_exe("reg add HKCU\\" KEY_BASE " /t REG_DWORD /v dword9 /f /d -1", &r); + todo_wine ok(r == REG_EXIT_FAILURE || broken(r == REG_EXIT_SUCCESS /* WinXP */), "got exit code %u\n", r); + run_reg_exe("reg add HKCU\\" KEY_BASE " /t REG_DWORD /v dword10 /f /d -0x1", &r); + todo_wine ok(r == REG_EXIT_FAILURE || broken(r == REG_EXIT_SUCCESS /* WinXP */), "got exit code %u\n", r); + /* REG_DWORD_LITTLE_ENDIAN */ run_reg_exe("reg add HKCU\\" KEY_BASE " /v DWORD_LE /t REG_DWORD_LITTLE_ENDIAN /d 456 /f", &r); ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r);

1 0

Amine Khaldi : d3dxof: Remove unused IDirectXFileObject_Vtbl (Clang).
by Alexandre Julliard 24 Oct '14

24 Oct '14

Module: wine Branch: master Commit: e67beed64db03eaeb98082d61bcb9fd6d7216ccd URL: http://source.winehq.org/git/wine.git/?a=commit;h=e67beed64db03eaeb98082d61… Author: Amine Khaldi <amine.khaldi(a)reactos.org> Date: Thu Oct 23 19:01:58 2014 +0100 d3dxof: Remove unused IDirectXFileObject_Vtbl (Clang). --- dlls/d3dxof/d3dxof.c | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/d3dxof/d3dxof.c b/dlls/d3dxof/d3dxof.c index 8ca5793..88647cf 100644 --- a/dlls/d3dxof/d3dxof.c +++ b/dlls/d3dxof/d3dxof.c @@ -39,7 +39,6 @@ static const struct IDirectXFileBinaryVtbl IDirectXFileBinary_Vtbl; static const struct IDirectXFileDataVtbl IDirectXFileData_Vtbl; static const struct IDirectXFileDataReferenceVtbl IDirectXFileDataReference_Vtbl; static const struct IDirectXFileEnumObjectVtbl IDirectXFileEnumObject_Vtbl; -static const struct IDirectXFileObjectVtbl IDirectXFileObject_Vtbl; static const struct IDirectXFileSaveObjectVtbl IDirectXFileSaveObject_Vtbl; static HRESULT IDirectXFileDataReferenceImpl_Create(IDirectXFileDataReferenceImpl** ppObj);

1 0

Jeremy Newman : remove unused counter var
by Jeremy Newman 23 Oct '14

23 Oct '14

Module: website Branch: master Commit: 696325e41ae5bfb86866f03aa64295126501c260 URL: http://source.winehq.org/git/website.git/?a=commit;h=696325e41ae5bfb86866f0… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Thu Oct 23 14:07:52 2014 -0500 remove unused counter var --- include/plugins/announce.php | 3 --- 1 file changed, 3 deletions(-) diff --git a/include/plugins/announce.php b/include/plugins/announce.php index e14158a..6c61baa 100644 --- a/include/plugins/announce.php +++ b/include/plugins/announce.php @@ -21,7 +21,6 @@ $title = ""; if ($arr = file($announce)) { $in_header = 1; - $x = 0; while (list($c,$val) = each($arr)) { if ($c == 0) @@ -50,8 +49,6 @@ if ($arr = file($announce)) "\\1<a href=\"".$config->bug_system."\\2\">\\2</a>", $arr[$c]); } - - $x++; } $announce = join("",$arr);

1 0

Jeremy Newman : set title and mega og
by Jeremy Newman 23 Oct '14

23 Oct '14

Module: website Branch: master Commit: 2a501a65e59894c68079ccbfea71d06cb9a21587 URL: http://source.winehq.org/git/website.git/?a=commit;h=2a501a65e59894c68079cc… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Thu Oct 23 11:24:05 2014 -0500 set title and mega og --- include/plugins/wwn.php | 3 +++ 1 file changed, 3 insertions(+) diff --git a/include/plugins/wwn.php b/include/plugins/wwn.php index e42afcc..45fd48d 100644 --- a/include/plugins/wwn.php +++ b/include/plugins/wwn.php @@ -69,6 +69,9 @@ switch ($_PLUGIN['mode']) case preg_match("/^[0-9]+$/", PAGE_PARAMS): // display single WWN issue echo $wwn->view_issue(PAGE_PARAMS); + // page title + $html->page_title .= " - WWN Issue ".PAGE_PARAMS; + $html->meta_og['title'] = "WWN Issue ".PAGE_PARAMS; break; // end single issue

1 0

Jeremy Newman : add support for open graph meta tags
by Jeremy Newman 23 Oct '14

23 Oct '14

Module: website Branch: master Commit: d8b0a041f5a74da371be41035bd52ee72a34f322 URL: http://source.winehq.org/git/website.git/?a=commit;h=d8b0a041f5a74da371be41… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Thu Oct 23 10:56:54 2014 -0500 add support for open graph meta tags --- include/html.php | 68 +++++++++++++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 62 insertions(+), 6 deletions(-) diff --git a/include/html.php b/include/html.php index be3c02d..a6de7e1 100644 --- a/include/html.php +++ b/include/html.php @@ -17,6 +17,7 @@ class html public $page_style; public $meta_keywords; public $meta_description; + public $meta_og = array(); public $rss_link; public $css_links = array('styles'); public $js_links = array('jquery','utils'); @@ -62,7 +63,7 @@ class html // 404 not found header if ($this->in404) header("HTTP/1.1 404 Not Found"); - + // set meta tags $meta_keywords = ""; $meta_description = ""; @@ -70,7 +71,42 @@ class html $meta_keywords = $this->meta("keywords", $this->meta_keywords); if ($this->meta_description) $meta_description = $this->meta("description", $this->meta_description); - + + // open graph tags + $meta_og = ""; + if (empty($this->in403) and empty($this->in404) and isset($this->meta_og) and is_array($this->meta_og)) + { + // defaults and fallbacks + if (empty($this->meta_og['title']) and !empty($this->page_title)) + $this->meta_og['title'] =& $this->page_title; + if (empty($this->mega_og['site_name'])) + $this->meta_og['site_name'] = $config->site_name; + if (empty($this->meta_og['description']) and !empty($this->meta_description)) + $this->meta_og['description'] = $this->meta_description; + if (empty($this->meta_og['type'])) + $this->meta_og['type'] = 'article'; + + // loop and build meta_og string + foreach ($this->meta_og as $og => $data) + { + if (is_array($data)) + { + foreach ($data as $in_data) + { + if (!empty($meta_og)) + $meta_og .= " "; + $meta_og .= "<meta property=\"og:{$og}\" content=\"{$in_data}\">\n"; + } + } + else + { + if (!empty($meta_og)) + $meta_og .= " "; + $meta_og .= "<meta property=\"og:{$og}\" content=\"{$data}\">\n"; + } + } + } + // rss link if ($this->rss_link) $rss_link = '<link rel="alternate" title="'.$title.'RSS" href="'.$this->rss_link.'" type="application/rss+xml">'; @@ -96,7 +132,7 @@ class html } unset($i); } - + // javascript links $js_links = ""; if (count($this->js_links)) @@ -126,7 +162,7 @@ class html $this->http_header("text/plain"); echo $this->page; break; - + // print view case "print": $this->http_header("text/html"); @@ -140,7 +176,7 @@ class html 1 ); break; - + // regular view default: $this->http_header("text/html"); @@ -152,6 +188,7 @@ class html 'page_blurb' => $this->page_blurb, 'meta_keywords' => &$meta_keywords, 'meta_description' => &$meta_description, + 'meta_og' => &$meta_og, 'css_links' => &$css_links, 'js_links' => &$js_links, 'rss_link' => &$rss_link, @@ -162,7 +199,7 @@ class html 1 ); } - + // cleanup unset($debug_log); } @@ -1409,6 +1446,25 @@ class html unset($arr); } + // set the meta og + if (preg_match('//', $orig)) + { + preg_match_all('//', $orig, $match); + for ($i = 0; $i < count($match[0]); $i++) + { + if ($match[1][$i] == "image") + { + if (empty($this->meta_og['image'])) + $this->meta_og['image'] = array(); + array_push($this->meta_og['image'], $match[2][$i]); + } + else + { + $this->meta_og[$match[1][$i]] = $match[2][$i]; + } + $in = str_replace('', "", $in); + } + } // load nested templates the template if (preg_match('//', $orig))

1 0

Jeremy Newman : include open graph header meta tags
by Jeremy Newman 23 Oct '14

23 Oct '14

Module: website Branch: master Commit: 00320277dfdf9a57599e85dc47c67d49de52d018 URL: http://source.winehq.org/git/website.git/?a=commit;h=00320277dfdf9a57599e85… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Thu Oct 23 10:57:21 2014 -0500 include open graph header meta tags --- templates/de/global/themes/winehq/content.template | 1 + templates/de/global/themes/winehq/content_nobox.template | 1 + templates/en/global/themes/winehq/content.template | 1 + templates/en/global/themes/winehq/content_nobox.template | 1 + templates/fr/global/themes/winehq/content.template | 1 + templates/fr/global/themes/winehq/content_nobox.template | 1 + templates/he/global/themes/winehq/content.template | 1 + templates/he/global/themes/winehq/content_nobox.template | 1 + templates/tr/global/themes/winehq/content.template | 1 + templates/tr/global/themes/winehq/content_nobox.template | 1 + templates/uk/global/themes/winehq/content.template | 1 + templates/uk/global/themes/winehq/content_nobox.template | 1 + 12 files changed, 12 insertions(+) diff --git a/templates/de/global/themes/winehq/content.template b/templates/de/global/themes/winehq/content.template index 18b1d06..d6ad836 100644 --- a/templates/de/global/themes/winehq/content.template +++ b/templates/de/global/themes/winehq/content.template @@ -9,6 +9,7 @@ {$meta_keywords} {$meta_description} + {$meta_og} {$css_links} diff --git a/templates/de/global/themes/winehq/content_nobox.template b/templates/de/global/themes/winehq/content_nobox.template index 06e3f2f..6f14f25 100644 --- a/templates/de/global/themes/winehq/content_nobox.template +++ b/templates/de/global/themes/winehq/content_nobox.template @@ -9,6 +9,7 @@ {$meta_keywords} {$meta_description} + {$meta_og} {$css_links} diff --git a/templates/en/global/themes/winehq/content.template b/templates/en/global/themes/winehq/content.template index 7b9e475..ffdfef2 100644 --- a/templates/en/global/themes/winehq/content.template +++ b/templates/en/global/themes/winehq/content.template @@ -8,6 +8,7 @@ {$meta_keywords} {$meta_description} + {$meta_og} {$css_links} diff --git a/templates/en/global/themes/winehq/content_nobox.template b/templates/en/global/themes/winehq/content_nobox.template index caf82b7..94613c7 100644 --- a/templates/en/global/themes/winehq/content_nobox.template +++ b/templates/en/global/themes/winehq/content_nobox.template @@ -8,6 +8,7 @@ {$meta_keywords} {$meta_description} + {$meta_og} {$css_links} diff --git a/templates/fr/global/themes/winehq/content.template b/templates/fr/global/themes/winehq/content.template index 19e5cdd..f228a4a 100644 --- a/templates/fr/global/themes/winehq/content.template +++ b/templates/fr/global/themes/winehq/content.template @@ -8,6 +8,7 @@ {$meta_keywords} {$meta_description} + {$meta_og} {$css_links} diff --git a/templates/fr/global/themes/winehq/content_nobox.template b/templates/fr/global/themes/winehq/content_nobox.template index d4253eb..94b78a8 100644 --- a/templates/fr/global/themes/winehq/content_nobox.template +++ b/templates/fr/global/themes/winehq/content_nobox.template @@ -8,6 +8,7 @@ {$meta_keywords} {$meta_description} + {$meta_og} {$css_links} diff --git a/templates/he/global/themes/winehq/content.template b/templates/he/global/themes/winehq/content.template index 3f04773..3a4cea4 100644 --- a/templates/he/global/themes/winehq/content.template +++ b/templates/he/global/themes/winehq/content.template @@ -9,6 +9,7 @@ {$meta_keywords} {$meta_description} + {$meta_og} {$css_links} diff --git a/templates/he/global/themes/winehq/content_nobox.template b/templates/he/global/themes/winehq/content_nobox.template index d7461f6..d369604 100644 --- a/templates/he/global/themes/winehq/content_nobox.template +++ b/templates/he/global/themes/winehq/content_nobox.template @@ -9,6 +9,7 @@ {$meta_keywords} {$meta_description} + {$meta_og} {$css_links} diff --git a/templates/tr/global/themes/winehq/content.template b/templates/tr/global/themes/winehq/content.template index 19eea85..a1986f1 100644 --- a/templates/tr/global/themes/winehq/content.template +++ b/templates/tr/global/themes/winehq/content.template @@ -8,6 +8,7 @@ {$meta_keywords} {$meta_description} + {$meta_og} {$css_links} diff --git a/templates/tr/global/themes/winehq/content_nobox.template b/templates/tr/global/themes/winehq/content_nobox.template index dc75406..e4a91f2 100644 --- a/templates/tr/global/themes/winehq/content_nobox.template +++ b/templates/tr/global/themes/winehq/content_nobox.template @@ -8,6 +8,7 @@ {$meta_keywords} {$meta_description} + {$meta_og} {$css_links} diff --git a/templates/uk/global/themes/winehq/content.template b/templates/uk/global/themes/winehq/content.template index eb01060..bb83dd2 100644 --- a/templates/uk/global/themes/winehq/content.template +++ b/templates/uk/global/themes/winehq/content.template @@ -8,6 +8,7 @@ {$meta_keywords} {$meta_description} + {$meta_og} {$css_links} diff --git a/templates/uk/global/themes/winehq/content_nobox.template b/templates/uk/global/themes/winehq/content_nobox.template index 85c0adf..a5854da 100644 --- a/templates/uk/global/themes/winehq/content_nobox.template +++ b/templates/uk/global/themes/winehq/content_nobox.template @@ -8,6 +8,7 @@ {$meta_keywords} {$meta_description} + {$meta_og} {$css_links}

1 0

Jeremy Newman : home page is og type website
by Jeremy Newman 23 Oct '14

23 Oct '14

Module: website Branch: master Commit: 1183320f5ee902ed8977ef1b02b897887d201e6f URL: http://source.winehq.org/git/website.git/?a=commit;h=1183320f5ee902ed8977ef… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Thu Oct 23 10:57:50 2014 -0500 home page is og type website --- templates/de/home.template | 3 ++- templates/en/home.template | 3 ++- templates/es/home.template | 3 ++- templates/fr/home.template | 3 ++- templates/he/home.template | 3 ++- templates/pl/home.template | 3 ++- templates/pt/home.template | 3 ++- templates/tr/home.template | 3 ++- templates/uk/home.template | 3 ++- 9 files changed, 18 insertions(+), 9 deletions(-) diff --git a/templates/de/home.template b/templates/de/home.template index 668a41d..6593029 100644 --- a/templates/de/home.template +++ b/templates/de/home.template @@ -1,8 +1,9 @@ +     - + <div id="main_left"> diff --git a/templates/en/home.template b/templates/en/home.template index 97d910e..f9f860e 100644 --- a/templates/en/home.template +++ b/templates/en/home.template @@ -1,8 +1,9 @@ +     - + <div id="main_left"> diff --git a/templates/es/home.template b/templates/es/home.template index b8a86b6..c58f2fb 100644 --- a/templates/es/home.template +++ b/templates/es/home.template @@ -1,8 +1,9 @@ +     - + <div id="main_left"> diff --git a/templates/fr/home.template b/templates/fr/home.template index fed103b..3615ec5 100644 --- a/templates/fr/home.template +++ b/templates/fr/home.template @@ -1,8 +1,9 @@ +     - + <div id="main_left"> diff --git a/templates/he/home.template b/templates/he/home.template index 1402c37..c758cfc 100644 --- a/templates/he/home.template +++ b/templates/he/home.template @@ -1,8 +1,9 @@ +     - + <div id="main_left"> diff --git a/templates/pl/home.template b/templates/pl/home.template index e6faeb5..770e713 100644 --- a/templates/pl/home.template +++ b/templates/pl/home.template @@ -1,8 +1,9 @@ +     - + <div id="main_left"> diff --git a/templates/pt/home.template b/templates/pt/home.template index 2c430f7..6bf6734 100644 --- a/templates/pt/home.template +++ b/templates/pt/home.template @@ -1,8 +1,9 @@ +     - + <div id="main_left"> diff --git a/templates/tr/home.template b/templates/tr/home.template index 5d42b0f..c254a22 100644 --- a/templates/tr/home.template +++ b/templates/tr/home.template @@ -1,8 +1,9 @@ +     - + <div id="main_left"> diff --git a/templates/uk/home.template b/templates/uk/home.template index 9e83925..54f131b 100644 --- a/templates/uk/home.template +++ b/templates/uk/home.template @@ -1,8 +1,9 @@ +     - + <div id="main_left">

1 0

Jeremy Newman : set title and open graph
by Jeremy Newman 23 Oct '14

23 Oct '14

Module: website Branch: master Commit: 0a206bbdb65e3dc794e7abf3e93df666247bb0eb URL: http://source.winehq.org/git/website.git/?a=commit;h=0a206bbdb65e3dc794e7ab… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Thu Oct 23 11:17:47 2014 -0500 set title and open graph --- include/plugins/news.php | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/include/plugins/news.php b/include/plugins/news.php index ec44525..bc9deb7 100644 --- a/include/plugins/news.php +++ b/include/plugins/news.php @@ -15,6 +15,7 @@ switch (true) { // single issue view case (defined('PAGE_PARAMS') and preg_match("/[0-9]{10}/", PAGE_PARAMS)): + // get data from XML file $item = PAGE_PARAMS . '.xml'; $vars = array(); @@ -22,7 +23,13 @@ switch (true) $vars = get_xml_tags($config->news_xml_path.'/'.$html->lang.'/'.$item, array('date', 'title', 'link', 'body')); else $vars = get_xml_tags($config->news_xml_path.'/'.$config->lang.'/'.$item, array('date', 'title', 'link', 'body')); - + + // set open graph tags + $html->meta_og['title'] = trim($vars['title']); + + // add page title + $html->page_title .= " - {$html->meta_og['title']}"; + // if link defined, use it in title if ($vars['link']) { @@ -33,10 +40,10 @@ switch (true) { $vars['title'] = '<a href="'.$html->_web_root.'/news/'.basename($item, ".xml").'">'.$vars['title'].'</a>'; } - + // replace {$root} $vars['body'] = str_replace("{\$root}", $html->_web_root, $vars['body']); - + // add to news body echo $html->template('base', 'news_row', $vars); echo $html->p($html->ahref("<< Back", "{$html->_web_root}/news")); @@ -44,6 +51,7 @@ switch (true) // RSS view case (defined('PAGE_PARAMS') and PAGE_PARAMS == "rss"): + // get list of news items $news = get_files($config->news_xml_path."/".$config->lang, "xml"); $news = array_reverse ($news);

1 0

Jeremy Newman : set title and open graph
by Jeremy Newman 23 Oct '14

23 Oct '14

Module: website Branch: master Commit: b6a5b8b769a84e5b3686d3c4d6e971016ef34b39 URL: http://source.winehq.org/git/website.git/?a=commit;h=b6a5b8b769a84e5b3686d3… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Thu Oct 23 11:18:01 2014 -0500 set title and open graph --- include/plugins/announce.php | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/include/plugins/announce.php b/include/plugins/announce.php index 5000fc5..e14158a 100644 --- a/include/plugins/announce.php +++ b/include/plugins/announce.php @@ -14,12 +14,19 @@ $ver = PAGE_PARAMS; $tag = ($ver == "latest") ? "master" : "wine-" . urlencode($ver); $announce = $config->git_tree . "/wine.git/" . $tag . ":ANNOUNCE"; +// announce title +$title = ""; + // load announce if ($arr = file($announce)) { $in_header = 1; + $x = 0; while (list($c,$val) = each($arr)) { + if ($c == 0) + $title = $html->encode(trim($arr[$c])); + $arr[$c] = $html->urlify($arr[$c]); if (preg_match("/^--------------------/", $arr[$c])) $in_header = 0; @@ -43,10 +50,14 @@ if ($arr = file($announce)) "\\1<a href=\"".$config->bug_system."\\2\">\\2</a>", $arr[$c]); } + + $x++; } $announce = join("",$arr); // display page + $html->meta_og['title'] = $title; + $html->page_title .= " - {$title}"; echo $html->pre($announce); } else

1 0