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

wininet: Use the constants from the wininet header.

This commit is contained in:
André Hentschel 2011-08-22 21:30:55 +02:00 committed by Alexandre Julliard
parent 138a12545d
commit 0fda135f3f
3 changed files with 27 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dlls/wininet/cookie.c
View File

@ -554,7 +554,7 @@ BOOL WINAPI InternetSetCookieW(LPCWSTR lpszUrl, LPCWSTR lpszCookieName,
LPCWSTR lpCookieData) LPCWSTR lpCookieData)
{ {
BOOL ret; BOOL ret;
WCHAR hostName[2048], path[2048]; WCHAR hostName[INTERNET_MAX_HOST_NAME_LENGTH], path[INTERNET_MAX_PATH_LENGTH];
TRACE("(%s,%s,%s)\n", debugstr_w(lpszUrl), TRACE("(%s,%s,%s)\n", debugstr_w(lpszUrl),
debugstr_w(lpszCookieName), debugstr_w(lpCookieData)); debugstr_w(lpszCookieName), debugstr_w(lpCookieData));

28
dlls/wininet/http.c
View File

@ -139,10 +139,6 @@ static const WCHAR szVia[] = { 'V','i','a',0 };
static const WCHAR szWarning[] = { 'W','a','r','n','i','n','g',0 }; static const WCHAR szWarning[] = { 'W','a','r','n','i','n','g',0 };
static const WCHAR szWWW_Authenticate[] = { 'W','W','W','-','A','u','t','h','e','n','t','i','c','a','t','e',0 }; static const WCHAR szWWW_Authenticate[] = { 'W','W','W','-','A','u','t','h','e','n','t','i','c','a','t','e',0 };
#define MAXHOSTNAME 100
#define MAX_FIELD_VALUE_LEN 256
#define MAX_FIELD_LEN 256
#define HTTP_REFERER szReferer #define HTTP_REFERER szReferer
#define HTTP_ACCEPT szAccept #define HTTP_ACCEPT szAccept
#define HTTP_USERAGENT szUser_Agent #define HTTP_USERAGENT szUser_Agent
@ -1689,10 +1685,10 @@ static WCHAR *HTTP_BuildProxyRequestUrl(http_request_t *req)
*/ */
static BOOL HTTP_DealWithProxy(appinfo_t *hIC, http_session_t *session, http_request_t *request) static BOOL HTTP_DealWithProxy(appinfo_t *hIC, http_session_t *session, http_request_t *request)
{ {
WCHAR buf[MAXHOSTNAME]; WCHAR buf[INTERNET_MAX_HOST_NAME_LENGTH];
WCHAR protoProxy[MAXHOSTNAME + 15]; WCHAR protoProxy[INTERNET_MAX_URL_LENGTH];
DWORD protoProxyLen = sizeof(protoProxy) / sizeof(protoProxy[0]); DWORD protoProxyLen = INTERNET_MAX_URL_LENGTH;
WCHAR proxy[MAXHOSTNAME + 15]; /* 15 == "http://" + sizeof(port#) + ":/\0" */ WCHAR proxy[INTERNET_MAX_URL_LENGTH];
static WCHAR szNul[] = { 0 }; static WCHAR szNul[] = { 0 };
URL_COMPONENTSW UrlComponents; URL_COMPONENTSW UrlComponents;
static const WCHAR protoHttp[] = { 'h','t','t','p',0 }; static const WCHAR protoHttp[] = { 'h','t','t','p',0 };
@ -1702,7 +1698,7 @@ static BOOL HTTP_DealWithProxy(appinfo_t *hIC, http_session_t *session, http_req
memset( &UrlComponents, 0, sizeof UrlComponents ); memset( &UrlComponents, 0, sizeof UrlComponents );
UrlComponents.dwStructSize = sizeof UrlComponents; UrlComponents.dwStructSize = sizeof UrlComponents;
UrlComponents.lpszHostName = buf; UrlComponents.lpszHostName = buf;
UrlComponents.dwHostNameLength = MAXHOSTNAME; UrlComponents.dwHostNameLength = INTERNET_MAX_HOST_NAME_LENGTH;
if (!INTERNET_FindProxyForProtocol(hIC->proxy, protoHttp, protoProxy, &protoProxyLen)) if (!INTERNET_FindProxyForProtocol(hIC->proxy, protoHttp, protoProxy, &protoProxyLen))
return FALSE; return FALSE;
@ -3758,7 +3754,7 @@ static DWORD HTTP_HandleRedirect(http_request_t *request, LPCWSTR lpszUrl)
http_session_t *session = request->session; http_session_t *session = request->session;
appinfo_t *hIC = session->appInfo; appinfo_t *hIC = session->appInfo;
BOOL using_proxy = hIC->proxy && hIC->proxy[0]; BOOL using_proxy = hIC->proxy && hIC->proxy[0];
WCHAR path[INTERNET_MAX_URL_LENGTH]; WCHAR path[INTERNET_MAX_PATH_LENGTH];
int index; int index;
if(lpszUrl[0]=='/') if(lpszUrl[0]=='/')
@ -3769,7 +3765,9 @@ static DWORD HTTP_HandleRedirect(http_request_t *request, LPCWSTR lpszUrl)
else else
{ {
URL_COMPONENTSW urlComponents; URL_COMPONENTSW urlComponents;
WCHAR protocol[32], hostName[MAXHOSTNAME], userName[1024]; WCHAR protocol[INTERNET_MAX_SCHEME_LENGTH];
WCHAR hostName[INTERNET_MAX_HOST_NAME_LENGTH];
WCHAR userName[INTERNET_MAX_USER_NAME_LENGTH];
static WCHAR szHttp[] = {'h','t','t','p',0}; static WCHAR szHttp[] = {'h','t','t','p',0};
static WCHAR szHttps[] = {'h','t','t','p','s',0}; static WCHAR szHttps[] = {'h','t','t','p','s',0};
@ -3779,15 +3777,15 @@ static DWORD HTTP_HandleRedirect(http_request_t *request, LPCWSTR lpszUrl)
urlComponents.dwStructSize = sizeof(URL_COMPONENTSW); urlComponents.dwStructSize = sizeof(URL_COMPONENTSW);
urlComponents.lpszScheme = protocol; urlComponents.lpszScheme = protocol;
urlComponents.dwSchemeLength = 32; urlComponents.dwSchemeLength = INTERNET_MAX_SCHEME_LENGTH;
urlComponents.lpszHostName = hostName; urlComponents.lpszHostName = hostName;
urlComponents.dwHostNameLength = MAXHOSTNAME; urlComponents.dwHostNameLength = INTERNET_MAX_HOST_NAME_LENGTH;
urlComponents.lpszUserName = userName; urlComponents.lpszUserName = userName;
urlComponents.dwUserNameLength = 1024; urlComponents.dwUserNameLength = INTERNET_MAX_USER_NAME_LENGTH;
urlComponents.lpszPassword = NULL; urlComponents.lpszPassword = NULL;
urlComponents.dwPasswordLength = 0; urlComponents.dwPasswordLength = 0;
urlComponents.lpszUrlPath = path; urlComponents.lpszUrlPath = path;
urlComponents.dwUrlPathLength = 2048; urlComponents.dwUrlPathLength = INTERNET_MAX_PATH_LENGTH;
urlComponents.lpszExtraInfo = NULL; urlComponents.lpszExtraInfo = NULL;
urlComponents.dwExtraInfoLength = 0; urlComponents.dwExtraInfoLength = 0;
if(!InternetCrackUrlW(lpszUrl, strlenW(lpszUrl), 0, &urlComponents)) if(!InternetCrackUrlW(lpszUrl, strlenW(lpszUrl), 0, &urlComponents))

24
dlls/wininet/internet.c
View File

@ -29,8 +29,6 @@
#include "config.h" #include "config.h"
#include "wine/port.h" #include "wine/port.h"
#define MAXHOSTNAME 100 /* from http.c */
#if defined(__MINGW32__) || defined (_MSC_VER) #if defined(__MINGW32__) || defined (_MSC_VER)
#include <ws2tcpip.h> #include <ws2tcpip.h>
#endif #endif
@ -3161,7 +3159,7 @@ BOOL WINAPI InternetCheckConnectionW( LPCWSTR lpszUrl, DWORD dwFlags, DWORD dwRe
static const CHAR ping[] = "ping -c 1 "; static const CHAR ping[] = "ping -c 1 ";
static const CHAR redirect[] = " >/dev/null 2>/dev/null"; static const CHAR redirect[] = " >/dev/null 2>/dev/null";
CHAR *command = NULL; CHAR *command = NULL;
WCHAR hostW[1024]; WCHAR hostW[INTERNET_MAX_HOST_NAME_LENGTH];
DWORD len; DWORD len;
INTERNET_PORT port; INTERNET_PORT port;
int status = -1; int status = -1;
@ -3189,7 +3187,7 @@ BOOL WINAPI InternetCheckConnectionW( LPCWSTR lpszUrl, DWORD dwFlags, DWORD dwRe
ZeroMemory(&components,sizeof(URL_COMPONENTSW)); ZeroMemory(&components,sizeof(URL_COMPONENTSW));
components.lpszHostName = (LPWSTR)hostW; components.lpszHostName = (LPWSTR)hostW;
components.dwHostNameLength = 1024; components.dwHostNameLength = INTERNET_MAX_HOST_NAME_LENGTH;
if (!InternetCrackUrlW(lpszUrl,0,0,&components)) if (!InternetCrackUrlW(lpszUrl,0,0,&components))
goto End; goto End;
@ -3286,8 +3284,12 @@ static HINTERNET INTERNET_InternetOpenUrlW(appinfo_t *hIC, LPCWSTR lpszUrl,
LPCWSTR lpszHeaders, DWORD dwHeadersLength, DWORD dwFlags, DWORD_PTR dwContext) LPCWSTR lpszHeaders, DWORD dwHeadersLength, DWORD dwFlags, DWORD_PTR dwContext)
{ {
URL_COMPONENTSW urlComponents; URL_COMPONENTSW urlComponents;
WCHAR protocol[32], hostName[MAXHOSTNAME], userName[1024]; WCHAR protocol[INTERNET_MAX_SCHEME_LENGTH];
WCHAR password[1024], path[2048], extra[1024]; WCHAR hostName[INTERNET_MAX_HOST_NAME_LENGTH];
WCHAR userName[INTERNET_MAX_USER_NAME_LENGTH];
WCHAR password[INTERNET_MAX_PASSWORD_LENGTH];
WCHAR path[INTERNET_MAX_PATH_LENGTH];
WCHAR extra[1024];
HINTERNET client = NULL, client1 = NULL; HINTERNET client = NULL, client1 = NULL;
DWORD res; DWORD res;
@ -3296,15 +3298,15 @@ static HINTERNET INTERNET_InternetOpenUrlW(appinfo_t *hIC, LPCWSTR lpszUrl,
urlComponents.dwStructSize = sizeof(URL_COMPONENTSW); urlComponents.dwStructSize = sizeof(URL_COMPONENTSW);
urlComponents.lpszScheme = protocol; urlComponents.lpszScheme = protocol;
urlComponents.dwSchemeLength = 32; urlComponents.dwSchemeLength = INTERNET_MAX_SCHEME_LENGTH;
urlComponents.lpszHostName = hostName; urlComponents.lpszHostName = hostName;
urlComponents.dwHostNameLength = MAXHOSTNAME; urlComponents.dwHostNameLength = INTERNET_MAX_HOST_NAME_LENGTH;
urlComponents.lpszUserName = userName; urlComponents.lpszUserName = userName;
urlComponents.dwUserNameLength = 1024; urlComponents.dwUserNameLength = INTERNET_MAX_USER_NAME_LENGTH;
urlComponents.lpszPassword = password; urlComponents.lpszPassword = password;
urlComponents.dwPasswordLength = 1024; urlComponents.dwPasswordLength = INTERNET_MAX_PASSWORD_LENGTH;
urlComponents.lpszUrlPath = path; urlComponents.lpszUrlPath = path;
urlComponents.dwUrlPathLength = 2048; urlComponents.dwUrlPathLength = INTERNET_MAX_PATH_LENGTH;
urlComponents.lpszExtraInfo = extra; urlComponents.lpszExtraInfo = extra;
urlComponents.dwExtraInfoLength = 1024; urlComponents.dwExtraInfoLength = 1024;
if(!InternetCrackUrlW(lpszUrl, strlenW(lpszUrl), 0, &urlComponents)) if(!InternetCrackUrlW(lpszUrl, strlenW(lpszUrl), 0, &urlComponents))