November 2005 - Wine-Commits

wine/dlls/wininet/tests http.c
by Alexandre Julliard Nov. 22, 2005

Nov. 22, 2005

ChangeSet ID: 21390 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/22 05:59:16 Modified files: dlls/wininet/tests: http.c Log message: Robert Shearman <rob(a)codeweavers.com> Test the sizes of some of the parameters passed into the callback. Patch: http://cvs.winehq.org/patch.py?id=21390 Old revision New revision Changes Path 1.32 1.33 +15 -0 wine/dlls/wininet/tests/http.c Index: wine/dlls/wininet/tests/http.c diff -u -p wine/dlls/wininet/tests/http.c:1.32 wine/dlls/wininet/tests/http.c:1.33 --- wine/dlls/wininet/tests/http.c:1.32 22 Nov 2005 11:59:16 -0000 +++ wine/dlls/wininet/tests/http.c 22 Nov 2005 11:59:16 -0000 @@ -85,6 +85,9 @@ static VOID WINAPI callback( lpvStatusInformation,dwStatusInformationLength); break; case INTERNET_STATUS_REQUEST_SENT: + ok(dwStatusInformationLength == sizeof(DWORD), + "info length should be sizeof(DWORD) instead of %ld\n", + dwStatusInformationLength); trace("%04lx:Callback %p 0x%lx INTERNET_STATUS_REQUEST_SENT 0x%lx %ld\n", GetCurrentThreadId(), hInternet, dwContext, *(DWORD *)lpvStatusInformation,dwStatusInformationLength); @@ -95,6 +98,9 @@ static VOID WINAPI callback( lpvStatusInformation,dwStatusInformationLength); break; case INTERNET_STATUS_RESPONSE_RECEIVED: + ok(dwStatusInformationLength == sizeof(DWORD), + "info length should be sizeof(DWORD) instead of %ld\n", + dwStatusInformationLength); trace("%04lx:Callback %p 0x%lx INTERNET_STATUS_RESPONSE_RECEIVED 0x%lx %ld\n", GetCurrentThreadId(), hInternet, dwContext, *(DWORD *)lpvStatusInformation,dwStatusInformationLength); @@ -120,11 +126,17 @@ static VOID WINAPI callback( lpvStatusInformation,dwStatusInformationLength); break; case INTERNET_STATUS_HANDLE_CREATED: + ok(dwStatusInformationLength == sizeof(HINTERNET), + "info length should be sizeof(HINTERNET) instead of %ld\n", + dwStatusInformationLength); trace("%04lx:Callback %p 0x%lx INTERNET_STATUS_HANDLE_CREATED %p %ld\n", GetCurrentThreadId(), hInternet, dwContext, *(HINTERNET *)lpvStatusInformation,dwStatusInformationLength); break; case INTERNET_STATUS_HANDLE_CLOSING: + ok(dwStatusInformationLength == sizeof(HINTERNET), + "info length should be sizeof(HINTERNET) instead of %ld\n", + dwStatusInformationLength); trace("%04lx:Callback %p 0x%lx INTERNET_STATUS_HANDLE_CLOSING %p %ld\n", GetCurrentThreadId(), hInternet, dwContext, *(HINTERNET *)lpvStatusInformation, dwStatusInformationLength); @@ -132,6 +144,9 @@ static VOID WINAPI callback( case INTERNET_STATUS_REQUEST_COMPLETE: { INTERNET_ASYNC_RESULT *iar = (INTERNET_ASYNC_RESULT *)lpvStatusInformation; + ok(dwStatusInformationLength == sizeof(INTERNET_ASYNC_RESULT), + "info length should be sizeof(INTERNET_ASYNC_RESULT) instead of %ld\n", + dwStatusInformationLength); trace("%04lx:Callback %p 0x%lx INTERNET_STATUS_REQUEST_COMPLETE {%ld,%ld} %ld\n", GetCurrentThreadId(), hInternet, dwContext, iar->dwResult,iar->dwError,dwStatusInformationLength);

1 0

wine/dlls/wininet utility.c internet.h internet.c
by Alexandre Julliard Nov. 22, 2005

Nov. 22, 2005

ChangeSet ID: 21389 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/22 05:59:07 Modified files: dlls/wininet : utility.c internet.h internet.c Log message: Robert Shearman <rob(a)codeweavers.com> Rename SendAsyncCallback to INTERNET_SendCallback. Patch: http://cvs.winehq.org/patch.py?id=21389 Old revision New revision Changes Path 1.29 1.30 +5 -5 wine/dlls/wininet/utility.c 1.41 1.42 +3 -3 wine/dlls/wininet/internet.h 1.143 1.144 +1 -1 wine/dlls/wininet/internet.c Index: wine/dlls/wininet/utility.c diff -u -p wine/dlls/wininet/utility.c:1.29 wine/dlls/wininet/utility.c:1.30 --- wine/dlls/wininet/utility.c:1.29 22 Nov 2005 11:59: 7 -0000 +++ wine/dlls/wininet/utility.c 22 Nov 2005 11:59: 7 -0000 @@ -210,9 +210,9 @@ static const char *get_callback_name(DWO return "Unknown"; } -VOID SendSyncCallback(LPWININETHANDLEHEADER hdr, DWORD dwContext, - DWORD dwInternetStatus, LPVOID lpvStatusInfo, - DWORD dwStatusInfoLength) +VOID INTERNET_SendCallback(LPWININETHANDLEHEADER hdr, DWORD dwContext, + DWORD dwInternetStatus, LPVOID lpvStatusInfo, + DWORD dwStatusInfoLength) { HINTERNET hHttpSession; LPVOID lpvNewInfo = NULL; @@ -294,6 +294,6 @@ VOID SendAsyncCallback(LPWININETHANDLEHE INTERNET_AsyncCall(&workRequest); } else - SendSyncCallback(hdr, dwContext, dwInternetStatus, - lpvStatusInfo, dwStatusInfoLength); + INTERNET_SendCallback(hdr, dwContext, dwInternetStatus, + lpvStatusInfo, dwStatusInfoLength); } Index: wine/dlls/wininet/internet.h diff -u -p wine/dlls/wininet/internet.h:1.41 wine/dlls/wininet/internet.h:1.42 --- wine/dlls/wininet/internet.h:1.41 22 Nov 2005 11:59: 7 -0000 +++ wine/dlls/wininet/internet.h 22 Nov 2005 11:59: 7 -0000 @@ -455,9 +455,9 @@ VOID SendAsyncCallback(LPWININETHANDLEHE DWORD dwInternetStatus, LPVOID lpvStatusInfo, DWORD dwStatusInfoLength); -VOID SendSyncCallback(LPWININETHANDLEHEADER hdr, DWORD dwContext, - DWORD dwInternetStatus, LPVOID lpvStatusInfo, - DWORD dwStatusInfoLength); +VOID INTERNET_SendCallback(LPWININETHANDLEHEADER hdr, DWORD dwContext, + DWORD dwInternetStatus, LPVOID lpvStatusInfo, + DWORD dwStatusInfoLength); BOOL NETCON_connected(WININET_NETCONNECTION *connection); void NETCON_init(WININET_NETCONNECTION *connnection, BOOL useSSL); Index: wine/dlls/wininet/internet.c diff -u -p wine/dlls/wininet/internet.c:1.143 wine/dlls/wininet/internet.c:1.144 --- wine/dlls/wininet/internet.c:1.143 22 Nov 2005 11:59: 7 -0000 +++ wine/dlls/wininet/internet.c 22 Nov 2005 11:59: 7 -0000 @@ -3268,7 +3268,7 @@ static VOID INTERNET_ExecuteWork(void) TRACE("SENDCALLBACK %p\n", workRequest.hdr); - SendSyncCallback(workRequest.hdr, + INTERNET_SendCallback(workRequest.hdr, req->dwContext, req->dwInternetStatus, req->lpvStatusInfo, req->dwStatusInfoLength);

1 0

wine/dlls/wininet http.c
by Alexandre Julliard Nov. 22, 2005

Nov. 22, 2005

ChangeSet ID: 21388 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/22 05:58:51 Modified files: dlls/wininet : http.c Log message: Robert Shearman <rob(a)codeweavers.com> Fix an incorrect entry in the HTTP header field table causing broken Location field parsing. Patch: http://cvs.winehq.org/patch.py?id=21388 Old revision New revision Changes Path 1.111 1.112 +1 -1 wine/dlls/wininet/http.c Index: wine/dlls/wininet/http.c diff -u -p wine/dlls/wininet/http.c:1.111 wine/dlls/wininet/http.c:1.112 --- wine/dlls/wininet/http.c:1.111 22 Nov 2005 11:58:51 -0000 +++ wine/dlls/wininet/http.c 22 Nov 2005 11:58:51 -0000 @@ -2556,7 +2556,7 @@ const std_hdr_data SORTED_STANDARD_HEADE {szIf_Range, HTTP_QUERY_IF_RANGE, REQUEST_HDR,}, {szIf_Unmodified_Since, HTTP_QUERY_IF_UNMODIFIED_SINCE, REQUEST_HDR,}, {szLast_Modified, HTTP_QUERY_LAST_MODIFIED, REQ_RESP_HDR,}, - {szLocation, HTTP_QUERY_CONTENT_LOCATION, REQ_RESP_HDR,}, + {szLocation, HTTP_QUERY_LOCATION, REQ_RESP_HDR,}, {szMax_Forwards, HTTP_QUERY_MAX_FORWARDS, REQUEST_HDR,}, {szMime_Version, HTTP_QUERY_MIME_VERSION, REQ_RESP_HDR,}, {szPragma, HTTP_QUERY_PRAGMA, REQ_RESP_HDR,},

1 0

wine/dlls/advpack/tests advpack.c
by Alexandre Julliard Nov. 22, 2005

Nov. 22, 2005

ChangeSet ID: 21387 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/22 05:58:25 Modified files: dlls/advpack/tests: advpack.c Log message: Saulius Krasuckas <saulius.krasuckas(a)ieee.org> Exit test after first TranslateInfString() failure, which seems to be NT3.51 specific. Patch: http://cvs.winehq.org/patch.py?id=21387 Old revision New revision Changes Path 1.8 1.9 +9 -2 wine/dlls/advpack/tests/advpack.c Index: wine/dlls/advpack/tests/advpack.c diff -u -p wine/dlls/advpack/tests/advpack.c:1.8 wine/dlls/advpack/tests/advpack.c:1.9 --- wine/dlls/advpack/tests/advpack.c:1.8 22 Nov 2005 11:58:25 -0000 +++ wine/dlls/advpack/tests/advpack.c 22 Nov 2005 11:58:25 -0000 @@ -183,8 +183,15 @@ static void translateinfstring_test() /* try to open an inf file that doesn't exist */ hr = pTranslateInfString("c:\\a.inf", "Options.NTx86", "Options.NTx86", "InstallDir", buffer, MAX_PATH, &dwSize, NULL); - ok(hr == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND) || hr == E_INVALIDARG, - "Expected 0x80070002 or E_INVALIDARG, got 0x%08x\n", (UINT)hr); + ok(hr == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND) || hr == E_INVALIDARG || + hr == HRESULT_FROM_WIN32(ERROR_MOD_NOT_FOUND), + "Expected E_INVALIDARG, 0x80070002 or 0x8007007e, got 0x%08x\n", (UINT)hr); + + if(hr == HRESULT_FROM_WIN32(ERROR_MOD_NOT_FOUND)) + { + trace("WinNT 3.51 detected. Skipping tests for TranslateInfString()"); + return; + } /* try a nonexistent section */ buffer[0] = 0;

1 0

appdb/ include/header.php include/incl.php ban ...
by Jeremy Newman Nov. 21, 2005

Nov. 21, 2005

ChangeSet ID: 21386 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: jnewman(a)winehq.org 2005/11/21 11:30:58 Modified files: include : header.php incl.php Removed files: banner/468x60 : cw-ad01.gif cw-ad02.gif cw-ad04.gif banner/xml : cw-ad01.xml cw-ad02.xml cw-ad04.xml include : banner.php Log message: use banner ad code from main winehq.org Patch: http://cvs.winehq.org/patch.py?id=21386 Old revision New revision Changes Path 1.1.1.1 Removed +0 -0 appdb/banner/468x60/cw-ad01.gif 1.1.1.1 Removed +0 -0 appdb/banner/468x60/cw-ad02.gif 1.1.1.1 Removed +0 -0 appdb/banner/468x60/cw-ad04.gif 1.2 Removed +0 -0 appdb/banner/xml/cw-ad01.xml 1.2 Removed +0 -0 appdb/banner/xml/cw-ad02.xml 1.2 Removed +0 -0 appdb/banner/xml/cw-ad04.xml 1.8 1.9 +7 -2 appdb/include/header.php 1.25 1.26 +0 -4 appdb/include/incl.php 1.5 Removed +0 -0 appdb/include/banner.php Index: appdb/banner/xml/cw-ad01.xml diff -u -p appdb/banner/xml/cw-ad01.xml:1.2 /dev/null --- appdb/banner/xml/cw-ad01.xml 21 Nov 2005 17:30:58 -0000 +++ /dev/null 21 Nov 2005 17:30:58 -0000 @@ -1,7 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE bannerAd> -<ad> - <id>cw-ad04</id> - <url>http://www.codeweavers.com/products/?ad=1</url> - <alt>QuickTime for Linux!</alt> -</ad> Index: appdb/banner/xml/cw-ad02.xml diff -u -p appdb/banner/xml/cw-ad02.xml:1.2 /dev/null --- appdb/banner/xml/cw-ad02.xml 21 Nov 2005 17:30:58 -0000 +++ /dev/null 21 Nov 2005 17:30:58 -0000 @@ -1,7 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE bannerAd> -<ad> - <id>cw-ad04</id> - <url>http://www.codeweavers.com/products/support_wine/?ad=1</url> - <alt>Support the Wine Project!</alt> -</ad> Index: appdb/banner/xml/cw-ad04.xml diff -u -p appdb/banner/xml/cw-ad04.xml:1.2 /dev/null --- appdb/banner/xml/cw-ad04.xml 21 Nov 2005 17:30:58 -0000 +++ /dev/null 21 Nov 2005 17:30:58 -0000 @@ -1,7 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE bannerAd> -<ad> - <id>cw-ad04</id> - <url>http://www.codeweavers.com/products/?ad=1</url> - <alt>Microsoft Office On Linux!</alt> -</ad> Index: appdb/include/header.php diff -u -p appdb/include/header.php:1.8 appdb/include/header.php:1.9 --- appdb/include/header.php:1.8 21 Nov 2005 17:30:58 -0000 +++ appdb/include/header.php 21 Nov 2005 17:30:58 -0000 @@ -25,8 +25,13 @@ <td> <img src="<?php echo BASE; ?>images/blank.gif" width="10" height="1" alt=""> </td> - <td width="100%" align="center" valign="middle"> - <?php echo $banner_ad; ?> + <td width="468" align="center" valign="middle"> +  + <iframe src="http://www.winehq.org/bin/ad" scrolling="no" frameBorder="0" height="60" width="468"></iframe> +  + </td> + <td> + <img src="<?php echo BASE; ?>images/blank.gif" width=10 height=1 alt=""> </td> </tr> </table> Index: appdb/include/incl.php diff -u -p appdb/include/incl.php:1.25 appdb/include/incl.php:1.26 --- appdb/include/incl.php:1.25 21 Nov 2005 17:30:58 -0000 +++ appdb/include/incl.php 21 Nov 2005 17:30:58 -0000 @@ -58,10 +58,6 @@ function apidb_header($title = 0) if ($title) $title = " - $title"; - // banner ad - include(BASE."include/banner.php"); - $banner_ad = banner_display(); - // Display Header include(BASE."include/header.php"); Index: appdb/include/banner.php diff -u -p appdb/include/banner.php:1.5 /dev/null --- appdb/include/banner.php 21 Nov 2005 17:30:58 -0000 +++ /dev/null 21 Nov 2005 17:30:58 -0000 @@ -1,50 +0,0 @@ -<?php -/**********************************************/ -/* Banner Ad Library */ -/* by Jeremy Newman <jnewman(a)codeweavers.com> */ -/* last modified: 2001.10.08 */ -/**********************************************/ - -/** - * Path for Banner Ads - */ -function banner_display () -{ - // import banner paths from config - $banner_path_468x60 = BASE."banner/468x60/"; - $banner_path_xml = BASE."banner/xml/"; - - // opening html - $banner = ""; - $banner .= "\n\n".''."\n"; - $banner .= "<div align=center id=\"banner\">\n"; - - // read dir and get list of banners - $ads = array(); - $d = opendir($banner_path_468x60); - while($entry = readdir($d)) - { - if(!ereg("(.+)\\.gif$", $entry, $arr)) - continue; //" - array_push($ads, $arr[1]); - } - closedir($d); - - // randomly select a banner and display it - $img = $ads[(rand(1,count($ads))-1)]; - $url = get_xml_tag($banner_path_xml.$img.'.xml','url'); - $alt = get_xml_tag($banner_path_xml.$img.'.xml','alt'); - - // da banner - $banner .= '<a href="'.$url.'">'; - $banner .= '<img src="'.$banner_path_468x60.$img.'.gif" width=468 height=60 alt="'.$alt.'">'; - $banner .= '</a>'."\n"; - - // closing html - $banner .= '</div>'."\n"; - $banner .= ''."\n\n"; - - return $banner; -} - -?>

1 0

bugzilla/template/en/default/global banner.htm ...
by Jeremy Newman Nov. 21, 2005

Nov. 21, 2005

ChangeSet ID: 21385 CVSROOT: /opt/cvs-commit Module name: bugzilla Changes by: jnewman(a)winehq.org 2005/11/21 11:26:01 Removed files: template/en/default/global: banner.html (copy).tmpl Log message: remove un-needed file Patch: http://cvs.winehq.org/patch.py?id=21385 Old revision New revision Changes Path (copy).tmpl +0 -0 template/en/default/global/banner.html +0 -0 template/en/default/global/(copy).tmpl

1 0

bugzilla/template/en/default/global banner.htm ...
by Jeremy Newman Nov. 21, 2005

Nov. 21, 2005

ChangeSet ID: 21384 CVSROOT: /opt/cvs-commit Module name: bugzilla Changes by: jnewman(a)winehq.org 2005/11/21 11:25:07 Modified files: template/en/default/global: banner.html.tmpl Log message: use banner ad code from winhq.org main site Patch: http://cvs.winehq.org/patch.py?id=21384 Old revision New revision Changes Path 1.1.1.1 1.2 +3 -7 bugzilla/template/en/default/global/banner.html.tmpl Index: bugzilla/template/en/default/global/banner.html.tmpl diff -u -p bugzilla/template/en/default/global/banner.html.tmpl:1.1.1.1 bugzilla/template/en/default/global/banner.html.tmpl:1.2 --- bugzilla/template/en/default/global/banner.html.tmpl:1.1.1.1 21 Nov 2005 17:25: 7 -0000 +++ bugzilla/template/en/default/global/banner.html.tmpl 21 Nov 2005 17:25: 7 -0000 @@ -31,14 +31,10 @@ <td> <img src="images/blank.gif" border=0 width=10 height=1 alt=""> </td> - <td width="100%" align="center" valign="middle"> + <td width="468" align="center" valign="middle">  - <table border=0 cellpadding=1 cellspacing=0> - <tr><td valign="middle" align="center" class="black" - > <a href="http://www.codeweavers.com/site/products/support_wine/?ad=5" ><img src="http://www.winehq.org/images/bannerads/cw-ad02.gif" border="0" width="468" height="60" alt="Support the Wine Project!" /></a> </td - ></tr> - </table> -  + <iframe src="http://www.winehq.org/bin/ad" scrolling="no" frameBorder="0" height="60" width="468"></iframe> +  </td> <td> <img src="images/blank.gif" border=0 width=10 height=1 alt="">

1 0

lostwages/ include/html.php include/incl.php i ...
by Jeremy Newman Nov. 21, 2005

Nov. 21, 2005

ChangeSet ID: 21383 CVSROOT: /opt/cvs-commit Module name: lostwages Changes by: jnewman(a)winehq.org 2005/11/21 11:23:15 Modified files: include : html.php incl.php utils.php include/themes/winehq: content.template Added files: bin : .htaccess ad Log message: revamp of the banner ad code. We now will store a cookie. If a user views the banner ad 50 times, we will fix to a static image. Ad code is also now in it's own file. This will allow us to embed the ad into other parts of the website. i.e. the appdb, and the bug tracker. Patch: http://cvs.winehq.org/patch.py?id=21383 Old revision New revision Changes Path Added 1.1 +0 -0 lostwages/bin/.htaccess Added 1.1 +0 -0 lostwages/bin/ad 1.15 1.16 +1 -2 lostwages/include/html.php 1.9 1.10 +0 -3 lostwages/include/incl.php 1.9 1.10 +1 -29 lostwages/include/utils.php 1.9 1.10 +2 -6 lostwages/include/themes/winehq/content.template Index: lostwages/bin/.htaccess diff -u -p /dev/null lostwages/bin/.htaccess:1.1 --- /dev/null 21 Nov 2005 17:23:15 -0000 +++ lostwages/bin/.htaccess 21 Nov 2005 17:23:15 -0000 @@ -0,0 +1,7 @@ +deny from all + +<Files ad> + allow from all + ForceType application/x-httpd-php +</Files> + Index: lostwages/bin/ad diff -u -p /dev/null lostwages/bin/ad:1.1 --- /dev/null 21 Nov 2005 17:23:16 -0000 +++ lostwages/bin/ad 21 Nov 2005 17:23:16 -0000 @@ -0,0 +1,87 @@ +<?PHP + +/* Banner Ad Code */ +/* For WineHQ */ + +// path for banner ad +$bannerads_path = '../images/bannerads/'; + +// base filename of the static ad +$fixed_ad = 'cw-ad02'; + +// max count until we fix on static ad +$max_ads = 50; + +// open file and display contents of selected tag (very simple) +function get_xml_tags ($file, $tags = null) +{ + if (is_array($tags) and file_exists($file)) + { + $content = array(); + $fp = @fopen($file, "r"); + $data = fread($fp, filesize($file)); + @fclose($fp); + foreach ($tags as $tag) + { + if (eregi("<" . $tag . ">(.*)</" . $tag . ">", $data, $out)) + { + array_push($content, $out[1]); + } + } + return $content; + } + else + { + return null; + } +} +// end get_xml_tags() + +// check cookie for ad counter +$whqac = 1; +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 = $fixed_ad; +} +else +{ + // display random ad + $ads = array(); + $d = opendir($bannerads_path); + while($entry = readdir($d)) + { + if(!ereg("(.+)\\.gif$", $entry, $arr)) + continue; + array_push($ads, $arr[1]); + } + closedir($d); + sort($ads); + $img = $ads[(rand(1,count($ads))-1)]; +} +list($url, $alt) = get_xml_tags($bannerads_path.$img.'.xml', array('url', 'alt')); + +// da banner +setcookie("whqac", $whqac, time()+60*60*24*1); +header("Expires: Mon, 26 Jul 1997 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"); +?> +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> +<html> +<head> + <title><?=$alt?></title> +</head> +<body bgcolor="#000000" text="#FFFFFF" marginwidth="0" marginheight="0" style="margin:0px;"><a href="<?=$url?>" +target="_top"><img src="../images/bannerads/<?=$img?>.gif" +width="468" height="60" border="0" alt="<?=$alt?>" /></a> <?=$whqac?></body> +</html> Index: lostwages/include/html.php diff -u -p lostwages/include/html.php:1.15 lostwages/include/html.php:1.16 --- lostwages/include/html.php:1.15 21 Nov 2005 17:23:16 -0000 +++ lostwages/include/html.php 21 Nov 2005 17:23:16 -0000 @@ -85,8 +85,7 @@ class html 'page_title' => $title, 'page_body' => $body, 'page_sidebar' => $menu, - 'page_search' => $search, - 'banner_ad' => $this->banner_ad + 'page_search' => $search ) ); } Index: lostwages/include/incl.php diff -u -p lostwages/include/incl.php:1.9 lostwages/include/incl.php:1.10 --- lostwages/include/incl.php:1.9 21 Nov 2005 17:23:16 -0000 +++ lostwages/include/incl.php 21 Nov 2005 17:23:16 -0000 @@ -39,9 +39,6 @@ if (isset($_GET['theme']) and in_array($ $config->theme = $_GET['theme']; } -// load a banner ad -$html->banner_ad = banner_ad(); - // load the path for the page if ($_SERVER['PATH_INFO']) { Index: lostwages/include/utils.php diff -u -p lostwages/include/utils.php:1.9 lostwages/include/utils.php:1.10 --- lostwages/include/utils.php:1.9 21 Nov 2005 17:23:16 -0000 +++ lostwages/include/utils.php 21 Nov 2005 17:23:16 -0000 @@ -3,7 +3,7 @@ /* WineHQ by Jeremy Newman <jnewman(a)codeweavers.com> -*/ +*/ /* * winehq misc utils @@ -33,34 +33,6 @@ function get_files ($dir, $filter = null return $files; } -// load and display banner ads -function banner_ad () -{ - global $file_root, $html; - $bannerads_path = $file_root.'/images/bannerads/'; - - // read dir and get list of banners - $ads = array(); - $d = opendir($bannerads_path); - while($entry = readdir($d)) - { - if(!ereg("(.+)\\.gif$", $entry, $arr)) - continue; - array_push($ads, $arr[1]); - } - closedir($d); - sort($ads); - - // randomly select a banner and display it - $img = $ads[(rand(1,count($ads))-1)]; - list($url, $alt) = get_xml_tags($bannerads_path.$img.'.xml', array('url', 'alt')); - - // da banner - $banner = $html->ahref($html->img('bannerads/'.$img.".gif", "", $alt), $url); - - return $banner; -} - // open file and display contents of selected tag (very simple) function get_xml_tags ($file, $tags = null) { Index: lostwages/include/themes/winehq/content.template diff -u -p lostwages/include/themes/winehq/content.template:1.9 lostwages/include/themes/winehq/content.template:1.10 --- lostwages/include/themes/winehq/content.template:1.9 21 Nov 2005 17:23:16 -0000 +++ lostwages/include/themes/winehq/content.template 21 Nov 2005 17:23:16 -0000 @@ -20,13 +20,9 @@ <td> <img src="{$root}/images/blank.gif" border=0 width=10 height=1 alt=""> </td> - <td width="100%" align="center" valign="middle"> + <td width="468" align="center" valign="middle">  - <table border=0 cellpadding=1 cellspacing=0> - <tr><td valign="middle" align="center" class="black" - >{$banner_ad}</td - ></tr> - </table> + <iframe src="{$root}/bin/ad" scrolling="no" frameBorder="0" height="60" width="468"></iframe>  </td> <td>

1 0

wine/ include/wine/wined3d_interface.h dlls/wi ...
by Alexandre Julliard Nov. 21, 2005

Nov. 21, 2005

ChangeSet ID: 21382 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/21 10:27:55 Modified files: include/wine : wined3d_interface.h dlls/wined3d : wined3d_private.h pixelshader.c device.c Log message: Oliver Stieber <oliver_stieber(a)yahoo.co.uk> Implement a pixel shader parser and cross compiler. All version of shaders up to 3 should be parsed correctly, but only shaders 1-1.4 will be cross compiled. Patch: http://cvs.winehq.org/patch.py?id=21382 Old revision New revision Changes Path 1.45 1.46 +3 -7 wine/include/wine/wined3d_interface.h 1.68 1.69 +2 -0 wine/dlls/wined3d/wined3d_private.h 1.1 1.2 +1711 -3 wine/dlls/wined3d/pixelshader.c 1.98 1.99 +25 -29 wine/dlls/wined3d/device.c

1 0

wine/ server/winstation.c server/trace.c serve ...
by Alexandre Julliard Nov. 21, 2005

Nov. 21, 2005

ChangeSet ID: 21381 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/21 10:27:04 Modified files: server : winstation.c trace.c timer.c semaphore.c object.c named_pipe.c mutex.c mapping.c mailslot.c event.c dlls/ntdll/tests: om.c Log message: Vitaliy Margolen <wine-patch(a)kievinfo.com> Return correct error on name collision when creating new named objects. Check for correct error in affected places. Patch: http://cvs.winehq.org/patch.py?id=21381 Old revision New revision Changes Path 1.15 1.16 +2 -2 wine/server/winstation.c 1.269 1.270 +1 -0 wine/server/trace.c 1.31 1.32 +1 -1 wine/server/timer.c 1.32 1.33 +1 -1 wine/server/semaphore.c 1.37 1.38 +7 -2 wine/server/object.c 1.53 1.54 +3 -3 wine/server/named_pipe.c 1.32 1.33 +1 -1 wine/server/mutex.c 1.60 1.61 +1 -1 wine/server/mapping.c 1.13 1.14 +1 -1 wine/server/mailslot.c 1.34 1.35 +1 -1 wine/server/event.c 1.5 1.6 +12 -8 wine/dlls/ntdll/tests/om.c

1 0