ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

wininet: De-Hungarian appinfo member names.

This commit is contained in:
Juan Lang 2011-03-01 11:00:49 -08:00 committed by Alexandre Julliard
parent 2c6ad546cd
commit 7243156bc1
5 changed files with 66 additions and 66 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
dlls/wininet/dialogs.c
View File

@ -82,7 +82,7 @@ static BOOL WININET_GetProxyServer( HINTERNET hRequest, LPWSTR szBuf, DWORD sz )
if (NULL == hIC) if (NULL == hIC)
goto done; goto done;
lstrcpynW(szBuf, hIC->lpszProxy, sz); lstrcpynW(szBuf, hIC->proxy, sz);
/* FIXME: perhaps it would be better to use InternetCrackUrl here */ /* FIXME: perhaps it would be better to use InternetCrackUrl here */
p = strchrW(szBuf, ':'); p = strchrW(szBuf, ':');
@ -272,11 +272,11 @@ static BOOL WININET_SetAuthorization( HINTERNET hRequest, LPWSTR username,
{ {
appinfo_t *hIC = session->lpAppInfo; appinfo_t *hIC = session->lpAppInfo;
HeapFree(GetProcessHeap(), 0, hIC->lpszProxyUsername); HeapFree(GetProcessHeap(), 0, hIC->proxyUsername);
hIC->lpszProxyUsername = p; hIC->proxyUsername = p;
HeapFree(GetProcessHeap(), 0, hIC->lpszProxyPassword); HeapFree(GetProcessHeap(), 0, hIC->proxyPassword);
hIC->lpszProxyPassword = q; hIC->proxyPassword = q;
} }
else else
{ {

6
dlls/wininet/ftp.c
View File

@ -2478,10 +2478,10 @@ HINTERNET FTP_Connect(appinfo_t *hIC, LPCWSTR lpszServerName,
lpwfs->lpAppInfo = hIC; lpwfs->lpAppInfo = hIC;
list_add_head( &hIC->hdr.children, &lpwfs->hdr.entry ); list_add_head( &hIC->hdr.children, &lpwfs->hdr.entry );
if(hIC->lpszProxy && hIC->dwAccessType == INTERNET_OPEN_TYPE_PROXY) { if(hIC->proxy && hIC->accessType == INTERNET_OPEN_TYPE_PROXY) {
if(strchrW(hIC->lpszProxy, ' ')) if(strchrW(hIC->proxy, ' '))
FIXME("Several proxies not implemented.\n"); FIXME("Several proxies not implemented.\n");
if(hIC->lpszProxyBypass) if(hIC->proxyBypass)
FIXME("Proxy bypass is ignored.\n"); FIXME("Proxy bypass is ignored.\n");
} }
if (!lpszUserName || !strlenW(lpszUserName)) { if (!lpszUserName || !strlenW(lpszUserName)) {

26
dlls/wininet/http.c
View File

@ -1464,7 +1464,7 @@ static BOOL HTTP_DealWithProxy(appinfo_t *hIC, http_session_t *session, http_req
UrlComponents.lpszHostName = buf; UrlComponents.lpszHostName = buf;
UrlComponents.dwHostNameLength = MAXHOSTNAME; UrlComponents.dwHostNameLength = MAXHOSTNAME;
if (!INTERNET_FindProxyForProtocol(hIC->lpszProxy, protoHttp, protoProxy, &protoProxyLen)) if (!INTERNET_FindProxyForProtocol(hIC->proxy, protoHttp, protoProxy, &protoProxyLen))
return FALSE; return FALSE;
if( CSTR_EQUAL != CompareStringW(LOCALE_SYSTEM_DEFAULT, NORM_IGNORECASE, if( CSTR_EQUAL != CompareStringW(LOCALE_SYSTEM_DEFAULT, NORM_IGNORECASE,
protoProxy,strlenW(szHttp),szHttp,strlenW(szHttp)) ) protoProxy,strlenW(szHttp),szHttp,strlenW(szHttp)) )
@ -1671,7 +1671,7 @@ static DWORD HTTPREQ_QueryOption(object_header_t *hdr, DWORD option, void *buffe
info->Flags = 0; info->Flags = 0;
if (HTTP_KeepAlive(req)) if (HTTP_KeepAlive(req))
info->Flags |= IDSI_FLAG_KEEP_ALIVE; info->Flags |= IDSI_FLAG_KEEP_ALIVE;
if (session->lpAppInfo->lpszProxy && session->lpAppInfo->lpszProxy[0] != 0) if (session->lpAppInfo->proxy && session->lpAppInfo->proxy[0] != 0)
info->Flags |= IDSI_FLAG_PROXY; info->Flags |= IDSI_FLAG_PROXY;
if (req->netConnection.useSSL) if (req->netConnection.useSSL)
info->Flags |= IDSI_FLAG_SECURE; info->Flags |= IDSI_FLAG_SECURE;
@ -2662,7 +2662,7 @@ static DWORD HTTP_HttpOpenRequestW(http_session_t *session,
INTERNET_DEFAULT_HTTPS_PORT : INTERNET_DEFAULT_HTTPS_PORT :
INTERNET_DEFAULT_HTTP_PORT); INTERNET_DEFAULT_HTTP_PORT);
if (NULL != hIC->lpszProxy && hIC->lpszProxy[0] != 0) if (NULL != hIC->proxy && hIC->proxy[0] != 0)
HTTP_DealWithProxy( hIC, session, request ); HTTP_DealWithProxy( hIC, session, request );
INTERNET_SendCallback(&session->hdr, dwContext, INTERNET_SendCallback(&session->hdr, dwContext,
@ -3318,7 +3318,7 @@ static DWORD HTTP_HandleRedirect(http_request_t *request, LPCWSTR lpszUrl)
{ {
http_session_t *session = request->lpHttpSession; http_session_t *session = request->lpHttpSession;
appinfo_t *hIC = session->lpAppInfo; appinfo_t *hIC = session->lpAppInfo;
BOOL using_proxy = hIC->lpszProxy && hIC->lpszProxy[0]; BOOL using_proxy = hIC->proxy && hIC->proxy[0];
WCHAR path[INTERNET_MAX_URL_LENGTH]; WCHAR path[INTERNET_MAX_URL_LENGTH];
int index; int index;
@ -3607,15 +3607,15 @@ static DWORD HTTP_HttpSendRequestW(http_request_t *request, LPCWSTR lpszHeaders,
HTTP_HttpAddRequestHeadersW(request, contentLengthStr, -1L, HTTP_ADDREQ_FLAG_REPLACE); HTTP_HttpAddRequestHeadersW(request, contentLengthStr, -1L, HTTP_ADDREQ_FLAG_REPLACE);
request->dwBytesToWrite = dwContentLength; request->dwBytesToWrite = dwContentLength;
} }
if (request->lpHttpSession->lpAppInfo->lpszAgent) if (request->lpHttpSession->lpAppInfo->agent)
{ {
WCHAR *agent_header; WCHAR *agent_header;
static const WCHAR user_agent[] = {'U','s','e','r','-','A','g','e','n','t',':',' ','%','s','\r','\n',0}; static const WCHAR user_agent[] = {'U','s','e','r','-','A','g','e','n','t',':',' ','%','s','\r','\n',0};
int len; int len;
len = strlenW(request->lpHttpSession->lpAppInfo->lpszAgent) + strlenW(user_agent); len = strlenW(request->lpHttpSession->lpAppInfo->agent) + strlenW(user_agent);
agent_header = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); agent_header = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR));
sprintfW(agent_header, user_agent, request->lpHttpSession->lpAppInfo->lpszAgent); sprintfW(agent_header, user_agent, request->lpHttpSession->lpAppInfo->agent);
HTTP_HttpAddRequestHeadersW(request, agent_header, strlenW(agent_header), HTTP_ADDREQ_FLAG_ADD_IF_NEW); HTTP_HttpAddRequestHeadersW(request, agent_header, strlenW(agent_header), HTTP_ADDREQ_FLAG_ADD_IF_NEW);
HeapFree(GetProcessHeap(), 0, agent_header); HeapFree(GetProcessHeap(), 0, agent_header);
@ -3673,7 +3673,7 @@ static DWORD HTTP_HttpSendRequestW(http_request_t *request, LPCWSTR lpszHeaders,
HTTP_ADDREQ_FLAG_ADD | HTTP_ADDHDR_FLAG_REPLACE); HTTP_ADDREQ_FLAG_ADD | HTTP_ADDHDR_FLAG_REPLACE);
} }
if (request->lpHttpSession->lpAppInfo->lpszProxy && request->lpHttpSession->lpAppInfo->lpszProxy[0]) if (request->lpHttpSession->lpAppInfo->proxy && request->lpHttpSession->lpAppInfo->proxy[0])
{ {
WCHAR *url = HTTP_BuildProxyRequestUrl(request); WCHAR *url = HTTP_BuildProxyRequestUrl(request);
requestString = HTTP_BuildHeaderRequestString(request, request->lpszVerb, url, request->lpszVersion); requestString = HTTP_BuildHeaderRequestString(request, request->lpszVerb, url, request->lpszVersion);
@ -3818,8 +3818,8 @@ static DWORD HTTP_HttpSendRequestW(http_request_t *request, LPCWSTR lpszHeaders,
{ {
if (HTTP_DoAuthorization(request, szAuthValue, if (HTTP_DoAuthorization(request, szAuthValue,
&request->pProxyAuthInfo, &request->pProxyAuthInfo,
request->lpHttpSession->lpAppInfo->lpszProxyUsername, request->lpHttpSession->lpAppInfo->proxyUsername,
request->lpHttpSession->lpAppInfo->lpszProxyPassword, request->lpHttpSession->lpAppInfo->proxyPassword,
NULL)) NULL))
{ {
loop_next = TRUE; loop_next = TRUE;
@ -4453,8 +4453,8 @@ DWORD HTTP_Connect(appinfo_t *hIC, LPCWSTR lpszServerName,
session->lpAppInfo = hIC; session->lpAppInfo = hIC;
list_add_head( &hIC->hdr.children, &session->hdr.entry ); list_add_head( &hIC->hdr.children, &session->hdr.entry );
if(hIC->lpszProxy && hIC->dwAccessType == INTERNET_OPEN_TYPE_PROXY) { if(hIC->proxy && hIC->accessType == INTERNET_OPEN_TYPE_PROXY) {
if(hIC->lpszProxyBypass) if(hIC->proxyBypass)
FIXME("Proxy bypass is ignored.\n"); FIXME("Proxy bypass is ignored.\n");
} }
session->lpszServerName = heap_strdupW(lpszServerName); session->lpszServerName = heap_strdupW(lpszServerName);
@ -4562,7 +4562,7 @@ static DWORD HTTP_OpenConnection(http_request_t *request)
* behaviour to be more correct and to not cause any incompatibilities * behaviour to be more correct and to not cause any incompatibilities
* because using a secure connection through a proxy server is a rare * because using a secure connection through a proxy server is a rare
* case that would be hard for anyone to depend on */ * case that would be hard for anyone to depend on */
if (hIC->lpszProxy && (res = HTTP_SecureProxyConnect(request)) != ERROR_SUCCESS) { if (hIC->proxy && (res = HTTP_SecureProxyConnect(request)) != ERROR_SUCCESS) {
HTTPREQ_CloseConnection(&request->hdr); HTTPREQ_CloseConnection(&request->hdr);
goto lend; goto lend;
} }

78
dlls/wininet/internet.c
View File

@ -603,12 +603,12 @@ static BOOL INTERNET_ConfigureProxy( appinfo_t *lpwai )
if (wpi.dwProxyEnabled) if (wpi.dwProxyEnabled)
{ {
lpwai->dwAccessType = INTERNET_OPEN_TYPE_PROXY; lpwai->accessType = INTERNET_OPEN_TYPE_PROXY;
lpwai->lpszProxy = wpi.lpszProxyServer; lpwai->proxy = wpi.lpszProxyServer;
return TRUE; return TRUE;
} }
lpwai->dwAccessType = INTERNET_OPEN_TYPE_DIRECT; lpwai->accessType = INTERNET_OPEN_TYPE_DIRECT;
return FALSE; return FALSE;
} }
@ -681,11 +681,11 @@ static VOID APPINFO_Destroy(object_header_t *hdr)
TRACE("%p\n",lpwai); TRACE("%p\n",lpwai);
HeapFree(GetProcessHeap(), 0, lpwai->lpszAgent); HeapFree(GetProcessHeap(), 0, lpwai->agent);
HeapFree(GetProcessHeap(), 0, lpwai->lpszProxy); HeapFree(GetProcessHeap(), 0, lpwai->proxy);
HeapFree(GetProcessHeap(), 0, lpwai->lpszProxyBypass); HeapFree(GetProcessHeap(), 0, lpwai->proxyBypass);
HeapFree(GetProcessHeap(), 0, lpwai->lpszProxyUsername); HeapFree(GetProcessHeap(), 0, lpwai->proxyUsername);
HeapFree(GetProcessHeap(), 0, lpwai->lpszProxyPassword); HeapFree(GetProcessHeap(), 0, lpwai->proxyPassword);
} }
static DWORD APPINFO_QueryOption(object_header_t *hdr, DWORD option, void *buffer, DWORD *size, BOOL unicode) static DWORD APPINFO_QueryOption(object_header_t *hdr, DWORD option, void *buffer, DWORD *size, BOOL unicode)
@ -711,14 +711,14 @@ static DWORD APPINFO_QueryOption(object_header_t *hdr, DWORD option, void *buffe
bufsize = *size; bufsize = *size;
if (unicode) { if (unicode) {
DWORD len = ai->lpszAgent ? strlenW(ai->lpszAgent) : 0; DWORD len = ai->agent ? strlenW(ai->agent) : 0;
*size = (len + 1) * sizeof(WCHAR); *size = (len + 1) * sizeof(WCHAR);
if(!buffer || bufsize < *size) if(!buffer || bufsize < *size)
return ERROR_INSUFFICIENT_BUFFER; return ERROR_INSUFFICIENT_BUFFER;
if (ai->lpszAgent) if (ai->agent)
strcpyW(buffer, ai->lpszAgent); strcpyW(buffer, ai->agent);
else else
*(WCHAR *)buffer = 0; *(WCHAR *)buffer = 0;
/* If the buffer is copied, the returned length doesn't include /* If the buffer is copied, the returned length doesn't include
@ -726,15 +726,15 @@ static DWORD APPINFO_QueryOption(object_header_t *hdr, DWORD option, void *buffe
*/ */
*size = len * sizeof(WCHAR); *size = len * sizeof(WCHAR);
}else { }else {
if (ai->lpszAgent) if (ai->agent)
*size = WideCharToMultiByte(CP_ACP, 0, ai->lpszAgent, -1, NULL, 0, NULL, NULL); *size = WideCharToMultiByte(CP_ACP, 0, ai->agent, -1, NULL, 0, NULL, NULL);
else else
*size = 1; *size = 1;
if(!buffer || bufsize < *size) if(!buffer || bufsize < *size)
return ERROR_INSUFFICIENT_BUFFER; return ERROR_INSUFFICIENT_BUFFER;
if (ai->lpszAgent) if (ai->agent)
WideCharToMultiByte(CP_ACP, 0, ai->lpszAgent, -1, buffer, *size, NULL, NULL); WideCharToMultiByte(CP_ACP, 0, ai->agent, -1, buffer, *size, NULL, NULL);
else else
*(char *)buffer = 0; *(char *)buffer = 0;
/* If the buffer is copied, the returned length doesn't include /* If the buffer is copied, the returned length doesn't include
@ -752,10 +752,10 @@ static DWORD APPINFO_QueryOption(object_header_t *hdr, DWORD option, void *buffe
DWORD proxyBytesRequired = 0, proxyBypassBytesRequired = 0; DWORD proxyBytesRequired = 0, proxyBypassBytesRequired = 0;
LPWSTR proxy, proxy_bypass; LPWSTR proxy, proxy_bypass;
if (ai->lpszProxy) if (ai->proxy)
proxyBytesRequired = (lstrlenW(ai->lpszProxy) + 1) * sizeof(WCHAR); proxyBytesRequired = (lstrlenW(ai->proxy) + 1) * sizeof(WCHAR);
if (ai->lpszProxyBypass) if (ai->proxyBypass)
proxyBypassBytesRequired = (lstrlenW(ai->lpszProxyBypass) + 1) * sizeof(WCHAR); proxyBypassBytesRequired = (lstrlenW(ai->proxyBypass) + 1) * sizeof(WCHAR);
if (*size < sizeof(INTERNET_PROXY_INFOW) + proxyBytesRequired + proxyBypassBytesRequired) if (*size < sizeof(INTERNET_PROXY_INFOW) + proxyBytesRequired + proxyBypassBytesRequired)
{ {
*size = sizeof(INTERNET_PROXY_INFOW) + proxyBytesRequired + proxyBypassBytesRequired; *size = sizeof(INTERNET_PROXY_INFOW) + proxyBytesRequired + proxyBypassBytesRequired;
@ -764,16 +764,16 @@ static DWORD APPINFO_QueryOption(object_header_t *hdr, DWORD option, void *buffe
proxy = (LPWSTR)((LPBYTE)buffer + sizeof(INTERNET_PROXY_INFOW)); proxy = (LPWSTR)((LPBYTE)buffer + sizeof(INTERNET_PROXY_INFOW));
proxy_bypass = (LPWSTR)((LPBYTE)buffer + sizeof(INTERNET_PROXY_INFOW) + proxyBytesRequired); proxy_bypass = (LPWSTR)((LPBYTE)buffer + sizeof(INTERNET_PROXY_INFOW) + proxyBytesRequired);
pi->dwAccessType = ai->dwAccessType; pi->dwAccessType = ai->accessType;
pi->lpszProxy = NULL; pi->lpszProxy = NULL;
pi->lpszProxyBypass = NULL; pi->lpszProxyBypass = NULL;
if (ai->lpszProxy) { if (ai->proxy) {
lstrcpyW(proxy, ai->lpszProxy); lstrcpyW(proxy, ai->proxy);
pi->lpszProxy = proxy; pi->lpszProxy = proxy;
} }
if (ai->lpszProxyBypass) { if (ai->proxyBypass) {
lstrcpyW(proxy_bypass, ai->lpszProxyBypass); lstrcpyW(proxy_bypass, ai->proxyBypass);
pi->lpszProxyBypass = proxy_bypass; pi->lpszProxyBypass = proxy_bypass;
} }
@ -784,10 +784,10 @@ static DWORD APPINFO_QueryOption(object_header_t *hdr, DWORD option, void *buffe
DWORD proxyBytesRequired = 0, proxyBypassBytesRequired = 0; DWORD proxyBytesRequired = 0, proxyBypassBytesRequired = 0;
LPSTR proxy, proxy_bypass; LPSTR proxy, proxy_bypass;
if (ai->lpszProxy) if (ai->proxy)
proxyBytesRequired = WideCharToMultiByte(CP_ACP, 0, ai->lpszProxy, -1, NULL, 0, NULL, NULL); proxyBytesRequired = WideCharToMultiByte(CP_ACP, 0, ai->proxy, -1, NULL, 0, NULL, NULL);
if (ai->lpszProxyBypass) if (ai->proxyBypass)
proxyBypassBytesRequired = WideCharToMultiByte(CP_ACP, 0, ai->lpszProxyBypass, -1, proxyBypassBytesRequired = WideCharToMultiByte(CP_ACP, 0, ai->proxyBypass, -1,
NULL, 0, NULL, NULL); NULL, 0, NULL, NULL);
if (*size < sizeof(INTERNET_PROXY_INFOA) + proxyBytesRequired + proxyBypassBytesRequired) if (*size < sizeof(INTERNET_PROXY_INFOA) + proxyBytesRequired + proxyBypassBytesRequired)
{ {
@ -797,16 +797,16 @@ static DWORD APPINFO_QueryOption(object_header_t *hdr, DWORD option, void *buffe
proxy = (LPSTR)((LPBYTE)buffer + sizeof(INTERNET_PROXY_INFOA)); proxy = (LPSTR)((LPBYTE)buffer + sizeof(INTERNET_PROXY_INFOA));
proxy_bypass = (LPSTR)((LPBYTE)buffer + sizeof(INTERNET_PROXY_INFOA) + proxyBytesRequired); proxy_bypass = (LPSTR)((LPBYTE)buffer + sizeof(INTERNET_PROXY_INFOA) + proxyBytesRequired);
pi->dwAccessType = ai->dwAccessType; pi->dwAccessType = ai->accessType;
pi->lpszProxy = NULL; pi->lpszProxy = NULL;
pi->lpszProxyBypass = NULL; pi->lpszProxyBypass = NULL;
if (ai->lpszProxy) { if (ai->proxy) {
WideCharToMultiByte(CP_ACP, 0, ai->lpszProxy, -1, proxy, proxyBytesRequired, NULL, NULL); WideCharToMultiByte(CP_ACP, 0, ai->proxy, -1, proxy, proxyBytesRequired, NULL, NULL);
pi->lpszProxy = proxy; pi->lpszProxy = proxy;
} }
if (ai->lpszProxyBypass) { if (ai->proxyBypass) {
WideCharToMultiByte(CP_ACP, 0, ai->lpszProxyBypass, -1, proxy_bypass, WideCharToMultiByte(CP_ACP, 0, ai->proxyBypass, -1, proxy_bypass,
proxyBypassBytesRequired, NULL, NULL); proxyBypassBytesRequired, NULL, NULL);
pi->lpszProxyBypass = proxy_bypass; pi->lpszProxyBypass = proxy_bypass;
} }
@ -883,16 +883,16 @@ HINTERNET WINAPI InternetOpenW(LPCWSTR lpszAgent, DWORD dwAccessType,
lpwai->hdr.htype = WH_HINIT; lpwai->hdr.htype = WH_HINIT;
lpwai->hdr.dwFlags = dwFlags; lpwai->hdr.dwFlags = dwFlags;
lpwai->dwAccessType = dwAccessType; lpwai->accessType = dwAccessType;
lpwai->lpszProxyUsername = NULL; lpwai->proxyUsername = NULL;
lpwai->lpszProxyPassword = NULL; lpwai->proxyPassword = NULL;
lpwai->lpszAgent = heap_strdupW(lpszAgent); lpwai->agent = heap_strdupW(lpszAgent);
if(dwAccessType == INTERNET_OPEN_TYPE_PRECONFIG) if(dwAccessType == INTERNET_OPEN_TYPE_PRECONFIG)
INTERNET_ConfigureProxy( lpwai ); INTERNET_ConfigureProxy( lpwai );
else else
lpwai->lpszProxy = heap_strdupW(lpszProxy); lpwai->proxy = heap_strdupW(lpszProxy);
lpwai->lpszProxyBypass = heap_strdupW(lpszProxyBypass); lpwai->proxyBypass = heap_strdupW(lpszProxyBypass);
TRACE("returning %p\n", lpwai); TRACE("returning %p\n", lpwai);

12
dlls/wininet/internet.h
View File

@ -220,12 +220,12 @@ struct _object_header_t
typedef struct typedef struct
{ {
object_header_t hdr; object_header_t hdr;
LPWSTR lpszAgent; LPWSTR agent;
LPWSTR lpszProxy; LPWSTR proxy;
LPWSTR lpszProxyBypass; LPWSTR proxyBypass;
LPWSTR lpszProxyUsername; LPWSTR proxyUsername;
LPWSTR lpszProxyPassword; LPWSTR proxyPassword;
DWORD dwAccessType; DWORD accessType;
} appinfo_t; } appinfo_t;