fix: i forgot to make this wide too

4J_Input/4J_Input.vcxproj

@@ -239,9 +239,9 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <ClCompile>
       <WarningLevel>Level3</WarningLevel>
-      <Optimization>MaxSpeed</Optimization>
+      <Optimization>Full</Optimization>
       <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <IntrinsicFunctions>false</IntrinsicFunctions>
       <PreprocessorDefinitions>_WINDOWS64;NDEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <SDLCheck>true</SDLCheck>
       <AdditionalIncludeDirectories>../Headers/Windows64;../Headers;$(ProjectDir);$(ProjectDir)Windows64\vendor\SDL\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
@@ -249,6 +249,7 @@
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
       <CompileAs>CompileAsCpp</CompileAs>
+      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>

4J_Input/4J_Input.vcxproj.filters

@@ -293,9 +293,6 @@
     </ClInclude>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="Windows64\4J_Input.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="Windows64\INP_ForceFeedback.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
@@ -314,5 +311,8 @@
     <ClCompile Include="stdafx.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="Windows64\4J_Input.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
 </Project>

4J_Input/Windows64/4J_Input.cpp

@@ -32,7 +32,6 @@ CKeyboard InternalKeyboard;
 void C_4JInput::Initialise(int iInputStateC, unsigned char ucMapC, unsigned char ucActionC, unsigned char ucMenuActionC)
 {
     InternalInputManager.Initialise(iInputStateC, ucMapC, ucActionC, ucMenuActionC);
-	InternalKeyboard.Init();
 }
 
 void C_4JInput::Tick(void)
@@ -40,10 +39,6 @@ void C_4JInput::Tick(void)
     InternalInputManager.Tick();
 }
 
-void C_4JInput::TickKBM(void)
-{
-	InternalKeyboard.Tick();
-}
 void C_4JInput::SetDeadzoneAndMovementRange(unsigned int uiDeadzone, unsigned int uiMovementRangeMax)
 {
     InternalInputManager.SetDeadzoneAndMovementRange(uiDeadzone, uiMovementRangeMax);
@@ -79,11 +74,6 @@ unsigned int C_4JInput::GetValue(int iPad, unsigned char ucAction, bool bRepeat)
     return InternalInputManager.GetValue(iPad, ucAction, bRepeat);
 }
 
-void C_4JInput::MapTouchInput(int iPad, int button)
-{
-    InternalInputManager.MapTouchInput(iPad, button);
-}
-
 bool C_4JInput::ButtonPressed(int iPad, unsigned char ucAction)
 {
     return InternalInputManager.ButtonPressed(iPad, ucAction);
@@ -129,11 +119,6 @@ bool C_4JInput::IsPadConnected(int iPad)
     return InternalInputManager.IsPadConnected(iPad);
 }
 
-bool C_4JInput::IsPadActive(int iPad)
-{
-	return InternalInputManager.IsPadActive(iPad);
-}
-
 float C_4JInput::GetJoypadStick_LX(int iPad, bool bCheckMenuDisplay)
 {
     return InternalInputManager.GetJoypadStick_LX(iPad, bCheckMenuDisplay);
@@ -169,171 +154,6 @@ void C_4JInput::SetMenuDisplayed(int iPad, bool bVal)
     InternalInputManager.SetMenuDisplayed(iPad, bVal);
 }
 
-void C_4JInput::OnKeyDown(int vkCode)
-{
-	InternalKeyboard.OnKeyDown(vkCode);
-}
-
-void C_4JInput::OnKeyUp(int vkCode)
-{
-	InternalKeyboard.OnKeyUp(vkCode);
-}
-
-void C_4JInput::OnChar(wchar_t ch)
-{
-	InternalKeyboard.OnChar(ch);
-}
-
-bool C_4JInput::IsKeyDown(int vkCode) const
-{
-	return InternalKeyboard.IsKeyDown(vkCode);
-}
-
-bool C_4JInput::IsKeyPressed(int vkCode) const
-{
-	return InternalKeyboard.IsKeyPressed(vkCode);
-}
-
-bool C_4JInput::IsKeyReleased(int vkCode) const
-{
-	return InternalKeyboard.IsKeyReleased(vkCode);
-}
-
-int C_4JInput::GetMouseX() const
-{
-	return InternalKeyboard.GetMouseX();
-}
-
-int C_4JInput::GetMouseY() const
-{
-	return InternalKeyboard.GetMouseY();
-}
-
-bool C_4JInput::IsMouseLDown() const
-{
-	return InternalKeyboard.IsLButtonDown();
-}
-
-bool C_4JInput::IsLButtonPressed() const
-{
-	return InternalKeyboard.IsLButtonPressed();
-}
-
-bool C_4JInput::IsLButtonReleased() const
-{
-	return InternalKeyboard.IsLButtonReleased();
-}
-
-bool C_4JInput::IsMouseRDown() const
-{
-	return InternalKeyboard.IsRButtonDown();
-}
-
-bool C_4JInput::IsRButtonPressed() const
-{
-	return InternalKeyboard.IsRButtonPressed();
-}
-
-bool C_4JInput::IsRButtonReleased() const
-{
-	return InternalKeyboard.IsRButtonReleased();
-}
-
-int C_4JInput::GetMouseWheelDelta() const
-{
-	return InternalKeyboard.GetMouseWheelDelta();
-}
-
-wchar_t C_4JInput::GetLastChar() const
-{
-	return InternalKeyboard.GetLastChar();
-}
-
-bool C_4JInput::HasChar() const
-{
-	return InternalKeyboard.HasChar();
-}
-
-wchar_t C_4JInput::GetChar(int index) const
-{
-	return InternalKeyboard.GetChar(index);
-}
-
-void C_4JInput::OnMouseMove(int x, int y)
-{
-	InternalKeyboard.OnMouseMove(x, y);
-}
-
-void C_4JInput::OnRawMouseDelta(int dx, int dy)
-{
-	InternalKeyboard.OnRawMouseDelta(dx, dy);
-}
-
-void C_4JInput::OnLButtonDown(int x, int y)
-{
-	InternalKeyboard.OnLButtonDown(x, y);
-}
-
-void C_4JInput::OnLButtonUp(int x, int y)
-{
-	InternalKeyboard.OnLButtonUp(x, y);
-}
-
-void C_4JInput::OnRButtonDown(int x, int y)
-{
-	InternalKeyboard.OnRButtonDown(x, y);
-}
-
-void C_4JInput::OnRButtonUp(int x, int y)
-{
-	InternalKeyboard.OnRButtonUp(x, y);
-}
-
-void C_4JInput::OnMButtonDown(int x, int y)
-{
-	InternalKeyboard.OnMButtonDown(x, y);
-}
-
-void C_4JInput::OnMButtonUp(int x, int y)
-{
-	InternalKeyboard.OnMButtonUp(x, y);
-}
-
-void C_4JInput::OnMouseWheel(int delta, int x, int y)
-{
-	InternalKeyboard.OnMouseWheel(delta, x, y);
-}
-
-void C_4JInput::SetMouseCaptured(bool captured)
-{
-	InternalKeyboard.SetMouseCaptured(captured);
-}
-
-void C_4JInput::SetWindowFocused(bool focused)
-{
-	InternalKeyboard.SetWindowFocused(focused);
-}
-
-bool C_4JInput::IsMouseCaptured() const
-{
-	return InternalKeyboard.IsMouseCaptured();
-}
-
-void C_4JInput::SetMousePos(int x, int y)
-{
-	InternalKeyboard.SetMousePos(x, y);
-}
-
-int C_4JInput::GetRawMouseX() const
-{
-	return InternalKeyboard.GetRawMouseX();
-}
-
-int C_4JInput::GetRawMouseY() const
-{
-	return InternalKeyboard.GetRawMouseY();
-}
-
 EKeyboardResult C_4JInput::RequestKeyboard(LPCWSTR Title, LPCWSTR Text, DWORD dwPad, UINT uiMaxChars, int (*Func)(LPVOID, const bool), LPVOID lpParam,
                                            C_4JInput::EKeyboardMode eMode)
 {

4J_Input/Windows64/INP_Keyboard.cpp

@@ -24,231 +24,7 @@ SOFTWARE.
 
 #include "INP_Keyboard.h"
 
-CKeyboard::CKeyboard()
-{
-    m_lParam = nullptr;
-    m_onInput = nullptr;
-    ZeroMemory(m_chrText, sizeof(m_chrText));
-
-	memset(m_keysPrev, 0, sizeof(m_keysPrev));
-	memset(m_keysCurr, 0, sizeof(m_keysCurr));
-	m_mouseX = m_mouseY = 0;
-	m_lButtonPrev = m_lButtonCurr = false;
-	m_rButtonPrev = m_rButtonCurr = false;
-	m_mButtonPrev = m_mButtonCurr = false;
-	m_mouseWheel = 0;
-	memset(m_charBuffer, 0, sizeof(m_charBuffer));
-	m_charCount = 0;
-	m_mouseCaptured = false;
-	m_mouseDeltaX = m_mouseDeltaY = 0;
-	m_windowFocused = true;
-}
-
-void CKeyboard::Init()
-{
-	RAWINPUTDEVICE rid;
-	rid.usUsagePage = 0x01; // HID_USAGE_PAGE_GENERIC
-	rid.usUsage = 0x02;     // HID_USAGE_GENERIC_MOUSE
-	rid.dwFlags = 0;
-	rid.hwndTarget = g_hWnd;
-	RegisterRawInputDevices(&rid, 1, sizeof(rid));
-}
-
-void CKeyboard::Tick(void)
-{
-	memcpy(m_keysPrev, m_keysCurr, sizeof(m_keysCurr));
-	m_lButtonPrev = m_lButtonCurr;
-	m_rButtonPrev = m_rButtonCurr;
-	m_mButtonPrev = m_mButtonCurr;
-	m_mouseWheel = 0;
-	m_charCount = 0;
-	m_mouseDeltaX = m_mouseDeltaAccumX;
-	m_mouseDeltaY = m_mouseDeltaAccumY;
-	m_mouseDeltaAccumX = 0;
-	m_mouseDeltaAccumY = 0;
-
-	if (m_mouseCaptured && g_hWnd && m_windowFocused && g_hWnd)
-	{
-		RECT rc;
-		GetClientRect(g_hWnd, &rc);
-		POINT center;
-		center.x = (rc.right - rc.left) / 2;
-		center.y = (rc.bottom - rc.top) / 2;
-		ClientToScreen(g_hWnd, &center);
-		SetCursorPos(center.x, center.y);
-	}
-}
-
-void CKeyboard::OnKeyDown(int vkCode)
-{
-	if (vkCode >= 0 && vkCode < MAX_KEYS)
-	{
-		m_keysCurr[vkCode] = true;
-	}
-}
-
-void CKeyboard::OnKeyUp(int vkCode)
-{
-	if (vkCode >= 0 && vkCode < MAX_KEYS)
-	{
-		m_keysCurr[vkCode] = false;
-	}
-}
-
-void CKeyboard::OnChar(wchar_t ch)
-{
-	if (m_charCount < MAX_CHARS_PER_FRAME)
-	{
-		m_charBuffer[m_charCount++] = ch;
-	}
-}
-
-bool CKeyboard::IsKeyDown(int vkCode) const
-{
-	if (vkCode >= 0 && vkCode < MAX_KEYS)
-		return m_keysCurr[vkCode];
-	return false;
-}
-
-bool CKeyboard::IsKeyPressed(int vkCode) const
-{
-	if (vkCode >= 0 && vkCode < MAX_KEYS)
-		return m_keysCurr[vkCode] && !m_keysPrev[vkCode];
-	return false;
-}
-
-bool CKeyboard::IsKeyReleased(int vkCode) const
-{
-	if (vkCode >= 0 && vkCode < MAX_KEYS)
-		return !m_keysCurr[vkCode] && m_keysPrev[vkCode];
-	return false;
-}
-
-void CKeyboard::OnMouseMove(int x, int y)
-{
-	m_mouseX = x;
-	m_mouseY = y;
-}
-
-void CKeyboard::OnRawMouseDelta(int dx, int dy)
-{
-	m_mouseDeltaAccumX += dx;
-	m_mouseDeltaAccumY += dy;
-}
-
-void CKeyboard::OnLButtonDown(int x, int y)
-{
-	m_mouseX = x;
-	m_mouseY = y;
-	m_lButtonCurr = true;
-}
-
-void CKeyboard::OnLButtonUp(int x, int y)
-{
-	m_mouseX = x;
-	m_mouseY = y;
-	m_lButtonCurr = false;
-}
-
-void CKeyboard::OnRButtonDown(int x, int y)
-{
-	m_mouseX = x;
-	m_mouseY = y;
-	m_rButtonCurr = true;
-}
-
-void CKeyboard::OnRButtonUp(int x, int y)
-{
-	m_mouseX = x;
-	m_mouseY = y;
-	m_rButtonCurr = false;
-}
-
-void CKeyboard::OnMButtonDown(int x, int y)
-{
-	m_mouseX = x;
-	m_mouseY = y;
-	m_mButtonCurr = true;
-}
-
-void CKeyboard::OnMButtonUp(int x, int y)
-{
-	m_mouseX = x;
-	m_mouseY = y;
-	m_mButtonCurr = false;
-}
-
-void CKeyboard::OnMouseWheel(int delta, int x, int y)
-{
-	m_mouseX = x;
-	m_mouseY = y;
-	m_mouseWheel += delta;
-}
-
-void CKeyboard::SetMouseCaptured(bool grabbed)
-{
-	if (m_mouseCaptured == grabbed)
-		return;
-
-	m_mouseCaptured = grabbed;
-	if (grabbed && g_hWnd)
-	{
-		while (ShowCursor(FALSE) >= 0) {}
-		RECT rc;
-		GetClientRect(g_hWnd, &rc);
-		POINT topLeft = { rc.left, rc.top };
-		POINT bottomRight = { rc.right, rc.bottom };
-		ClientToScreen(g_hWnd, &topLeft);
-		ClientToScreen(g_hWnd, &bottomRight);
-		RECT clipRect = { topLeft.x, topLeft.y, bottomRight.x, bottomRight.y };
-		ClipCursor(&clipRect);
-
-		GetClientRect(g_hWnd, &rc);
-		POINT center;
-		center.x = (rc.right - rc.left) / 2;
-		center.y = (rc.bottom - rc.top) / 2;
-		ClientToScreen(g_hWnd, &center);
-		SetCursorPos(center.x, center.y);
-
-		m_mouseDeltaAccumX = 0;
-		m_mouseDeltaAccumY = 0;
-	}
-	else if (!grabbed && g_hWnd)
-	{
-		while (ShowCursor(TRUE) < 0) {}
-		ClipCursor(nullptr);
-	}
-}
-
-void CKeyboard::SetWindowFocused(bool focused)
-{
-	m_windowFocused = focused;
-	if (focused)
-	{
-		if (m_mouseCaptured)
-		{
-			while (ShowCursor(FALSE) >= 0) {}
-			RECT rc;
-			GetClientRect(g_hWnd, &rc);
-			POINT center;
-			center.x = (rc.right - rc.left) / 2;
-			center.y = (rc.bottom - rc.top) / 2;
-			ClientToScreen(g_hWnd, &center);
-			SetCursorPos(center.x, center.y);
-		}
-		else
-		{
-			while (ShowCursor(TRUE) < 0) {}
-			ClipCursor(nullptr);
-		}
-	}
-	else
-	{
-		while (ShowCursor(TRUE) < 0) {}
-		ClipCursor(nullptr);
-	}
-}
-
+void CKeyboard::Tick(void) {}
 
 EKeyboardResult CKeyboard::RequestKeyboard(LPCWSTR Title, LPCWSTR Text, DWORD dwPad, UINT uiMaxChars, int (*Func)(LPVOID, const bool), LPVOID lpParam,
                                            C_4JInput::EKeyboardMode eMode)

4J_Input/Windows64/INP_Keyboard.h

@@ -32,8 +32,6 @@ void SeedEditBox();
 class CKeyboard
 {
 public:
-	CKeyboard();
-
     enum EKeyboardProcessState
     {
     };
@@ -42,83 +40,11 @@ public:
     {
     };
 
-	void Init();
-	void Tick();
+    void Tick(void);
 
-	void OnKeyDown(int vkCode);
-	void OnKeyUp(int vkCode);
-	void OnChar(wchar_t ch);
-
-	void OnMouseMove(int x, int y);
-	void OnRawMouseDelta(int dx, int dy);
-	void OnLButtonDown(int x, int y);
-	void OnLButtonUp(int x, int y);
-	void OnRButtonDown(int x, int y);
-	void OnRButtonUp(int x, int y);
-	void OnMButtonDown(int x, int y);
-	void OnMButtonUp(int x, int y);
-	void OnMouseWheel(int delta, int x, int y);
-
-	bool IsKeyDown(int vkCode) const;
-	bool IsKeyPressed(int vkCode) const;
-	bool IsKeyReleased(int vkCode) const;
-
-	int GetMouseX() const { return m_mouseX; }
-	int GetMouseY() const { return m_mouseY; }
-
-	int GetRawMouseX() const { return m_mouseDeltaX; }
-	int GetRawMouseY() const { return m_mouseDeltaY; }
-
-	bool IsLButtonDown() const { return m_lButtonCurr; }
-	bool IsLButtonPressed() const { return m_lButtonCurr && !m_lButtonPrev; }
-	bool IsLButtonReleased() const { return !m_lButtonCurr && m_lButtonPrev; }
-
-	bool IsRButtonDown() const { return m_rButtonCurr; }
-	bool IsRButtonPressed() const { return m_rButtonCurr && !m_rButtonPrev; }
-	bool IsRButtonReleased() const { return !m_rButtonCurr && m_rButtonPrev; }
-
-	int GetMouseWheelDelta() const { return m_mouseWheel; }
-
-	wchar_t GetLastChar() const { return m_charCount > 0 ? m_charBuffer[0] : 0; }
-	bool HasChar() const { return m_charCount > 0; }
-	int GetCharCount() const { return m_charCount; }
-	wchar_t GetChar(int index) const { return (index >= 0 && index < m_charCount) ? m_charBuffer[index] : 0; }
-
-	void SetMouseCaptured(bool captured);
-	void SetWindowFocused(bool focused);
-	bool IsMouseCaptured() const { return m_mouseCaptured; }
-
-	void SetMousePos(int x, int y) { m_mouseX = x; m_mouseY = y; }
-	
-	EKeyboardResult RequestKeyboard(LPCWSTR Title, LPCWSTR Text, DWORD dwPad, UINT uiMaxChars, int (*Func)(LPVOID, const bool), LPVOID lpParam,
+    EKeyboardResult RequestKeyboard(LPCWSTR Title, LPCWSTR Text, DWORD dwPad, UINT uiMaxChars, int (*Func)(LPVOID, const bool), LPVOID lpParam,
                                     C_4JInput::EKeyboardMode eMode);
     void GetText(uint16_t *UTF16String);
 
-
     BYTE gap0[0x68];
-private:
-	static const int MAX_KEYS = 256;
-	static const int MAX_CHARS_PER_FRAME = 32;
-
-	bool m_keysPrev[MAX_KEYS];
-	bool m_keysCurr[MAX_KEYS];
-
-	int m_mouseX, m_mouseY;
-	bool m_lButtonPrev, m_lButtonCurr;
-	bool m_rButtonPrev, m_rButtonCurr;
-	bool m_mButtonPrev, m_mButtonCurr;
-	int m_mouseWheel;
-
-	wchar_t m_charBuffer[MAX_CHARS_PER_FRAME];
-	int m_charCount;
-
-	bool m_windowFocused;
-	bool m_mouseCaptured;
-	int m_mouseDeltaX, m_mouseDeltaY;
-	int m_mouseDeltaAccumX, m_mouseDeltaAccumY;
-
-	wchar_t m_chrText[128];
-	LPVOID m_lParam;
-    int (*m_onInput)(LPVOID, LPCWSTR);
-	
 };

4J_Input/Windows64/INP_Main.cpp

@@ -29,6 +29,8 @@ CInput InternalInputManager;
 
 CInput::CInput()
 {
+    m_Keyboard = CKeyboard();
+
     m_uiSigninJoypadMask = 0;
     for (int i = 0; i < 4; ++i)
         m_bIsMenuDisplayed[i] = 0;
@@ -75,8 +77,6 @@ void CInput::Initialise(int iInputStateC, unsigned char ucMapC, unsigned char uc
         m_Joypads[i].m_pucLeftTriggerAxisMap = &m_Joypads[i].m_ucLeftTriggerState;
         m_Joypads[i].m_pucRightTriggerAxisMap = &m_Joypads[i].m_ucRightTriggerState;
         m_Joypads[i].m_fSensitivity = 1.0f;
-
-		m_iTouchInputButton[i] = 0;
     }
 
     m_JoypadMap = (unsigned int **)operator new[](ucMapC * sizeof(int *));
@@ -95,6 +95,7 @@ void CInput::Tick(void)
 {
 	HandleGamepadEvents();
     UpdateJoypads();
+    m_Keyboard.Tick();
 }
 
 void CInput::SetJoypadValues(JOYPAD *pThisPad)
@@ -332,11 +333,6 @@ unsigned char CInput::GetJoypadMapVal(int iPad)
     return m_Joypads[iPad].m_ucMappingValue;
 }
 
-void CInput::MapTouchInput(int iPad, int button)
-{
-	m_iTouchInputButton[iPad] |= button;
-}
-
 void CInput::SetJoypadStickAxisMap(int iPad, unsigned int uiFrom, unsigned int uiTo)
 {
     float *pfTo = nullptr;
@@ -404,11 +400,6 @@ bool CInput::IsPadConnected(int iPad)
     return m_Joypads[iPad].m_bIsConnected;
 }
 
-bool CInput::IsPadActive(int iPad)
-{
-	return m_Joypads[iPad].m_bControllerActive;
-}
-
 void CInput::SetSigninJoypadMask(unsigned int mask)
 {
     m_uiSigninJoypadMask = mask;
@@ -765,39 +756,27 @@ bool CInput::UpdateJoypads()
             if (pThisPad->m_bIsConnected)
             {
                 SetJoypadValues(pThisPad);
+
+                pThisPad->m_uiButtonsPressed = ~pThisPad->m_uiOldButtons & pThisPad->m_uiButtons;
+                pThisPad->m_uiButtonsReleased = ~pThisPad->m_uiButtons & pThisPad->m_uiOldButtons;
+
+                for (int bit = 0; bit < 24; ++bit)
+                {
+                    if ((pThisPad->m_uiButtonsPressed & (1 << bit)) != 0)
+                    {
+                        GetStartTime(i, bit);
+                    }
+                    else if ((pThisPad->m_uiButtons & (1 << bit)) != 0)
+                    {
+                        UpdateTime(i, bit);
+                    }
+                }
             }
             else if (pThisPad->m_bWasConnected)
             {
                 ClearJoypadValues(pThisPad);
             }
 
-			if (m_iTouchInputButton[i])
-			{
-				pThisPad->m_uiButtons |= m_iTouchInputButton[i];
-			}
-
-			m_iTouchInputButton[i] = 0;
-
-			pThisPad->m_uiButtonsPressed = ~pThisPad->m_uiOldButtons & pThisPad->m_uiButtons;
-            pThisPad->m_uiButtonsReleased = ~pThisPad->m_uiButtons & pThisPad->m_uiOldButtons;
-
-            for (int bit = 0; bit < 24; ++bit)
-            {
-                if ((pThisPad->m_uiButtonsPressed & (1 << bit)) != 0)
-                {
-                    GetStartTime(i, bit);
-                }
-                else if ((pThisPad->m_uiButtons & (1 << bit)) != 0)
-                {
-                    UpdateTime(i, bit);
-                }
-            }
-
-			if (pThisPad->m_uiButtonsPressed)
-				pThisPad->m_bControllerActive = true;
-			else
-				pThisPad->m_bControllerActive = false;
-
             if (m_pDebugSequenceFn && (pThisPad->m_uiButtonsPressed & (_360_JOY_BUTTON_A | _360_JOY_BUTTON_B | _360_JOY_BUTTON_X | _360_JOY_BUTTON_Y |
                                                                        _360_JOY_BUTTON_RB | _360_JOY_BUTTON_LB)) != 0)
             {

4J_Input/Windows64/INP_Main.h

@@ -58,7 +58,6 @@ public:
         bool m_bIsConnected;
         bool m_bWasConnected;
         bool m_bHasConnected;
-		bool m_bControllerActive;
 
         unsigned int m_uiButtons;
         unsigned int m_uiOldButtons;
@@ -126,12 +125,10 @@ public:
     void SetJoypadMapVal(int iPad, unsigned char ucMap);
     unsigned char GetJoypadMapVal(int iPad);
 
-	void MapTouchInput(int iPad, int button);
     void SetJoypadStickAxisMap(int iPad, unsigned int uiFrom, unsigned int uiTo);
     void SetJoypadStickTriggerMap(int iPad, unsigned int uiFrom, unsigned int uiTo);
 
     bool IsPadConnected(int iPad);
-	bool IsPadActive(int iPad);
     void SetSigninJoypadMask(unsigned int mask);
     unsigned int GetValue(int iPad, unsigned char ucAction, bool bRepeat = false);
     bool IsSet(int iPad, unsigned char ucAction);
@@ -205,8 +202,6 @@ public:
     unsigned int m_uiDebugSequenceIndex;
     int (*m_pDebugSequenceFn)(void *);
     LPVOID m_pDebugSequenceParam;
-
-	unsigned int m_iTouchInputButton[MAX_JOYPADS];
 };
 
 // Singleton

4J_Input/stdafx.h

@@ -1,13 +1,17 @@
 #ifndef PCH_H
 #define PCH_H
 
+#ifdef _WIN64
 #define WIN32_LEAN_AND_MEAN
 #include <Windows.h>
 
 #include <cstdint>
 #include <assert.h>
 #include <Xinput.h>
+#endif
 
+#ifndef _XBOX
 #include "extraX64.h"
+#endif
 
 #endif //PCH_H

4J_Profile/4J_Profile.vcxproj

@@ -121,7 +121,7 @@
       <SDLCheck>true</SDLCheck>
       <AdditionalIncludeDirectories>../Headers/Windows64;../Headers;$(ProjectDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <ForcedIncludeFiles>stdafx.h</ForcedIncludeFiles>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
       <MinimalRebuild>false</MinimalRebuild>
     </ClCompile>
@@ -153,15 +153,16 @@
     <ClCompile>
       <WarningLevel>Level3</WarningLevel>
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
-      <Optimization>MaxSpeed</Optimization>
+      <Optimization>Full</Optimization>
       <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <IntrinsicFunctions>false</IntrinsicFunctions>
       <PreprocessorDefinitions>_WINDOWS64;NDEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <SDLCheck>true</SDLCheck>
       <AdditionalIncludeDirectories>../Headers/Windows64;../Headers;$(ProjectDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <ForcedIncludeFiles>stdafx.h</ForcedIncludeFiles>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
+      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>

4J_Profile/Windows64/4J_Profile.cpp

@@ -23,6 +23,46 @@ SOFTWARE.
 */
 
 #include "4J_Profile.h"
+#include <Windows.h>
+#include <stdio.h>
 
 C_4JProfile ProfileManager;
 
+//str1k3r - GetSettings is basically snatched from smartCMD
+void GetSettings(wchar_t *outPath, DWORD size)
+{
+    GetModuleFileNameW(NULL, outPath, size); //str1k3r - unlike smartCMD we use wide so we can handle non english characters
+    wchar_t *lastSlash = wcsrchr(outPath, '\\');
+    if (lastSlash) *(lastSlash + 1) = '\0';
+    wcsncat_s(outPath, size, L"settings.dat", _TRUNCATE);
+}
+
+void C_4JProfile::LoadSettings(void* gs, size_t gsSize)
+{
+	if (!gs || gsSize == 0) return;
+
+	wchar_t settingsPath[MAX_PATH] = {};
+	GetSettings(settingsPath, MAX_PATH);
+
+	FILE *file = NULL;
+	if (_wfopen_s(&file, settingsPath, L"rb") == 0 && file) //str1k3r - fun fact theres a version of fopen_s but for wide :3
+	{
+		fread(gs, 1, gsSize, file);
+		fclose(file);
+	}
+}
+
+void C_4JProfile::SaveSettings(void* gs, size_t gsSize)
+{
+	if (!gs || gsSize == 0) return;
+
+	wchar_t settingsPath[MAX_PATH] = {};
+	GetSettings(settingsPath, MAX_PATH);
+
+	FILE *file = NULL;
+	if (_wfopen_s(&file, settingsPath, L"wb") == 0 && file)
+	{
+		fwrite(gs, 1, gsSize, file);
+		fclose(file);
+	}
+}

4J_Profile/stdafx.h

@@ -1,13 +1,17 @@
 #ifndef PCH_H
 #define PCH_H
 
+#ifdef _WIN64
 #define WIN32_LEAN_AND_MEAN
 #include <Windows.h>
 
 #include <cstdint>
 #include <assert.h>
 #include <Xinput.h>
+#endif
 
+#ifndef _XBOX
 #include "extraX64.h"
+#endif
 
 #endif //PCH_H

4J_Render/4J_Render.vcxproj

@@ -187,9 +187,9 @@
     <ClCompile>
       <WarningLevel>Level3</WarningLevel>
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
-      <Optimization>MaxSpeed</Optimization>
+      <Optimization>Full</Optimization>
       <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <IntrinsicFunctions>false</IntrinsicFunctions>
       <PreprocessorDefinitions>_WINDOWS64;NDEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <SDLCheck>true</SDLCheck>
       <AdditionalIncludeDirectories>../Headers/Windows64;../Headers;$(ProjectDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
@@ -197,6 +197,7 @@
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
       <CompileAs>CompileAsCpp</CompileAs>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
+      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>

4J_Render/Windows64/4J_Render.cpp

@@ -28,6 +28,9 @@ SOFTWARE.
 
 C4JRender RenderManager;
 
+//str1k3r - set VSync to true by default
+bool C4JRender::m_VSyncState = true;
+
 void C4JRender::Tick()
 {
 	InternalRenderManager.CBuffTick();
@@ -38,6 +41,16 @@ void C4JRender::UpdateGamma(unsigned short usGamma)
 	InternalRenderManager.UpdateGamma(usGamma);
 }
 
+void C4JRender::SetVSync(bool vs)
+{
+	m_VSyncState = vs;
+}
+
+int C4JRender::GetVSync()
+{
+	return m_VSyncState ? 1 : 0;
+}
+
 void C4JRender::MatrixMode(int type)
 {
 	InternalRenderManager.MatrixMode(type);
@@ -133,6 +146,11 @@ void C4JRender::SetClearColour(const float colourRGBA[4])
 	InternalRenderManager.SetClearColour(colourRGBA);
 }
 
+void C4JRender::setResolution(int ScreenWidth, int ScreenHeight)
+{
+	InternalRenderManager.setResolution(ScreenWidth, ScreenHeight);
+}
+
 bool C4JRender::IsWidescreen()
 {
 	return InternalRenderManager.IsWidescreen();

4J_Render/Windows64/Renderer.h

@@ -75,6 +75,7 @@ public:
     void Present();
     void Clear(int flags, D3D11_RECT *pRect);
     void SetClearColour(const float colourRGBA[4]);
+	void setResolution(int ScreenWidth, int ScreenHeight);
     bool IsWidescreen();
     bool IsHiDef();
     void CaptureThumbnail(ImageFileBuffer *pngOut);

4J_Render/Windows64/RendererCore.cpp

@@ -55,8 +55,8 @@ D3D11_PRIMITIVE_TOPOLOGY Renderer::g_topologies[C4JRender::PRIMITIVE_TYPE_COUNT]
 };
 
 static const unsigned int kVertexBufferSize = 0x100000;
-static const unsigned int kScreenGrabWidth = 1920;
-static const unsigned int kScreenGrabHeight = 1080;
+static unsigned int kScreenWidth = 1920;
+static unsigned int kScreenHeight = 1080;
 static const unsigned int kThumbnailSize = 64;
 
 static const unsigned int g_vertexStrides[C4JRender::VERTEX_TYPE_COUNT] = { 32, 16, 32, 32 };
@@ -854,14 +854,27 @@ ID3D11DeviceContext *Renderer::InitialiseContext(bool fromPresent)
     return deviceContext;
 }
 
+//str1k3r - yo fuck you 4J and your hardcoded ass game
+void Renderer::setResolution(int ScreenWidth, int ScreenHeight)
+{
+	if(kScreenHeight != ScreenHeight || kScreenWidth != ScreenWidth)
+	{
+		kScreenHeight = ScreenHeight;
+		kScreenWidth = ScreenWidth;
+	}
+}
+
 bool Renderer::IsHiDef()
 {
-    return true;
+	return (kScreenHeight >= 720 && kScreenWidth >= 1280);
 }
 
 bool Renderer::IsWidescreen()
 {
-    return true;
+    if (kScreenHeight == 0) return false;
+
+    float aspectRatio = static_cast<float>(kScreenWidth) / kScreenHeight;
+    return (aspectRatio >= 1.56f); 
 }
 
 void Renderer::Present()
@@ -872,7 +885,7 @@ void Renderer::Present()
     {
         PROFILER_SCOPE("Renderer::Present", "ScreenGrab", MP_MAGENTA);
 
-        unsigned char *linearData = new unsigned char[kScreenGrabWidth * kScreenGrabHeight * 4];
+        unsigned char *linearData = new unsigned char[kScreenWidth * kScreenHeight * 4];
 
         ID3D11Resource *backBufferResource = NULL;
         ID3D11Texture2D *backBuffer = NULL;
@@ -898,13 +911,13 @@ void Renderer::Present()
             m_pDeviceContext->Map(stagingTexture, 0, D3D11_MAP_READ_WRITE, 0, &mapped);
             const unsigned char* src = reinterpret_cast<const unsigned char*>(mapped.pData);
 
-            for (UINT y = 0; y < kScreenGrabHeight; ++y)
+            for (UINT y = 0; y < kScreenHeight; ++y)
             {
-                unsigned char *dstRow = linearData + y * kScreenGrabWidth * 4;
+                unsigned char *dstRow = linearData + y * kScreenWidth * 4;
                 const unsigned char *srcRow = src + y * mapped.RowPitch;
-                std::memcpy(dstRow, srcRow, kScreenGrabWidth * 4);
+                std::memcpy(dstRow, srcRow, kScreenWidth * 4);
 
-                for (UINT x = 0; x < kScreenGrabWidth; ++x)
+                for (UINT x = 0; x < kScreenWidth; ++x)
                     dstRow[x * 4 + 3] = 0xFF;
             }
 
@@ -926,8 +939,8 @@ void Renderer::Present()
                 UTCSysTime.wSecond);
 
         D3DXIMAGE_INFO info;
-        info.Width = kScreenGrabWidth;
-        info.Height = kScreenGrabHeight;
+        info.Width = kScreenWidth;
+        info.Height = kScreenHeight;
         SaveTextureData(fileName, &info, reinterpret_cast<int*>(linearData));
 
         delete[] linearData;
@@ -935,7 +948,7 @@ void Renderer::Present()
         m_bShouldScreenGrabNextFrame = false;
     }
 
-    m_pSwapChain->Present(1, 0);
+    m_pSwapChain->Present(C4JRender::GetVSync(), 0);
     ++presentCount;
 }
 
@@ -1046,4 +1059,3 @@ Renderer::Context &Renderer::getContext()
 {
     return *reinterpret_cast<Renderer::Context*>(TlsGetValue(Renderer::tlsIdx));
 }
-

4J_Render/stdafx.h

@@ -1,6 +1,7 @@
 #ifndef PCH_H
 #define PCH_H
 
+#ifdef _WIN64
 #define WIN32_LEAN_AND_MEAN
 #include <Windows.h>
 
@@ -11,7 +12,10 @@
 #include <d3d11.h>
 #include <d3d11_1.h>
 #include <DirectXMath.h>
+#endif
 
+#ifndef _XBOX
 #include "extraX64.h"
+#endif
 
 #endif //PCH_H

4J_Storage/4J_Storage.vcxproj

@@ -149,15 +149,16 @@
     <ClCompile>
       <WarningLevel>Level3</WarningLevel>
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
-      <Optimization>MaxSpeed</Optimization>
+      <Optimization>Full</Optimization>
       <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <IntrinsicFunctions>false</IntrinsicFunctions>
       <PreprocessorDefinitions>_WINDOWS64;NDEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <SDLCheck>true</SDLCheck>
       <AdditionalIncludeDirectories>../Headers/Windows64;../Headers;$(ProjectDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <ForcedIncludeFiles>stdafx.h</ForcedIncludeFiles>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
+      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>

4J_Storage/Windows64/4J_Storage.cpp

@@ -218,7 +218,7 @@ void C4JStorage::RegisterMarketplaceCountsCallback(int (*Func)(LPVOID lpParam, C
     ;
 }
 
-void C4JStorage::SetDLCPackageRoot(char *pszDLCRoot)
+void C4JStorage::SetDLCPackageRoot(wchar_t *pszDLCRoot)
 {
     InternalStorageManager.m_DLC.SetPackageRoot(pszDLCRoot);
 }
@@ -268,22 +268,22 @@ XCONTENT_DATA &C4JStorage::GetDLC(DWORD dw)
     return InternalStorageManager.m_DLC.GetDLC(dw);
 }
 
-DWORD C4JStorage::MountInstalledDLC(int iPad, DWORD dwDLC, int (*Func)(LPVOID, int, DWORD, DWORD), LPVOID lpParam, LPCSTR szMountDrive)
+DWORD C4JStorage::MountInstalledDLC(int iPad, DWORD dwDLC, int (*Func)(LPVOID, int, DWORD, DWORD), LPVOID lpParam, LPCWSTR szMountDrive)
 {
     return InternalStorageManager.m_DLC.MountInstalledDLC(iPad, dwDLC, Func, lpParam, szMountDrive);
 }
 
-DWORD C4JStorage::UnmountInstalledDLC(LPCSTR szMountDrive)
+DWORD C4JStorage::UnmountInstalledDLC(LPCWSTR szMountDrive)
 {
     return InternalStorageManager.m_DLC.UnmountInstalledDLC(szMountDrive);
 }
 
-void C4JStorage::GetMountedDLCFileList(const char *szMountDrive, std::vector<std::string> &fileList)
+void C4JStorage::GetMountedDLCFileList(const char *szMountDrive, std::vector<std::wstring> &fileList)
 {
     InternalStorageManager.m_DLC.GetMountedDLCFileList(szMountDrive, fileList);
 }
 
-std::string C4JStorage::GetMountedPath(std::string szMount)
+std::wstring C4JStorage::GetMountedPath(std::wstring szMount)
 {
     return InternalStorageManager.m_DLC.GetMountedPath(szMount);
 }

4J_Storage/Windows64/STO_DLC.cpp

@@ -63,10 +63,10 @@ C4JStorage::EDLCStatus CDLC::GetInstalledDLC(int iPad, int (*Func)(LPVOID, int,
     m_iHasNewInstalledDLCs = true;
 
     bool ret = false;
-    DWORD atts = GetFileAttributesA("Windows64Media/DLC");
+    DWORD atts = GetFileAttributesW(L"Windows64Media/DLC");
     if (atts == -1)
     {
-        atts = GetFileAttributesA("Windows64/DLC");
+        atts = GetFileAttributesW(L"Windows64/DLC");
         ret = true;
     }
 
@@ -77,38 +77,38 @@ C4JStorage::EDLCStatus CDLC::GetInstalledDLC(int iPad, int (*Func)(LPVOID, int,
         return C4JStorage::EDLC_Error;
     }
 
-    _WIN32_FIND_DATAA hFind;
+    _WIN32_FIND_DATAW hFind;
     HANDLE hFindFile;
     if (ret)
     {
-        hFindFile = FindFirstFileA("Windows64/DLC/*", &hFind);
+        hFindFile = FindFirstFileW(L"Windows64/DLC/*", &hFind);
     }
     else
     {
-        hFindFile = FindFirstFileA("Windows64Media/DLC/*", &hFind);
+        hFindFile = FindFirstFileW(L"Windows64Media/DLC/*", &hFind);
     }
 
-    if (hFindFile != (HANDLE)-1LL)
+	if (hFindFile != INVALID_HANDLE_VALUE)
     {
         do
         {
             atts = hFind.dwFileAttributes;
 
             bool isArt = hFind.dwFileAttributes != -1 && (hFind.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY);
-            if (isArt && hFind.cFileName[0] != '.')
+            if (isArt && hFind.cFileName[0] != L'.')
             {
                 XCONTENT_DATA data;
 
                 if (ret)
                 {
-                    sprintf(data.szFileName, "Windows64/DLC/%s", hFind.cFileName);
+                    swprintf_s(data.szFileName, _countof(data.szFileName), L"Windows64/DLC/%s", hFind.cFileName);
                 }
                 else
                 {
-                    sprintf(data.szFileName, "Windows64Media/DLC/%s", hFind.cFileName);
+                    swprintf_s(data.szFileName, _countof(data.szFileName), L"Windows64Media/DLC/%s", hFind.cFileName);
                 }
 
-                swprintf(data.szDisplayName, 256, L"%S", hFind.cFileName);
+                swprintf_s(data.szDisplayName, 256, L"%s", hFind.cFileName);
                 int displayNameLen = wcslen(data.szDisplayName);
 
                 data.DeviceID = 0;
@@ -116,14 +116,14 @@ C4JStorage::EDLCStatus CDLC::GetInstalledDLC(int iPad, int (*Func)(LPVOID, int,
 
                 AddInstalled(&data);
             }
-        } while (FindNextFileA(hFindFile, &hFind));
+        } while (FindNextFileW(hFindFile, &hFind));
         FindClose(hFindFile);
     }
 
     return C4JStorage::EDLC_Idle;
 }
 
-DWORD CDLC::MountInstalledDLC(int iPad, DWORD dwDLC, int (*Func)(LPVOID, int, DWORD, DWORD), LPVOID lpParam, LPCSTR szMountDrive)
+DWORD CDLC::MountInstalledDLC(int iPad, DWORD dwDLC, int (*Func)(LPVOID, int, DWORD, DWORD), LPVOID lpParam, LPCWSTR szMountDrive)
 {
     this->m_pMountedDLCFunc = Func;
     this->m_pMountedDLCParam = lpParam;
@@ -139,7 +139,7 @@ DWORD CDLC::MountInstalledDLC(int iPad, DWORD dwDLC, int (*Func)(LPVOID, int, DW
 
     this->m_uiCurrentMappedDLC = dwDLC;
 
-    char *dlcdirPath = m_vInstalledDLCs[m_uiCurrentMappedDLC].szFileName;
+    wchar_t *dlcdirPath = m_vInstalledDLCs[m_uiCurrentMappedDLC].szFileName;
     m_vDLCDriveMappings.push_back(DriveMapping(dlcdirPath, m_szMountPath));
 
     m_iHasNewMountedDLCs = true;
@@ -147,9 +147,9 @@ DWORD CDLC::MountInstalledDLC(int iPad, DWORD dwDLC, int (*Func)(LPVOID, int, DW
     return 997;
 }
 
-DWORD CDLC::UnmountInstalledDLC(LPCSTR szMountDrive)
+DWORD CDLC::UnmountInstalledDLC(LPCWSTR szMountDrive)
 {
-    LPCSTR szDrive = nullptr;
+    LPCWSTR szDrive = nullptr;
 
     if (szMountDrive)
     {
@@ -172,49 +172,48 @@ DWORD CDLC::UnmountInstalledDLC(LPCSTR szMountDrive)
     return 0;
 }
 
-void CDLC::GetMountedDLCFileList(const char *szMountDrive, std::vector<std::string> &fileList)
+void CDLC::GetMountedDLCFileList(const char *szMountDrive, std::vector<std::wstring> &fileList)
 {
-    char *dlcdirPath = new char[256];
-    sprintf(dlcdirPath, "%s/*", m_vInstalledDLCs[m_uiCurrentMappedDLC].szFileName);
+    wchar_t dlcdirPath[256];
+    swprintf_s(dlcdirPath, 256, L"%s/*", m_vInstalledDLCs[m_uiCurrentMappedDLC].szFileName);
 
-    _WIN32_FIND_DATAA atts;
-    HANDLE hFind = FindFirstFileA(dlcdirPath, &atts);
-    if (hFind != (HANDLE)-1LL)
+    _WIN32_FIND_DATAW atts;
+    HANDLE hFind = FindFirstFileW(dlcdirPath, &atts);
+    if (hFind != INVALID_HANDLE_VALUE)
     {
         do
         {
             if (atts.dwFileAttributes == -1 || (atts.dwFileAttributes & 0x10) != 0x10)
             {
-                char dir[256];
-                sprintf(dir, "%s/%s", m_vInstalledDLCs[m_uiCurrentMappedDLC].szFileName, atts.cFileName);
+                wchar_t dir[256];
+				swprintf_s(dir, _countof(dir), L"%s/%s", m_vInstalledDLCs[m_uiCurrentMappedDLC].szFileName, atts.cFileName);
 
                 fileList.push_back(dir);
             }
-        } while (FindNextFileA(hFind, &atts));
+        } while (FindNextFileW(hFind, &atts));
         FindClose(hFind);
     }
-    delete[] dlcdirPath;
 }
 
-std::string CDLC::GetMountedPath(std::string szMount)
+std::wstring CDLC::GetMountedPath(std::wstring szMount)
 {
     for (int ch = 0; ch < szMount.size(); ++ch)
     {
         if (szMount[ch] == '/' || szMount[ch] == '\\')
         {
-            return "";
+            return L"";
         }
 
         if (szMount[ch] == ':')
         {
-            std::string driveName = szMount.substr(0, ch);
+            std::wstring driveName = szMount.substr(0, ch);
             for (int i = 0; i < m_vDLCDriveMappings.size(); i++)
             {
                 if (m_vDLCDriveMappings[i].m_szMountPath == driveName)
                 {
-                    std::string newPath = m_vDLCDriveMappings[i].m_szDirectoryPath;
+                    std::wstring newPath = m_vDLCDriveMappings[i].m_szDirectoryPath;
 
-                    newPath.append(szMount.substr(ch + 1, -1));
+                    newPath.append(szMount.substr(ch + 1));
 
                     return newPath;
                 }
@@ -223,7 +222,7 @@ std::string CDLC::GetMountedPath(std::string szMount)
         }
     }
 
-    return "";
+    return L"";
 }
 
 void CDLC::SetDLCProductCode(const char *szProductCode)
@@ -241,9 +240,9 @@ int CDLC::GetAvailableDLCCount(int iPad)
     return 0;
 }
 
-void CDLC::SetPackageRoot(char *pszDLCRoot)
+void CDLC::SetPackageRoot(wchar_t *pszDLCRoot)
 {
-    strcpy(this->m_szPackageRoot, pszDLCRoot);
+     wcscpy(this->m_szPackageRoot, pszDLCRoot);
 }
 
 void CDLC::Tick(void)

4J_Storage/Windows64/STO_DLC.h

@@ -30,13 +30,13 @@ class CDLC
 public:
     struct DriveMapping
     {
-        DriveMapping(std::string szDirectoryPath, std::string szMountPath) : m_szDirectoryPath(szDirectoryPath), m_szMountPath(szMountPath)
+        DriveMapping(std::wstring szDirectoryPath, std::wstring szMountPath) : m_szDirectoryPath(szDirectoryPath), m_szMountPath(szMountPath)
         {
             ;
         }
 
-        std::string m_szMountPath;
-        std::string m_szDirectoryPath;
+        std::wstring m_szMountPath;
+        std::wstring m_szDirectoryPath;
     };
 
     XCONTENT_DATA &GetDLC(DWORD dw);
@@ -46,15 +46,15 @@ public:
                                      DWORD dwOfferTypesBitmask = XMARKETPLACE_OFFERING_TYPE_CONTENT);
     void ClearOffers();
     C4JStorage::EDLCStatus GetInstalledDLC(int iPad, int (*Func)(LPVOID, int, int), LPVOID lpParam);
-    DWORD MountInstalledDLC(int iPad, DWORD dwDLC, int (*Func)(LPVOID, int, DWORD, DWORD), LPVOID lpParam, LPCSTR szMountDrive = NULL);
-    DWORD UnmountInstalledDLC(LPCSTR szMountDrive = NULL);
-    void GetMountedDLCFileList(const char *szMountDrive, std::vector<std::string> &fileList);
-    std::string GetMountedPath(std::string szMount);
+    DWORD MountInstalledDLC(int iPad, DWORD dwDLC, int (*Func)(LPVOID, int, DWORD, DWORD), LPVOID lpParam, LPCWSTR szMountDrive = NULL);
+    DWORD UnmountInstalledDLC(LPCWSTR szMountDrive = NULL);
+    void GetMountedDLCFileList(const char *szMountDrive, std::vector<std::wstring> &fileList);
+    std::wstring GetMountedPath(std::wstring szMount);
 
     void SetDLCProductCode(const char *szProductCode);
     void SetProductUpgradeKey(const char *szProductCode);
     int GetAvailableDLCCount(int iPad);
-    void SetPackageRoot(char *pszDLCRoot);
+    void SetPackageRoot(wchar_t *pszDLCRoot);
 
     void Tick(void);
     void AddInstalled(XCONTENT_DATA *data);
@@ -70,10 +70,10 @@ public:
     DWORD m_iHasNewMountedDLCs;
     int (*m_pMountedDLCFunc)(LPVOID, int, DWORD, DWORD);
     LPVOID m_pMountedDLCParam;
-    std::string m_szMountPath;
+    std::wstring m_szMountPath;
     DWORD m_uiCurrentMappedDLC;
     DWORD m_dwLicenseMask;
-    char m_szPackageRoot[40];
+    wchar_t m_szPackageRoot[40];
     DWORD dwordC0;
     std::vector<DriveMapping> m_vDLCDriveMappings;
     char m_szDLCProductCode[16];

4J_Storage/stdafx.h

@@ -1,6 +1,7 @@
 #ifndef PCH_H
 #define PCH_H
 
+#ifdef _WIN64
 #define WIN32_LEAN_AND_MEAN
 #include <Windows.h>
 
@@ -8,6 +9,11 @@
 #include <assert.h>
 #include <Xinput.h>
 
+#include <cwchar>
+#endif
+
+#ifndef _XBOX
 #include "extraX64.h"
+#endif
 
 #endif //PCH_H

4J_XTMS/4J_XTMS.vcxproj

@@ -96,7 +96,7 @@
       <SDLCheck>true</SDLCheck>
       <AdditionalIncludeDirectories>../Headers;$(ProjectDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <ForcedIncludeFiles>stdafx.h</ForcedIncludeFiles>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>
@@ -126,14 +126,15 @@
     <ClCompile>
       <WarningLevel>Level3</WarningLevel>
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
-      <Optimization>MaxSpeed</Optimization>
+      <Optimization>Full</Optimization>
       <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <IntrinsicFunctions>false</IntrinsicFunctions>
       <PreprocessorDefinitions>_WINDOWS64;_CRT_SECURE_NO_WARNINGS</PreprocessorDefinitions>
       <SDLCheck>true</SDLCheck>
       <AdditionalIncludeDirectories>../Headers;$(ProjectDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <ForcedIncludeFiles>stdafx.h</ForcedIncludeFiles>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>

Headers/Windows64/4J_Input.h

@@ -101,7 +101,6 @@ public:
 
 	void				Initialise( int iInputStateC, unsigned char ucMapC,unsigned char ucActionC, unsigned char ucMenuActionC );
 	void				Tick(void);
-	void				TickKBM(void);
 	void				SetDeadzoneAndMovementRange(unsigned int uiDeadzone, unsigned int uiMovementRangeMax );
 	void				SetGameJoypadMaps(unsigned char ucMap,unsigned char ucAction,unsigned int uiActionVal);
 	unsigned int		GetGameJoypadMaps(unsigned char ucMap,unsigned char ucAction);
@@ -109,7 +108,6 @@ public:
 	unsigned char		GetJoypadMapVal(int iPad);
 	void				SetJoypadSensitivity(int iPad, float fSensitivity);
 	unsigned int		GetValue(int iPad,unsigned char ucAction, bool bRepeat=false);
-	void				MapTouchInput(int iPad, int button);
 	bool				ButtonPressed(int iPad,unsigned char ucAction=255); // toggled
 	bool				ButtonReleased(int iPad,unsigned char ucAction); //toggled
 	bool				ButtonDown(int iPad,unsigned char ucAction=255); // button held down
@@ -120,8 +118,8 @@ public:
 	void				SetDebugSequence( const char *chSequenceA,int( *Func)(LPVOID),LPVOID lpParam );
 	FLOAT				GetIdleSeconds(int iPad);
 	bool				IsPadConnected(int iPad);
-	bool				IsPadActive(int iPad);
 	bool				IsCircleCrossSwapped();
+
 	// In-Game values which may have been remapped due to Southpaw, swap triggers, etc
 	float				GetJoypadStick_LX(int iPad, bool bCheckMenuDisplay=true);
 	float				GetJoypadStick_LY(int iPad, bool bCheckMenuDisplay=true);
@@ -132,51 +130,6 @@ public:
 
 	void				SetMenuDisplayed(int iPad, bool bVal);
 
-	void				OnKeyDown(int vkCode);
-	void				OnKeyUp(int vkCode);
-	void				OnChar(wchar_t ch);
-
-	void				OnMouseMove(int x, int y);
-	void				OnRawMouseDelta(int dx, int dy);
-	void				OnLButtonDown(int x, int y);
-	void				OnLButtonUp(int x, int y);
-	void				OnRButtonDown(int x, int y);
-	void				OnRButtonUp(int x, int y);
-	void				OnMButtonDown(int x, int y);
-	void				OnMButtonUp(int x, int y);
-	void				OnMouseWheel(int delta, int x, int y);
-
-	bool				IsKeyDown(int vkCode) const;
-	bool				IsKeyPressed(int vkCode) const;
-	bool				IsKeyReleased(int vkCode) const;
-
-	int					GetMouseX() const;
-	int					GetMouseY() const;
-
-	// PIEBOT: Used to be IsLButtonDown, changed so it doesnt conflict with windowx.h
-	bool				IsMouseLDown() const;
-	bool				IsLButtonPressed() const;
-	bool				IsLButtonReleased() const;
-
-	bool				IsMouseRDown() const;
-	bool				IsRButtonPressed() const;
-	bool				IsRButtonReleased() const;
-
-	int					GetMouseWheelDelta() const;
-
-	wchar_t				GetLastChar() const;
-	bool				HasChar() const;
-	int					GetCharCount() const;
-	wchar_t				GetChar(int index) const;
-
-	void				SetMouseCaptured(bool captured);
-	void				SetWindowFocused(bool focused);
-	bool				IsMouseCaptured() const;
-
-	void				SetMousePos(int x, int y);
-
-	int					GetRawMouseX() const;
-	int					GetRawMouseY() const;
 // 	EKeyboardResult		RequestKeyboard(UINT uiTitle, UINT uiText, UINT uiDesc, DWORD dwPad, WCHAR *pwchResult, UINT uiResultSize,int( *Func)(LPVOID,const bool),LPVOID lpParam,EKeyboardMode eMode,C4JStringTable *pStringTable=NULL);
 // 	EKeyboardResult		RequestKeyboard(UINT uiTitle, LPCWSTR pwchDefault, UINT uiDesc, DWORD dwPad, WCHAR *pwchResult, UINT uiResultSize,int( *Func)(LPVOID,const bool),LPVOID lpParam, EKeyboardMode eMode,C4JStringTable *pStringTable=NULL);
 	EKeyboardResult		RequestKeyboard(LPCWSTR Title, LPCWSTR Text, DWORD dwPad, UINT uiMaxChars, int( *Func)(LPVOID,const bool),LPVOID lpParam,C_4JInput::EKeyboardMode eMode);
@@ -213,5 +166,4 @@ public:
 };
 
 // Singleton
-extern C_4JInput InputManager;
-extern HWND g_hWnd;
+extern C_4JInput InputManager;

Headers/Windows64/4J_Profile.h

@@ -97,6 +97,10 @@ public:
 	void				ResetProfileProcessState(); // after a sign out from the primary player, call this
 	void				Tick( void );
 
+	// SETTINGS
+	void LoadSettings(void* gs, size_t gsSize);
+	void SaveSettings(void* gs, size_t gsSize);
+
 	// ACHIEVEMENTS & AWARDS
 
 	void				RegisterAward(int iAwardNumber,int iGamerconfigID, eAwardType eType, bool bLeaderboardAffected=false, 

Headers/Windows64/4J_Render.h

@@ -57,6 +57,11 @@ public:
     void Tick();
     void UpdateGamma(unsigned short usGamma);
 
+	// VSync
+	static bool m_VSyncState;
+	static void SetVSync(bool vs);
+	static int  GetVSync();
+
     // Matrix stack
     void MatrixMode(int type);
     void MatrixSetIdentity();
@@ -79,6 +84,7 @@ public:
     void Present();
     void Clear(int flags, D3D11_RECT *pRect = NULL);
     void SetClearColour(const float colourRGBA[4]);
+	void setResolution(int ScreenWidth, int ScreenHeight);
     bool IsWidescreen();
     bool IsHiDef();
     void CaptureThumbnail(ImageFileBuffer *pngOut);

Headers/Windows64/4J_Storage.h

@@ -285,7 +285,7 @@ public:
 
 	// DLC
 	void								RegisterMarketplaceCountsCallback(int (*Func)(LPVOID lpParam, C4JStorage::DLC_TMS_DETAILS*, int), LPVOID lpParam);
-	void								SetDLCPackageRoot(char* pszDLCRoot);
+	void								SetDLCPackageRoot(wchar_t* pszDLCRoot);
 	C4JStorage::EDLCStatus				GetDLCOffers(int iPad, int(*Func)(LPVOID, int, DWORD, int), LPVOID lpParam, DWORD dwOfferTypesBitmask = XMARKETPLACE_OFFERING_TYPE_CONTENT);
 	DWORD								CancelGetDLCOffers();
 	void								ClearDLCOffers();
@@ -296,10 +296,10 @@ public:
 
 	C4JStorage::EDLCStatus				GetInstalledDLC(int iPad, int(*Func)(LPVOID, int, int), LPVOID lpParam);
 	XCONTENT_DATA& GetDLC(DWORD dw);
-	DWORD								MountInstalledDLC(int iPad, DWORD dwDLC, int(*Func)(LPVOID, int, DWORD, DWORD), LPVOID lpParam, LPCSTR szMountDrive = NULL);
-	DWORD								UnmountInstalledDLC(LPCSTR szMountDrive = NULL);
-	void								GetMountedDLCFileList(const char* szMountDrive, std::vector<std::string>& fileList);
-	std::string							GetMountedPath(std::string szMount);
+	DWORD								MountInstalledDLC(int iPad, DWORD dwDLC, int(*Func)(LPVOID, int, DWORD, DWORD), LPVOID lpParam, LPCWSTR szMountDrive = NULL);
+	DWORD								UnmountInstalledDLC(LPCWSTR szMountDrive = NULL);
+	void								GetMountedDLCFileList(const char* szMountDrive, std::vector<std::wstring>& fileList);
+	std::wstring						GetMountedPath(std::wstring szMount);
 
 	// Global title storage
 	C4JStorage::ETMSStatus				ReadTMSFile(int iQuadrant, eGlobalStorage eStorageFacility, C4JStorage::eTMS_FileType eFileType,

Headers/extraX64.h

@@ -354,7 +354,7 @@ typedef struct _XCONTENT_DATA
     XCONTENTDEVICEID DeviceID;
     DWORD dwContentType;
     WCHAR szDisplayName[XCONTENT_MAX_DISPLAYNAME_LENGTH];
-    CHAR szFileName[XCONTENT_MAX_FILENAME_LENGTH];
+    WCHAR szFileName[XCONTENT_MAX_FILENAME_LENGTH];
 } XCONTENT_DATA, *PXCONTENT_DATA;
 #endif //__PS3__
 

README.md

@@ -1,5 +1,8 @@
 # 4JLibs-VS2012
 
+## WARNING
+This needs the [Windows 10 SDK](https://learn.microsoft.com/en-us/windows/apps/windows-sdk/downloads#windows-10) to build `4J_Render`.
+
 ## Implementation
 
 For implementation details, please look at the [IMPLEMENTATION_GUIDE.md](.gitea/IMPLEMENTATION_GUIDE.md) file