From 9cdec950b6d7d6cabf8b81a414497e729773a8d6 Mon Sep 17 00:00:00 2001
From: PatrickvL <pvanlogchem@gmail.com>
Date: Fri, 11 Nov 2016 00:55:17 +0100
Subject: [PATCH] Corrections

---
 src/CxbxKrnl/EmuKrnl.cpp    | 14 ++++++--------
 src/CxbxKrnl/EmuXactEng.cpp |  5 ++++-
 src/CxbxKrnl/EmuXapi.cpp    | 37 +++++++++++++------------------------
 3 files changed, 23 insertions(+), 33 deletions(-)

diff --git a/src/CxbxKrnl/EmuKrnl.cpp b/src/CxbxKrnl/EmuKrnl.cpp
index 1e677b5a8..aaa5688d7 100644
--- a/src/CxbxKrnl/EmuKrnl.cpp
+++ b/src/CxbxKrnl/EmuKrnl.cpp
@@ -1741,8 +1741,6 @@ XBSYSAPI EXPORTNUM(47) VOID xboxkrnl::HalRegisterShutdownNotification
 		LOG_FUNC_END;
 
 	EmuWarning("HalRegisterShutdownNotification not implemented!\n");
-	
-		
 
 	return;
 }
@@ -2682,9 +2680,9 @@ XBSYSAPI EXPORTNUM(184) xboxkrnl::NTSTATUS NTAPI xboxkrnl::NtAllocateVirtualMemo
 )
 {
 	LOG_FUNC_BEGIN
-		LOG_FUNC_ARG_OUT(BaseAddress)
+		LOG_FUNC_ARG(BaseAddress)
 		LOG_FUNC_ARG(ZeroBits)
-		LOG_FUNC_ARG_OUT(AllocationSize)
+		LOG_FUNC_ARG(AllocationSize)
 		LOG_FUNC_ARG(AllocationType)
 		LOG_FUNC_ARG(Protect)
 		LOG_FUNC_END;
@@ -3083,8 +3081,8 @@ XBSYSAPI EXPORTNUM(199) xboxkrnl::NTSTATUS NTAPI xboxkrnl::NtFreeVirtualMemory
 )
 {
 	LOG_FUNC_BEGIN
-		LOG_FUNC_ARG_OUT(BaseAddress)
-		LOG_FUNC_ARG_OUT(FreeSize)
+		LOG_FUNC_ARG(BaseAddress)
+		LOG_FUNC_ARG(FreeSize)
 		LOG_FUNC_ARG(FreeType)
 		LOG_FUNC_END;
 
@@ -3167,8 +3165,8 @@ XBSYSAPI EXPORTNUM(205) xboxkrnl::NTSTATUS NTAPI xboxkrnl::NtProtectVirtualMemor
 )
 {
 	LOG_FUNC_BEGIN
-		LOG_FUNC_ARG_OUT(BaseAddress)
-		LOG_FUNC_ARG_OUT(RegionSize)
+		LOG_FUNC_ARG(BaseAddress)
+		LOG_FUNC_ARG(RegionSize)
 		LOG_FUNC_ARG(NewProtect)
 		LOG_FUNC_ARG_OUT(OldProtect)
 		LOG_FUNC_END;
diff --git a/src/CxbxKrnl/EmuXactEng.cpp b/src/CxbxKrnl/EmuXactEng.cpp
index 84e6922c8..4d332c656 100644
--- a/src/CxbxKrnl/EmuXactEng.cpp
+++ b/src/CxbxKrnl/EmuXactEng.cpp
@@ -333,7 +333,10 @@ HRESULT WINAPI XTL::EmuIXACTEngine_SetMasterVolume
 // ******************************************************************
 // * EmuIXACTEngine_CommitDeferredSettings
 // ******************************************************************
-HRESULT WINAPI XTL::EmuIXACTEngine_CommitDeferredSettings(X_XACTEngine* pThis)
+HRESULT WINAPI XTL::EmuIXACTEngine_CommitDeferredSettings
+(
+	X_XACTEngine* pThis
+)
 {
 	LOG_FUNC_ONE_ARG(pThis);
 
diff --git a/src/CxbxKrnl/EmuXapi.cpp b/src/CxbxKrnl/EmuXapi.cpp
index 1d0ee4e19..f532bdf36 100644
--- a/src/CxbxKrnl/EmuXapi.cpp
+++ b/src/CxbxKrnl/EmuXapi.cpp
@@ -190,10 +190,8 @@ VOID WINAPI XTL::EmuXInitDevices
     {
         g_hInputHandle[v] = 0;
     }
-
-    
-
-    return;
+	
+	return;
 }
 
 // ******************************************************************
@@ -213,9 +211,7 @@ DWORD WINAPI XTL::EmuXGetDevices
     else
         EmuWarning("Unknown DeviceType (0x%.08X, 0x%.08X, 0x%.08X)\n", DeviceType->Reserved[0], DeviceType->Reserved[1], DeviceType->Reserved[2]);
 
-    
-
-    return ret;
+	return ret;
 }
 
 // ******************************************************************
@@ -259,9 +255,7 @@ BOOL WINAPI XTL::EmuXGetDeviceChanges
         *pdwRemovals   = 0;
     }
 
-    
-
-    return TRUE; //bRet;
+	return TRUE; //bRet;
 }
 
 // ******************************************************************
@@ -332,9 +326,7 @@ HANDLE WINAPI XTL::EmuXInputOpen
 
 	g_bXInputOpenCalled = true;
 
-    
-
-    return (HANDLE)pph;
+	return (HANDLE)pph;
 }
 
 // ******************************************************************
@@ -463,9 +455,7 @@ DWORD WINAPI XTL::EmuXInputGetCapabilities
         }
     }
 
-    
-
-    return ret;
+	return ret;
 }
 
 // ******************************************************************
@@ -517,9 +507,7 @@ DWORD WINAPI XTL::EmuXInputGetState
 	else
 		EmuWarning( "EmuXInputGetState(): pph == NULL!" );
 
-    
-
-    return ret;
+	return ret;
 }
 
 // ******************************************************************
@@ -533,7 +521,7 @@ DWORD WINAPI XTL::EmuXInputSetState
 {
 	LOG_FUNC_BEGIN
 		LOG_FUNC_ARG(hDevice)
-		LOG_FUNC_ARG_OUT(pFeedback)
+		LOG_FUNC_ARG(pFeedback)
 		LOG_FUNC_END;
 
     DWORD ret = ERROR_IO_PENDING;
@@ -595,9 +583,7 @@ DWORD WINAPI XTL::EmuXInputSetState
         }
     }
 
-    
-
-    return ret;
+	return ret;
 }
 
 
@@ -1028,7 +1014,10 @@ DWORD WINAPI XTL::EmuSignalObjectAndWait
 // ******************************************************************
 // * func: EmuPulseEvent
 // ******************************************************************
-BOOL WINAPI XTL::EmuPulseEvent( HANDLE hEvent )
+BOOL WINAPI XTL::EmuPulseEvent
+( 
+	HANDLE hEvent 
+)
 {
 	LOG_FUNC_ONE_ARG(hEvent);