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

wininet: Code clean up by using heap_strdup* functions.

Browse Source
This commit is contained in:
Jacek Caban 2009-07-17 02:05:36 +02:00 committed by Alexandre Julliard
parent 5d6f01b76b
commit 13974e9d5a
1 changed files with 28 additions and 88 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

116
dlls/wininet/internet.c
View File

@ -693,30 +693,12 @@ HINTERNET WINAPI InternetOpenW(LPCWSTR lpszAgent, DWORD dwAccessType,
goto lend; goto lend;
} }
if (NULL != lpszAgent) lpwai->lpszAgent = heap_strdupW(lpszAgent);
{
lpwai->lpszAgent = HeapAlloc( GetProcessHeap(),0,
(strlenW(lpszAgent)+1)*sizeof(WCHAR));
if (lpwai->lpszAgent)
lstrcpyW( lpwai->lpszAgent, lpszAgent );
}
if(dwAccessType == INTERNET_OPEN_TYPE_PRECONFIG) if(dwAccessType == INTERNET_OPEN_TYPE_PRECONFIG)
INTERNET_ConfigureProxy( lpwai ); INTERNET_ConfigureProxy( lpwai );
else if (NULL != lpszProxy) else
{ lpwai->lpszProxy = heap_strdupW(lpszProxy);
lpwai->lpszProxy = HeapAlloc( GetProcessHeap(), 0, lpwai->lpszProxyBypass = heap_strdupW(lpszProxyBypass);
(strlenW(lpszProxy)+1)*sizeof(WCHAR));
if (lpwai->lpszProxy)
lstrcpyW( lpwai->lpszProxy, lpszProxy );
}
if (NULL != lpszProxyBypass)
{
lpwai->lpszProxyBypass = HeapAlloc( GetProcessHeap(), 0,
(strlenW(lpszProxyBypass)+1)*sizeof(WCHAR));
if (lpwai->lpszProxyBypass)
lstrcpyW( lpwai->lpszProxyBypass, lpszProxyBypass );
}
lend: lend:
if( lpwai ) if( lpwai )
@ -741,33 +723,15 @@ lend:
HINTERNET WINAPI InternetOpenA(LPCSTR lpszAgent, DWORD dwAccessType, HINTERNET WINAPI InternetOpenA(LPCSTR lpszAgent, DWORD dwAccessType,
LPCSTR lpszProxy, LPCSTR lpszProxyBypass, DWORD dwFlags) LPCSTR lpszProxy, LPCSTR lpszProxyBypass, DWORD dwFlags)
{ {
HINTERNET rc = NULL; WCHAR *szAgent, *szProxy, *szBypass;
INT len; HINTERNET rc;
WCHAR *szAgent = NULL, *szProxy = NULL, *szBypass = NULL;
TRACE("(%s, 0x%08x, %s, %s, 0x%08x)\n", debugstr_a(lpszAgent), TRACE("(%s, 0x%08x, %s, %s, 0x%08x)\n", debugstr_a(lpszAgent),
dwAccessType, debugstr_a(lpszProxy), debugstr_a(lpszProxyBypass), dwFlags); dwAccessType, debugstr_a(lpszProxy), debugstr_a(lpszProxyBypass), dwFlags);
if( lpszAgent ) szAgent = heap_strdupAtoW(lpszAgent);
{ szProxy = heap_strdupAtoW(lpszProxy);
len = MultiByteToWideChar(CP_ACP, 0, lpszAgent, -1, NULL, 0); szBypass = heap_strdupAtoW(lpszProxyBypass);
szAgent = HeapAlloc(GetProcessHeap(), 0, len*sizeof(WCHAR));
MultiByteToWideChar(CP_ACP, 0, lpszAgent, -1, szAgent, len);
}
if( lpszProxy )
{
len = MultiByteToWideChar(CP_ACP, 0, lpszProxy, -1, NULL, 0);
szProxy = HeapAlloc(GetProcessHeap(), 0, len*sizeof(WCHAR));
MultiByteToWideChar(CP_ACP, 0, lpszProxy, -1, szProxy, len);
}
if( lpszProxyBypass )
{
len = MultiByteToWideChar(CP_ACP, 0, lpszProxyBypass, -1, NULL, 0);
szBypass = HeapAlloc(GetProcessHeap(), 0, len*sizeof(WCHAR));
MultiByteToWideChar(CP_ACP, 0, lpszProxyBypass, -1, szBypass, len);
}
rc = InternetOpenW(szAgent, dwAccessType, szProxy, szBypass, dwFlags); rc = InternetOpenW(szAgent, dwAccessType, szProxy, szBypass, dwFlags);
@ -1025,30 +989,13 @@ HINTERNET WINAPI InternetConnectA(HINTERNET hInternet,
DWORD dwService, DWORD dwFlags, DWORD_PTR dwContext) DWORD dwService, DWORD dwFlags, DWORD_PTR dwContext)
{ {
HINTERNET rc = NULL; HINTERNET rc = NULL;
INT len = 0; LPWSTR szServerName;
LPWSTR szServerName = NULL; LPWSTR szUserName;
LPWSTR szUserName = NULL; LPWSTR szPassword;
LPWSTR szPassword = NULL;
if (lpszServerName)
{
len = MultiByteToWideChar(CP_ACP, 0, lpszServerName, -1, NULL, 0);
szServerName = HeapAlloc(GetProcessHeap(), 0, len*sizeof(WCHAR));
MultiByteToWideChar(CP_ACP, 0, lpszServerName, -1, szServerName, len);
}
if (lpszUserName)
{
len = MultiByteToWideChar(CP_ACP, 0, lpszUserName, -1, NULL, 0);
szUserName = HeapAlloc(GetProcessHeap(), 0, len*sizeof(WCHAR));
MultiByteToWideChar(CP_ACP, 0, lpszUserName, -1, szUserName, len);
}
if (lpszPassword)
{
len = MultiByteToWideChar(CP_ACP, 0, lpszPassword, -1, NULL, 0);
szPassword = HeapAlloc(GetProcessHeap(), 0, len*sizeof(WCHAR));
MultiByteToWideChar(CP_ACP, 0, lpszPassword, -1, szPassword, len);
}
szServerName = heap_strdupAtoW(lpszServerName);
szUserName = heap_strdupAtoW(lpszUserName);
szPassword = heap_strdupAtoW(lpszPassword);
rc = InternetConnectW(hInternet, szServerName, nServerPort, rc = InternetConnectW(hInternet, szServerName, nServerPort,
szUserName, szPassword, dwService, dwFlags, dwContext); szUserName, szPassword, dwService, dwFlags, dwContext);
@ -2590,16 +2537,12 @@ BOOL WINAPI InternetTimeToSystemTimeA( LPCSTR string, SYSTEMTIME* time, DWORD re
{ {
BOOL ret = FALSE; BOOL ret = FALSE;
WCHAR *stringW; WCHAR *stringW;
int len;
TRACE( "%s %p 0x%08x\n", debugstr_a(string), time, reserved ); TRACE( "%s %p 0x%08x\n", debugstr_a(string), time, reserved );
len = MultiByteToWideChar( CP_ACP, 0, string, -1, NULL, 0 ); stringW = heap_strdupAtoW(string);
stringW = HeapAlloc( GetProcessHeap(), 0, len * sizeof(WCHAR) );
if (stringW) if (stringW)
{ {
MultiByteToWideChar( CP_ACP, 0, string, -1, stringW, len );
ret = InternetTimeToSystemTimeW( stringW, time, reserved ); ret = InternetTimeToSystemTimeW( stringW, time, reserved );
HeapFree( GetProcessHeap(), 0, stringW ); HeapFree( GetProcessHeap(), 0, stringW );
} }
@ -2806,17 +2749,18 @@ End:
*/ */
BOOL WINAPI InternetCheckConnectionA(LPCSTR lpszUrl, DWORD dwFlags, DWORD dwReserved) BOOL WINAPI InternetCheckConnectionA(LPCSTR lpszUrl, DWORD dwFlags, DWORD dwReserved)
{ {
WCHAR *szUrl; WCHAR *url = NULL;
INT len;
BOOL rc; BOOL rc;
len = MultiByteToWideChar(CP_ACP, 0, lpszUrl, -1, NULL, 0); if(lpszUrl) {
if (!(szUrl = HeapAlloc(GetProcessHeap(), 0, len*sizeof(WCHAR)))) url = heap_strdupAtoW(lpszUrl);
return FALSE; if(!url)
MultiByteToWideChar(CP_ACP, 0, lpszUrl, -1, szUrl, len); return FALSE;
rc = InternetCheckConnectionW(szUrl, dwFlags, dwReserved); }
HeapFree(GetProcessHeap(), 0, szUrl);
rc = InternetCheckConnectionW(url, dwFlags, dwReserved);
HeapFree(GetProcessHeap(), 0, url);
return rc; return rc;
} }
@ -3018,20 +2962,16 @@ HINTERNET WINAPI InternetOpenUrlA(HINTERNET hInternet, LPCSTR lpszUrl,
LPCSTR lpszHeaders, DWORD dwHeadersLength, DWORD dwFlags, DWORD_PTR dwContext) LPCSTR lpszHeaders, DWORD dwHeadersLength, DWORD dwFlags, DWORD_PTR dwContext)
{ {
HINTERNET rc = NULL; HINTERNET rc = NULL;
DWORD lenHeaders = 0;
INT lenUrl;
INT lenHeaders = 0;
LPWSTR szUrl = NULL; LPWSTR szUrl = NULL;
LPWSTR szHeaders = NULL; LPWSTR szHeaders = NULL;
TRACE("\n"); TRACE("\n");
if(lpszUrl) { if(lpszUrl) {
lenUrl = MultiByteToWideChar(CP_ACP, 0, lpszUrl, -1, NULL, 0 ); szUrl = heap_strdupAtoW(lpszUrl);
szUrl = HeapAlloc(GetProcessHeap(), 0, lenUrl*sizeof(WCHAR));
if(!szUrl) if(!szUrl)
return NULL; return NULL;
MultiByteToWideChar(CP_ACP, 0, lpszUrl, -1, szUrl, lenUrl);
} }
if(lpszHeaders) { if(lpszHeaders) {