August 2008 - Wine-Commits - list.winehq.org

Jeremy Newman : misc cleanup for new link tags in news XML
by Jeremy Newman Aug. 5, 2008

Aug. 5, 2008

Module: website Branch: master Commit: c0444b592f5abbaf03e1c9697d035dfced66905a URL: http://source.winehq.org/git/website.git/?a=commit;h=c0444b592f5abbaf03e1c9… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Tue Aug 5 11:20:40 2008 -0500 misc cleanup for new link tags in news XML rename Wine Weekly News -> World Wine News changes for get_xml_tags() return value add WWN to side bar menu --- news/en/2008071301.xml | 3 +- news/en/2008080401.xml | 18 ++++++++------ site | 56 +++++++++++++++++++++++++++----------------- templates/en/menu.xml | 3 +- templates/en/wwn.template | 2 +- templates/es/menu.xml | 3 +- winehq_styles.css | 6 ++++- 7 files changed, 56 insertions(+), 35 deletions(-) Diff: http://source.winehq.org/git/website.git/?a=commitdiff;h=c0444b592f5abbaf03…

1 0

Jeremy Newman : get_xml_tags(): change to return assoc array
by Jeremy Newman Aug. 5, 2008

Aug. 5, 2008

Module: website Branch: master Commit: ddf85c1eb9655a12af61ce066dcf00e29f4d5619 URL: http://source.winehq.org/git/website.git/?a=commit;h=ddf85c1eb9655a12af61ce… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Tue Aug 5 11:19:17 2008 -0500 get_xml_tags(): change to return assoc array --- include/utils.php | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/include/utils.php b/include/utils.php index 20ca58a..2f59e90 100644 --- a/include/utils.php +++ b/include/utils.php @@ -46,7 +46,7 @@ function get_xml_tags ($file, $tags = null) { if (eregi("<" . $tag . ">(.*)</" . $tag . ">", $data, $out)) { - array_push($content, $out[1]); + $content[$tag] = $out[1]; } } return $content;

1 0

Zachary Goldberg : WWN 350
by Jeremy Newman Aug. 5, 2008

Aug. 5, 2008

Module: website Branch: master Commit: 7cb967bd91ef5269fc734eb4c108e77f4f534996 URL: http://source.winehq.org/git/website.git/?a=commit;h=7cb967bd91ef5269fc734e… Author: Zachary Goldberg <zgold(a)bluesata.com> Date: Mon Aug 4 21:51:05 2008 -0400 WWN 350 WWN 350 -- including super cool news indexing within the news posting for those RSS junkies. CC-ing Francois on this one -- Was there anything else you wanted me to change other than adding indexes to the news post? I think i recall something needed for RSS but I can't remember just now. --Zach >From fd312b6cff285ff17a562e8a8a28f270c639aa02 Mon Sep 17 00:00:00 2001 From: Zachary Goldberg <zgs(a)seas.upenn.edu> Date: Mon, 4 Aug 2008 21:48:42 -0400 Subject: [WineHQ][WWN] WWN 350 To: wine-patches <wine-patches(a)winehq.org>, Jeremy Newman <jnewman(a)codeweavers.com> --- news/en/2008080401.xml | 15 + wwn/en/wn20080804_350.xml | 4377 +++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 4392 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/website.git/?a=commitdiff;h=7cb967bd91ef5269fc…

1 0

Francois Gouget : news: Link to the 1.1.2 announcement.
by Jeremy Newman Aug. 5, 2008

Aug. 5, 2008

Module: website Branch: master Commit: 4b58e458eefb32a2f7798aedff0c245af29c72b7 URL: http://source.winehq.org/git/website.git/?a=commit;h=4b58e458eefb32a2f7798a… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Aug 4 15:26:44 2008 +0200 news: Link to the 1.1.2 announcement. --- news/en/2008072501.xml | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/news/en/2008072501.xml b/news/en/2008072501.xml index 1fb4aad..4ad6e2b 100644 --- a/news/en/2008072501.xml +++ b/news/en/2008072501.xml @@ -1,6 +1,7 @@ <news> <date>July 25, 2008</date> <title>Wine 1.1.2 Released</title> +<link>?announce=1.1.2</link> <body> The Wine development release 1.1.2 is now available. <a href="?announce=1.1.2">What's new</a> in this release:

1 0

Francois Gouget : news: Include the index in the WWN announcements, and link to the relevant issue.
by Jeremy Newman Aug. 5, 2008

Aug. 5, 2008

Module: website Branch: master Commit: fc046d41fffeeb489b3baa6320730b5cb9777dfb URL: http://source.winehq.org/git/website.git/?a=commit;h=fc046d41fffeeb489b3baa… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Aug 4 15:26:46 2008 +0200 news: Include the index in the WWN announcements, and link to the relevant issue. --- news/en/2008052801.xml | 14 +++++++++++++- news/en/2008061801.xml | 13 ++++++++++++- news/en/2008071301.xml | 11 ++++++++++- 3 files changed, 35 insertions(+), 3 deletions(-) diff --git a/news/en/2008052801.xml b/news/en/2008052801.xml index 9c99305..72cc346 100644 --- a/news/en/2008052801.xml +++ b/news/en/2008052801.xml @@ -1,7 +1,19 @@ <news> <date>May 28, 2008</date> <title>Wine Weekly News Issue 347</title> + <link>?issue=347</link> <body> - <a href="?issue=347">WWN Issue 347</a> was released today. + <ul> + <li><a href="?issue=347#News: Wine 1.0-rc1 and Wine 1.0-rc2 released!" class="small">News: Wine 1.0-rc1 and Wine 1.0-rc2 released!</a></li> + <li><a href="?issue=347#WWN Interview Series: Jeremy White" class="small">WWN Interview Series: Jeremy White</a></li> + <li><a href="?issue=347#WWN Interview Series: Marcus Meissner" class="small">WWN Interview Series: Marcus Meissner</a></li> + <li><a href="?issue=347#Releases post 1.0" class="small">Releases post 1.0</a></li> + <li><a href="?issue=347#More SoC Introductions" class="small">More SoC Introductions</a></li> + <li><a href="?issue=347#Wine Bug Research at Aalborg University" class="small">Wine Bug Research at Aalborg University</a></li> + <li><a href="?issue=347#Wine Test Suite: Progress Report" class="small">Wine Test Suite: Progress Report</a></li> + <li><a href="?issue=347#Weekly AppDB/BugZilla Status Changes" class="small">Weekly AppDB/BugZilla Status Changes</a></li> + + </ul> + <a href="?issue=back">More Issues...</a> </body> </news> diff --git a/news/en/2008061801.xml b/news/en/2008061801.xml index 028aa24..840676b 100644 --- a/news/en/2008061801.xml +++ b/news/en/2008061801.xml @@ -1,7 +1,18 @@ <news> <date>June 18, 2008</date> <title>Wine Weekly News Issue 348</title> + <link>?issue=348</link> <body> - <a href="?issue=348">WWN Issue 348</a> was released today. + <ul> + <li><a href="?issue=348#News: Wine 1.0!" class="small">News: Wine 1.0!</a></li> + <li><a href="?issue=348#WWN Wine 1.0 Interview Series! Interview: Alexandre Julliard" class="small">WWN Wine 1.0 Interview Series! Interview: Alexandre Julliard</a></li> + <li><a href="?issue=348#Wine's popularity" class="small">Wine's popularity</a></li> + <li><a href="?issue=348#Length of time to compile Wine" class="small">Length of time to compile Wine</a></li> + <li><a href="?issue=348#Linux Tag 2008" class="small">Linux Tag 2008</a></li> + <li><a href="?issue=348#A Wine 1.0 overview and summary by Steven Edwards" class="small">A Wine 1.0 overview and summary by Steven Edwards</a></li> + <li><a href="?issue=348#Post 1.0 Development" class="small">Post 1.0 Development</a></li> + <li><a href="?issue=348#Weekly AppDB/BugZilla Status Changes" class="small">Weekly AppDB/BugZilla Status Changes</a></li> + </ul> + <a href="?issue=back">More Issues...</a> </body> </news> diff --git a/news/en/2008071301.xml b/news/en/2008071301.xml index e359685..00154f7 100644 --- a/news/en/2008071301.xml +++ b/news/en/2008071301.xml @@ -1,7 +1,16 @@ <news> <date>July 13, 2008</date> <title>Wine Weekly News Issue 349</title> + <link>?issue=349</link> <body> - <a href="?issue=349">WWN Issue 349</a> was released today. + <ul> + <li><a href="?issue=349#News:%20Stable%20and%20Development%20versions%20of%20Wine%20released">News: Stable and Development versions of Wine released</a></li> + <li><a href="?issue=349#Wineconf%202008%20Announced">Wineconf 2008 Announced</a></li> + <li><a href="?issue=349#GSoC%20Midterms">GSoC Midterms</a></li> + <li><a href="?issue=349#Wine%20and%20CUDA%20(Nvidia%20GPGPU)">Wine and CUDA (Nvidia GPGPU)</a></li> + <li><a href="?issue=349#Valgrind%20Updates">Valgrind Updates</a></li> + <li><a href="?issue=349#Weekly%20AppDB/BugZilla%20Status%20Changes">Weekly AppDB/BugZilla Status Changes</a></li> + </ul> + <a href="?issue=back">More Issues...</a> </body> </news>

1 0

Francois Gouget : news: Let the news items specify where they should link to.
by Jeremy Newman Aug. 5, 2008

Aug. 5, 2008

Module: website Branch: master Commit: 09db9cce69efe8c1fe9657d66d80da94813c2031 URL: http://source.winehq.org/git/website.git/?a=commit;h=09db9cce69efe8c1fe9657… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Aug 4 15:21:36 2008 +0200 news: Let the news items specify where they should link to. --- site | 20 +++++++++++++------- 1 files changed, 13 insertions(+), 7 deletions(-) diff --git a/site b/site index 0efcec2..4feefe8 100644 --- a/site +++ b/site @@ -209,9 +209,11 @@ function view_news ($where) // get data from XML file $vars = array(); if (file_exists($config->news_xml_path.'/'.$html->lang.'/'.$item)) - list($vars['date'], $vars['title'], $vars['body']) = get_xml_tags($config->news_xml_path.'/'.$html->lang.'/'.$item, array('date', 'title', 'body')); + list($vars['date'], $vars['title'], $vars['link'], $vars['body']) = get_xml_tags($config->news_xml_path.'/'.$html->lang.'/'.$item, array('date', 'title', 'link', 'body')); else - list($vars['date'], $vars['title'], $vars['body']) = get_xml_tags($config->news_xml_path.'/'.$config->lang.'/'.$item, array('date', 'title', 'body')); + list($vars['date'], $vars['title'], $vars['link'], $vars['body']) = get_xml_tags($config->news_xml_path.'/'.$config->lang.'/'.$item, array('date', 'title', 'link', 'body')); + if ($vars['link'] != '') + $vars['title'] = '<a href="'.$vars['link'].'">'.$vars['title'].'</a>'; // add to news body $news_body .= $html->template('base', 'news_row', $vars); @@ -283,13 +285,17 @@ function view_rss () // get data from XML file if (file_exists($config->news_xml_path.'/'.$html->lang.'/'.$item)) - list($date, $title, $body) = get_xml_tags($config->news_xml_path.'/'.$html->lang.'/'.$item, array('date', 'title', 'body')); + list($date, $title, $link, $body) = get_xml_tags($config->news_xml_path.'/'.$html->lang.'/'.$item, array('date', 'title', 'link', 'body')); else - list($date, $title, $body) = get_xml_tags($config->news_xml_path.'/'.$config->lang.'/'.$item, array('date', 'title', 'body')); - + list($date, $title, $link, $body) = get_xml_tags($config->news_xml_path.'/'.$config->lang.'/'.$item, array('date', 'title', 'link', 'body')); + // fix filename for urls $item = str_replace(".xml", "", $item); - + + // compute where to link to if unspecified + if ($link == '') + $link = $config->base_url.'?news='.$item; + // fix relative URLs $body = str_replace("<a href=\"?", "<a href=\"{$config->base_url}/?", $body); $body = str_replace("<a href=\"/site", "<a href=\"{$config->base_url}/site", $body); @@ -298,7 +304,7 @@ function view_rss () $rss_row = array( 'item_title' => strip_tags($title), 'item_desc' => htmlentities($body), - 'item_link' => $config->base_url.'?news='.$item, + 'item_link' => $link, 'item_guid' => $config->base_url.'?news='.$item, 'item_date' => date("r", strtotime($date)) );

1 0

Jeremy Newman : return of the banner ad disabling code
by Jeremy Newman Aug. 5, 2008

Aug. 5, 2008

Module: website Branch: master Commit: 1e070b16a9435bb51498e5738149074a50f60ca7 URL: http://source.winehq.org/git/website.git/?a=commit;h=1e070b16a9435bb51498e5… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Tue Aug 5 10:34:20 2008 -0500 return of the banner ad disabling code (ad is now disabled after 10 views) --- bin/ad | 59 +++++++++++++++++++++++++++++++++++++++++------------------ 1 files changed, 41 insertions(+), 18 deletions(-) diff --git a/bin/ad b/bin/ad index 8465bd6..e7c20da 100644 --- a/bin/ad +++ b/bin/ad @@ -1,4 +1,4 @@ -<?PHP +<?php /* Banner Ad Code */ /* For WineHQ */ @@ -6,33 +6,56 @@ // path for banner ad $bannerads_path = '../images/bannerads/'; +// max count until we stop displaying ads for user +$max_ads = 10; + +// check cookie for ad counter +$whqac = 0; +if (isset($_COOKIE['whqac'])) + $whqac = $_COOKIE['whqac']; +unset($_COOKIE["whqac"]); +$whqac++; + +// randomly select a banner and display it +if ($whqac >= $max_ads) +{ + // display fixed ad + $whqac = $max_ads; + $img = "../images/blank.gif"; +} +else +{ + // get random ad + $ads = array(); + $d = opendir($bannerads_path); + while($entry = readdir($d)) + { + if(!ereg("(.+)\\.png$", $entry, $arr)) + continue; + array_push($ads, $arr[1]); + } + closedir($d); + sort($ads); + $img = $bannerads_path.$ads[(rand(1,count($ads))-1)]; +} + // da banner +setcookie("whqac", $whqac, time()+60*60*24*365); header("Expires: Mon, 1 Jan 2006 05:00:00 GMT"); header("Last-Modified: " . gmdate("D, d M Y H:i:s") . " GMT"); header("Cache-Control: no-store, no-cache, must-revalidate"); header("Cache-Control: post-check=0, pre-check=0", false); header("Pragma: no-cache"); -// get random ad -$ads = array(); -$d = opendir($bannerads_path); -while($entry = readdir($d)) -{ - if(!ereg("(.+)\\.png$", $entry, $arr)) - continue; - array_push($ads, $arr[1]); -} -closedir($d); -sort($ads); -$img = $ads[(rand(1,count($ads))-1)]; - ?> <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> <html> <head> - <title>Banner Ad</title> + <title>WineHQ Banner Ad</title> </head> -<body bgcolor="#FFFFFF" text="#000000" marginwidth="0" marginheight="0" style="margin:0px;"><a href="http://www.codeweavers.com/products/support_wine/" -target="_top"><img src="../images/bannerads/<?=$img?>" -width="468" height="60" border="0" alt="Support the Wine Project" title="Support the Wine Project" /></a></body> +<body bgcolor="#E2E2E2" text="#000000" marginwidth="0" marginheight="0" style="margin:0px;"> +<a href="http://www.codeweavers.com/products/support_wine/" target="_top"><img +src="<?=$img?>" width="468" height="60" border="0" alt="Support the Wine Project" +title="Support the Wine Project" /></a> +</body> </html>

1 0

Francois Gouget : Assorted spelling fixes.
by Jeremy Newman Aug. 5, 2008

Aug. 5, 2008

Module: website Branch: master Commit: 42846cec4e464e0b0f0f4d9bd0ec2574662f5ef2 URL: http://source.winehq.org/git/website.git/?a=commit;h=42846cec4e464e0b0f0f4d… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Aug 4 15:17:00 2008 +0200 Assorted spelling fixes. --- include/XMLToArray.php | 2 +- site | 2 +- wwn/en/wn20010526_96.xml | 2 +- wwn/en/wn20011212_110.xml | 2 +- wwn/en/wn20030718_179.xml | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/include/XMLToArray.php b/include/XMLToArray.php index 39320a6..cc47fbd 100644 --- a/include/XMLToArray.php +++ b/include/XMLToArray.php @@ -76,7 +76,7 @@ class XMLToArray { $node = array_pop($this->node_stack); $node["_DATA"] = trim($node["_DATA"]); - // and add it an an element of the last node in the stack... + // and add it as an element of the last node in the stack... $lastnode = count($this->node_stack); array_push($this->node_stack[$lastnode-1]["_ELEMENTS"], $node); } diff --git a/site b/site index c59bd5f..0efcec2 100644 --- a/site +++ b/site @@ -26,7 +26,7 @@ switch (true) $text .= view_rss(); break; - // view news archvie + // view news archive case ($_REQUEST['news']): $text .= $html->theme_box($config->theme, "box_title", 'News Archives', "100%", view_news($_REQUEST['news']), '10', 'white', 'topMenu'); break; diff --git a/wwn/en/wn20010526_96.xml b/wwn/en/wn20010526_96.xml index 5378d46..85013be 100644 --- a/wwn/en/wn20010526_96.xml +++ b/wwn/en/wn20010526_96.xml @@ -125,7 +125,7 @@ with regards to Microsoft's latest XP incarnation. Basically this comes down to new applications taking advantages of additions to the Windows API. In the past a lot of vendors have avoided immediately using new stuff because they would -break backwards capatibility with the older versions +break backwards compatibility with the older versions of Windows that users are inevitably using. Francois Gouget summed it up by saying: <quote who="Francois Gouget"> diff --git a/wwn/en/wn20011212_110.xml b/wwn/en/wn20011212_110.xml index 42e1ee9..2ec64ea 100644 --- a/wwn/en/wn20011212_110.xml +++ b/wwn/en/wn20011212_110.xml @@ -613,7 +613,7 @@ now. Actually, I just download from cvs randomly, and see what happens. It's been a while, but I decided to try again in October. At that time, there was an OLE error, but the only other strange -occurence was a 'locking' of the screen on a print preview. +occurrence was a 'locking' of the screen on a print preview. Since then, this 'locking' is the only issue (though I haven't yet attempted to print). diff --git a/wwn/en/wn20030718_179.xml b/wwn/en/wn20030718_179.xml index a902bb0..f77bf87 100644 --- a/wwn/en/wn20030718_179.xml +++ b/wwn/en/wn20030718_179.xml @@ -172,7 +172,7 @@ about in bug 1358 subtitled "GraphicsDriver" = "none" wanted. On the off chance that a "none" driver had been implemented, I tried it. -And suprisingly, something sensible happened: +And surprisingly, something sensible happened: <ul><code> dank_at_dank:~$ wine /dos/d/vss/win32/ss.exe help Could not load graphics driver 'none'

1 0

Kirill K. Smirnov : winhlp32: Fix off-by-one error.
by Alexandre Julliard Aug. 5, 2008

Aug. 5, 2008

Module: wine Branch: master Commit: 52081393bc897b56e2932b5718c9ef49570e8c15 URL: http://source.winehq.org/git/wine.git/?a=commit;h=52081393bc897b56e2932b571… Author: Kirill K. Smirnov <lich(a)math.spbu.ru> Date: Mon Aug 4 03:49:20 2008 +0400 winhlp32: Fix off-by-one error. --- programs/winhlp32/hlpfile.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/winhlp32/hlpfile.c b/programs/winhlp32/hlpfile.c index 870bac7..7f1a931 100644 --- a/programs/winhlp32/hlpfile.c +++ b/programs/winhlp32/hlpfile.c @@ -1639,7 +1639,7 @@ BOOL HLPFILE_BrowsePage(HLPFILE_PAGE* page, struct RtfData* rd, case 0x20: case 0x23: if (!HLPFILE_BrowseParagraph(page, rd, buf, end, &parlen)) return FALSE; - if (relative >= index * 0x8000 + offs) + if (relative > index * 0x8000 + offs) rd->char_pos_rel = rd->char_pos; offs += parlen; break;

1 0

Kirill K. Smirnov : winhlp32: Clear richedit area before setting text.
by Alexandre Julliard Aug. 5, 2008

Aug. 5, 2008

Module: wine Branch: master Commit: 520ab5c261706f6118a85a82ba84213932ba76e7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=520ab5c261706f6118a85a82b… Author: Kirill K. Smirnov <lich(a)math.spbu.ru> Date: Mon Aug 4 03:50:39 2008 +0400 winhlp32: Clear richedit area before setting text. --- programs/winhlp32/winhelp.c | 7 +++---- 1 files changed, 3 insertions(+), 4 deletions(-) diff --git a/programs/winhlp32/winhelp.c b/programs/winhlp32/winhelp.c index d3f4d14..34f93ee 100644 --- a/programs/winhlp32/winhelp.c +++ b/programs/winhlp32/winhelp.c @@ -5,6 +5,7 @@ * 2002 Sylvain Petreolle <spetreolle(a)yahoo.fr> * 2002, 2008 Eric Pouech <eric.pouech(a)wanadoo.fr> * 2004 Ken Belleau <jamez(a)ivic.qc.ca> + * 2008 Kirill K. Smirnov <lich(a)math.spbu.ru> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -1101,6 +1102,8 @@ static DWORD CALLBACK WINHELP_RtfStreamIn(DWORD_PTR cookie, BYTE* buff, static void WINHELP_SetupText(HWND hTextWnd, WINHELP_WINDOW* win, ULONG relative) { + /* At first clear area - needed by EM_POSFROMCHAR/EM_SETSCROLLPOS */ + SendMessage(hTextWnd, WM_SETTEXT, 0, (LPARAM)""); SendMessage(hTextWnd, WM_SETREDRAW, FALSE, 0); SendMessage(hTextWnd, EM_SETBKGNDCOLOR, 0, (LPARAM)win->info->sr_color); /* set word-wrap to window size (undocumented) */ @@ -1130,10 +1133,6 @@ static void WINHELP_SetupText(HWND hTextWnd, WINHELP_WINDOW* win, ULONG relative pt.x = 0; pt.y = ptl.y; SendMessage(hTextWnd, EM_SETSCROLLPOS, 0, (LPARAM)&pt); } - else - { - SendMessage(hTextWnd, WM_SETTEXT, 0, (LPARAM)""); - } SendMessage(hTextWnd, WM_SETREDRAW, TRUE, 0); InvalidateRect(hTextWnd, NULL, TRUE); }

1 0