Formatted the code

Author: Atvaark

Eldorado.HttpProxy/include/resource.h

@@ -1,3 +1,4 @@
+#pragma once
 #include <Windows.h>
 
 // WINHTTP_QUERY_RAW_HEADERS

Eldorado.HttpProxy/include/winhttp_functions.h

@@ -18,7 +18,8 @@ void Logger::Log(std::wstring message)
 	time_t time = std::time(nullptr);
 	tm localtime;
 	localtime_s(&localtime, &time);
-	log_stream << _T("[") << std::put_time(&localtime, _T("%d.%m.%Y %H:%M:%S")) << _T("] ") << message.c_str() << _T("\n") << std::flush;
+	log_stream << _T("[") << std::put_time(&localtime, _T("%d.%m.%Y %H:%M:%S")) << _T("] ");
+	log_stream << message.c_str() << _T("\n") << std::flush;
 }
 
 void Logger::LogFormat(const _TCHAR* format, ...)
@@ -31,7 +32,8 @@ void Logger::LogFormat(const _TCHAR* format, ...)
 	time_t time = std::time(nullptr);
 	tm localtime;
 	localtime_s(&localtime, &time);
-	log_stream << _T("[") << std::put_time(&localtime, _T("%d.%m.%Y %H:%M:%S")) << _T("] ") << message << _T("\n") << std::flush;
+	log_stream << _T("[") << std::put_time(&localtime, _T("%d.%m.%Y %H:%M:%S")) << _T("] ");
+	log_stream << message << _T("\n") << std::flush;
 	va_end(args);
 }
 

Eldorado.HttpProxy/source/Logger.cpp

@@ -1,8 +1,10 @@
+#include <string>
+
 #include <Windows.h>
 #include <tchar.h>
-#include "winhttp_functions.h"
 #include "Logger.h"
-#include <string>
+
+#include "winhttp_functions.h"
 
 // globals
 
@@ -71,8 +73,23 @@ HINTERNET WINAPI WinHttpOpenRequest(
 	IN DWORD dwFlags
 	)
 {
-	theLogger().LogFormatW(L"Calling WinHttpOpenRequest(%x, %s, %s, %s, %s, %s, %d)", hConnect, pwszVerb, pwszObjectName, pwszVersion, pwszReferrer, ppwszAcceptTypes, dwFlags);
-	HINTERNET result = oWinHttpOpenRequest(hConnect, pwszVerb, pwszObjectName, pwszVersion, pwszReferrer, ppwszAcceptTypes, dwFlags);
+	theLogger().LogFormatW(
+		L"Calling WinHttpOpenRequest(%x, %s, %s, %s, %s, %s, %d)",
+		hConnect,
+		pwszVerb,
+		pwszObjectName,
+		pwszVersion,
+		pwszReferrer,
+		ppwszAcceptTypes,
+		dwFlags);
+	HINTERNET result = oWinHttpOpenRequest(
+		hConnect,
+		pwszVerb,
+		pwszObjectName,
+		pwszVersion,
+		pwszReferrer,
+		ppwszAcceptTypes,
+		dwFlags);
 	theLogger().LogFormat(_T("WinHttpOpenRequest(%x, ...) returned %x"), hConnect, result);
 	return result;
 }
@@ -112,7 +129,11 @@ BOOL WINAPI WinHttpQueryHeaders(
 	default:
 		break;
 	}
-	theLogger().LogFormatW(L"WinHttpQueryHeaders(%x, %d, ... ) returned: %s: %s", hRequest, dwInfoLevel, headerName.c_str(), headerValue.c_str());
+	theLogger().LogFormatW(
+		L"WinHttpQueryHeaders(%x, %d, ... ) returned: %s: %s",
+		hRequest, dwInfoLevel,
+		headerName.c_str(),
+		headerValue.c_str());
 	return result;
 }
 
@@ -169,7 +190,14 @@ BOOL WINAPI WinHttpSendRequest(
 	std::string body = dwOptionalLength == -1 ? std::string(pBody) : std::string(pBody, dwOptionalLength);
 	theLogger().LogFormatA("WinHttpSendRequest(%x, ...) called with body: %s", hRequest, body.c_str());
 
-	return oWinHttpSendRequest(hRequest, lpszHeaders, dwHeadersLength, lpOptional, dwOptionalLength, dwTotalLength, dwContext);
+	return oWinHttpSendRequest(
+		hRequest,
+		lpszHeaders,
+		dwHeadersLength,
+		lpOptional,
+		dwOptionalLength,
+		dwTotalLength,
+		dwContext);
 }
 
 WINHTTP_STATUS_CALLBACK WINAPI WinHttpSetStatusCallback(
@@ -191,7 +219,13 @@ BOOL WINAPI WinHttpSetTimeouts(
 	IN int nReceiveTimeout
 	)
 {
-	theLogger().LogFormat(_T("Calling WinHttpSetTimeouts(%x, %d, %d, %d, %d)"), hInternet, nResolveTimeout, nConnectTimeout, nSendTimeout, nReceiveTimeout);
+	theLogger().LogFormat(
+		_T("Calling WinHttpSetTimeouts(%x, %d, %d, %d, %d)"),
+		hInternet,
+		nResolveTimeout,
+		nConnectTimeout,
+		nSendTimeout,
+		nReceiveTimeout);
 	return oWinHttpSetTimeouts(hInternet, nResolveTimeout, nConnectTimeout, nSendTimeout, nReceiveTimeout);
 }
 
@@ -260,14 +294,14 @@ HMODULE LoadOriginalDll()
 
 void InitializeDll(HINSTANCE hInstance)
 {
-	theLogger().LogFormat(_T("####################################################################################################"));
+	theLogger().LogFormat(_T("("###############################################"));
 	theLogger().LogFormat(_T("Initializing the winhttp proxy dll"));
 	DisableThreadLibraryCalls(hInstance);
 	g_proxy_dll_hInstance = hInstance;
 	g_original_dll_hInstance = LoadOriginalDll();
 	InitializeOriginalDllFunctions();
 	theLogger().LogFormat(_T("Proxy dll initialized"));
-	theLogger().LogFormat(_T("####################################################################################################"));
+	theLogger().LogFormat(_T("("###############################################"));
 }
 
 BOOL WINAPI DllMain(HINSTANCE hInstance, DWORD reason, LPVOID /*reserved*/)