Commit 3462299c authored by Mike McCormack's avatar Mike McCormack Committed by Alexandre Julliard

Convert unicode strings to const.

parent 7104df5d
...@@ -343,11 +343,11 @@ BOOL WINAPI InternetGetCookieW(LPCWSTR lpszUrl, LPCWSTR lpszCookieName, ...@@ -343,11 +343,11 @@ BOOL WINAPI InternetGetCookieW(LPCWSTR lpszUrl, LPCWSTR lpszCookieName,
* It'd be nice to know what exactly is going on, M$ tracking users? Does this need * It'd be nice to know what exactly is going on, M$ tracking users? Does this need
* to be unique? Should I generate a random number here? etc. * to be unique? Should I generate a random number here? etc.
*/ */
WCHAR TrackingString[] = { const WCHAR TrackingString[] = {
'M','t','r','x','T','r','a','c','k','i','n','g','I','D','=', 'M','t','r','x','T','r','a','c','k','i','n','g','I','D','=',
'0','1','2','3','4','5','6','7','8','9','0','1','2','3','4','5', '0','1','2','3','4','5','6','7','8','9','0','1','2','3','4','5',
'6','7','8','9','0','1','2','3','4','5','6','7','8','9','0','1', 0 }; '6','7','8','9','0','1','2','3','4','5','6','7','8','9','0','1', 0 };
WCHAR szps[] = { '%','s',0 }; const WCHAR szps[] = { '%','s',0 };
TRACE("(%s, %s, %p, %p)\n", debugstr_w(lpszUrl),debugstr_w(lpszCookieName), TRACE("(%s, %s, %p, %p)\n", debugstr_w(lpszUrl),debugstr_w(lpszCookieName),
lpCookieData, lpdwSize); lpCookieData, lpdwSize);
...@@ -377,8 +377,8 @@ BOOL WINAPI InternetGetCookieW(LPCWSTR lpszUrl, LPCWSTR lpszCookieName, ...@@ -377,8 +377,8 @@ BOOL WINAPI InternetGetCookieW(LPCWSTR lpszUrl, LPCWSTR lpszCookieName,
} }
while (thisCookie) while (thisCookie)
{ {
WCHAR szsc[] = { ';',' ',0 }; const WCHAR szsc[] = { ';',' ',0 };
WCHAR szpseq[] = { '%','s','=','%','s',0 }; const WCHAR szpseq[] = { '%','s','=','%','s',0 };
cnt += snprintfW(lpCookieData + cnt, *lpdwSize - cnt, szsc); cnt += snprintfW(lpCookieData + cnt, *lpdwSize - cnt, szsc);
cnt += snprintfW(lpCookieData + cnt, *lpdwSize - cnt, szpseq, cnt += snprintfW(lpCookieData + cnt, *lpdwSize - cnt, szpseq,
thisCookie->lpCookieName, thisCookie->lpCookieName,
......
...@@ -93,7 +93,7 @@ static BOOL WININET_GetAuthRealm( HINTERNET hRequest, LPWSTR szBuf, DWORD sz ) ...@@ -93,7 +93,7 @@ static BOOL WININET_GetAuthRealm( HINTERNET hRequest, LPWSTR szBuf, DWORD sz )
{ {
LPWSTR p, q; LPWSTR p, q;
DWORD index; DWORD index;
WCHAR szRealm[] = { 'r','e','a','l','m','=',0 }; const WCHAR szRealm[] = { 'r','e','a','l','m','=',0 };
/* extract the Realm from the proxy response and show it */ /* extract the Realm from the proxy response and show it */
index = 0; index = 0;
...@@ -136,7 +136,7 @@ static BOOL WININET_GetSetPassword( HWND hdlg, LPCWSTR szServer, ...@@ -136,7 +136,7 @@ static BOOL WININET_GetSetPassword( HWND hdlg, LPCWSTR szServer,
DWORD r, dwMagic = 19; DWORD r, dwMagic = 19;
UINT r_len, u_len; UINT r_len, u_len;
WORD sz; WORD sz;
WCHAR szColon[] = { ':',0 }, szbs[] = { '/', 0 }; const WCHAR szColon[] = { ':',0 }, szbs[] = { '/', 0 };
hUserItem = GetDlgItem( hdlg, IDC_USERNAME ); hUserItem = GetDlgItem( hdlg, IDC_USERNAME );
hPassItem = GetDlgItem( hdlg, IDC_PASSWORD ); hPassItem = GetDlgItem( hdlg, IDC_PASSWORD );
......
...@@ -342,7 +342,7 @@ static BOOL INTERNET_ConfigureProxyFromReg( LPWININETAPPINFOW lpwai ) ...@@ -342,7 +342,7 @@ static BOOL INTERNET_ConfigureProxyFromReg( LPWININETAPPINFOW lpwai )
DWORD r, keytype, len, enabled; DWORD r, keytype, len, enabled;
LPSTR lpszInternetSettings = LPSTR lpszInternetSettings =
"Software\\Microsoft\\Windows\\CurrentVersion\\Internet Settings"; "Software\\Microsoft\\Windows\\CurrentVersion\\Internet Settings";
WCHAR szProxyServer[] = { 'P','r','o','x','y','S','e','r','v','e','r', 0 }; const WCHAR szProxyServer[] = { 'P','r','o','x','y','S','e','r','v','e','r', 0 };
r = RegOpenKeyA(HKEY_CURRENT_USER, lpszInternetSettings, &key); r = RegOpenKeyA(HKEY_CURRENT_USER, lpszInternetSettings, &key);
if ( r != ERROR_SUCCESS ) if ( r != ERROR_SUCCESS )
...@@ -361,7 +361,7 @@ static BOOL INTERNET_ConfigureProxyFromReg( LPWININETAPPINFOW lpwai ) ...@@ -361,7 +361,7 @@ static BOOL INTERNET_ConfigureProxyFromReg( LPWININETAPPINFOW lpwai )
if( (r == ERROR_SUCCESS) && len && (keytype == REG_SZ) ) if( (r == ERROR_SUCCESS) && len && (keytype == REG_SZ) )
{ {
LPWSTR szProxy, p; LPWSTR szProxy, p;
WCHAR szHttp[] = {'h','t','t','p','=',0}; const WCHAR szHttp[] = {'h','t','t','p','=',0};
szProxy=HeapAlloc( GetProcessHeap(), 0, len ); szProxy=HeapAlloc( GetProcessHeap(), 0, len );
RegQueryValueExW( key, szProxyServer, NULL, &keytype, RegQueryValueExW( key, szProxyServer, NULL, &keytype,
...@@ -1070,14 +1070,14 @@ BOOL WINAPI InternetCrackUrlA(LPCSTR lpszUrl, DWORD dwUrlLength, DWORD dwFlags, ...@@ -1070,14 +1070,14 @@ BOOL WINAPI InternetCrackUrlA(LPCSTR lpszUrl, DWORD dwUrlLength, DWORD dwFlags,
INTERNET_SCHEME GetInternetSchemeW(LPCWSTR lpszScheme, INT nMaxCmp) INTERNET_SCHEME GetInternetSchemeW(LPCWSTR lpszScheme, INT nMaxCmp)
{ {
INTERNET_SCHEME iScheme=INTERNET_SCHEME_UNKNOWN; INTERNET_SCHEME iScheme=INTERNET_SCHEME_UNKNOWN;
WCHAR lpszFtp[]={'f','t','p',0}; const WCHAR lpszFtp[]={'f','t','p',0};
WCHAR lpszGopher[]={'g','o','p','h','e','r',0}; const WCHAR lpszGopher[]={'g','o','p','h','e','r',0};
WCHAR lpszHttp[]={'h','t','t','p',0}; const WCHAR lpszHttp[]={'h','t','t','p',0};
WCHAR lpszHttps[]={'h','t','t','p','s',0}; const WCHAR lpszHttps[]={'h','t','t','p','s',0};
WCHAR lpszFile[]={'f','i','l','e',0}; const WCHAR lpszFile[]={'f','i','l','e',0};
WCHAR lpszNews[]={'n','e','w','s',0}; const WCHAR lpszNews[]={'n','e','w','s',0};
WCHAR lpszMailto[]={'m','a','i','l','t','o',0}; const WCHAR lpszMailto[]={'m','a','i','l','t','o',0};
WCHAR lpszRes[]={'r','e','s',0}; const WCHAR lpszRes[]={'r','e','s',0};
WCHAR* tempBuffer=NULL; WCHAR* tempBuffer=NULL;
TRACE("\n"); TRACE("\n");
if(lpszScheme==NULL) if(lpszScheme==NULL)
...@@ -1155,8 +1155,8 @@ BOOL WINAPI InternetCrackUrlW(LPCWSTR lpszUrl, DWORD dwUrlLength, DWORD dwFlags, ...@@ -1155,8 +1155,8 @@ BOOL WINAPI InternetCrackUrlW(LPCWSTR lpszUrl, DWORD dwUrlLength, DWORD dwFlags,
BOOL bIsAbsolute = FALSE; BOOL bIsAbsolute = FALSE;
LPWSTR lpszap = (WCHAR*)lpszUrl; LPWSTR lpszap = (WCHAR*)lpszUrl;
LPWSTR lpszcp = NULL; LPWSTR lpszcp = NULL;
WCHAR lpszSeparators[3]={';','?',0}; const WCHAR lpszSeparators[3]={';','?',0};
WCHAR lpszSlash[2]={'/',0}; const WCHAR lpszSlash[2]={'/',0};
if(dwUrlLength==0) if(dwUrlLength==0)
dwUrlLength=strlenW(lpszUrl); dwUrlLength=strlenW(lpszUrl);
...@@ -1197,7 +1197,7 @@ BOOL WINAPI InternetCrackUrlW(LPCWSTR lpszUrl, DWORD dwUrlLength, DWORD dwFlags, ...@@ -1197,7 +1197,7 @@ BOOL WINAPI InternetCrackUrlW(LPCWSTR lpszUrl, DWORD dwUrlLength, DWORD dwFlags,
if (bIsAbsolute) /* Parse <protocol>:[//<net_loc>] */ if (bIsAbsolute) /* Parse <protocol>:[//<net_loc>] */
{ {
LPWSTR lpszNetLoc; LPWSTR lpszNetLoc;
WCHAR wszAbout[]={'a','b','o','u','t',':',0}; const WCHAR wszAbout[]={'a','b','o','u','t',':',0};
/* Get scheme first. */ /* Get scheme first. */
lpUC->nScheme = GetInternetSchemeW(lpszUrl, lpszcp - lpszUrl); lpUC->nScheme = GetInternetSchemeW(lpszUrl, lpszcp - lpszUrl);
...@@ -1680,7 +1680,7 @@ static BOOL INET_QueryOptionHelper(BOOL bIsUnicode, HINTERNET hInternet, DWORD d ...@@ -1680,7 +1680,7 @@ static BOOL INET_QueryOptionHelper(BOOL bIsUnicode, HINTERNET hInternet, DWORD d
{ {
LPWININETHTTPREQW lpreq = (LPWININETHTTPREQW) lpwhh; LPWININETHTTPREQW lpreq = (LPWININETHTTPREQW) lpwhh;
WCHAR url[1023]; WCHAR url[1023];
WCHAR szFmt[] = {'h','t','t','p',':','/','/','%','s','%','s',0}; const WCHAR szFmt[] = {'h','t','t','p',':','/','/','%','s','%','s',0};
sprintfW(url,szFmt,lpreq->lpszHostName,lpreq->lpszPath); sprintfW(url,szFmt,lpreq->lpszHostName,lpreq->lpszPath);
TRACE("INTERNET_OPTION_URL: %s\n",debugstr_w(url)); TRACE("INTERNET_OPTION_URL: %s\n",debugstr_w(url));
...@@ -2076,7 +2076,7 @@ HINTERNET WINAPI INTERNET_InternetOpenUrlW(HINTERNET hInternet, LPCWSTR lpszUrl, ...@@ -2076,7 +2076,7 @@ HINTERNET WINAPI INTERNET_InternetOpenUrlW(HINTERNET hInternet, LPCWSTR lpszUrl,
case INTERNET_SCHEME_HTTP: case INTERNET_SCHEME_HTTP:
case INTERNET_SCHEME_HTTPS: { case INTERNET_SCHEME_HTTPS: {
WCHAR szStars[] = { '*','/','*', 0 }; const WCHAR szStars[] = { '*','/','*', 0 };
LPCWSTR accept[2] = { szStars, NULL }; LPCWSTR accept[2] = { szStars, NULL };
if(urlComponents.nPort == 0) { if(urlComponents.nPort == 0) {
if(urlComponents.nScheme == INTERNET_SCHEME_HTTP) if(urlComponents.nScheme == INTERNET_SCHEME_HTTP)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment