ShuriZma
/
Cxbx-Reloaded
mirror of https://github.com/Cxbx-Reloaded/Cxbx-Reloaded.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'refs/remotes/Cxbx-Reloaded/master'

This commit is contained in:
PatrickvL 2017-06-06 01:51:54 +01:00
parent c733fd2af0 2d26c459e1
commit 5c3d37d11c
15 changed files with 765 additions and 685 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
build/win32/Cxbx.vcxproj
View File

@ -76,7 +76,7 @@
<ClCompile> <ClCompile>
<Optimization>Disabled</Optimization> <Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>..\..\src\Common;..\..\src;..\..\src\Common\Win32;..\..\import\stb;%(AdditionalIncludeDirectories);..\..\import\OpenXDK\include;..\..\import\distorm\include;..\..\import\glew-2.0.0\include;..\..\src;..\..\src\Common;..\..\src\Common\Win32</AdditionalIncludeDirectories> <AdditionalIncludeDirectories>..\..\src\Common;..\..\src;..\..\src\Common\Win32;..\..\import\stb;%(AdditionalIncludeDirectories);..\..\import\OpenXDK\include;..\..\import\distorm\include;..\..\import\glew-2.0.0\include;..\..\src;..\..\src\Common;..\..\src\Common\Win32</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions> <PreprocessorDefinitions>_WIN32_WINNT=0x0601;WIN32;_DEBUG;_WINDOWS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
<BrowseInformation>true</BrowseInformation> <BrowseInformation>true</BrowseInformation>
@ -92,7 +92,7 @@
<AdditionalIncludeDirectories>Include\Win32\Cxbx;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <AdditionalIncludeDirectories>Include\Win32\Cxbx;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ResourceCompile> </ResourceCompile>
<Link> <Link>
<AdditionalDependencies>legacy_stdio_definitions.lib;d3d8.lib;dinput8.lib;dxguid.lib;odbc32.lib;odbccp32.lib;Shlwapi.lib;dxerr8.lib;xinput.lib;ws2_32.lib;dsound.lib;winmm.lib;ddraw.lib;d3dx8.lib;dbghelp.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalDependencies>legacy_stdio_definitions.lib;d3d8.lib;dinput8.lib;dxguid.lib;odbc32.lib;odbccp32.lib;Shlwapi.lib;dxerr8.lib;ws2_32.lib;dsound.lib;winmm.lib;ddraw.lib;d3dx8.lib;dbghelp.lib;comctl32.lib;XINPUT9_1_0.LIB;%(AdditionalDependencies)</AdditionalDependencies>
<SuppressStartupBanner>true</SuppressStartupBanner> <SuppressStartupBanner>true</SuppressStartupBanner>
<AdditionalLibraryDirectories>$(Configuration)\;..\..\import\distorm\lib\Win32\;..\..\import\glew-2.0.0\lib\Release\Win32\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> <AdditionalLibraryDirectories>$(Configuration)\;..\..\import\distorm\lib\Win32\;..\..\import\glew-2.0.0\lib\Release\Win32\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<IgnoreSpecificDefaultLibraries>msvcrt;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries> <IgnoreSpecificDefaultLibraries>msvcrt;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
@ -138,7 +138,7 @@ $(SOLUTIONDIR)Export.bat</Command>
<Optimization>MaxSpeed</Optimization> <Optimization>MaxSpeed</Optimization>
<InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion> <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
<AdditionalIncludeDirectories>..\..\src;..\..\src\Common;..\..\src\Common\Win32\;..\..\import\stb;%(AdditionalIncludeDirectories);..\..\import\OpenXDK\include;..\..\import\distorm\include;..\..\import\glew-2.0.0\include;..\..\src;..\..\src\Common;..\..\src\Common\Win32</AdditionalIncludeDirectories> <AdditionalIncludeDirectories>..\..\src;..\..\src\Common;..\..\src\Common\Win32\;..\..\import\stb;%(AdditionalIncludeDirectories);..\..\import\OpenXDK\include;..\..\import\distorm\include;..\..\import\glew-2.0.0\include;..\..\src;..\..\src\Common;..\..\src\Common\Win32</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions> <PreprocessorDefinitions>_WIN32_WINNT=0x0601;WIN32;NDEBUG;_WINDOWS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<StringPooling>true</StringPooling> <StringPooling>true</StringPooling>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
<FunctionLevelLinking>true</FunctionLevelLinking> <FunctionLevelLinking>true</FunctionLevelLinking>
@ -155,7 +155,7 @@ $(SOLUTIONDIR)Export.bat</Command>
<AdditionalIncludeDirectories>Include\Win32\Cxbx;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <AdditionalIncludeDirectories>Include\Win32\Cxbx;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ResourceCompile> </ResourceCompile>
<Link> <Link>
<AdditionalDependencies>legacy_stdio_definitions.lib;d3d8.lib;dinput8.lib;dxguid.lib;odbc32.lib;odbccp32.lib;Shlwapi.lib;dxerr8.lib;xinput.lib;ws2_32.lib;dsound.lib;winmm.lib;ddraw.lib;d3dx8.lib;dbghelp.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalDependencies>legacy_stdio_definitions.lib;d3d8.lib;dinput8.lib;dxguid.lib;odbc32.lib;odbccp32.lib;Shlwapi.lib;dxerr8.lib;ws2_32.lib;dsound.lib;winmm.lib;ddraw.lib;d3dx8.lib;dbghelp.lib;comctl32.lib;XINPUT9_1_0.LIB;%(AdditionalDependencies)</AdditionalDependencies>
<SuppressStartupBanner>true</SuppressStartupBanner> <SuppressStartupBanner>true</SuppressStartupBanner>
<AdditionalLibraryDirectories>$(Configuration)\;..\..\import\distorm\lib\Win32\;..\..\import\glew-2.0.0\lib\Release\Win32\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> <AdditionalLibraryDirectories>$(Configuration)\;..\..\import\distorm\lib\Win32\;..\..\import\glew-2.0.0\lib\Release\Win32\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<IgnoreSpecificDefaultLibraries>%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries> <IgnoreSpecificDefaultLibraries>%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>

2
resource/Cxbx.rc
View File

@ -131,6 +131,8 @@ BEGIN
MENUITEM "Config &Audio...", ID_SETTINGS_CONFIGURESOUND, GRAYED MENUITEM "Config &Audio...", ID_SETTINGS_CONFIGURESOUND, GRAYED
MENUITEM "Config &Video...", ID_SETTINGS_CONFIG_VIDEO MENUITEM "Config &Video...", ID_SETTINGS_CONFIG_VIDEO
MENUITEM SEPARATOR MENUITEM SEPARATOR
MENUITEM "Use XInput", ID_SETTINGS_XINPUT
MENUITEM SEPARATOR
POPUP "&HLE Cache" POPUP "&HLE Cache"
BEGIN BEGIN
MENUITEM "&Clear entire HLE Cache", ID_CACHE_CLEARHLECACHE_ALL MENUITEM "&Clear entire HLE Cache", ID_CACHE_CLEARHLECACHE_ALL

48
src/Common/Win32/XBController.cpp
View File

@ -782,76 +782,76 @@ void XBController::ListenPoll(XTL::XINPUT_STATE *Controller)
Controller->Gamepad.sThumbRX -= wValue; Controller->Gamepad.sThumbRX -= wValue;
break; break;
case XBCTRL_OBJECT_A: case XBCTRL_OBJECT_A:
Controller->Gamepad.bAnalogButtons[XINPUT_GAMEPAD_A] = (wValue / 128); Controller->Gamepad.bAnalogButtons[XB_XINPUT_GAMEPAD_A] = (wValue / 128);
break; break;
case XBCTRL_OBJECT_B: case XBCTRL_OBJECT_B:
Controller->Gamepad.bAnalogButtons[XINPUT_GAMEPAD_B] = (wValue / 128); Controller->Gamepad.bAnalogButtons[XB_XINPUT_GAMEPAD_B] = (wValue / 128);
break; break;
case XBCTRL_OBJECT_X: case XBCTRL_OBJECT_X:
Controller->Gamepad.bAnalogButtons[XINPUT_GAMEPAD_X] = (wValue / 128); Controller->Gamepad.bAnalogButtons[XB_XINPUT_GAMEPAD_X] = (wValue / 128);
break; break;
case XBCTRL_OBJECT_Y: case XBCTRL_OBJECT_Y:
Controller->Gamepad.bAnalogButtons[XINPUT_GAMEPAD_Y] = (wValue / 128); Controller->Gamepad.bAnalogButtons[XB_XINPUT_GAMEPAD_Y] = (wValue / 128);
break; break;
case XBCTRL_OBJECT_WHITE: case XBCTRL_OBJECT_WHITE:
Controller->Gamepad.bAnalogButtons[XINPUT_GAMEPAD_WHITE] = (wValue / 128); Controller->Gamepad.bAnalogButtons[XB_XINPUT_GAMEPAD_WHITE] = (wValue / 128);
break; break;
case XBCTRL_OBJECT_BLACK: case XBCTRL_OBJECT_BLACK:
Controller->Gamepad.bAnalogButtons[XINPUT_GAMEPAD_BLACK] = (wValue / 128); Controller->Gamepad.bAnalogButtons[XB_XINPUT_GAMEPAD_BLACK] = (wValue / 128);
break; break;
case XBCTRL_OBJECT_LTRIGGER: case XBCTRL_OBJECT_LTRIGGER:
Controller->Gamepad.bAnalogButtons[XINPUT_GAMEPAD_LEFT_TRIGGER] = (wValue / 128); Controller->Gamepad.bAnalogButtons[XB_XINPUT_GAMEPAD_LEFT_TRIGGER] = (wValue / 128);
break; break;
case XBCTRL_OBJECT_RTRIGGER: case XBCTRL_OBJECT_RTRIGGER:
Controller->Gamepad.bAnalogButtons[XINPUT_GAMEPAD_RIGHT_TRIGGER] = (wValue / 128); Controller->Gamepad.bAnalogButtons[XB_XINPUT_GAMEPAD_RIGHT_TRIGGER] = (wValue / 128);
break; break;
case XBCTRL_OBJECT_DPADUP: case XBCTRL_OBJECT_DPADUP:
if(wValue > 0) if(wValue > 0)
Controller->Gamepad.wButtons |= XINPUT_GAMEPAD_DPAD_UP; Controller->Gamepad.wButtons |= XB_XINPUT_GAMEPAD_DPAD_UP;
else else
Controller->Gamepad.wButtons &= ~XINPUT_GAMEPAD_DPAD_UP; Controller->Gamepad.wButtons &= ~XB_XINPUT_GAMEPAD_DPAD_UP;
break; break;
case XBCTRL_OBJECT_DPADDOWN: case XBCTRL_OBJECT_DPADDOWN:
if(wValue > 0) if(wValue > 0)
Controller->Gamepad.wButtons |= XINPUT_GAMEPAD_DPAD_DOWN; Controller->Gamepad.wButtons |= XB_XINPUT_GAMEPAD_DPAD_DOWN;
else else
Controller->Gamepad.wButtons &= ~XINPUT_GAMEPAD_DPAD_DOWN; Controller->Gamepad.wButtons &= ~XB_XINPUT_GAMEPAD_DPAD_DOWN;
break; break;
case XBCTRL_OBJECT_DPADLEFT: case XBCTRL_OBJECT_DPADLEFT:
if(wValue > 0) if(wValue > 0)
Controller->Gamepad.wButtons |= XINPUT_GAMEPAD_DPAD_LEFT; Controller->Gamepad.wButtons |= XB_XINPUT_GAMEPAD_DPAD_LEFT;
else else
Controller->Gamepad.wButtons &= ~XINPUT_GAMEPAD_DPAD_LEFT; Controller->Gamepad.wButtons &= ~XB_XINPUT_GAMEPAD_DPAD_LEFT;
break; break;
case XBCTRL_OBJECT_DPADRIGHT: case XBCTRL_OBJECT_DPADRIGHT:
if(wValue > 0) if(wValue > 0)
Controller->Gamepad.wButtons |= XINPUT_GAMEPAD_DPAD_RIGHT; Controller->Gamepad.wButtons |= XB_XINPUT_GAMEPAD_DPAD_RIGHT;
else else
Controller->Gamepad.wButtons &= ~XINPUT_GAMEPAD_DPAD_RIGHT; Controller->Gamepad.wButtons &= ~XB_XINPUT_GAMEPAD_DPAD_RIGHT;
break; break;
case XBCTRL_OBJECT_BACK: case XBCTRL_OBJECT_BACK:
if(wValue > 0) if(wValue > 0)
Controller->Gamepad.wButtons |= XINPUT_GAMEPAD_BACK; Controller->Gamepad.wButtons |= XB_XINPUT_GAMEPAD_BACK;
else else
Controller->Gamepad.wButtons &= ~XINPUT_GAMEPAD_BACK; Controller->Gamepad.wButtons &= ~XB_XINPUT_GAMEPAD_BACK;
break; break;
case XBCTRL_OBJECT_START: case XBCTRL_OBJECT_START:
if(wValue > 0) if(wValue > 0)
Controller->Gamepad.wButtons |= XINPUT_GAMEPAD_START; Controller->Gamepad.wButtons |= XB_XINPUT_GAMEPAD_START;
else else
Controller->Gamepad.wButtons &= ~XINPUT_GAMEPAD_START; Controller->Gamepad.wButtons &= ~XB_XINPUT_GAMEPAD_START;
break; break;
case XBCTRL_OBJECT_LTHUMB: case XBCTRL_OBJECT_LTHUMB:
if(wValue > 0) if(wValue > 0)
Controller->Gamepad.wButtons |= XINPUT_GAMEPAD_LEFT_THUMB; Controller->Gamepad.wButtons |= XB_XINPUT_GAMEPAD_LEFT_THUMB;
else else
Controller->Gamepad.wButtons &= ~XINPUT_GAMEPAD_LEFT_THUMB; Controller->Gamepad.wButtons &= ~XB_XINPUT_GAMEPAD_LEFT_THUMB;
break; break;
case XBCTRL_OBJECT_RTHUMB: case XBCTRL_OBJECT_RTHUMB:
if(wValue > 0) if(wValue > 0)
Controller->Gamepad.wButtons |= XINPUT_GAMEPAD_RIGHT_THUMB; Controller->Gamepad.wButtons |= XB_XINPUT_GAMEPAD_RIGHT_THUMB;
else else
Controller->Gamepad.wButtons &= ~XINPUT_GAMEPAD_RIGHT_THUMB; Controller->Gamepad.wButtons &= ~XB_XINPUT_GAMEPAD_RIGHT_THUMB;
break; break;
} }
} }

3
src/Cxbx/ResCxbx.h
View File

@ -93,6 +93,7 @@
#define ID_SETTINGS_CACHE 40083 #define ID_SETTINGS_CACHE 40083
#define ID_CACHE_CLEARHLECACHE_ALL 40084 #define ID_CACHE_CLEARHLECACHE_ALL 40084
#define ID_CACHE_CLEARHLECACHE_CURRENT 40085 #define ID_CACHE_CLEARHLECACHE_CURRENT 40085
#define ID_SETTINGS_XINPUT 40086
#define IDC_STATIC -1 #define IDC_STATIC -1
// Next default values for new objects // Next default values for new objects
@ -100,7 +101,7 @@
#ifdef APSTUDIO_INVOKED #ifdef APSTUDIO_INVOKED
#ifndef APSTUDIO_READONLY_SYMBOLS #ifndef APSTUDIO_READONLY_SYMBOLS
#define _APS_NEXT_RESOURCE_VALUE 130 #define _APS_NEXT_RESOURCE_VALUE 130
#define _APS_NEXT_COMMAND_VALUE 40085 #define _APS_NEXT_COMMAND_VALUE 40087
#define _APS_NEXT_CONTROL_VALUE 1058 #define _APS_NEXT_CONTROL_VALUE 1058
#define _APS_NEXT_SYMED_VALUE 104 #define _APS_NEXT_SYMED_VALUE 104
#endif #endif

1213
src/Cxbx/WndMain.cpp
View File

File diff suppressed because it is too large Load Diff

5
src/Cxbx/WndMain.h
View File

@ -163,6 +163,11 @@ class WndMain : public Wnd
// ****************************************************************** // ******************************************************************
int m_FlagsLLE; int m_FlagsLLE;
// ******************************************************************
// * XInout Enabled Flag
// ******************************************************************
int m_XInputEnabled;
// ****************************************************************** // ******************************************************************
// * debug output filenames // * debug output filenames
// ****************************************************************** // ******************************************************************

13
src/CxbxKrnl/CxbxKrnl.cpp
View File

@ -666,6 +666,19 @@ void CxbxKrnlInit
DbgPrintf("EmuMain : LLE enabled for JIT.\n"); DbgPrintf("EmuMain : LLE enabled for JIT.\n");
} }
// Process XInput Enabled flag
{
int XInputEnabled;
g_EmuShared->GetXInputEnabled(&XInputEnabled);
if (XInputEnabled) {
g_XInputEnabled = true;
printf("EmuMain : Using XInput\n");
} else {
g_XInputEnabled = false;
printf("EmuMain : Using DirectInput\n");
}
}
// Initialize devices : // Initialize devices :
char szBuffer[MAX_PATH]; char szBuffer[MAX_PATH];
SHGetSpecialFolderPath(NULL, szBuffer, CSIDL_APPDATA, TRUE); SHGetSpecialFolderPath(NULL, szBuffer, CSIDL_APPDATA, TRUE);

1
src/CxbxKrnl/Emu.cpp
View File

@ -71,6 +71,7 @@ CHAR *g_strCurDrive= NULL;
volatile bool g_bEmuException = false; volatile bool g_bEmuException = false;
volatile bool g_bEmuSuspended = false; volatile bool g_bEmuSuspended = false;
volatile bool g_bPrintfOn = true; volatile bool g_bPrintfOn = true;
bool g_XInputEnabled = false;
// Delta added to host SystemTime, used in xboxkrnl::KeQuerySystemTime and xboxkrnl::NtSetSystemTime // Delta added to host SystemTime, used in xboxkrnl::KeQuerySystemTime and xboxkrnl::NtSetSystemTime
LARGE_INTEGER HostSystemTimeDelta = {}; LARGE_INTEGER HostSystemTimeDelta = {};

1
src/CxbxKrnl/Emu.h
View File

@ -95,6 +95,7 @@ g_pXInputSetStateStatus[XINPUT_SETSTATE_SLOTS];
// 4 controllers // 4 controllers
#define XINPUT_HANDLE_SLOTS 4 #define XINPUT_HANDLE_SLOTS 4
extern bool g_XInputEnabled;
extern HANDLE g_hInputHandle[XINPUT_HANDLE_SLOTS]; extern HANDLE g_hInputHandle[XINPUT_HANDLE_SLOTS];
extern void InitializeSectionStructures(void); extern void InitializeSectionStructures(void);

24
src/CxbxKrnl/EmuDInput.h
View File

@ -52,28 +52,4 @@ extern void EmuDInputCleanup();
// ****************************************************************** // ******************************************************************
extern void EmuDInputPoll(PXINPUT_STATE Controller); extern void EmuDInputPoll(PXINPUT_STATE Controller);
// ******************************************************************
// * offsets into analog button array
// ******************************************************************
#define XINPUT_GAMEPAD_A 0
#define XINPUT_GAMEPAD_B 1
#define XINPUT_GAMEPAD_X 2
#define XINPUT_GAMEPAD_Y 3
#define XINPUT_GAMEPAD_BLACK 4
#define XINPUT_GAMEPAD_WHITE 5
#define XINPUT_GAMEPAD_LEFT_TRIGGER 6
#define XINPUT_GAMEPAD_RIGHT_TRIGGER 7
// ******************************************************************
// * masks for digital buttons
// ******************************************************************
#define XINPUT_GAMEPAD_DPAD_UP 0x00000001
#define XINPUT_GAMEPAD_DPAD_DOWN 0x00000002
#define XINPUT_GAMEPAD_DPAD_LEFT 0x00000004
#define XINPUT_GAMEPAD_DPAD_RIGHT 0x00000008
#define XINPUT_GAMEPAD_START 0x00000010
#define XINPUT_GAMEPAD_BACK 0x00000020
#define XINPUT_GAMEPAD_LEFT_THUMB 0x00000040
#define XINPUT_GAMEPAD_RIGHT_THUMB 0x00000080
#endif #endif

7
src/CxbxKrnl/EmuShared.h
View File

@ -91,6 +91,12 @@ class EmuShared : public Mutex
void GetFlagsLLE( int *flags) { Lock(); *flags = m_FlagsLLE; Unlock(); } void GetFlagsLLE( int *flags) { Lock(); *flags = m_FlagsLLE; Unlock(); }
void SetFlagsLLE(const int *flags) { Lock(); m_FlagsLLE = *flags; Unlock(); } void SetFlagsLLE(const int *flags) { Lock(); m_FlagsLLE = *flags; Unlock(); }
// ******************************************************************
// * XInput Flag Accessors
// ******************************************************************
void GetXInputEnabled(int* value) { Lock(); *value = m_XInputEnabled; Unlock(); }
void SetXInputEnabled(int* value) { Lock(); m_XInputEnabled = *value; Unlock(); }
private: private:
// ****************************************************************** // ******************************************************************
// * Constructor / Deconstructor // * Constructor / Deconstructor
@ -105,6 +111,7 @@ class EmuShared : public Mutex
XBVideo m_XBVideo; XBVideo m_XBVideo;
char m_XbePath[MAX_PATH]; char m_XbePath[MAX_PATH];
int m_FlagsLLE; int m_FlagsLLE;
int m_XInputEnabled;
}; };
// ****************************************************************** // ******************************************************************

90
src/CxbxKrnl/EmuXInput.cpp
View File

@ -41,24 +41,6 @@
#include "EmuShared.h" #include "EmuShared.h"
#include "EmuXInput.h" #include "EmuXInput.h"
//
// Prevent naming collisions
//
#undef XINPUT_GAMEPAD_DPAD_UP
#undef XINPUT_GAMEPAD_DPAD_DOWN
#undef XINPUT_GAMEPAD_DPAD_LEFT
#undef XINPUT_GAMEPAD_DPAD_RIGHT
#undef XINPUT_GAMEPAD_START
#undef XINPUT_GAMEPAD_BACK
#undef XINPUT_GAMEPAD_LEFT_THUMB
#undef XINPUT_GAMEPAD_RIGHT_THUMB
#undef XINPUT_GAMEPAD_LEFT_SHOULDER
#undef XINPUT_GAMEPAD_RIGHT_SHOULDER
#undef XINPUT_GAMEPAD_A
#undef XINPUT_GAMEPAD_B
#undef XINPUT_GAMEPAD_X
#undef XINPUT_GAMEPAD_Y
#include <xinput.h> #include <xinput.h>
@ -73,7 +55,7 @@ static BOOL g_bXInputInitialized = FALSE;
// ****************************************************************** // ******************************************************************
// * patch: XInputPCPoll // * patch: XInputPCPoll
// ****************************************************************** // ******************************************************************
/*void XTL::EMUPATCH(XInputPCPoll)( XTL::PXINPUT_STATE Controller ) void XTL::EmuXInputPCPoll( XTL::PXINPUT_STATE Controller )
{ {
// //
// Get the PC's XInput values // Get the PC's XInput values
@ -85,20 +67,68 @@ static BOOL g_bXInputInitialized = FALSE;
// //
// Now convert those values to Xbox XInput // Now convert those values to Xbox XInput
// //
// Analog Sticks
Controller->Gamepad.sThumbLX = g_Controller.Gamepad.sThumbLX; Controller->Gamepad.sThumbLX = g_Controller.Gamepad.sThumbLX;
Controller->Gamepad.sThumbLY = g_Controller.Gamepad.sThumbLY; Controller->Gamepad.sThumbLY = g_Controller.Gamepad.sThumbLY;
Controller->Gamepad.sThumbRX = g_Controller.Gamepad.sThumbRX; Controller->Gamepad.sThumbRX = g_Controller.Gamepad.sThumbRX;
Controller->Gamepad.sThumbRY = g_Controller.Gamepad.sThumbRY; Controller->Gamepad.sThumbRY = g_Controller.Gamepad.sThumbRY;
Controller->Gamepad.wButtons = g_Controller.Gamepad.wButtons & 0x00FF; // Analog Buttons
Controller->Gamepad.bAnalogButtons[XB_XINPUT_GAMEPAD_A] = (g_Controller.Gamepad.wButtons & XINPUT_GAMEPAD_A) ? 255 : 0;
Controller->Gamepad.bAnalogButtons[XB_XINPUT_GAMEPAD_B] = (g_Controller.Gamepad.wButtons & XINPUT_GAMEPAD_B) ? 255 : 0;
Controller->Gamepad.bAnalogButtons[XB_XINPUT_GAMEPAD_X] = (g_Controller.Gamepad.wButtons & XINPUT_GAMEPAD_X) ? 255 : 0;
Controller->Gamepad.bAnalogButtons[XB_XINPUT_GAMEPAD_Y] = (g_Controller.Gamepad.wButtons & XINPUT_GAMEPAD_Y) ? 255 : 0;
Controller->Gamepad.bAnalogButtons[XB_XINPUT_GAMEPAD_WHITE] = (g_Controller.Gamepad.wButtons & XINPUT_GAMEPAD_LEFT_SHOULDER) ? 255 : 0;
Controller->Gamepad.bAnalogButtons[XB_XINPUT_GAMEPAD_BLACK] = (g_Controller.Gamepad.wButtons & XINPUT_GAMEPAD_RIGHT_SHOULDER) ? 255 : 0;
Controller->Gamepad.bAnalogButtons[XB_XINPUT_GAMEPAD_LEFT_TRIGGER] = g_Controller.Gamepad.bLeftTrigger;
Controller->Gamepad.bAnalogButtons[XB_XINPUT_GAMEPAD_RIGHT_TRIGGER] = g_Controller.Gamepad.bRightTrigger;
Controller->Gamepad.bAnalogButtons[0] = (g_Controller.Gamepad.wButtons & 0x1000) ? 1 : 0; // Digital Buttons
Controller->Gamepad.bAnalogButtons[1] = (g_Controller.Gamepad.wButtons & 0x2000) ? 1 : 0; if (g_Controller.Gamepad.wButtons & XINPUT_GAMEPAD_BACK) {
Controller->Gamepad.bAnalogButtons[2] = (g_Controller.Gamepad.wButtons & 0x4000) ? 1 : 0; Controller->Gamepad.wButtons |= XB_XINPUT_GAMEPAD_BACK;
Controller->Gamepad.bAnalogButtons[3] = (g_Controller.Gamepad.wButtons & 0x8000) ? 1 : 0; } else {
Controller->Gamepad.bAnalogButtons[4] = (g_Controller.Gamepad.wButtons & 0x0100) ? 1 : 0; Controller->Gamepad.wButtons &= ~XB_XINPUT_GAMEPAD_BACK;
Controller->Gamepad.bAnalogButtons[5] = (g_Controller.Gamepad.wButtons & 0x0200) ? 1 : 0; }
Controller->Gamepad.bAnalogButtons[6] = g_Controller.Gamepad.bLeftTrigger;
Controller->Gamepad.bAnalogButtons[7] = g_Controller.Gamepad.bRightTrigger; if (g_Controller.Gamepad.wButtons & XINPUT_GAMEPAD_START) {
}*/ Controller->Gamepad.wButtons |= XB_XINPUT_GAMEPAD_START;
} else {
Controller->Gamepad.wButtons &= ~XB_XINPUT_GAMEPAD_START;
}
if (g_Controller.Gamepad.wButtons & XINPUT_GAMEPAD_LEFT_THUMB) {
Controller->Gamepad.wButtons |= XB_XINPUT_GAMEPAD_LEFT_THUMB;
} else {
Controller->Gamepad.wButtons &= ~XB_XINPUT_GAMEPAD_LEFT_THUMB;
}
if (g_Controller.Gamepad.wButtons & XINPUT_GAMEPAD_RIGHT_THUMB) {
Controller->Gamepad.wButtons |= XB_XINPUT_GAMEPAD_RIGHT_THUMB;
} else {
Controller->Gamepad.wButtons &= ~XB_XINPUT_GAMEPAD_RIGHT_THUMB;
}
if (g_Controller.Gamepad.wButtons & XINPUT_GAMEPAD_DPAD_UP) {
Controller->Gamepad.wButtons |= XB_XINPUT_GAMEPAD_DPAD_UP;
} else {
Controller->Gamepad.wButtons &= ~XB_XINPUT_GAMEPAD_DPAD_UP;
}
if (g_Controller.Gamepad.wButtons & XINPUT_GAMEPAD_DPAD_DOWN) {
Controller->Gamepad.wButtons |= XB_XINPUT_GAMEPAD_DPAD_DOWN;
} else {
Controller->Gamepad.wButtons &= ~XB_XINPUT_GAMEPAD_DPAD_DOWN;
}
if (g_Controller.Gamepad.wButtons & XINPUT_GAMEPAD_DPAD_LEFT) {
Controller->Gamepad.wButtons |= XB_XINPUT_GAMEPAD_DPAD_LEFT;
} else {
Controller->Gamepad.wButtons &= ~XB_XINPUT_GAMEPAD_DPAD_LEFT;
}
if (g_Controller.Gamepad.wButtons & XINPUT_GAMEPAD_DPAD_RIGHT) {
Controller->Gamepad.wButtons |= XB_XINPUT_GAMEPAD_DPAD_RIGHT;
} else {
Controller->Gamepad.wButtons &= ~XB_XINPUT_GAMEPAD_DPAD_RIGHT;
}
}

2
src/CxbxKrnl/EmuXInput.h
View File

@ -37,6 +37,6 @@
// ****************************************************************** // ******************************************************************
// * patch: XInputPCPoll // * patch: XInputPCPoll
// ****************************************************************** // ******************************************************************
// void EmuXInputPCPoll( XTL::PXINPUT_STATE Controller ); void EmuXInputPCPoll( XTL::PXINPUT_STATE Controller );
#endif #endif

9
src/CxbxKrnl/EmuXapi.cpp
View File

@ -89,7 +89,6 @@ XFIBER g_Fibers[256];
// Number of fiber routines queued // Number of fiber routines queued
int g_FiberCount = 0; int g_FiberCount = 0;
// ****************************************************************** // ******************************************************************
// * patch: XFormatUtilityDrive // * patch: XFormatUtilityDrive
// ****************************************************************** // ******************************************************************
@ -462,8 +461,12 @@ DWORD WINAPI XTL::EMUPATCH(XInputGetState)
if(dwPort == 0) if(dwPort == 0)
{ {
EmuDInputPoll(pState); if (g_XInputEnabled) {
// EmuXInputPCPoll(pState); EmuXInputPCPoll(pState);
} else {
EmuDInputPoll(pState);
}
ret = ERROR_SUCCESS; ret = ERROR_SUCCESS;
} }
} }

24
src/CxbxKrnl/EmuXapi.h
View File

@ -229,6 +229,30 @@ typedef struct _XINPUT_STATE
} }
XINPUT_STATE, *PXINPUT_STATE; XINPUT_STATE, *PXINPUT_STATE;
// ******************************************************************
// * offsets into analog button array
// ******************************************************************
#define XB_XINPUT_GAMEPAD_A 0
#define XB_XINPUT_GAMEPAD_B 1
#define XB_XINPUT_GAMEPAD_X 2
#define XB_XINPUT_GAMEPAD_Y 3
#define XB_XINPUT_GAMEPAD_BLACK 4
#define XB_XINPUT_GAMEPAD_WHITE 5
#define XB_XINPUT_GAMEPAD_LEFT_TRIGGER 6
#define XB_XINPUT_GAMEPAD_RIGHT_TRIGGER 7
// ******************************************************************
// * masks for digital buttons
// ******************************************************************
#define XB_XINPUT_GAMEPAD_DPAD_UP 0x00000001
#define XB_XINPUT_GAMEPAD_DPAD_DOWN 0x00000002
#define XB_XINPUT_GAMEPAD_DPAD_LEFT 0x00000004
#define XB_XINPUT_GAMEPAD_DPAD_RIGHT 0x00000008
#define XB_XINPUT_GAMEPAD_START 0x00000010
#define XB_XINPUT_GAMEPAD_BACK 0x00000020
#define XB_XINPUT_GAMEPAD_LEFT_THUMB 0x00000040
#define XB_XINPUT_GAMEPAD_RIGHT_THUMB 0x00000080
// ****************************************************************** // ******************************************************************
// * XINPUT_FEEDBACK_HEADER // * XINPUT_FEEDBACK_HEADER
// ****************************************************************** // ******************************************************************