TF2 backpack now 100% fixed; numerous other small changes

README

@@ -1,4 +1,4 @@
-RInput Library v1.36 by Vols and Jezuz
+RInput Library v1.37 by Vols and Jezuz
 --------------------------------------
 RInput is an alternative to in-game raw input, which some users perceive as having input lag or other shortcomings. It also allows for raw input in games which do not have a native raw input implementation. In either case, RInput will only work for games that control aim using the Win32 API functions GetCursorPos and SetCursorPos.
 

README.mdown

@@ -1,4 +1,4 @@
-# RInput Library v1.36 by Vols and Jezuz
+# RInput Library v1.37 by Vols and Jezuz
 RInput is an alternative to in-game raw input, which some users perceive as having input lag or other shortcomings. It also allows for raw input in games which do not have a native raw input implementation. In either case, RInput will only work for games that control aim using the Win32 API functions GetCursorPos and SetCursorPos.
 
 ## Requirements

RInput.vcproj

@@ -62,6 +62,7 @@
 				WarningLevel="3"
 				Detect64BitPortabilityProblems="false"
 				DebugInformationFormat="3"
+				CallingConvention="0"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@@ -77,7 +78,7 @@
 				Name="VCLinkerTool"
 				UseUnicodeResponseFiles="false"
 				AdditionalDependencies="shlwapi.lib"
-				Version="1.36-debug"
+				Version="1.37-debug"
 				LinkIncremental="1"
 				AdditionalLibraryDirectories="&quot;C:\Program Files\Microsoft SDKs\Windows\v6.0A\Lib&quot;"
 				EnableUAC="true"
@@ -185,7 +186,7 @@
 				Name="VCLinkerTool"
 				UseUnicodeResponseFiles="false"
 				AdditionalDependencies="shlwapi.lib"
-				Version="1.36"
+				Version="1.37"
 				LinkIncremental="1"
 				AdditionalLibraryDirectories="&quot;C:\Program Files\Microsoft SDKs\Windows\v6.0A\Lib&quot;"
 				GenerateManifest="true"

main.cpp

@@ -94,7 +94,7 @@ extern "C" __declspec(dllexport) void entryPoint()
 #endif
 }
 
-// Validate that we are working with Windows XP or higher (required for raw input)
+// Validate that we are working with at least Windows XP
 inline bool validateVersion()
 {
 	DWORD dwVersion = GetVersion();

main.h

@@ -4,21 +4,21 @@
 #define STRICT
 #define WIN32_LEAN_AND_MEAN
 
-#define WINVER 0x0501			// XP atleast
-#define _WIN32_WINDOWS 0x0501	// XP atleast
-#define _WIN32_WINNT 0x0501		// XP atleast
+#define WINVER 0x0501			// Need at least Windows XP
+#define _WIN32_WINDOWS 0x0501	// Need at least Windows XP
+#define _WIN32_WINNT 0x0501		// Need at least Windows XP
 
-#define ERROR_BUFFER_SIZE 256	// amount of bytes to store an error string
+#define ERROR_BUFFER_SIZE 256	// Amount of bytes to store an error string
 
 #define EVENTNAME "RInputEvent32"
 #define KERNEL_LIB L"kernel32.dll"
 
 #include <windows.h>
-#include "rawinput.h" // raw input class
+#include "rawinput.h"	// Raw input class
 
 HINSTANCE g_hInstance = NULL;
 
-// only handle the hooking / dll functions here
+// Only handle the hooking and dll functions here
 extern "C" __declspec(dllexport) void entryPoint();
 inline bool validateVersion();
 void unloadLibrary();

rawinput.cpp

@@ -47,6 +47,7 @@ long CRawInput::hold_y = 0;
 int CRawInput::SCP = 0;
 bool CRawInput::GCP = false;
 bool CRawInput::sourceEXE = false;
+int CRawInput::consecG = 0;
 
 bool CRawInput::initialize(WCHAR* pwszError)
 {
@@ -95,8 +96,9 @@ bool CRawInput::initWindow(WCHAR* pwszError)
 
 bool CRawInput::initInput(WCHAR* pwszError)
 {
-	// Set default coordinates
-	CRawInput::x = CRawInput::y = CRawInput::set_x = CRawInput::set_y = 0;
+	// Set screen center until SetCursorPos is called
+	CRawInput::hold_x = GetSystemMetrics(SM_CXSCREEN) >> 1;
+	CRawInput::hold_y = GetSystemMetrics(SM_CYSCREEN) >> 1;
 
 	// Get process and enable bug fixes for source games
 	char szEXEPath[MAX_PATH];
@@ -181,13 +183,15 @@ LRESULT __stdcall CRawInput::wpInput(HWND hWnd, UINT message, WPARAM wParam, LPA
 
 int __stdcall CRawInput::hSetCursorPos(int x, int y)
 {
-	if (!TrmpSetCursorPos(x, y)) return 1;
+	// Skips unnecessary second SetCursorPos call for source games
+	if (!CRawInput::SCP && !TrmpSetCursorPos(x, y)) return 1;
 
 	CRawInput::set_x = (long)x;
 	CRawInput::set_y = (long)y;
 
 	if (CRawInput::sourceEXE)
 	{
+		CRawInput::consecG = 0;
 		// Alt-tab bug fix
 		if ((CRawInput::set_x == 0) && (CRawInput::set_y == 0))
 			CRawInput::GCP = true;
@@ -221,6 +225,21 @@ int __stdcall CRawInput::hGetCursorPos(LPPOINT lpPoint)
 	CRawInput::set_y += CRawInput::y;
 
 	CRawInput::SCP = 0;
+	// Bug fix for cursor hitting side of screen in TF2 backpack
+	if (CRawInput::consecG < 2)
+		++CRawInput::consecG;
+	if (CRawInput::sourceEXE && (CRawInput::consecG == 2))
+	{
+		if (CRawInput::set_x >= CRawInput::hold_x << 1)
+			CRawInput::set_x = (CRawInput::hold_x << 1) - 1;
+		else if (CRawInput::set_x < 0)
+			CRawInput::set_x = 0;
+		if (CRawInput::set_y >= CRawInput::hold_y << 1)
+			CRawInput::set_y = (CRawInput::hold_y << 1) - 1;
+		else if (CRawInput::set_y < 0)
+			CRawInput::set_y = 0;
+	}
+
 	// Alt-tab bug fix
 	if (!CRawInput::GCP)
 	{

rawinput.h

@@ -25,24 +25,24 @@ class CRawInput {
 	// Initialize raw input
 	static bool initialize(WCHAR* pwszError);
 
-	// Enable/Disable the hooking
+	// Enables or disables the hooking
 	static bool hookLibrary(bool bInstall);
 
 	// Hooked functions handling
 	static int __stdcall hGetCursorPos(LPPOINT lpPoint);
 	static int __stdcall hSetCursorPos(int x, int y);
 
-	// Poll Input
+	// Poll input
 	static unsigned int pollInput();
 
-	// Input Window Proc
+	// Input window proc
 	static LRESULT __stdcall wpInput(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam);
 
 	// Initialization
 	static bool initWindow(WCHAR* pwszError);
 	static bool initInput(WCHAR* pwszError);
 
-	// Unload Raw Input
+	// Unload raw input
 	static void unload();
 
 private:
@@ -55,6 +55,7 @@ class CRawInput {
 	static int SCP;
 	static bool GCP;
 	static bool sourceEXE;
+	static int consecG;
 
 	static HWND hwndInput;
 	static bool bRegistered;

versioninfo.h

@@ -1,8 +1,8 @@
 #ifndef _VERSIONINFO_H_
 #define _VERSIONINFO_H_
 
-#define RINPUTVER "v1.36"
-#define RINPUTFVER 1,36
+#define RINPUTVER "v1.37"
+#define RINPUTFVER 1,37
 #define IDI_ICON 101
 
 #define RINPUTINT "RInput"