chibicitiberiu/rainmeter-studio
1
0
Fork 0
mirror of https://github.com/chibicitiberiu/rainmeter-studio.git synced 2024-02-24 04:33:31 +00:00
Code Issues Releases Wiki Activity

WebParser: Tweaks to DownloadUrl

Browse Source
This commit is contained in:
Birunthan Mohanathas 2013-03-08 09:11:54 +02:00
parent ddbdc71111
commit 03d529cedc
1 changed files with 31 additions and 75 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

98
Plugins/PluginWebParser/WebParser.cpp
View File

@ -242,7 +242,7 @@ struct MeasureData
} }
}; };
BYTE* DownloadUrl(HINTERNET handle, std::wstring& url, DWORD* dwSize, bool forceReload); BYTE* DownloadUrl(HINTERNET handle, std::wstring& url, DWORD* dataSize, bool forceReload);
unsigned __stdcall NetworkThreadProc(void* pParam); unsigned __stdcall NetworkThreadProc(void* pParam);
unsigned __stdcall NetworkDownloadThreadProc(void* pParam); unsigned __stdcall NetworkDownloadThreadProc(void* pParam);
void ParseData(MeasureData* measure, LPCSTR parseData, DWORD dwSize); void ParseData(MeasureData* measure, LPCSTR parseData, DWORD dwSize);
@ -869,7 +869,7 @@ unsigned __stdcall NetworkThreadProc(void* pParam)
ParseData(measure, (LPCSTR)data, dwSize); ParseData(measure, (LPCSTR)data, dwSize);
delete [] data; free(data);
} }
EnterCriticalSection(&g_CriticalSection); EnterCriticalSection(&g_CriticalSection);
@ -1592,19 +1592,10 @@ PLUGIN_EXPORT void Finalize(void* data)
/* /*
Downloads the given url and returns the webpage as dynamically allocated string. Downloads the given url and returns the webpage as dynamically allocated string.
You need to delete the returned string after use! You need to free the returned string after use!
*/ */
BYTE* DownloadUrl(HINTERNET handle, std::wstring& url, DWORD* dwDataSize, bool forceReload) BYTE* DownloadUrl(HINTERNET handle, std::wstring& url, DWORD* dataSize, bool forceReload)
{ {
HINTERNET hUrlDump;
DWORD dwSize;
BYTE* lpData;
BYTE* lpOutPut;
BYTE* lpHolding = NULL;
int nCounter = 1;
int nBufferSize;
const int CHUNK_SIZE = 8192;
std::wstring err = L"WebParser.dll: Fetching: " + url; std::wstring err = L"WebParser.dll: Fetching: " + url;
RmLog(LOG_DEBUG, err.c_str()); RmLog(LOG_DEBUG, err.c_str());
@ -1614,8 +1605,8 @@ BYTE* DownloadUrl(HINTERNET handle, std::wstring& url, DWORD* dwDataSize, bool f
flags = INTERNET_FLAG_RELOAD; flags = INTERNET_FLAG_RELOAD;
} }
hUrlDump = InternetOpenUrl(handle, url.c_str(), NULL, NULL, flags, 0); HINTERNET hUrlDump = InternetOpenUrl(handle, url.c_str(), NULL, NULL, flags, 0);
if (hUrlDump == NULL) if (!hUrlDump)
{ {
if (_wcsnicmp(url.c_str(), L"file://", 7) == 0) // file scheme if (_wcsnicmp(url.c_str(), L"file://", 7) == 0) // file scheme
{ {
@ -1623,85 +1614,50 @@ BYTE* DownloadUrl(HINTERNET handle, std::wstring& url, DWORD* dwDataSize, bool f
hUrlDump = InternetOpenUrlA(handle, urlACP.c_str(), NULL, NULL, flags, 0); hUrlDump = InternetOpenUrlA(handle, urlACP.c_str(), NULL, NULL, flags, 0);
} }
if (hUrlDump == NULL) if (!hUrlDump)
{ {
ShowError(__LINE__); ShowError(__LINE__);
return NULL; return NULL;
} }
} }
*dwDataSize = 0; // Allocate buffer with 3 extra bytes for triple null termination in case the string is
// invalid (e.g. when incorrectly using the UTF-16LE codepage for the data).
// Allocate the buffer. const int CHUNK_SIZE = 8192;
lpData = new BYTE[CHUNK_SIZE]; DWORD bufferSize = CHUNK_SIZE;
BYTE* buffer = (BYTE*)malloc(bufferSize + 3);
*dataSize = 0;
// Read the data.
do do
{ {
// Read the data. DWORD readSize;
if (!InternetReadFile(hUrlDump, (LPVOID)lpData, CHUNK_SIZE, &dwSize)) if (!InternetReadFile(hUrlDump, buffer + *dataSize, bufferSize - *dataSize, &readSize))
{ {
ShowError(__LINE__); ShowError(__LINE__);
break; break;
} }
else else if (readSize == 0)
{
// Check if all of the data has been read. This should
// never get called on the first time through the loop.
if (dwSize == 0)
{ {
// All data read.
break; break;
} }
// Determine the buffer size to hold the new data and the data *dataSize += readSize;
// already written (if any).
nBufferSize = *dwDataSize + dwSize;
// Allocate the output buffer. bufferSize += CHUNK_SIZE;
lpOutPut = new BYTE[nBufferSize + 3]; buffer = (BYTE*)realloc(buffer, bufferSize + 3);
// Make sure the buffer is not the initial buffer.
if (lpHolding != NULL)
{
// Copy the data in the holding buffer.
memcpy(lpOutPut, lpHolding, *dwDataSize);
// Delete the old buffer
delete [] lpHolding;
lpHolding = lpOutPut;
lpOutPut = lpOutPut + *dwDataSize;
}
else
{
lpHolding = lpOutPut;
} }
while (true);
// Copy the data buffer.
memcpy(lpOutPut, lpData, dwSize);
*dwDataSize += dwSize;
// End with triple null
lpOutPut[dwSize] = 0;
lpOutPut[dwSize + 1] = 0;
lpOutPut[dwSize + 2] = 0;
// Increment the number of buffers read.
++nCounter;
// Clear the buffer
memset(lpData, 0, CHUNK_SIZE);
}
} while (TRUE);
// Close the HINTERNET handle.
InternetCloseHandle(hUrlDump); InternetCloseHandle(hUrlDump);
// Delete the existing buffers. // Triple null terminate the buffer.
delete [] lpData; buffer[*dataSize] = 0;
buffer[*dataSize + 1] = 0;
buffer[*dataSize + 2] = 0;
// Return. return buffer;
return lpHolding;
} }
/* /*