wine-commits December 2008

wine-commits@winehq.org

2 participants
1225 discussions

Paul Vriens : Acknowledge the work in the correct year
by Jeremy Newman 11 Dec '08

11 Dec '08

Module: website Branch: master Commit: 2826a753aa4fc03dbb671fcc2ee21d28981b1c23 URL: http://source.winehq.org/git/website.git/?a=commit;h=2826a753aa4fc03dbb671f… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Thu Dec 11 17:55:38 2008 +0100 Acknowledge the work in the correct year Hi, Or maybe they intend to start working in 20002 again? Changelog Acknowledge the work in the correct year -- Cheers, Paul. >From 9158107d84062bae8b537886b91ce3bb099cb4c9 Mon Sep 17 00:00:00 2001 From: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Thu, 11 Dec 2008 17:54:36 +0100 Subject: [PATCH] Acknowledge the work in the correct year --- templates/de/acknowledgement.template | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/templates/de/acknowledgement.template b/templates/de/acknowledgement.template index 5a1c937..34f36f3 100644 --- a/templates/de/acknowledgement.template +++ b/templates/de/acknowledgement.template @@ -49,7 +49,7 @@ haben, die schwierige Probleme angehen... wir schon.</p> verbessern. Das ReactOS-Team verantwortet außerdem die Tools Regedit und Task Manager.</dd> <dt class="bold underline"><a href="http://www.transgaming.com">TransGaming</a></dt> - <dd>TransGamings Entwicklungsaufwand, hauptsächlich in 20002, hat mehrere + <dd>TransGamings Entwicklungsaufwand, hauptsächlich in 2002, hat mehrere kritische Bereiche von Wine verbessert. Änderungen an DCOM, DirectDraw und 2D Grafikunterstützung erlaubten das Installieren neuer Arten von Anwendungen. Später wurde das Tool widl als Ersatz für MIDL

1 0

Jeremy Newman : slight revision to German change language text
by Jeremy Newman 11 Dec '08

11 Dec '08

Module: website Branch: master Commit: f1a99f776f439e903061422d49b0be0ec663e25d URL: http://source.winehq.org/git/website.git/?a=commit;h=f1a99f776f439e90306142… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Thu Dec 11 10:40:07 2008 -0600 slight revision to German change language text --- include/data.php | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/include/data.php b/include/data.php index 22efb06..a4cfbdc 100644 --- a/include/data.php +++ b/include/data.php @@ -51,7 +51,7 @@ class data ), 'de' => array( 'name' => 'Deutsch', - 'change' => 'Ändern Sie Sprache' + 'change' => 'Sprache ändern' ), 'es' => array( 'name' => 'Español',

1 0

Jeremy Newman : adding German (de) to available languages config
by Jeremy Newman 11 Dec '08

11 Dec '08

Module: website Branch: master Commit: bdc8e941c28a5fad947d919619fbd95caa516336 URL: http://source.winehq.org/git/website.git/?a=commit;h=bdc8e941c28a5fad947d91… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Thu Dec 11 10:24:46 2008 -0600 adding German (de) to available languages config --- include/winehq.conf.sample | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/include/winehq.conf.sample b/include/winehq.conf.sample index 64e6722..06b9c3e 100644 --- a/include/winehq.conf.sample +++ b/include/winehq.conf.sample @@ -16,7 +16,7 @@ theme: winehq lang: en # available languages -@languages: en, es +@languages: en, de, es # default base URLS (if you run the site, in a subdir, set base_root) base_root:

1 0

Jeremy Newman : add english names of languages as well
by Jeremy Newman 11 Dec '08

11 Dec '08

Module: website Branch: master Commit: 882397ecd17a6536295cafd6e16a47618e68a188 URL: http://source.winehq.org/git/website.git/?a=commit;h=882397ecd17a6536295caf… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Thu Dec 11 10:24:01 2008 -0600 add english names of languages as well --- templates/en/lang.template | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/templates/en/lang.template b/templates/en/lang.template index 0aa1263..c513cc1 100644 --- a/templates/en/lang.template +++ b/templates/en/lang.template @@ -12,9 +12,13 @@ <li style="background-image: url('{$root}/images/lang/en.png'); background-repeat: no-repeat; padding: 0 0 10px 40px;"> <a href="{$root}/lang/en" title="English">English</a> </li></a> - + + <li style="background-image: url('{$root}/images/lang/de.png'); background-repeat: no-repeat; padding: 0 0 10px 40px;"> + <a href="{$root}/lang/de" title="Deutsch">Deutsch</a> <small>(German)</small> + </li></a> + <li style="background-image: url('{$root}/images/lang/es.png'); background-repeat: no-repeat; padding: 0 0 10px 40px;"> - <a href="{$root}/lang/es" title="Español">Español</a> + <a href="{$root}/lang/es" title="Español">Español</a> <small>(Spanish)</small> </li> </ul>

1 0

Jeremy Newman : adding German as language
by Jeremy Newman 11 Dec '08

11 Dec '08

Module: website Branch: master Commit: b0ff22a86e4ab725b3c2ddbb5dd8773d69641ecc URL: http://source.winehq.org/git/website.git/?a=commit;h=b0ff22a86e4ab725b3c2dd… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Thu Dec 11 10:23:40 2008 -0600 adding German as language --- include/data.php | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/include/data.php b/include/data.php index c5281d7..22efb06 100644 --- a/include/data.php +++ b/include/data.php @@ -49,6 +49,10 @@ class data 'name' => 'English', 'change' => 'Change Language' ), + 'de' => array( + 'name' => 'Deutsch', + 'change' => 'Ändern Sie Sprache' + ), 'es' => array( 'name' => 'Español', 'change' => 'Cambiar la Lengua'

1 0

Jeremy Newman : add some debug messages about language detection
by Jeremy Newman 11 Dec '08

11 Dec '08

Module: website Branch: master Commit: 20075e4820d30b1832a2ba589c98177a6dcc11fd URL: http://source.winehq.org/git/website.git/?a=commit;h=20075e4820d30b1832a2ba… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Thu Dec 11 10:23:18 2008 -0600 add some debug messages about language detection --- include/html.php | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/include/html.php b/include/html.php index f56348f..27c2162 100644 --- a/include/html.php +++ b/include/html.php @@ -246,6 +246,7 @@ class html if (isset($_COOKIE['lang']) and in_array($_COOKIE['lang'], $GLOBALS['config']->languages)) { // load language from URL or cookie + debug("global", "lang from cookie: {$_COOKIE['lang']}"); $lang = $_COOKIE['lang']; } else if (isset($_SERVER["HTTP_ACCEPT_LANGUAGE"])) @@ -259,7 +260,10 @@ class html $avail[0] = substr($avail[0], 0, 2); // check to make sure lang is defined in our config if (in_array($avail[0], $GLOBALS['config']->languages)) + { + debug("global", "lang from browser: {$avail[0]}"); $lang = $avail[0]; + } } unset($avail); }

1 0

Jeremy Newman : limit cookie to the base_root of the site
by Jeremy Newman 11 Dec '08

11 Dec '08

Module: website Branch: master Commit: a6cc111129a8dd7123bd0bbebc06fdb0aecd0caf URL: http://source.winehq.org/git/website.git/?a=commit;h=a6cc111129a8dd7123bd0b… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Thu Dec 11 10:22:47 2008 -0600 limit cookie to the base_root of the site --- include/plugins/language.php | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/include/plugins/language.php b/include/plugins/language.php index 0291f8b..a785430 100644 --- a/include/plugins/language.php +++ b/include/plugins/language.php @@ -11,7 +11,7 @@ global $html, $config; // if specified, switch to lang if (defined('PAGE_PARAMS') and in_array(PAGE_PARAMS, $config->languages)) { - setcookie("lang", PAGE_PARAMS, time()+60*60*24*365, '/'); + setcookie("lang", PAGE_PARAMS, time()+60*60*24*365, "{$config->base_root}/"); $html->redirect($config->base_url); exit(); }

1 0

Maik Schulz : German translation for winehq.org
by Jeremy Newman 11 Dec '08

11 Dec '08

Module: website Branch: master Commit: 744861af39961533ee837f5d4c41396493b4ddf8 URL: http://source.winehq.org/git/website.git/?a=commit;h=744861af39961533ee837f… Author: Maik Schulz <maik.schulz(a)gmail.com> Date: Thu Dec 11 08:51:35 2008 +0100 German translation for winehq.org Hi, please find attached a patch for the beginning of a German translation of the new winehq.org. More patches to follow as I go through the remaining templates. Cheers, -Maik >From 8f3cad44a4889822c8dccad587713e66f499ce89 Mon Sep 17 00:00:00 2001 From: Maik Schulz <maik.schulz(a)gmail.com> Date: Thu, 11 Dec 2008 08:41:41 +0100 Subject: German translation --- templates/de/about.template | 55 +++++++++ templates/de/acknowledgement.template | 216 +++++++++++++++++++++++++++++++++ templates/de/announce.template | 7 + templates/de/home.template | 90 ++++++++++++++ 4 files changed, 368 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/website.git/?a=commitdiff;h=744861af39961533ee…

1 0

Maurilio Genovese : Patch for debian lenny repository
by Jeremy Newman 11 Dec '08

11 Dec '08

Module: website Branch: master Commit: a4b6b133e01de7366e1c3a3ea38916149f26a2ed URL: http://source.winehq.org/git/website.git/?a=commit;h=a4b6b133e01de7366e1c3a… Author: Maurilio Genovese <repository(a)lamaresh.net> Date: Wed Dec 10 12:30:58 2008 +0100 Patch for debian lenny repository in attachment Maurilio Genovese >From 3f807550fcc412f9d75df5a2475245377674ebd5 Mon Sep 17 00:00:00 2001 From: Maurilio Genovese <maurilio(a)(none).(none)> Date: Wed, 10 Dec 2008 12:28:50 +0100 Subject: Fixed mail address and a typo modified: templates/en/download.template modified: templates/en/download/deblenny.template --- templates/en/download.template | 2 +- templates/en/download/deblenny.template | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/templates/en/download.template b/templates/en/download.template index 066d0ff..8c0bdb8 100644 --- a/templates/en/download.template +++ b/templates/en/download.template @@ -79,7 +79,7 @@ for post-installation instructions.</b></p> </td> <td> <b><a href="{$root}/download/deblenny">Debian</a></b> binary .debs for Debian Lenny (5.0)</td> - <td><a href="mailto:lamalennyreport@altervista.org">Maurilio Genovese</a></td> + <td><a href="mailto:repository@lamaresh.net">Maurilio Genovese</a></td> </tr> <tr bgcolor="#ffffff"> diff --git a/templates/en/download/deblenny.template b/templates/en/download/deblenny.template index 5965be0..d5e9238 100644 --- a/templates/en/download/deblenny.template +++ b/templates/en/download/deblenny.template @@ -28,12 +28,12 @@ Wine for Debian Lenny <div style="position:relative;left:20px"><i>apt-get update</i> <font color="gray">#to update package list</font></div> <div style="position:relative;left:20px"><i>apt-get install wine</i> <font color="gray">#to install latest wine version</font></div><p></p> <h2>Method 2: Download .deb and manually install it</h2> -<div style="position:relative;left:20px">Chose a .deb package from <a href="http://www.lamalennyrepo.altervista.org/binary.php" target="_new">binary list</a> and save it in your home directory</div> +<div style="position:relative;left:20px">Chose a .deb package from <a href="http://www.lamaresh.net/binary.php" target="_blank">binary list</a> and save it in your home directory</div> <div style="position:relative;left:20px">Open a terminal</div> <div style="position:relative;left:20px"><i>cd ~</i> <font color="gray">#to go to your home directory</font></div> <div style="position:relative;left:20px"><i>su</i> <font color="gray">#to log as root</font></div> -<div style="position:relative;left:20px"><i>dpkg -i wine_1.1.x_i386.deb</i> <font color="gray">#change xxx with your chosen package, this will install wine</font></div> +<div style="position:relative;left:20px"><i>dpkg -i wine_1.1.xxx.deb</i> <font color="gray">#change xxx with your chosen package, this will install wine</font></div> -<br><br><p style="font-size:12px;text-align:left;font-style: italic;">Manteiner: <a href="http://www.lamaresh.net" target="_blank">homepage</a>, <a href="mailto:lamalennyrepo@altervista.org">email</a></p> +<br><br><p style="font-size:12px;text-align:left;font-style: italic;">Maintainer: <a href="http://www.lamaresh.net" target="_blank">homepage</a>, <a href="mailto:repository@lamaresh.net">email</a></p>

1 0

Hans Leidekker : winhttp: Resolve host port at the latest possible moment.
by Alexandre Julliard 11 Dec '08

11 Dec '08

Module: wine Branch: master Commit: 0719b6ed86ce6ea86a577a3c288541d88ee88121 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0719b6ed86ce6ea86a577a3c2… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Dec 11 13:56:52 2008 +0100 winhttp: Resolve host port at the latest possible moment. --- dlls/winhttp/request.c | 25 +++++++++++++++++-------- dlls/winhttp/session.c | 4 ++-- 2 files changed, 19 insertions(+), 10 deletions(-) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index d2d515f..868045a 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -715,13 +715,16 @@ static BOOL open_connection( request_t *request ) connect_t *connect; char address[32]; WCHAR *addressW; + INTERNET_PORT port; if (netconn_connected( &request->netconn )) return TRUE; + connect = request->connect; + port = connect->hostport ? connect->hostport : (request->hdr.flags & WINHTTP_FLAG_SECURE ? 443 : 80); send_callback( &request->hdr, WINHTTP_CALLBACK_STATUS_RESOLVING_NAME, connect->servername, strlenW(connect->servername) + 1 ); - if (!netconn_resolve( connect->servername, connect->serverport, &connect->sockaddr )) return FALSE; + if (!netconn_resolve( connect->servername, port, &connect->sockaddr )) return FALSE; inet_ntop( connect->sockaddr.sin_family, &connect->sockaddr.sin_addr, address, sizeof(address) ); addressW = strdupAW( address ); @@ -764,20 +767,24 @@ void close_connection( request_t *request ) send_callback( &request->hdr, WINHTTP_CALLBACK_STATUS_CONNECTION_CLOSED, 0, 0 ); } -static BOOL add_host_header( request_t *request, WCHAR *hostname, INTERNET_PORT port, DWORD modifier ) +static BOOL add_host_header( request_t *request, DWORD modifier ) { BOOL ret; DWORD len; WCHAR *host; static const WCHAR fmt[] = {'%','s',':','%','u',0}; + connect_t *connect = request->connect; + INTERNET_PORT port; + + port = connect->hostport ? connect->hostport : (request->hdr.flags & WINHTTP_FLAG_SECURE ? 443 : 80); if (port == INTERNET_DEFAULT_HTTP_PORT || port == INTERNET_DEFAULT_HTTPS_PORT) { - return process_header( request, attr_host, hostname, modifier, TRUE ); + return process_header( request, attr_host, connect->hostname, modifier, TRUE ); } - len = strlenW( hostname ) + 7; /* sizeof(":65335") */ + len = strlenW( connect->hostname ) + 7; /* sizeof(":65335") */ if (!(host = heap_alloc( len * sizeof(WCHAR) ))) return FALSE; - sprintfW( host, fmt, hostname, port ); + sprintfW( host, fmt, connect->hostname, port ); ret = process_header( request, attr_host, host, modifier, TRUE ); heap_free( host ); return ret; @@ -802,7 +809,7 @@ static BOOL send_request( request_t *request, LPCWSTR headers, DWORD headers_len process_header( request, attr_user_agent, session->agent, WINHTTP_ADDREQ_FLAG_ADD_IF_NEW, TRUE ); if (connect->hostname) - add_host_header( request, connect->hostname, connect->hostport, WINHTTP_ADDREQ_FLAG_ADD_IF_NEW ); + add_host_header( request, WINHTTP_ADDREQ_FLAG_ADD_IF_NEW ); if (total_len || (request->verb && !strcmpW( request->verb, postW ))) { @@ -1092,14 +1099,16 @@ static BOOL handle_redirect( request_t *request ) port = uc.nPort ? uc.nPort : (uc.nScheme == INTERNET_SCHEME_HTTPS ? 443 : 80); if (strcmpiW( connect->servername, hostname ) || connect->serverport != port) { + heap_free( connect->hostname ); + connect->hostname = hostname; heap_free( connect->servername ); - connect->servername = hostname; + connect->servername = strdupW( connect->hostname ); connect->serverport = connect->hostport = port; netconn_close( &request->netconn ); if (!(ret = netconn_init( &request->netconn, request->hdr.flags & WINHTTP_FLAG_SECURE ))) goto end; } - if (!(ret = add_host_header( request, hostname, port, WINHTTP_ADDREQ_FLAG_REPLACE ))) goto end; + if (!(ret = add_host_header( request, WINHTTP_ADDREQ_FLAG_REPLACE ))) goto end; if (!(ret = open_connection( request ))) goto end; heap_free( request->path ); diff --git a/dlls/winhttp/session.c b/dlls/winhttp/session.c index e9937ce..db4ce03 100644 --- a/dlls/winhttp/session.c +++ b/dlls/winhttp/session.c @@ -253,10 +253,10 @@ HINTERNET WINAPI WinHttpConnect( HINTERNET hsession, LPCWSTR server, INTERNET_PO list_add_head( &session->hdr.children, &connect->hdr.entry ); if (server && !(connect->hostname = strdupW( server ))) goto end; - connect->hostport = port ? port : (connect->hdr.flags & WINHTTP_FLAG_SECURE ? 443 : 80); + connect->hostport = port; if (server && !(connect->servername = strdupW( server ))) goto end; - connect->serverport = port ? port : (connect->hdr.flags & WINHTTP_FLAG_SECURE ? 443 : 80); + connect->serverport = port; if (!(hconnect = alloc_handle( &connect->hdr ))) goto end; connect->hdr.handle = hconnect;

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits December 2008