Misc updates

- Update copyright to 2019 - Update Init logs - Simplify LoadLibrary - Fix IDirectType switche statements
elishacloud · Feb 15, 2019 · 584f62c · 584f62c
1 parent eb92904
commit 584f62c
Show file tree

Hide file tree

Showing 26 changed files with 44 additions and 39 deletions.
diff --git a/BuildNo.rc b/BuildNo.rc
@@ -1 +1 @@
-#define BUILD_NUMBER 13 
+#define BUILD_NUMBER 14 
diff --git a/IDirectInputDeviceX.cpp b/IDirectInputDeviceX.cpp
@@ -1,5 +1,5 @@
 /**
-* Copyright (C) 2018 Elisha Riedlinger
+* Copyright (C) 2019 Elisha Riedlinger
 *
 * This software is  provided 'as-is', without any express  or implied  warranty. In no event will the
 * authors be held liable for any damages arising from the use of this software.

diff --git a/IDirectInputEffect.cpp b/IDirectInputEffect.cpp
@@ -1,5 +1,5 @@
 /**
-* Copyright (C) 2018 Elisha Riedlinger
+* Copyright (C) 2019 Elisha Riedlinger
 *
 * This software is  provided 'as-is', without any express  or implied  warranty. In no event will the
 * authors be held liable for any damages arising from the use of this software.

diff --git a/IDirectInputEnum.cpp b/IDirectInputEnum.cpp
@@ -1,5 +1,5 @@
 /**
-* Copyright (C) 2018 Elisha Riedlinger
+* Copyright (C) 2019 Elisha Riedlinger
 *
 * This software is  provided 'as-is', without any express  or implied  warranty. In no event will the
 * authors be held liable for any damages arising from the use of this software.

diff --git a/IDirectInputTypes.cpp b/IDirectInputTypes.cpp
@@ -1,5 +1,5 @@
 /**
-* Copyright (C) 2018 Elisha Riedlinger
+* Copyright (C) 2019 Elisha Riedlinger
 *
 * This software is  provided 'as-is', without any express  or implied  warranty. In no event will the
 * authors be held liable for any damages arising from the use of this software.
@@ -27,20 +27,15 @@ DWORD ConvertDevTypeTo7(DWORD dwDevType)
 	{
 	case DI8DEVTYPE_DEVICE:
 		return DIDEVTYPE_DEVICE;
-		break;
 	case DI8DEVTYPE_MOUSE:
 		return DIDEVTYPE_MOUSE;
-		break;
 	case DI8DEVTYPE_KEYBOARD:
 		return DIDEVTYPE_KEYBOARD;
-		break;
 	case DI8DEVTYPE_JOYSTICK:
 	case DI8DEVTYPE_GAMEPAD:
 		return DIDEVTYPE_JOYSTICK;
-		break;
 	default:
 		return dwDevType;
-		break;
 	}
 }
 
@@ -50,18 +45,13 @@ DWORD ConvertDevTypeTo8(DWORD dwDevType)
 	{
 	case DIDEVTYPE_DEVICE:
 		return DI8DEVTYPE_DEVICE;
-		break;
 	case DIDEVTYPE_MOUSE:
 		return DI8DEVTYPE_MOUSE;
-		break;
 	case DIDEVTYPE_KEYBOARD:
 		return DI8DEVTYPE_KEYBOARD;
-		break;
 	case DIDEVTYPE_JOYSTICK:
 		return DI8DEVTYPE_GAMEPAD;
-		break;
 	default:
 		return dwDevType;
-		break;
 	}
 }
diff --git a/IDirectInputX.cpp b/IDirectInputX.cpp
@@ -1,5 +1,5 @@
 /**
-* Copyright (C) 2018 Elisha Riedlinger
+* Copyright (C) 2019 Elisha Riedlinger
 *
 * This software is  provided 'as-is', without any express  or implied  warranty. In no event will the
 * authors be held liable for any damages arising from the use of this software.
@@ -104,6 +104,7 @@ HRESULT m_IDirectInputX::CreateDeviceEx(REFGUID rguid, REFIID riid, T *ppvObj, L
 
 	if (SUCCEEDED(hr))
 	{
+		AddRef();
 		genericQueryInterface(riid, (LPVOID *)ppvObj);
 	}
 

diff --git a/InterfaceQuery.cpp b/InterfaceQuery.cpp
@@ -1,5 +1,5 @@
 /**
-* Copyright (C) 2018 Elisha Riedlinger
+* Copyright (C) 2019 Elisha Riedlinger
 *
 * This software is  provided 'as-is', without any express  or implied  warranty. In no event will the
 * authors be held liable for any damages arising from the use of this software.

diff --git a/License.txt b/License.txt
@@ -1,5 +1,5 @@
 /**
-* Copyright (C) 2018 Elisha Riedlinger
+* Copyright (C) 2019 Elisha Riedlinger
 *
 * This software is  provided 'as-is', without any express  or implied  warranty. In no event will the
 * authors be held liable for any damages arising from the use of this software.

diff --git a/Logging/License.txt b/Logging/License.txt
@@ -0,0 +1,15 @@
+/**
+* Copyright (C) 2019 Elisha Riedlinger
+*
+* This software is  provided 'as-is', without any express  or implied  warranty. In no event will the
+* authors be held liable for any damages arising from the use of this software.
+* Permission  is granted  to anyone  to use  this software  for  any  purpose,  including  commercial
+* applications, and to alter it and redistribute it freely, subject to the following restrictions:
+*
+*   1. The origin of this software must not be misrepresented; you must not claim that you  wrote the
+*      original  software. If you use this  software  in a product, an  acknowledgment in the product
+*      documentation would be appreciated but is not required.
+*   2. Altered source versions must  be plainly  marked as such, and  must not be  misrepresented  as
+*      being the original software.
+*   3. This notice may not be removed or altered from any source distribution.
+*/
diff --git a/Logging/Logging.cpp b/Logging/Logging.cpp
@@ -1,5 +1,5 @@
 /**
-* Copyright (C) 2018 Elisha Riedlinger
+* Copyright (C) 2019 Elisha Riedlinger
 *
 * This software is  provided 'as-is', without any express  or implied  warranty. In no event will the
 * authors be held liable for any damages arising from the use of this software.

diff --git a/README.md b/README.md
@@ -17,7 +17,7 @@ Delete the `dinput.dll` files from the game's directory. You can also delete the
 There are no configuration options for dinputto8.
 
 ### License
-Copyright (C) 2018 Elisha Riedlinger
+Copyright (C) 2019 Elisha Riedlinger
 
 This software is provided 'as-is', without any express or implied warranty. In no event will the author(s) be held liable for any damages arising from the use of this software. Permission is granted to anyone to use this software for any purpose, including commercial applications, and to alter it and redistribute it freely, subject to the following restrictions:
 

diff --git a/Versions/IDirectInput2A.cpp b/Versions/IDirectInput2A.cpp
@@ -1,5 +1,5 @@
 /**
-* Copyright (C) 2018 Elisha Riedlinger
+* Copyright (C) 2019 Elisha Riedlinger
 *
 * This software is  provided 'as-is', without any express  or implied  warranty. In no event will the
 * authors be held liable for any damages arising from the use of this software.

diff --git a/Versions/IDirectInput2W.cpp b/Versions/IDirectInput2W.cpp
@@ -1,5 +1,5 @@
 /**
-* Copyright (C) 2018 Elisha Riedlinger
+* Copyright (C) 2019 Elisha Riedlinger
 *
 * This software is  provided 'as-is', without any express  or implied  warranty. In no event will the
 * authors be held liable for any damages arising from the use of this software.

diff --git a/Versions/IDirectInput7A.cpp b/Versions/IDirectInput7A.cpp
@@ -1,5 +1,5 @@
 /**
-* Copyright (C) 2018 Elisha Riedlinger
+* Copyright (C) 2019 Elisha Riedlinger
 *
 * This software is  provided 'as-is', without any express  or implied  warranty. In no event will the
 * authors be held liable for any damages arising from the use of this software.

diff --git a/Versions/IDirectInput7W.cpp b/Versions/IDirectInput7W.cpp
@@ -1,5 +1,5 @@
 /**
-* Copyright (C) 2018 Elisha Riedlinger
+* Copyright (C) 2019 Elisha Riedlinger
 *
 * This software is  provided 'as-is', without any express  or implied  warranty. In no event will the
 * authors be held liable for any damages arising from the use of this software.

diff --git a/Versions/IDirectInputA.cpp b/Versions/IDirectInputA.cpp
@@ -1,5 +1,5 @@
 /**
-* Copyright (C) 2018 Elisha Riedlinger
+* Copyright (C) 2019 Elisha Riedlinger
 *
 * This software is  provided 'as-is', without any express  or implied  warranty. In no event will the
 * authors be held liable for any damages arising from the use of this software.

diff --git a/Versions/IDirectInputDevice2A.cpp b/Versions/IDirectInputDevice2A.cpp
@@ -1,5 +1,5 @@
 /**
-* Copyright (C) 2018 Elisha Riedlinger
+* Copyright (C) 2019 Elisha Riedlinger
 *
 * This software is  provided 'as-is', without any express  or implied  warranty. In no event will the
 * authors be held liable for any damages arising from the use of this software.

diff --git a/Versions/IDirectInputDevice2W.cpp b/Versions/IDirectInputDevice2W.cpp
@@ -1,5 +1,5 @@
 /**
-* Copyright (C) 2018 Elisha Riedlinger
+* Copyright (C) 2019 Elisha Riedlinger
 *
 * This software is  provided 'as-is', without any express  or implied  warranty. In no event will the
 * authors be held liable for any damages arising from the use of this software.

diff --git a/Versions/IDirectInputDevice7A.cpp b/Versions/IDirectInputDevice7A.cpp
@@ -1,5 +1,5 @@
 /**
-* Copyright (C) 2018 Elisha Riedlinger
+* Copyright (C) 2019 Elisha Riedlinger
 *
 * This software is  provided 'as-is', without any express  or implied  warranty. In no event will the
 * authors be held liable for any damages arising from the use of this software.

diff --git a/Versions/IDirectInputDevice7W.cpp b/Versions/IDirectInputDevice7W.cpp
@@ -1,5 +1,5 @@
 /**
-* Copyright (C) 2018 Elisha Riedlinger
+* Copyright (C) 2019 Elisha Riedlinger
 *
 * This software is  provided 'as-is', without any express  or implied  warranty. In no event will the
 * authors be held liable for any damages arising from the use of this software.

diff --git a/Versions/IDirectInputDeviceA.cpp b/Versions/IDirectInputDeviceA.cpp
@@ -1,5 +1,5 @@
 /**
-* Copyright (C) 2018 Elisha Riedlinger
+* Copyright (C) 2019 Elisha Riedlinger
 *
 * This software is  provided 'as-is', without any express  or implied  warranty. In no event will the
 * authors be held liable for any damages arising from the use of this software.

diff --git a/Versions/IDirectInputDeviceW.cpp b/Versions/IDirectInputDeviceW.cpp
@@ -1,5 +1,5 @@
 /**
-* Copyright (C) 2018 Elisha Riedlinger
+* Copyright (C) 2019 Elisha Riedlinger
 *
 * This software is  provided 'as-is', without any express  or implied  warranty. In no event will the
 * authors be held liable for any damages arising from the use of this software.

diff --git a/Versions/IDirectInputW.cpp b/Versions/IDirectInputW.cpp
@@ -1,5 +1,5 @@
 /**
-* Copyright (C) 2018 Elisha Riedlinger
+* Copyright (C) 2019 Elisha Riedlinger
 *
 * This software is  provided 'as-is', without any express  or implied  warranty. In no event will the
 * authors be held liable for any damages arising from the use of this software.

diff --git a/Versions/License.txt b/Versions/License.txt
@@ -1,5 +1,5 @@
 /**
-* Copyright (C) 2018 Elisha Riedlinger
+* Copyright (C) 2019 Elisha Riedlinger
 *
 * This software is  provided 'as-is', without any express  or implied  warranty. In no event will the
 * authors be held liable for any damages arising from the use of this software.

diff --git a/dinputto8.cpp b/dinputto8.cpp
@@ -1,5 +1,5 @@
 /**
-* Copyright (C) 2018 Elisha Riedlinger
+* Copyright (C) 2019 Elisha Riedlinger
 *
 * This software is  provided 'as-is', without any express  or implied  warranty. In no event will the
 * authors be held liable for any damages arising from the use of this software.
@@ -44,17 +44,16 @@ void InitDinput8()
 	// Init logs
 #ifdef NOLOGGING
 	Logging::EnableLogging = false;
-#endif
+#else
 	Logging::Open("dinput.log");
 	Logging::Log() << "Starting dinputto8 v" << APP_VERSION;
 	Logging::LogComputerManufacturer();
 	Logging::LogOSVersion();
 	Logging::LogProcessNameAndPID();
+#endif
 
 	// Load dll
-	char path[MAX_PATH];
-	strcpy_s(path, "dinput8.dll");
-	HMODULE dinput8dll = LoadLibraryA(path);
+	HMODULE dinput8dll = LoadLibraryA("dinput8.dll");
 
 	// Get function addresses
 	m_pDirectInput8Create = (DirectInput8CreateProc)GetProcAddress(dinput8dll, "DirectInput8Create");

diff --git a/resource.h b/resource.h
@@ -12,7 +12,7 @@
 #define APP_REVISION			0
 #define APP_COMPANYNAME			"Sadrate Presents"
 #define APP_DESCRPTION			"Converts DirectInput 1-7 (dinput.dll) to DirectInput 8 (dinput8.dll) for older games."
-#define APP_COPYRIGHT			"Copyright (C) 2018 Elisha Riedlinger"
+#define APP_COPYRIGHT			"Copyright (C) 2019 Elisha Riedlinger"
 #define APP_ORIGINALVERSION		"dinput.dll"
 #define APP_INTERNALNAME		"dinputto8"