Jacek Caban : wininet: Get rid of no longer used serverName and serverPort from http_session_t.
Alexandre Julliard
julliard at winehq.org
Tue May 29 13:58:02 CDT 2012
Module: wine
Branch: master
Commit: 2ed97ebe43ef637605ebca25197a39acd1cdd60d
URL: http://source.winehq.org/git/wine.git/?a=commit;h=2ed97ebe43ef637605ebca25197a39acd1cdd60d
Author: Jacek Caban <jacek at codeweavers.com>
Date: Mon May 28 13:55:13 2012 +0200
wininet: Get rid of no longer used serverName and serverPort from http_session_t.
---
dlls/wininet/http.c | 7 ++-----
dlls/wininet/internet.h | 2 --
2 files changed, 2 insertions(+), 7 deletions(-)
diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c
index f08ab6d..74c9006 100644
--- a/dlls/wininet/http.c
+++ b/dlls/wininet/http.c
@@ -3086,11 +3086,11 @@ static DWORD HTTP_HttpOpenRequestW(http_session_t *session,
request->session = session;
list_add_head( &session->hdr.children, &request->hdr.entry );
- port = session->serverPort;
+ port = session->hostPort;
if(port == INTERNET_INVALID_PORT_NUMBER)
port = dwFlags & INTERNET_FLAG_SECURE ? INTERNET_DEFAULT_HTTPS_PORT : INTERNET_DEFAULT_HTTP_PORT;
- request->server = get_server(session->serverName, port);
+ request->server = get_server(session->hostName, port);
if(!request->server) {
WININET_Release(&request->hdr);
return ERROR_OUTOFMEMORY;
@@ -5450,7 +5450,6 @@ static void HTTPSESSION_Destroy(object_header_t *hdr)
WININET_Release(&session->appInfo->hdr);
heap_free(session->hostName);
- heap_free(session->serverName);
heap_free(session->password);
heap_free(session->userName);
}
@@ -5602,13 +5601,11 @@ DWORD HTTP_Connect(appinfo_t *hIC, LPCWSTR lpszServerName,
if(hIC->proxyBypass)
FIXME("Proxy bypass is ignored.\n");
}
- session->serverName = heap_strdupW(lpszServerName);
session->hostName = heap_strdupW(lpszServerName);
if (lpszUserName && lpszUserName[0])
session->userName = heap_strdupW(lpszUserName);
if (lpszPassword && lpszPassword[0])
session->password = heap_strdupW(lpszPassword);
- session->serverPort = serverPort;
session->hostPort = serverPort;
session->connect_timeout = hIC->connect_timeout;
session->send_timeout = INFINITE;
diff --git a/dlls/wininet/internet.h b/dlls/wininet/internet.h
index fd6b5f7..2e59720 100644
--- a/dlls/wininet/internet.h
+++ b/dlls/wininet/internet.h
@@ -269,11 +269,9 @@ typedef struct
object_header_t hdr;
appinfo_t *appInfo;
LPWSTR hostName; /* the final destination of the request */
- LPWSTR serverName; /* the name of the server we directly connect to */
LPWSTR userName;
LPWSTR password;
INTERNET_PORT hostPort; /* the final destination port of the request */
- INTERNET_PORT serverPort; /* the port of the server we directly connect to */
DWORD connect_timeout;
DWORD send_timeout;
DWORD receive_timeout;
More information about the wine-cvs
mailing list