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

- Don't return NULL for proxy details if there is no proxy. 

- Remove stub message, it seems to be complete.
This commit is contained in:
Mike Hearn 2005-06-05 19:19:43 +00:00 committed by Alexandre Julliard
parent e46047e4da
commit 599f3e879e
1 changed files with 28 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
dlls/wininet/internet.c
View File

@ -1955,16 +1955,27 @@ static BOOL INET_QueryOptionHelper(BOOL bIsUnicode, HINTERNET hInternet, DWORD d
lstrcpyW((LPWSTR)pPI->lpszProxy, lpwai->lpszProxy); lstrcpyW((LPWSTR)pPI->lpszProxy, lpwai->lpszProxy);
} }
else else
pPI->lpszProxy = NULL; {
pPI->lpszProxy = (LPWSTR)((LPBYTE)lpBuffer +
sizeof(INTERNET_PROXY_INFOW));
*((LPWSTR)(pPI->lpszProxy)) = 0;
}
if (lpwai->lpszProxyBypass) if (lpwai->lpszProxyBypass)
{ {
pPI->lpszProxyBypass = (LPWSTR)((LPBYTE)lpBuffer + pPI->lpszProxyBypass = (LPWSTR)((LPBYTE)lpBuffer +
sizeof(INTERNET_PROXY_INFOW) + proxyBytesRequired); sizeof(INTERNET_PROXY_INFOW) +
proxyBytesRequired);
lstrcpyW((LPWSTR)pPI->lpszProxyBypass, lstrcpyW((LPWSTR)pPI->lpszProxyBypass,
lpwai->lpszProxyBypass); lpwai->lpszProxyBypass);
} }
else else
pPI->lpszProxyBypass = NULL; {
pPI->lpszProxyBypass = (LPWSTR)((LPBYTE)lpBuffer +
sizeof(INTERNET_PROXY_INFOW) +
proxyBytesRequired);
*((LPWSTR)(pPI->lpszProxyBypass)) = 0;
}
bSuccess = TRUE; bSuccess = TRUE;
} }
*lpdwBufferLength = sizeof(INTERNET_PROXY_INFOW) + *lpdwBufferLength = sizeof(INTERNET_PROXY_INFOW) +
@ -1987,7 +1998,6 @@ static BOOL INET_QueryOptionHelper(BOOL bIsUnicode, HINTERNET hInternet, DWORD d
else else
{ {
pPI->dwAccessType = lpwai->dwAccessType; pPI->dwAccessType = lpwai->dwAccessType;
FIXME("INTERNET_OPTION_PROXY: Stub\n");
if (lpwai->lpszProxy) if (lpwai->lpszProxy)
{ {
pPI->lpszProxy = (LPSTR)((LPBYTE)lpBuffer + pPI->lpszProxy = (LPSTR)((LPBYTE)lpBuffer +
@ -1996,7 +2006,12 @@ static BOOL INET_QueryOptionHelper(BOOL bIsUnicode, HINTERNET hInternet, DWORD d
(LPSTR)pPI->lpszProxy, proxyBytesRequired, NULL, NULL); (LPSTR)pPI->lpszProxy, proxyBytesRequired, NULL, NULL);
} }
else else
pPI->lpszProxy = NULL; {
pPI->lpszProxy = (LPSTR)((LPBYTE)lpBuffer +
sizeof(INTERNET_PROXY_INFOA));
*((LPSTR)(pPI->lpszProxy)) = '\0';
}
if (lpwai->lpszProxyBypass) if (lpwai->lpszProxyBypass)
{ {
pPI->lpszProxyBypass = (LPSTR)((LPBYTE)lpBuffer + pPI->lpszProxyBypass = (LPSTR)((LPBYTE)lpBuffer +
@ -2007,7 +2022,12 @@ static BOOL INET_QueryOptionHelper(BOOL bIsUnicode, HINTERNET hInternet, DWORD d
NULL, NULL); NULL, NULL);
} }
else else
pPI->lpszProxyBypass = NULL; {
pPI->lpszProxyBypass = (LPSTR)((LPBYTE)lpBuffer +
sizeof(INTERNET_PROXY_INFOA) +
proxyBytesRequired);
*((LPSTR)(pPI->lpszProxyBypass)) = '\0';
}
bSuccess = TRUE; bSuccess = TRUE;
} }
*lpdwBufferLength = sizeof(INTERNET_PROXY_INFOA) + *lpdwBufferLength = sizeof(INTERNET_PROXY_INFOA) +