Fix some warnings.
This commit is contained in:
parent
4a109c7818
commit
9b95bb526d
@ -1854,7 +1854,7 @@ lend:
|
|||||||
* NULL on failure
|
* NULL on failure
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
BOOL FTP_SendCommandA(INT nSocket, FTP_COMMAND ftpCmd, LPCSTR lpszParam,
|
static BOOL FTP_SendCommandA(INT nSocket, FTP_COMMAND ftpCmd, LPCSTR lpszParam,
|
||||||
INTERNET_STATUS_CALLBACK lpfnStatusCB, LPWININETHANDLEHEADER hdr, DWORD dwContext)
|
INTERNET_STATUS_CALLBACK lpfnStatusCB, LPWININETHANDLEHEADER hdr, DWORD dwContext)
|
||||||
{
|
{
|
||||||
DWORD len;
|
DWORD len;
|
||||||
|
@ -490,7 +490,7 @@ end:
|
|||||||
static UINT HTTP_Base64( LPCWSTR bin, LPWSTR base64 )
|
static UINT HTTP_Base64( LPCWSTR bin, LPWSTR base64 )
|
||||||
{
|
{
|
||||||
UINT n = 0, x;
|
UINT n = 0, x;
|
||||||
static LPSTR HTTP_Base64Enc =
|
static LPCSTR HTTP_Base64Enc =
|
||||||
"ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
|
"ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
|
||||||
|
|
||||||
while( bin[0] )
|
while( bin[0] )
|
||||||
@ -840,7 +840,7 @@ lend:
|
|||||||
/***********************************************************************
|
/***********************************************************************
|
||||||
* HTTP_HttpQueryInfoW (internal)
|
* HTTP_HttpQueryInfoW (internal)
|
||||||
*/
|
*/
|
||||||
BOOL WINAPI HTTP_HttpQueryInfoW( LPWININETHTTPREQW lpwhr, DWORD dwInfoLevel,
|
static BOOL WINAPI HTTP_HttpQueryInfoW( LPWININETHTTPREQW lpwhr, DWORD dwInfoLevel,
|
||||||
LPVOID lpBuffer, LPDWORD lpdwBufferLength, LPDWORD lpdwIndex)
|
LPVOID lpBuffer, LPDWORD lpdwBufferLength, LPDWORD lpdwIndex)
|
||||||
{
|
{
|
||||||
LPHTTPHEADERW lphttpHdr = NULL;
|
LPHTTPHEADERW lphttpHdr = NULL;
|
||||||
|
@ -102,9 +102,6 @@ static LPWORKREQUEST lpHeadWorkQueue;
|
|||||||
static LPWORKREQUEST lpWorkQueueTail;
|
static LPWORKREQUEST lpWorkQueueTail;
|
||||||
static HMODULE WININET_hModule;
|
static HMODULE WININET_hModule;
|
||||||
|
|
||||||
extern void URLCacheContainers_CreateDefaults(void);
|
|
||||||
extern void URLCacheContainers_DeleteAll(void);
|
|
||||||
|
|
||||||
#define HANDLE_CHUNK_SIZE 0x10
|
#define HANDLE_CHUNK_SIZE 0x10
|
||||||
|
|
||||||
static CRITICAL_SECTION WININET_cs;
|
static CRITICAL_SECTION WININET_cs;
|
||||||
@ -373,7 +370,7 @@ static BOOL INTERNET_ConfigureProxyFromReg( LPWININETAPPINFOW lpwai )
|
|||||||
{
|
{
|
||||||
HKEY key;
|
HKEY key;
|
||||||
DWORD r, keytype, len, enabled;
|
DWORD r, keytype, len, enabled;
|
||||||
LPSTR lpszInternetSettings =
|
LPCSTR lpszInternetSettings =
|
||||||
"Software\\Microsoft\\Windows\\CurrentVersion\\Internet Settings";
|
"Software\\Microsoft\\Windows\\CurrentVersion\\Internet Settings";
|
||||||
static const WCHAR szProxyServer[] = { 'P','r','o','x','y','S','e','r','v','e','r', 0 };
|
static const WCHAR szProxyServer[] = { 'P','r','o','x','y','S','e','r','v','e','r', 0 };
|
||||||
|
|
||||||
|
@ -469,6 +469,9 @@ BOOL NETCON_recv(WININET_NETCONNECTION *connection, void *buf, size_t len, int f
|
|||||||
int *recvd /* out */);
|
int *recvd /* out */);
|
||||||
BOOL NETCON_getNextLine(WININET_NETCONNECTION *connection, LPSTR lpszBuffer, LPDWORD dwBuffer);
|
BOOL NETCON_getNextLine(WININET_NETCONNECTION *connection, LPSTR lpszBuffer, LPDWORD dwBuffer);
|
||||||
|
|
||||||
|
extern void URLCacheContainers_CreateDefaults(void);
|
||||||
|
extern void URLCacheContainers_DeleteAll(void);
|
||||||
|
|
||||||
#define MAX_REPLY_LEN 0x5B4
|
#define MAX_REPLY_LEN 0x5B4
|
||||||
|
|
||||||
/* Used for debugging - maybe need to be shared in the Wine debugging code ? */
|
/* Used for debugging - maybe need to be shared in the Wine debugging code ? */
|
||||||
|
@ -19,7 +19,7 @@
|
|||||||
|
|
||||||
int goon = 0;
|
int goon = 0;
|
||||||
|
|
||||||
VOID WINAPI callback(
|
static VOID WINAPI callback(
|
||||||
HINTERNET hInternet,
|
HINTERNET hInternet,
|
||||||
DWORD dwContext,
|
DWORD dwContext,
|
||||||
DWORD dwInternetStatus,
|
DWORD dwInternetStatus,
|
||||||
@ -85,10 +85,11 @@ VOID WINAPI callback(
|
|||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
trace("Callback %p 0x%lx %s(%li) %p %ld\n",hInternet,dwContext,name,dwInternetStatus,lpvStatusInformation,dwStatusInformationLength);
|
trace("Callback %p 0x%lx %s(%li) %p %ld\n",hInternet,dwContext,name,
|
||||||
|
dwInternetStatus,lpvStatusInformation,dwStatusInformationLength);
|
||||||
}
|
}
|
||||||
|
|
||||||
void winapi_test(int flags)
|
static void winapi_test(int flags)
|
||||||
{
|
{
|
||||||
DWORD rc;
|
DWORD rc;
|
||||||
CHAR buffer[4000];
|
CHAR buffer[4000];
|
||||||
@ -216,7 +217,7 @@ abort:
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void InternetOpenUrlA_test(void)
|
static void InternetOpenUrlA_test(void)
|
||||||
{
|
{
|
||||||
HINTERNET myhinternet, myhttp;
|
HINTERNET myhinternet, myhttp;
|
||||||
char buffer[0x400];
|
char buffer[0x400];
|
||||||
@ -261,7 +262,7 @@ void InternetOpenUrlA_test(void)
|
|||||||
trace("read 0x%08lx bytes\n",totalbytes);
|
trace("read 0x%08lx bytes\n",totalbytes);
|
||||||
}
|
}
|
||||||
|
|
||||||
void InternetCrackUrl_test(void)
|
static void InternetCrackUrl_test(void)
|
||||||
{
|
{
|
||||||
URL_COMPONENTSA urlComponents;
|
URL_COMPONENTSA urlComponents;
|
||||||
char protocol[32], hostName[1024], userName[1024];
|
char protocol[32], hostName[1024], userName[1024];
|
||||||
@ -328,7 +329,7 @@ void InternetCrackUrl_test(void)
|
|||||||
ok(InternetCrackUrlA(TEST_URL3, 0, ICU_DECODE, &urlComponents),"InternetCrackUrl failed with GLE 0x%lx\n",GetLastError());
|
ok(InternetCrackUrlA(TEST_URL3, 0, ICU_DECODE, &urlComponents),"InternetCrackUrl failed with GLE 0x%lx\n",GetLastError());
|
||||||
}
|
}
|
||||||
|
|
||||||
void InternetCrackUrlW_test(void)
|
static void InternetCrackUrlW_test(void)
|
||||||
{
|
{
|
||||||
WCHAR url[] = {
|
WCHAR url[] = {
|
||||||
'h','t','t','p',':','/','/','1','9','2','.','1','6','8','.','0','.','2','2','/',
|
'h','t','t','p',':','/','/','1','9','2','.','1','6','8','.','0','.','2','2','/',
|
||||||
@ -416,7 +417,7 @@ void InternetCrackUrlW_test(void)
|
|||||||
ok( comp.dwExtraInfoLength == 29, "extra length wrong\n");
|
ok( comp.dwExtraInfoLength == 29, "extra length wrong\n");
|
||||||
}
|
}
|
||||||
|
|
||||||
static void InternetTimeFromSystemTimeA_test()
|
static void InternetTimeFromSystemTimeA_test(void)
|
||||||
{
|
{
|
||||||
BOOL ret;
|
BOOL ret;
|
||||||
static const SYSTEMTIME time = { 2005, 1, 5, 7, 12, 6, 35, 0 };
|
static const SYSTEMTIME time = { 2005, 1, 5, 7, 12, 6, 35, 0 };
|
||||||
@ -430,7 +431,7 @@ static void InternetTimeFromSystemTimeA_test()
|
|||||||
"InternetTimeFromSystemTimeA failed (%ld)\n", GetLastError() );
|
"InternetTimeFromSystemTimeA failed (%ld)\n", GetLastError() );
|
||||||
}
|
}
|
||||||
|
|
||||||
static void InternetTimeFromSystemTimeW_test()
|
static void InternetTimeFromSystemTimeW_test(void)
|
||||||
{
|
{
|
||||||
BOOL ret;
|
BOOL ret;
|
||||||
static const SYSTEMTIME time = { 2005, 1, 5, 7, 12, 6, 35, 0 };
|
static const SYSTEMTIME time = { 2005, 1, 5, 7, 12, 6, 35, 0 };
|
||||||
@ -445,7 +446,7 @@ static void InternetTimeFromSystemTimeW_test()
|
|||||||
"InternetTimeFromSystemTimeW failed (%ld)\n", GetLastError() );
|
"InternetTimeFromSystemTimeW failed (%ld)\n", GetLastError() );
|
||||||
}
|
}
|
||||||
|
|
||||||
static void InternetTimeToSystemTimeA_test()
|
static void InternetTimeToSystemTimeA_test(void)
|
||||||
{
|
{
|
||||||
BOOL ret;
|
BOOL ret;
|
||||||
SYSTEMTIME time;
|
SYSTEMTIME time;
|
||||||
@ -464,7 +465,7 @@ static void InternetTimeToSystemTimeA_test()
|
|||||||
"InternetTimeToSystemTimeA failed (%ld)\n", GetLastError() );
|
"InternetTimeToSystemTimeA failed (%ld)\n", GetLastError() );
|
||||||
}
|
}
|
||||||
|
|
||||||
static void InternetTimeToSystemTimeW_test()
|
static void InternetTimeToSystemTimeW_test(void)
|
||||||
{
|
{
|
||||||
BOOL ret;
|
BOOL ret;
|
||||||
SYSTEMTIME time;
|
SYSTEMTIME time;
|
||||||
|
@ -548,7 +548,7 @@ static void URLCacheContainer_DeleteContainer(URLCACHECONTAINER * pContainer)
|
|||||||
HeapFree(GetProcessHeap(), 0, pContainer);
|
HeapFree(GetProcessHeap(), 0, pContainer);
|
||||||
}
|
}
|
||||||
|
|
||||||
void URLCacheContainers_CreateDefaults()
|
void URLCacheContainers_CreateDefaults(void)
|
||||||
{
|
{
|
||||||
static const WCHAR UrlSuffix[] = {'C','o','n','t','e','n','t','.','I','E','5',0};
|
static const WCHAR UrlSuffix[] = {'C','o','n','t','e','n','t','.','I','E','5',0};
|
||||||
static const WCHAR UrlPrefix[] = {0};
|
static const WCHAR UrlPrefix[] = {0};
|
||||||
@ -604,7 +604,7 @@ void URLCacheContainers_CreateDefaults()
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void URLCacheContainers_DeleteAll()
|
void URLCacheContainers_DeleteAll(void)
|
||||||
{
|
{
|
||||||
while(!list_empty(&UrlContainers))
|
while(!list_empty(&UrlContainers))
|
||||||
URLCacheContainer_DeleteContainer(
|
URLCacheContainer_DeleteContainer(
|
||||||
|
Loading…
x
Reference in New Issue
Block a user