diff --git a/pcsx2/PAD/Windows/PAD.cpp b/pcsx2/PAD/Windows/PAD.cpp index 1f215bdfda..adf3cfa64a 100644 --- a/pcsx2/PAD/Windows/PAD.cpp +++ b/pcsx2/PAD/Windows/PAD.cpp @@ -45,9 +45,6 @@ #define FORCE_UPDATE_WPARAM ((WPARAM)0x74328943) #define FORCE_UPDATE_LPARAM ((LPARAM)0x89437437) -// PAD version. -#define VERSION ((1 << 8) | 12 | (1 << 24)) - #ifdef __linux__ Display* GSdsp; Window GSwin; @@ -789,7 +786,7 @@ inline void SetVibrate(int port, int slot, int motor, u8 val) // Used in about and config screens. void GetNameAndVersionString(wchar_t* out) { - wsprintfW(out, L"GamePad settings", (VERSION >> 8) & 0xFF, VERSION & 0xFF, (VERSION >> 24) & 0xFF, SVN_REV); + wsprintfW(out, L"GamePad"); } #endif @@ -1829,4 +1826,4 @@ void PADDoFreezeIn(pxInputStream& infp) infp.Read(fP.data, fP.size); if (PADfreeze(FREEZE_LOAD, &fP) != 0) throw std::runtime_error(" * PAD: Error loading state!\n"); -} \ No newline at end of file +} diff --git a/pcsx2/PAD/Windows/PAD.rc b/pcsx2/PAD/Windows/PAD.rc index f51560f181..d3554d3f63 100644 --- a/pcsx2/PAD/Windows/PAD.rc +++ b/pcsx2/PAD/Windows/PAD.rc @@ -55,6 +55,7 @@ STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN CONTROL "",IDC_BINDINGS_LIST,"SysListView32",LVS_REPORT | LVS_SHOWSELALWAYS | LVS_NOSORTHEADER | WS_BORDER | WS_VSCROLL | WS_TABSTOP,7,7,183,237,WS_EX_CLIENTEDGE + // Input Bindings: PUSHBUTTON "Select",ID_SELECT,328,34,34,15 PUSHBUTTON "Start",ID_START,366,34,34,15 PUSHBUTTON "Analog",ID_ANALOG,328,51,34,15 @@ -86,22 +87,27 @@ BEGIN PUSHBUTTON "R3",ID_R3,348,171,30,15 PUSHBUTTON "Right",ID_RSTICK_RIGHT,380,171,30,15 PUSHBUTTON "Down",ID_RSTICK_DOWN,348,191,30,15 + // Force Feedback bindings: GROUPBOX "Add Force Feedback Effect",ID_FORCEFEEDBACK_BOX,196,215,221,30 COMBOBOX IDC_FORCEFEEDBACK,202,225,96,118,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP PUSHBUTTON "Big Motor",ID_BIG_MOTOR,304,224,50,14 PUSHBUTTON "Small Motor",ID_SMALL_MOTOR,360,224,50,14 + // Input options: PUSHBUTTON "Quick Setup",ID_QUICK_SETUP,358,7,59,15 CTEXT "",IDC_QUICK_SETUP_TEXT,196,7,156,15,WS_BORDER CONTROL "Configure on bind",IDC_CONFIGURE_ON_BIND,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,347,266,70,15 PUSHBUTTON "Show Special Inputs",ID_SPECIAL_INPUTS,196,249,90,15 COMBOBOX IDC_DEVICE_SELECT,304,250,113,70,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + // Special bindings: PUSHBUTTON "Lock Input",ID_LOCK_ALL_INPUT,7,249,58,15 PUSHBUTTON "Lock Direction",ID_LOCK_DIRECTION,69,249,58,15 PUSHBUTTON "Lock Buttons",ID_LOCK_BUTTONS,131,249,58,15 PUSHBUTTON "Turbo",ID_TURBO_KEY,7,265,58,15 PUSHBUTTON "Exclude Input",ID_EXCLUDE,131,265,58,15 + // Force Feedback & Input configurations: PUSHBUTTON "Back to Controls",ID_CONTROLS,196,260,59,15 PUSHBUTTON "Reset Configuration",ID_RESET_CONFIG,259,260,72,15 + // Force Feedback configuration: GROUPBOX "",ID_FF,195,9,222,248 COMBOBOX IDC_FF_EFFECT,203,23,206,106,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP CONTROL "",IDC_FF_AXIS1,"msctls_trackbar32",WS_TABSTOP,199,43,214,17 @@ -129,6 +135,7 @@ BEGIN CONTROL "Flip",IDC_FF_AXIS6_FLIP,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,302,243,35,10 EDITTEXT IDC_FF_AXIS6_SCALE,375,243,33,12,ES_RIGHT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP,WS_EX_RTLREADING PUSHBUTTON "Test",ID_TEST,335,260,59,15 + // Input configuration: GROUPBOX "Configure Binding",ID_SENSITIVITY,195,9,222,110 EDITTEXT IDC_AXIS_DEVICE,202,22,72,12,ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP COMBOBOX IDC_AXIS_DIRECTION,276,20,70,47,CBS_DROPDOWNLIST | WS_TABSTOP @@ -152,6 +159,7 @@ STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN CONTROL "",IDC_BINDINGS_LIST,"SysListView32",LVS_REPORT | LVS_SHOWSELALWAYS | LVS_NOSORTHEADER | WS_BORDER | WS_VSCROLL | WS_TABSTOP,7,7,183,237,WS_EX_CLIENTEDGE + // Input Bindings: PUSHBUTTON "Select",ID_SELECT,262,25,43,15 PUSHBUTTON "Start",ID_START,306,25,43,15 PUSHBUTTON "White L",ID_TRIANGLE,196,69,43,15 @@ -163,22 +171,27 @@ BEGIN PUSHBUTTON "Green R",ID_R2,328,69,43,15 PUSHBUTTON "Yellow R",ID_DPAD_UP,350,51,43,15 PUSHBUTTON "White R",ID_L2,372,69,43,15 + // Force Feedback bindings: GROUPBOX "Add Force Feedback Effect",ID_FORCEFEEDBACK_BOX,196,215,221,30 COMBOBOX IDC_FORCEFEEDBACK,202,225,96,118,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP PUSHBUTTON "Big Motor",ID_BIG_MOTOR,304,224,50,14 PUSHBUTTON "Small Motor",ID_SMALL_MOTOR,360,224,50,14 + // Input options: PUSHBUTTON "Quick Setup",ID_QUICK_SETUP,358,7,59,15 CTEXT "",IDC_QUICK_SETUP_TEXT,196,7,156,15,WS_BORDER CONTROL "Configure on bind",IDC_CONFIGURE_ON_BIND,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,347,266,70,15 PUSHBUTTON "Show Special Inputs",ID_SPECIAL_INPUTS,196,249,90,15 COMBOBOX IDC_DEVICE_SELECT,304,250,113,70,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + // Special bindings: PUSHBUTTON "Lock Input",ID_LOCK_ALL_INPUT,7,249,58,15 PUSHBUTTON "Lock Direction",ID_LOCK_DIRECTION,69,249,58,15 PUSHBUTTON "Lock Buttons",ID_LOCK_BUTTONS,131,249,58,15 PUSHBUTTON "Turbo",ID_TURBO_KEY,7,265,58,15 PUSHBUTTON "Exclude Input",ID_EXCLUDE,131,265,58,15 + // Force Feedback & Input configurations: PUSHBUTTON "Back to Controls",ID_CONTROLS,196,260,59,15 PUSHBUTTON "Reset Configuration",ID_RESET_CONFIG,259,260,72,15 + // Force Feedback configuration: GROUPBOX "",ID_FF,195,9,222,248 COMBOBOX IDC_FF_EFFECT,203,23,206,106,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP CONTROL "",IDC_FF_AXIS1,"msctls_trackbar32",WS_TABSTOP,199,43,214,17 @@ -206,6 +219,7 @@ BEGIN CONTROL "Flip",IDC_FF_AXIS6_FLIP,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,302,243,35,10 EDITTEXT IDC_FF_AXIS6_SCALE,375,243,33,12,ES_RIGHT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP,WS_EX_RTLREADING PUSHBUTTON "Test",ID_TEST,335,260,59,15 + // Input configuration: GROUPBOX "Configure Binding",ID_SENSITIVITY,195,9,222,110 EDITTEXT IDC_AXIS_DEVICE,202,22,72,12,ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP COMBOBOX IDC_AXIS_DIRECTION,276,20,70,47,CBS_DROPDOWNLIST | WS_TABSTOP @@ -229,6 +243,7 @@ STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN CONTROL "",IDC_BINDINGS_LIST,"SysListView32",LVS_REPORT | LVS_SHOWSELALWAYS | LVS_NOSORTHEADER | WS_BORDER | WS_VSCROLL | WS_TABSTOP,7,7,183,237,WS_EX_CLIENTEDGE + // Input Bindings: PUSHBUTTON "Fret 1",ID_R2,283,30,45,15 PUSHBUTTON "Fret 2",ID_CIRCLE,283,53,45,15 PUSHBUTTON "Fret 3",ID_TRIANGLE,283,76,45,15 @@ -240,22 +255,27 @@ BEGIN PUSHBUTTON "Whammy Bar Down",ID_LSTICK_DOWN,219,191,69,15 PUSHBUTTON "Strum Bar Up",ID_DPAD_UP,336,168,58,15 PUSHBUTTON "Strum Bar Down",ID_DPAD_DOWN,336,191,58,15 + // Force Feedback bindings: GROUPBOX "Add Force Feedback Effect",ID_FORCEFEEDBACK_BOX,196,215,221,30 COMBOBOX IDC_FORCEFEEDBACK,202,225,96,118,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP PUSHBUTTON "Big Motor",ID_BIG_MOTOR,304,224,50,14 PUSHBUTTON "Small Motor",ID_SMALL_MOTOR,360,224,50,14 + // Input options: PUSHBUTTON "Quick Setup",ID_QUICK_SETUP,358,7,59,15 CTEXT "",IDC_QUICK_SETUP_TEXT,196,7,156,15,WS_BORDER CONTROL "Configure on bind",IDC_CONFIGURE_ON_BIND,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,347,266,70,15 PUSHBUTTON "Show Special Inputs",ID_SPECIAL_INPUTS,196,249,90,15 COMBOBOX IDC_DEVICE_SELECT,304,250,113,70,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + // Special bindings: PUSHBUTTON "Lock Input",ID_LOCK_ALL_INPUT,7,249,58,15 PUSHBUTTON "Lock Direction",ID_LOCK_DIRECTION,69,249,58,15 PUSHBUTTON "Lock Buttons",ID_LOCK_BUTTONS,131,249,58,15 PUSHBUTTON "Turbo",ID_TURBO_KEY,7,265,58,15 PUSHBUTTON "Exclude Input",ID_EXCLUDE,131,265,58,15 + // Force Feedback & Input configurations: PUSHBUTTON "Back to Controls",ID_CONTROLS,196,260,59,15 PUSHBUTTON "Reset Configuration",ID_RESET_CONFIG,259,260,72,15 + // Force Feedback configuration: GROUPBOX "",ID_FF,195,9,222,248 COMBOBOX IDC_FF_EFFECT,203,23,206,106,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP CONTROL "",IDC_FF_AXIS1,"msctls_trackbar32",WS_TABSTOP,199,43,214,17 @@ -283,6 +303,7 @@ BEGIN CONTROL "Flip",IDC_FF_AXIS6_FLIP,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,302,243,35,10 EDITTEXT IDC_FF_AXIS6_SCALE,375,243,33,12,ES_RIGHT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP,WS_EX_RTLREADING PUSHBUTTON "Test",ID_TEST,335,260,59,15 + // Input configuration: GROUPBOX "Configure Binding",ID_SENSITIVITY,195,9,222,110 EDITTEXT IDC_AXIS_DEVICE,202,22,72,12,ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP COMBOBOX IDC_AXIS_DIRECTION,276,20,70,47,CBS_DROPDOWNLIST | WS_TABSTOP @@ -306,6 +327,7 @@ STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN CONTROL "",IDC_BINDINGS_LIST,"SysListView32",LVS_REPORT | LVS_SHOWSELALWAYS | LVS_NOSORTHEADER | WS_BORDER | WS_VSCROLL | WS_TABSTOP,7,7,183,237,WS_EX_CLIENTEDGE + // Input bindings: PUSHBUTTON "Mouse",ID_MOUSE,379,28,34,15 GROUPBOX "Mouse buttons",IDC_FACE,242,46,124,34 PUSHBUTTON "Left-click",ID_CIRCLE,256,57,45,15 @@ -315,22 +337,27 @@ BEGIN PUSHBUTTON "X-axis Right",ID_LSTICK_RIGHT,307,112,45,15 PUSHBUTTON "Y-axis Up",ID_LSTICK_UP,283,92,45,15 PUSHBUTTON "Y-axis Down",ID_LSTICK_DOWN,283,132,45,15 + // Force Feedback bindings: GROUPBOX "Add Force Feedback Effect",ID_FORCEFEEDBACK_BOX,196,215,221,30 COMBOBOX IDC_FORCEFEEDBACK,202,225,96,118,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP PUSHBUTTON "Big Motor",ID_BIG_MOTOR,304,224,50,14 PUSHBUTTON "Small Motor",ID_SMALL_MOTOR,360,224,50,14 + // Input options: PUSHBUTTON "Quick Setup",ID_QUICK_SETUP,358,7,59,15 CTEXT "",IDC_QUICK_SETUP_TEXT,196,7,156,15,WS_BORDER CONTROL "Configure on bind",IDC_CONFIGURE_ON_BIND,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,347,266,70,15 PUSHBUTTON "Show Special Inputs",ID_SPECIAL_INPUTS,196,249,90,15 COMBOBOX IDC_DEVICE_SELECT,304,250,113,70,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + // Special bindings: PUSHBUTTON "Lock Input",ID_LOCK_ALL_INPUT,7,249,58,15 PUSHBUTTON "Lock Direction",ID_LOCK_DIRECTION,69,249,58,15 PUSHBUTTON "Lock Buttons",ID_LOCK_BUTTONS,131,249,58,15 PUSHBUTTON "Turbo",ID_TURBO_KEY,7,265,58,15 PUSHBUTTON "Exclude Input",ID_EXCLUDE,131,265,58,15 + // Force Feedback & Input configurations: PUSHBUTTON "Back to Controls",ID_CONTROLS,196,260,59,15 PUSHBUTTON "Reset Configuration",ID_RESET_CONFIG,259,260,72,15 + // Input configuration: GROUPBOX "Configure Binding",ID_SENSITIVITY,195,9,222,110 EDITTEXT IDC_AXIS_DEVICE,202,22,72,12,ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP COMBOBOX IDC_AXIS_DIRECTION,276,20,70,47,CBS_DROPDOWNLIST | WS_TABSTOP @@ -354,6 +381,7 @@ STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN CONTROL "",IDC_BINDINGS_LIST,"SysListView32",LVS_REPORT | LVS_SHOWSELALWAYS | LVS_NOSORTHEADER | WS_BORDER | WS_VSCROLL | WS_TABSTOP,7,7,183,237,WS_EX_CLIENTEDGE + // Input bindings: GROUPBOX "Shoulder buttons",IDC_SHOULDER,220,30,173,34 PUSHBUTTON "Analog L",ID_L1,233,41,34,15 PUSHBUTTON "Digital R",ID_R1,346,41,34,15 @@ -373,22 +401,27 @@ BEGIN PUSHBUTTON "Right",ID_LSTICK_RIGHT,327,147,30,15 PUSHBUTTON "Start",ID_START,207,139,34,15 PUSHBUTTON "Mouse",ID_MOUSE,207,158,34,15 + // Force Feedback bindings: GROUPBOX "Add Force Feedback Effect",ID_FORCEFEEDBACK_BOX,196,215,221,30 COMBOBOX IDC_FORCEFEEDBACK,202,225,96,118,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP PUSHBUTTON "Big Motor",ID_BIG_MOTOR,304,224,50,14 PUSHBUTTON "Small Motor",ID_SMALL_MOTOR,360,224,50,14 + // Input options: PUSHBUTTON "Quick Setup",ID_QUICK_SETUP,358,7,59,15 CTEXT "",IDC_QUICK_SETUP_TEXT,196,7,156,15,WS_BORDER CONTROL "Configure on bind",IDC_CONFIGURE_ON_BIND,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,347,266,70,15 PUSHBUTTON "Show Special Inputs",ID_SPECIAL_INPUTS,196,249,90,15 COMBOBOX IDC_DEVICE_SELECT,304,250,113,70,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + // Special bindings: PUSHBUTTON "Lock Input",ID_LOCK_ALL_INPUT,7,249,58,15 PUSHBUTTON "Lock Direction",ID_LOCK_DIRECTION,69,249,58,15 PUSHBUTTON "Lock Buttons",ID_LOCK_BUTTONS,131,249,58,15 PUSHBUTTON "Turbo",ID_TURBO_KEY,7,265,58,15 PUSHBUTTON "Exclude Input",ID_EXCLUDE,131,265,58,15 + // Force Feedback & Input configurations: PUSHBUTTON "Back to Controls",ID_CONTROLS,196,260,59,15 PUSHBUTTON "Reset Configuration",ID_RESET_CONFIG,259,260,72,15 + // Input configuration: GROUPBOX "Configure Binding",ID_SENSITIVITY,195,9,222,110 EDITTEXT IDC_AXIS_DEVICE,202,22,72,12,ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP COMBOBOX IDC_AXIS_DIRECTION,276,20,70,47,CBS_DROPDOWNLIST | WS_TABSTOP @@ -419,8 +452,7 @@ BEGIN GROUPBOX "Game Device APIs",IDC_STATIC,16,70,191,62 CONTROL "DirectInput (Legacy)",IDC_G_DI,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,22,82,100,10 CONTROL "XInput (Modern)",IDC_G_XI,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,22,94,100,10 - CONTROL "DualShock 3 native mode (Requires libusb)",IDC_G_DS3, - "Button",BS_AUTOCHECKBOX | WS_TABSTOP,22,106,155,10 + CONTROL "DualShock 3 native mode (Requires libusb)",IDC_G_DS3,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,22,106,155,10 CONTROL "Monitor when in background",IDC_BACKGROUND,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,22,118,107,10 GROUPBOX "Mouse API",IDC_STATIC,216,16,192,85 CONTROL "Windows messaging (Recommended)",IDC_M_WM,"Button",BS_AUTORADIOBUTTON | WS_GROUP,223,27,137,10 diff --git a/pcsx2/System/SysCoreThread.cpp b/pcsx2/System/SysCoreThread.cpp index 51ef0ee977..516a5db233 100644 --- a/pcsx2/System/SysCoreThread.cpp +++ b/pcsx2/System/SysCoreThread.cpp @@ -101,7 +101,7 @@ void SysCoreThread::Start() return; GetCorePlugins().Init(); SPU2init(); - PADinit(); + PADinit(); DEV9init(); USBinit(); _parent::Start(); @@ -317,7 +317,7 @@ void SysCoreThread::OnSuspendInThread() USBclose(); DoCDVDclose(); FWclose(); - PADclose(); + PADclose(); SPU2close(); } @@ -332,7 +332,7 @@ void SysCoreThread::OnResumeInThread(bool isSuspended) } FWopen(); SPU2open((void*)pDsp); - PADopen((void*)pDsp); + PADopen((void*)pDsp); } @@ -349,7 +349,7 @@ void SysCoreThread::OnCleanupInThread() vu1Thread.WaitVU(); USBclose(); SPU2close(); - PADclose(); + PADclose(); DEV9close(); DoCDVDclose(); FWclose(); @@ -357,7 +357,7 @@ void SysCoreThread::OnCleanupInThread() GetCorePlugins().Shutdown(); USBshutdown(); SPU2shutdown(); - PADshutdown(); + PADshutdown(); DEV9shutdown(); _mm_setcsr(m_mxcsr_saved.bitmask);