From 2b558a960616acbdae2a3e762dae5eec14993a64 Mon Sep 17 00:00:00 2001
From: Jonathan Li <jonathan.li@hotmail.co.uk>
Date: Sun, 14 Feb 2016 12:29:05 +0000
Subject: [PATCH] lilypad: Make command/response debug output portable

It also makes the log viewable in Windows Notepad.

Also fix an off-by-one and fix the missing C++ exception settings.
---
 plugins/LilyPad/LilyPad.cpp     | 70 ++++++++++++++++-----------------
 plugins/LilyPad/LilyPad.vcxproj |  4 --
 2 files changed, 33 insertions(+), 41 deletions(-)

diff --git a/plugins/LilyPad/LilyPad.cpp b/plugins/LilyPad/LilyPad.cpp
index a0ff878f56..d39662183f 100644
--- a/plugins/LilyPad/LilyPad.cpp
+++ b/plugins/LilyPad/LilyPad.cpp
@@ -19,6 +19,9 @@
 
 // For escape timer, so as not to break GSDX+DX9.
 #include <time.h>
+#include <fstream>
+#include <iomanip>
+#include <sstream>
 #include "resource.h"
 #include "InputManager.h"
 #include "Config.h"
@@ -109,55 +112,48 @@ int IsWindowMaximized (HWND hWnd) {
 #endif
 
 void DEBUG_TEXT_OUT(const char *text) {
-#ifdef _MSC_VER
-	if (config.debug) {
-		HANDLE hFile = CreateFileA("logs\\padLog.txt", FILE_APPEND_DATA, FILE_SHARE_READ, 0, OPEN_ALWAYS, 0, 0);
-		if (hFile != INVALID_HANDLE_VALUE) {
-			DWORD junk;
-			WriteFile(hFile, text, strlen(text), &junk, 0);
-			CloseHandle(hFile);;
-		}
-	}
-#endif
+	if (!config.debug)
+		return;
+
+	std::ofstream file("logs/padLog.txt", std::ios::app);
+	if (!file.good())
+		return;
+	file << text;
 }
 
 void DEBUG_NEW_SET() {
-#ifdef _MSC_VER
-	if (config.debug && bufSize>1) {
-		HANDLE hFile = CreateFileA("logs\\padLog.txt", FILE_APPEND_DATA, FILE_SHARE_READ, 0, OPEN_ALWAYS, 0, 0);
-		if (hFile != INVALID_HANDLE_VALUE) {
-			u32 i;
-			char temp[1500];
-			char *end = temp;
-			sprintf(end, "%02X (%02X) ", inBuf[0], inBuf[1]);
-			end += 8;
-			for (i=2; i<bufSize; i++) {
-				sprintf(end, "%02X ", inBuf[i]);
-				end += 3;
+	if (config.debug && bufSize > 1) {
+		std::ofstream file("logs/padLog.txt", std::ios::app);
+		if (file.good()) {
+			std::stringstream stream;
+			stream.setf(std::ios::hex, std::ios::basefield);
+			stream.setf(std::ios::uppercase);
+			stream.fill('0');
+
+			unsigned char *buffer[2] = {inBuf, outBuf};
+			for (const auto &buf : buffer) {
+				// Port/FF
+				stream << std::setw(2) << int(buf[0]);
+				// Active slots/Enabled (only relevant for multitap)
+				stream << " (" << std::setw(2) << int(buf[1]) << ')';
+
+				// Command/Response
+				for (u32 n = 2; n < bufSize; ++n)
+					stream << ' ' << std::setw(2) << int(buf[n]);
+				stream << '\n';
 			}
-			end[-1] = '\n';
-			sprintf(end, "%02X (%02X) ", outBuf[0], outBuf[1]);
-			end += 8;
-			for (i=2; i<bufSize; i++) {
-				sprintf(end, "%02X ", outBuf[i]);
-				end+=3;
-			}
-			end[-1] = '\n';
-			end++[0] = '\n';
-			DWORD junk;
-			WriteFile(hFile, temp, end-temp, &junk, 0);
-			CloseHandle(hFile);;
+			stream << '\n';
+			file << stream.rdbuf();
 		}
 	}
 	bufSize = 0;
-#endif
 }
 
 inline void DEBUG_IN(unsigned char c) {
-	if (bufSize < sizeof(inBuf)-1) inBuf[bufSize] = c;
+	if (bufSize < sizeof(inBuf)) inBuf[bufSize] = c;
 }
 inline void DEBUG_OUT(unsigned char c) {
-	if (bufSize < sizeof(outBuf)-1) outBuf[bufSize++] = c;
+	if (bufSize < sizeof(outBuf)) outBuf[bufSize++] = c;
 }
 
 struct Stick {
diff --git a/plugins/LilyPad/LilyPad.vcxproj b/plugins/LilyPad/LilyPad.vcxproj
index 6733410ae6..13bd0d2222 100644
--- a/plugins/LilyPad/LilyPad.vcxproj
+++ b/plugins/LilyPad/LilyPad.vcxproj
@@ -146,8 +146,6 @@
     </Midl>
     <ClCompile>
       <PreprocessorDefinitions>NDEBUG;_USRDLL;TEST_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExceptionHandling>
-      </ExceptionHandling>
       <PrecompiledHeader>Use</PrecompiledHeader>
       <PrecompiledHeaderFile>Global.h</PrecompiledHeaderFile>
       <CallingConvention>FastCall</CallingConvention>
@@ -227,8 +225,6 @@
       <WholeProgramOptimization>true</WholeProgramOptimization>
       <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;TEST_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
-      <ExceptionHandling>
-      </ExceptionHandling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <BufferSecurityCheck>false</BufferSecurityCheck>
       <FunctionLevelLinking>true</FunctionLevelLinking>