AstralTransRocketries/ClassiCube
1
0
Fork 0
mirror of https://github.com/ClassiCube/ClassiCube.git synced 2025-09-13 09:35:23 -04:00
Code Issues Packages Projects Releases Wiki Activity

Windows 95: Now gets slightly worker with connecting to websites

Browse Source
This commit is contained in:
UnknownShadow200 2021-11-23 08:20:21 +11:00
parent c91ca242f2
commit 37ffee6a1c
1 changed files with 17 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/Http_Worker.c
View File

@ -428,8 +428,8 @@ typedef WORD INTERNET_PORT;
INETAPI BOOL WINAPI InternetCloseHandle(HINTERNET hInternet); INETAPI BOOL WINAPI InternetCloseHandle(HINTERNET hInternet);
INETAPI HINTERNET WINAPI InternetConnectA(HINTERNET hInternet, PCSTR serverName, INTERNET_PORT serverPort, PCSTR userName, PCSTR password, DWORD service, DWORD flags, DWORD_PTR context); INETAPI HINTERNET WINAPI InternetConnectA(HINTERNET hInternet, PCSTR serverName, INTERNET_PORT serverPort, PCSTR userName, PCSTR password, DWORD service, DWORD flags, DWORD_PTR context);
INETAPI HINTERNET WINAPI InternetOpenA(PCSTR agent, DWORD accessType, PCSTR lpszProxy, PCSTR proxyBypass, DWORD flags); INETAPI HINTERNET WINAPI InternetOpenA(PCSTR agent, DWORD accessType, PCSTR lpszProxy, PCSTR proxyBypass, DWORD flags);
INETAPI BOOL WINAPI InternetQueryOptionW(HINTERNET hInternet, DWORD option, PVOID buffer, DWORD* bufferLength); INETAPI BOOL WINAPI InternetQueryOptionA(HINTERNET hInternet, DWORD option, PVOID buffer, DWORD* bufferLength);
INETAPI BOOL WINAPI InternetSetOptionW(HINTERNET hInternet, DWORD option, PVOID buffer, DWORD bufferLength); INETAPI BOOL WINAPI InternetSetOptionA(HINTERNET hInternet, DWORD option, PVOID buffer, DWORD bufferLength);
INETAPI BOOL WINAPI InternetQueryDataAvailable(HINTERNET hFile, DWORD* numBytesAvailable, DWORD flags, DWORD_PTR context); INETAPI BOOL WINAPI InternetQueryDataAvailable(HINTERNET hFile, DWORD* numBytesAvailable, DWORD flags, DWORD_PTR context);
INETAPI BOOL WINAPI InternetReadFile(HINTERNET hFile, PVOID buffer, DWORD numBytesToRead, DWORD* numBytesRead); INETAPI BOOL WINAPI InternetReadFile(HINTERNET hFile, PVOID buffer, DWORD numBytesToRead, DWORD* numBytesRead);
INETAPI BOOL WINAPI HttpQueryInfoA(HINTERNET hRequest, DWORD infoLevel, PVOID buffer, DWORD* bufferLength, DWORD* index); INETAPI BOOL WINAPI HttpQueryInfoA(HINTERNET hRequest, DWORD infoLevel, PVOID buffer, DWORD* bufferLength, DWORD* index);
@ -552,11 +552,12 @@ static void Http_AddHeader(struct HttpRequest* req, const char* key, const cc_st
} }
/* Creates and sends a HTTP request */ /* Creates and sends a HTTP request */
static cc_result Http_StartRequest(struct HttpRequest* req, cc_string* url, HINTERNET* handle) { static cc_result Http_StartRequest(struct HttpRequest* req, cc_string* url) {
static const char* verbs[3] = { "GET", "HEAD", "POST" }; static const char* verbs[3] = { "GET", "HEAD", "POST" };
struct HttpCacheEntry entry; struct HttpCacheEntry entry;
cc_string path; char pathBuffer[URL_MAX_SIZE + 1]; cc_string path; char pathBuffer[URL_MAX_SIZE + 1];
DWORD flags, bufferLen; DWORD flags, bufferLen;
HINTERNET handle;
cc_result res; cc_result res;
String_InitArray_NT(path, pathBuffer); String_InitArray_NT(path, pathBuffer);
@ -567,22 +568,26 @@ static cc_result Http_StartRequest(struct HttpRequest* req, cc_string* url, HINT
flags = INTERNET_FLAG_NO_CACHE_WRITE | INTERNET_FLAG_NO_UI | INTERNET_FLAG_RELOAD | INTERNET_FLAG_NO_COOKIES; flags = INTERNET_FLAG_NO_CACHE_WRITE | INTERNET_FLAG_NO_UI | INTERNET_FLAG_RELOAD | INTERNET_FLAG_NO_COOKIES;
if (entry.Https) flags |= INTERNET_FLAG_SECURE; if (entry.Https) flags |= INTERNET_FLAG_SECURE;
*handle = HttpOpenRequestA(entry.Handle, verbs[req->requestType], handle = HttpOpenRequestA(entry.Handle, verbs[req->requestType], pathBuffer, NULL, NULL, NULL, flags, 0);
pathBuffer, NULL, NULL, NULL, flags, 0); /* Fallback for Windows 95 which returns ERROR_INVALID_PARAMETER */
req->meta = *handle; if (!handle) {
if (!req->meta) return GetLastError(); flags &= ~INTERNET_FLAG_NO_UI; /* INTERNET_FLAG_NO_UI unsupported on Windows 95 */
handle = HttpOpenRequestA(entry.Handle, verbs[req->requestType], pathBuffer, NULL, NULL, NULL, flags, 0);
if (!handle) return GetLastError();
}
req->meta = handle;
bufferLen = sizeof(flags); bufferLen = sizeof(flags);
InternetQueryOptionW(*handle, INTERNET_OPTION_SECURITY_FLAGS, (void*)&bufferLen, &flags); InternetQueryOptionA(handle, INTERNET_OPTION_SECURITY_FLAGS, (void*)&bufferLen, &flags);
/* Users have had issues in the past with revocation servers randomly being offline, */ /* Users have had issues in the past with revocation servers randomly being offline, */
/* which caused all https:// requests to fail. So just skip revocation check. */ /* which caused all https:// requests to fail. So just skip revocation check. */
flags |= SECURITY_FLAG_IGNORE_REVOCATION; flags |= SECURITY_FLAG_IGNORE_REVOCATION;
if (!httpsVerify) flags |= SECURITY_FLAG_IGNORE_UNKNOWN_CA; if (!httpsVerify) flags |= SECURITY_FLAG_IGNORE_UNKNOWN_CA;
InternetSetOptionW(*handle, INTERNET_OPTION_SECURITY_FLAGS, &flags, sizeof(flags)); InternetSetOptionA(handle, INTERNET_OPTION_SECURITY_FLAGS, &flags, sizeof(flags));
Http_SetRequestHeaders(req); Http_SetRequestHeaders(req);
return HttpSendRequestA(*handle, NULL, 0, req->data, req->size) ? 0 : GetLastError(); return HttpSendRequestA(handle, NULL, 0, req->data, req->size) ? 0 : GetLastError();
} }
/* Gets headers from a HTTP response */ /* Gets headers from a HTTP response */
@ -621,10 +626,11 @@ static cc_result Http_DownloadData(struct HttpRequest* req, HINTERNET handle) {
static cc_result HttpBackend_Do(struct HttpRequest* req, cc_string* url) { static cc_result HttpBackend_Do(struct HttpRequest* req, cc_string* url) {
HINTERNET handle; HINTERNET handle;
cc_result res = Http_StartRequest(req, url, &handle); cc_result res = Http_StartRequest(req, url);
HttpRequest_Free(req); HttpRequest_Free(req);
if (res) return res; if (res) return res;
handle = req->meta;
http_curProgress = HTTP_PROGRESS_FETCHING_DATA; http_curProgress = HTTP_PROGRESS_FETCHING_DATA;
res = Http_ProcessHeaders(req, handle); res = Http_ProcessHeaders(req, handle);
if (res) { InternetCloseHandle(handle); return res; } if (res) { InternetCloseHandle(handle); return res; }