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

Paul Vriens : transl: Get rid of the [hide] parameter in the conf files.
by Alexandre Julliard 16 Jul '09

16 Jul '09

Module: tools Branch: master Commit: 1bcd58ff30ab1d7cd5bb0416c4d4752d26a5bc78 URL: http://source.winehq.org/git/tools.git/?a=commit;h=1bcd58ff30ab1d7cd5bb0416… Author: Paul Vriens <paul(a)acer.famvriens.nl> Date: Wed Jul 15 12:38:09 2009 +0200 transl: Get rid of the [hide] parameter in the conf files. --- transl/php/index.php | 2 +- transl/php/lang.php | 9 +++++++- transl/php/lib.php | 50 +++++++++++++++++++++++++++++++++---------- transl/php/resfile.php | 10 +++++++- transl/php/style.css | 1 + transl/scripts/conf/016:00 | 2 +- 6 files changed, 57 insertions(+), 17 deletions(-) diff --git a/transl/php/index.php b/transl/php/index.php index 76ed5a8..94ee569 100644 --- a/transl/php/index.php +++ b/transl/php/index.php @@ -10,7 +10,7 @@ while ($line = fgets($summary, 1024)) die("couldn't parse line $line"); } - if (has_lang_flag($m[1], "hide")) + if ($m[3] == 0) continue; $sum = $m[2]+0; diff --git a/transl/php/lang.php b/transl/php/lang.php index bb46261..c6a237f 100644 --- a/transl/php/lang.php +++ b/transl/php/lang.php @@ -84,7 +84,14 @@ function dump_table($table) <div class="main"> <h1><?php echo "Language: ".get_lang_name($lang) ?></h1> -<?php warn_if_lang_hidden($lang) ?> +<?php +$translations = count($partial) + count($transl); +if (preg_match("/:00/", $lang) && $translations == 0) +{ + show_sublangs($lang); + exit(); +} +?> <div class="group"> <h2>Partially translated modules</h2> diff --git a/transl/php/lib.php b/transl/php/lib.php index adde182..6774775 100644 --- a/transl/php/lib.php +++ b/transl/php/lib.php @@ -60,6 +60,44 @@ function get_lang_base($id) return preg_replace("/:[0-9a-f]{2}/", ":00", $id); } +function get_sublangs($id) +{ + if (preg_match("/:00/", $id)) + { + global $LOCALE_NAMES; + include_once("dump_locales.php"); + + $base = preg_replace("/:00/", "", $id); + $sublangs = array(); + foreach ($LOCALE_NAMES as $key => $value) + if (preg_match("/$base/", $key) && ($key != $id)) + $sublangs[] = $key; + return $sublangs; + } + else + return NULL; +} + +function show_sublangs($id) +{ + echo "<p class=\"note\"><b>Note:</b> This is the '".get_lang_name($id)."' locale which ". + "is not used directly but has resources inherited by sublanguages.<br />". + "You can still use this locale in translations but the results will show up at the ". + "sublanguages (see below).</p>"; + + echo "<div class=\"group\">"; + echo "<h2>Sublanguages</h2>"; + echo "<table>\n"; + echo "<tr><th>Sublanguage</th></tr>\n"; + $sublangs = get_sublangs($id); + foreach ($sublangs as $key) + { + echo "<tr><td>".gen_lang_a($key).get_lang_name($key)."</a></td></tr>"; + } + echo "</table>\n"; + echo "</div>"; +} + function has_lang_flag($id, $flag) { return is_int(strpos(get_raw_lang_name($id), "[".$flag."]")); @@ -79,18 +117,6 @@ function get_lang_binid($lang) return hexdec($m[1]) + (hexdec($m[2]) << 10); } -/* Make sure people are not suprised if they see Portugese (Neutral) has nearly - * no resources */ -function warn_if_lang_hidden($lang) -{ - if (has_lang_flag($lang, "hide")) - { - echo "<p class=\"note\"><b>Note:</b> this is the ".get_lang_name($lang)." locale which\n". - "is not supposed to be used directly but only to have some resources\n". - "inherited by sublanguages.</p>"; - } -} - function get_locale_name($localeid) { global $LOCALE_NAMES; diff --git a/transl/php/resfile.php b/transl/php/resfile.php index 685f80e..337dc89 100644 --- a/transl/php/resfile.php +++ b/transl/php/resfile.php @@ -19,7 +19,6 @@ $msgs = array(); <h1>Module <?php echo $resfile?></h1> <?php -warn_if_lang_hidden($lang); while ($line = fgets($file, 4096)) { @@ -29,7 +28,14 @@ while ($line = fgets($file, 4096)) } } -if (count($msgs) == 0) { +if (count($msgs) == 0) +{ + if (preg_match("/:00/", $lang)) + { + show_sublangs($lang); + exit(); + } + echo "<p>This module is not translated into ".get_lang_name($lang).".</p>\n"; echo "<ul><li>If you want to see what resources are in this module, check the " .gen_resfile_a($MASTER_LANGUAGE, $resfile)."English (US) version</a>" diff --git a/transl/php/style.css b/transl/php/style.css index e600cc7..0464bc2 100644 --- a/transl/php/style.css +++ b/transl/php/style.css @@ -89,6 +89,7 @@ p.note border-style: solid; border-color: black; padding: 2px; + text-align: center; } /* table with a standard resource dump */ diff --git a/transl/scripts/conf/016:00 b/transl/scripts/conf/016:00 index 13944f6..edbd93f 100644 --- a/transl/scripts/conf/016:00 +++ b/transl/scripts/conf/016:00 @@ -1 +1 @@ -Portugese (Neutral)[hide] \ No newline at end of file +Portuguese (Neutral)

1 0

Alexander Nicolaysen Sørnes : objectManager: Send a more helpful mail when moving child objects
by Alexander Nicolaysen Sørnes 16 Jul '09

16 Jul '09

Module: appdb Branch: master Commit: 7997837f191eefe8ab89a25d6849da19e3519004 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=7997837f191eefe8ab89a25d… Author: Alexander Nicolaysen Sørnes <alexander(a)linux-xqqm.site> Date: Wed Jul 15 01:11:55 2009 +0200 objectManager: Send a more helpful mail when moving child objects --- include/objectManager.php | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/include/objectManager.php b/include/objectManager.php index 735e839..5153941 100644 --- a/include/objectManager.php +++ b/include/objectManager.php @@ -899,7 +899,7 @@ class ObjectManager } /* The argument is the reply text */ - $this->delete_entry("Duplicate entry"); + $this->delete_entry("This entry was merged with an existing one, which can be found at\n" . $oNewObject->objectMakeUrl()); } /* Display a page where the user can move the current object to another parent */

1 0

Dmitry Timoshkov : comctl32: Do not redraw treeview in TVM_INSERTITEM handler if bRedraw is not set, trigger the redraw on WM_SETREDRAW/TRUE.
by Alexandre Julliard 15 Jul '09

15 Jul '09

Module: wine Branch: master Commit: ee7ca802f4839fab9efd1759a762a9839d931a9b URL: http://source.winehq.org/git/wine.git/?a=commit;h=ee7ca802f4839fab9efd1759a… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Wed Jul 15 21:21:26 2009 +0900 comctl32: Do not redraw treeview in TVM_INSERTITEM handler if bRedraw is not set, trigger the redraw on WM_SETREDRAW/TRUE. --- dlls/comctl32/treeview.c | 16 +++++++++++----- 1 files changed, 11 insertions(+), 5 deletions(-) diff --git a/dlls/comctl32/treeview.c b/dlls/comctl32/treeview.c index 8bea973..fd20cef 100644 --- a/dlls/comctl32/treeview.c +++ b/dlls/comctl32/treeview.c @@ -1367,6 +1367,8 @@ TREEVIEW_InsertItemT(TREEVIEW_INFO *infoPtr, const TVINSERTSTRUCTW *ptdi, BOOL i TREEVIEW_VerifyTree(infoPtr); + if (!infoPtr->bRedraw) return (LRESULT)newItem; + if (parentItem == infoPtr->root || (ISVISIBLE(parentItem) && parentItem->state & TVIS_EXPANDED)) { @@ -1564,6 +1566,7 @@ TREEVIEW_DeleteItem(TREEVIEW_INFO *infoPtr, HTREEITEM wineItem) TREEVIEW_VerifyTree(infoPtr); + if (!infoPtr->bRedraw) return TRUE; if (visible) { @@ -1586,12 +1589,15 @@ TREEVIEW_DeleteItem(TREEVIEW_INFO *infoPtr, HTREEITEM wineItem) static LRESULT TREEVIEW_SetRedraw(TREEVIEW_INFO* infoPtr, WPARAM wParam) { - if(wParam) - infoPtr->bRedraw = TRUE; - else - infoPtr->bRedraw = FALSE; + infoPtr->bRedraw = wParam ? TRUE : FALSE; - return 0; + if (infoPtr->bRedraw) + { + TREEVIEW_UpdateSubTree(infoPtr, infoPtr->root); + TREEVIEW_UpdateScrollBars(infoPtr); + TREEVIEW_Invalidate(infoPtr, NULL); + } + return 0; } static LRESULT

1 0

Ricardo Filipe : crypt32: Update Portuguese translation and convert to UTF8 .
by Alexandre Julliard 15 Jul '09

15 Jul '09

Module: wine Branch: master Commit: 1f710d72820fbaa82f7c4650dc7747dad4219c22 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1f710d72820fbaa82f7c4650d… Author: Ricardo Filipe <ricardojdfilipe(a)gmail.com> Date: Wed Jul 15 04:56:18 2009 -0700 crypt32: Update Portuguese translation and convert to UTF8. --- dlls/crypt32/crypt32_Pt.rc | 29 +++++++++++++++++++++++++---- 1 files changed, 25 insertions(+), 4 deletions(-) diff --git a/dlls/crypt32/crypt32_Pt.rc b/dlls/crypt32/crypt32_Pt.rc index 5c5d3b7..dcce809 100644 --- a/dlls/crypt32/crypt32_Pt.rc +++ b/dlls/crypt32/crypt32_Pt.rc @@ -20,7 +20,9 @@ #include "cryptres.h" -LANGUAGE LANG_PORTUGUESE, SUBLANG_NEUTRAL +#pragma code_page(65001) + +LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE STRINGTABLE DISCARDABLE { @@ -108,11 +110,11 @@ STRINGTABLE DISCARDABLE IDS_CMC_ATTRIBUTES "Atributos CMC" IDS_PKCS_7_DATA "Dados PKCS 7" IDS_PKCS_7_SIGNED "Assinado PKCS 7" - IDS_PKCS_7_ENVELOPED "PKCS 7 Enveloped" - IDS_PKCS_7_SIGNED_ENVELOPED "PKCS 7 Signed Enveloped" + IDS_PKCS_7_ENVELOPED "PKCS 7 Envolvido" + IDS_PKCS_7_SIGNED_ENVELOPED "PKCS 7 Assinado Envolvido" IDS_PKCS_7_DIGESTED "PKCS 7 Resumido" IDS_PKCS_7_ENCRYPTED "PKCS 7 Cifrado" - IDS_PREVIOUS_CA_CERT_HASH "Hash Certificado CA prévio" + IDS_PREVIOUS_CA_CERT_HASH "Hash anterior de Certificado CA" IDS_CRL_VIRTUAL_BASE "Número CRL de Base Virtual" IDS_CRL_NEXT_PUBLISH "Próxima Publicação CRL" IDS_CA_EXCHANGE "Certificado de Cifra CA" @@ -173,6 +175,8 @@ STRINGTABLE DISCARDABLE IDS_LOCALIZEDNAME_MY "Pessoal" IDS_LOCALIZEDNAME_CA "Autoridades de Certificação Intermédias" IDS_LOCALIZEDNAME_ADDRESSBOOK "Outras pessoas" + IDS_LOCALIZEDNAME_TRUSTEDPUBLISHER "Publicadores Confiáveis" + IDS_LOCALIZEDNAME_DISALLOWED "Certificados Desconfiáveis" } STRINGTABLE DISCARDABLE @@ -219,4 +223,21 @@ STRINGTABLE DISCARDABLE IDS_FINANCIAL_CRITERIA_MEETS_CRITERIA "Conforme os Critérios=" IDS_YES "Sim" IDS_NO "Não" + IDS_DIGITAL_SIGNATURE "Assinatura Digital" + IDS_NON_REPUDIATION "Não-Repudiação" + IDS_KEY_ENCIPHERMENT "Ciframento de Chaves" + IDS_DATA_ENCIPHERMENT "Ciframento de Dados" + IDS_KEY_AGREEMENT "Acordo de Chaves" + IDS_CERT_SIGN "Assinatura de Certificados" + IDS_OFFLINE_CRL_SIGN "Assinatura CRL Off-line" + IDS_CRL_SIGN "Assinatura CRL" + IDS_ENCIPHER_ONLY "Cifrar apenas" + IDS_DECIPHER_ONLY "Decifrar apenas" + IDS_NETSCAPE_SSL_CLIENT "Autenticação de Cliente SSL" + IDS_NETSCAPE_SSL_SERVER "Autenticação de Servidor SSL" + IDS_NETSCAPE_SMIME "S/MIME" + IDS_NETSCAPE_SIGN "Assinatura" + IDS_NETSCAPE_SSL_CA "SSL CA" + IDS_NETSCAPE_SMIME_CA "S/MIME CA" + IDS_NETSCAPE_SIGN_CA "CA de Assinatura" }

1 0

Vincent Povirk : windowscodecs: Register BMP decoder as a bitmap decoder.
by Alexandre Julliard 15 Jul '09

15 Jul '09

Module: wine Branch: master Commit: 81c7e81348c63a7b863219e4ffcd29eb3ad84d09 URL: http://source.winehq.org/git/wine.git/?a=commit;h=81c7e81348c63a7b863219e4f… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Mon Jul 6 17:53:36 2009 -0500 windowscodecs: Register BMP decoder as a bitmap decoder. --- dlls/windowscodecs/regsvr.c | 289 +++++++++++++++++++++++++++++++++++++++++++ include/wincodec.idl | 4 + 2 files changed, 293 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=81c7e81348c63a7b86321…

1 0

Alexandre Julliard : msi: Build a proper tab chain by walking through the controls list.
by Alexandre Julliard 15 Jul '09

15 Jul '09

Module: wine Branch: master Commit: 2c5bd49297f79d9941a256d8ec61e0eb2bf9bf9c URL: http://source.winehq.org/git/wine.git/?a=commit;h=2c5bd49297f79d9941a256d8e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jul 15 14:22:14 2009 +0200 msi: Build a proper tab chain by walking through the controls list. Simply changing Z-order as we encounter windows is not sufficient to ensure correct ordering, we have to rebuild the list from scratch. --- dlls/msi/dialog.c | 50 +++++++++++++++++++++++--------------------------- 1 files changed, 23 insertions(+), 27 deletions(-) diff --git a/dlls/msi/dialog.c b/dlls/msi/dialog.c index 025a227..88416e3 100644 --- a/dlls/msi/dialog.c +++ b/dlls/msi/dialog.c @@ -417,7 +417,7 @@ static msi_control *msi_dialog_create_window( msi_dialog *dialog, return NULL; strcpyW( control->name, name ); - list_add_head( &dialog->controls, &control->entry ); + list_add_tail( &dialog->controls, &control->entry ); control->handler = NULL; control->update = NULL; control->property = NULL; @@ -3002,37 +3002,34 @@ static void msi_dialog_adjust_dialog_pos( msi_dialog *dialog, MSIRECORD *rec, LP AdjustWindowRect( pos, style, FALSE ); } -static BOOL msi_control_set_next( msi_control *control, msi_control *next ) +static void msi_dialog_set_tab_order( msi_dialog *dialog, LPCWSTR first ) { - return SetWindowPos( next->hwnd, control->hwnd, 0, 0, 0, 0, - SWP_NOMOVE | SWP_NOOWNERZORDER | SWP_NOREDRAW | - SWP_NOREPOSITION | SWP_NOSENDCHANGING | SWP_NOSIZE ); -} + struct list tab_chain; + msi_control *control; + HWND prev = HWND_TOP; -static UINT msi_dialog_set_tab_order( msi_dialog *dialog ) -{ - msi_control *control, *tab_next; + list_init( &tab_chain ); + if (!(control = msi_dialog_find_control( dialog, first ))) return; - LIST_FOR_EACH_ENTRY( control, &dialog->controls, msi_control, entry ) + dialog->hWndFocus = control->hwnd; + while (control) { - tab_next = msi_dialog_find_control( dialog, control->tabnext ); - if( !tab_next ) - continue; - msi_control_set_next( control, tab_next ); + list_remove( &control->entry ); + list_add_tail( &tab_chain, &control->entry ); + if (!control->tabnext) break; + control = msi_dialog_find_control( dialog, control->tabnext ); } - return ERROR_SUCCESS; -} - -static void msi_dialog_set_first_control( msi_dialog* dialog, LPCWSTR name ) -{ - msi_control *control; + LIST_FOR_EACH_ENTRY( control, &tab_chain, msi_control, entry ) + { + SetWindowPos( control->hwnd, prev, 0, 0, 0, 0, + SWP_NOMOVE | SWP_NOOWNERZORDER | SWP_NOREDRAW | + SWP_NOREPOSITION | SWP_NOSENDCHANGING | SWP_NOSIZE ); + prev = control->hwnd; + } - control = msi_dialog_find_control( dialog, name ); - if( control ) - dialog->hWndFocus = control->hwnd; - else - dialog->hWndFocus = NULL; + /* put them back on the main list */ + list_move_head( &dialog->controls, &tab_chain ); } static LRESULT msi_dialog_oncreate( HWND hwnd, LPCREATESTRUCTW cs ) @@ -3082,8 +3079,7 @@ static LRESULT msi_dialog_oncreate( HWND hwnd, LPCREATESTRUCTW cs ) msi_dialog_build_font_list( dialog ); msi_dialog_fill_controls( dialog ); msi_dialog_evaluate_control_conditions( dialog ); - msi_dialog_set_tab_order( dialog ); - msi_dialog_set_first_control( dialog, MSI_RecordGetString( rec, 8 ) ); + msi_dialog_set_tab_order( dialog, MSI_RecordGetString( rec, 8 ) ); msiobj_release( &rec->hdr ); return 0;

1 0

Juan Lang : winhttp: Issue CONNECT command to connect to a secure server through a proxy server .
by Alexandre Julliard 15 Jul '09

15 Jul '09

Module: wine Branch: master Commit: bd7a2e70b0e00725a5e76bdbbc7b2cf36ab3c33b URL: http://source.winehq.org/git/wine.git/?a=commit;h=bd7a2e70b0e00725a5e76bdbb… Author: Juan Lang <juan.lang(a)gmail.com> Date: Tue Jul 14 13:05:01 2009 -0700 winhttp: Issue CONNECT command to connect to a secure server through a proxy server. --- dlls/winhttp/request.c | 140 ++++++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 136 insertions(+), 4 deletions(-) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index 85e9b61..edb9143 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -1,5 +1,8 @@ /* + * Copyright 2004 Mike McCormack for CodeWeavers + * Copyright 2006 Rob Shearman for CodeWeavers * Copyright 2008 Hans Leidekker for CodeWeavers + * Copyright 2009 Juan Lang * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -752,6 +755,123 @@ BOOL WINAPI WinHttpQueryHeaders( HINTERNET hrequest, DWORD level, LPCWSTR name, return ret; } +static LPWSTR concatenate_string_list( LPCWSTR *list, int len ) +{ + LPCWSTR *t; + LPWSTR str; + + for( t = list; *t ; t++ ) + len += strlenW( *t ); + len++; + + str = heap_alloc( len * sizeof(WCHAR) ); + *str = 0; + + for( t = list; *t ; t++ ) + strcatW( str, *t ); + + return str; +} + +static LPWSTR build_header_request_string( request_t *request, LPCWSTR verb, + LPCWSTR path, LPCWSTR version ) +{ + static const WCHAR crlf[] = {'\r','\n',0}; + static const WCHAR space[] = { ' ',0 }; + static const WCHAR colon[] = { ':',' ',0 }; + static const WCHAR twocrlf[] = {'\r','\n','\r','\n', 0}; + LPWSTR requestString; + DWORD len, n; + LPCWSTR *req; + UINT i; + LPWSTR p; + + /* allocate space for an array of all the string pointers to be added */ + len = (request->num_headers) * 4 + 10; + req = heap_alloc( len * sizeof(LPCWSTR) ); + + /* add the verb, path and HTTP version string */ + n = 0; + req[n++] = verb; + req[n++] = space; + req[n++] = path; + req[n++] = space; + req[n++] = version; + + /* Append custom request headers */ + for (i = 0; i < request->num_headers; i++) + { + if (request->headers[i].is_request) + { + req[n++] = crlf; + req[n++] = request->headers[i].field; + req[n++] = colon; + req[n++] = request->headers[i].value; + + TRACE("Adding custom header %s (%s)\n", + debugstr_w(request->headers[i].field), + debugstr_w(request->headers[i].value)); + } + } + + if( n >= len ) + ERR("oops. buffer overrun\n"); + + req[n] = NULL; + requestString = concatenate_string_list( req, 4 ); + heap_free( req ); + + /* + * Set (header) termination string for request + * Make sure there's exactly two new lines at the end of the request + */ + p = &requestString[strlenW(requestString)-1]; + while ( (*p == '\n') || (*p == '\r') ) + p--; + strcpyW( p+1, twocrlf ); + + return requestString; +} + +static BOOL read_reply( request_t *request ); + +static BOOL secure_proxy_connect( request_t *request ) +{ + static const WCHAR verbConnect[] = {'C','O','N','N','E','C','T',0}; + static const WCHAR fmt[] = {'%','s',':','%','d',0}; + static const WCHAR http1_1[] = {'H','T','T','P','/','1','.','1',0}; + BOOL ret = FALSE; + LPWSTR path; + connect_t *connect = request->connect; + + path = heap_alloc( (strlenW( connect->hostname ) + 13) * sizeof(WCHAR) ); + if (path) + { + LPWSTR requestString; + + sprintfW( path, fmt, connect->hostname, connect->hostport ); + requestString = build_header_request_string( request, verbConnect, + path, http1_1 ); + heap_free( path ); + if (requestString) + { + LPSTR req_ascii = strdupWA( requestString ); + + heap_free( requestString ); + if (req_ascii) + { + int len = strlen( req_ascii ), bytes_sent; + + ret = netconn_send( &request->netconn, req_ascii, len, 0, &bytes_sent ); + heap_free( req_ascii ); + if (ret) + ret = read_reply( request ); + } + } + } + return ret; +} + #ifndef INET6_ADDRSTRLEN #define INET6_ADDRSTRLEN 46 #endif @@ -806,11 +926,23 @@ static BOOL open_connection( request_t *request ) heap_free( addressW ); return FALSE; } - if (request->hdr.flags & WINHTTP_FLAG_SECURE && !netconn_secure_connect( &request->netconn )) + if (request->hdr.flags & WINHTTP_FLAG_SECURE) { - netconn_close( &request->netconn ); - heap_free( addressW ); - return FALSE; + if (connect->session->proxy_server && + strcmpiW( connect->hostname, connect->servername )) + { + if (!secure_proxy_connect( request )) + { + heap_free( addressW ); + return FALSE; + } + } + if (!netconn_secure_connect( &request->netconn )) + { + netconn_close( &request->netconn ); + heap_free( addressW ); + return FALSE; + } } send_callback( &request->hdr, WINHTTP_CALLBACK_STATUS_CONNECTED_TO_SERVER, addressW, strlenW(addressW) + 1 );

1 0

Juan Lang : winhttp: Don' t set port number to a default before scheme is known.
by Alexandre Julliard 15 Jul '09

15 Jul '09

Module: wine Branch: master Commit: c2ba725196aa2f5ce93761d0602adeadb28407c5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c2ba725196aa2f5ce93761d06… Author: Juan Lang <juan.lang(a)gmail.com> Date: Tue Jul 14 13:04:42 2009 -0700 winhttp: Don't set port number to a default before scheme is known. --- dlls/winhttp/session.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/winhttp/session.c b/dlls/winhttp/session.c index b09e887..fab6c96 100644 --- a/dlls/winhttp/session.c +++ b/dlls/winhttp/session.c @@ -343,7 +343,7 @@ BOOL set_server_for_hostname( connect_t *connect, LPCWSTR server, INTERNET_PORT if (*(colon + 1)) connect->serverport = atoiW( colon + 1 ); else - connect->serverport = INTERNET_DEFAULT_HTTP_PORT; + connect->serverport = INTERNET_DEFAULT_PORT; } } else @@ -357,7 +357,7 @@ BOOL set_server_for_hostname( connect_t *connect, LPCWSTR server, INTERNET_PORT ret = FALSE; goto end; } - connect->serverport = INTERNET_DEFAULT_HTTP_PORT; + connect->serverport = INTERNET_DEFAULT_PORT; } } }

1 0

Juan Lang : winhttp: Allow full path in addition to relative path in headers to accomodate proxy servers .
by Alexandre Julliard 15 Jul '09

15 Jul '09

Module: wine Branch: master Commit: 5c24a1c824be04ac7684ff77c40e6255c7318629 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5c24a1c824be04ac7684ff77c… Author: Juan Lang <juan.lang(a)gmail.com> Date: Tue Jul 14 13:04:20 2009 -0700 winhttp: Allow full path in addition to relative path in headers to accomodate proxy servers. --- dlls/winhttp/tests/winhttp.c | 9 +++++++-- 1 files changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/winhttp/tests/winhttp.c b/dlls/winhttp/tests/winhttp.c index 5a1db48..78c4777 100644 --- a/dlls/winhttp/tests/winhttp.c +++ b/dlls/winhttp/tests/winhttp.c @@ -343,6 +343,8 @@ static void test_WinHttpAddHeaders(void) static const WCHAR test_header_begin[] = {'P','O','S','T',' ','/','p','o','s','t','t','e','s','t','.','p','h','p',' ','H','T','T','P','/','1'}; + static const WCHAR full_path_test_header_begin[] = + {'P','O','S','T',' ','h','t','t','p',':','/','/','c','r','o','s','s','o','v','e','r','.','c','o','d','e','w','e','a','v','e','r','s','.','c','o','m',':','8','0','/','p','o','s','t','t','e','s','t','.','p','h','p',' ','H','T','T','P','/','1'}; static const WCHAR test_header_end[] = {'\r','\n','\r','\n',0}; static const WCHAR test_header_name[] = {'W','a','r','n','i','n','g',0}; @@ -476,7 +478,8 @@ static void test_WinHttpAddHeaders(void) ok(len + sizeof(WCHAR) <= oldlen, "WinHttpQueryHeaders resulting length longer than advertized.\n"); ok((len < sizeof(buffer) - sizeof(WCHAR)) && buffer[len / sizeof(WCHAR)] == 0, "WinHttpQueryHeaders did not append NULL terminator\n"); ok(len == lstrlenW(buffer) * sizeof(WCHAR), "WinHttpQueryHeaders returned incorrect length.\n"); - ok(memcmp(buffer, test_header_begin, sizeof(test_header_begin)) == 0, + ok(memcmp(buffer, test_header_begin, sizeof(test_header_begin)) == 0 || + memcmp(buffer, full_path_test_header_begin, sizeof(full_path_test_header_begin)) == 0, "WinHttpQueryHeaders returned invalid beginning of header string.\n"); ok(memcmp(buffer + lstrlenW(buffer) - 4, test_header_end, sizeof(test_header_end)) == 0, "WinHttpQueryHeaders returned invalid end of header string.\n"); @@ -503,7 +506,9 @@ static void test_WinHttpAddHeaders(void) ok(len + sizeof(WCHAR) <= oldlen, "resulting length longer than advertized\n"); ok((len < sizeof(buffer) - sizeof(WCHAR)) && !buffer[len / sizeof(WCHAR)] && !buffer[len / sizeof(WCHAR) - 1], "no double NULL terminator\n"); - ok(!memcmp(buffer, test_header_begin, sizeof(test_header_begin)), "invalid beginning of header string\n"); + ok(memcmp(buffer, test_header_begin, sizeof(test_header_begin)) == 0 || + memcmp(buffer, full_path_test_header_begin, sizeof(full_path_test_header_begin)) == 0, + "invalid beginning of header string.\n"); ok(index == 0, "header index was incremented\n"); /* tests for more indices */

1 0

Juan Lang : winhttp: Use proxy server when redirecting.
by Alexandre Julliard 15 Jul '09

15 Jul '09

Module: wine Branch: master Commit: 31545206fb6be070c223c42b85bf3143867d6a63 URL: http://source.winehq.org/git/wine.git/?a=commit;h=31545206fb6be070c223c42b8… Author: Juan Lang <juan.lang(a)gmail.com> Date: Tue Jul 14 13:03:52 2009 -0700 winhttp: Use proxy server when redirecting. --- dlls/winhttp/request.c | 7 +++---- dlls/winhttp/session.c | 1 - dlls/winhttp/winhttp_private.h | 1 + 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index 37dd556..85e9b61 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -1158,13 +1158,12 @@ static BOOL handle_redirect( request_t *request ) hostname[len] = 0; port = uc.nPort ? uc.nPort : (uc.nScheme == INTERNET_SCHEME_HTTPS ? 443 : 80); - if (strcmpiW( connect->servername, hostname ) || connect->serverport != port) + if (strcmpiW( connect->hostname, hostname ) || connect->serverport != port) { heap_free( connect->hostname ); connect->hostname = hostname; - heap_free( connect->servername ); - connect->servername = strdupW( connect->hostname ); - connect->serverport = connect->hostport = port; + connect->hostport = port; + if (!(ret = set_server_for_hostname( connect, hostname, port ))) goto end; netconn_close( &request->netconn ); if (!(ret = netconn_init( &request->netconn, request->hdr.flags & WINHTTP_FLAG_SECURE ))) goto end; diff --git a/dlls/winhttp/session.c b/dlls/winhttp/session.c index 5d2466e..b09e887 100644 --- a/dlls/winhttp/session.c +++ b/dlls/winhttp/session.c @@ -316,7 +316,6 @@ static BOOL should_bypass_proxy(session_t *session, LPCWSTR server) return ret; } -static BOOL set_server_for_hostname( connect_t *connect, LPCWSTR server, INTERNET_PORT port ) { session_t *session = connect->session; diff --git a/dlls/winhttp/winhttp_private.h b/dlls/winhttp/winhttp_private.h index 2143953..2431d7c 100644 --- a/dlls/winhttp/winhttp_private.h +++ b/dlls/winhttp/winhttp_private.h @@ -221,6 +221,7 @@ BOOL set_cookies( request_t *, const WCHAR * ); BOOL add_cookie_headers( request_t * ); BOOL add_request_headers( request_t *, LPCWSTR, DWORD, DWORD ); void delete_domain( domain_t * ); +BOOL set_server_for_hostname( connect_t *connect, LPCWSTR server, INTERNET_PORT port ); static inline void *heap_alloc( SIZE_T size ) {

1 0