PAD: windows removal of callbacks, merging with linux api

pcsx2/PAD/Windows/DeviceEnumerator.cpp

@@ -23,7 +23,7 @@
 #ifdef _WIN32
 #include "WindowsMessaging.h"
 #include "DirectInput.h"
-#include "RawInput.h"
+#include "PADRawInput.h"
 #include "XInputEnum.h"
 #include "HidDevice.h"
 #include "DualShock3.h"

pcsx2/PAD/Windows/DirectInput.cpp

@@ -20,7 +20,7 @@
 #define DIRECTINPUT_VERSION 0x0800
 #include <dinput.h>
 #include "InputManager.h"
-#include "Config.h"
+#include "PADConfig.h"
 
 #include "VKey.h"
 #include "DirectInput.h"

pcsx2/PAD/Windows/DualShock3.cpp

@@ -18,7 +18,7 @@
 #include "PrecompiledHeader.h"
 #include "Global.h"
 #include "InputManager.h"
-#include "Config.h"
+#include "PADConfig.h"
 
 #include "usb.h"
 #include "HidDevice.h"

pcsx2/PAD/Windows/InputManager.cpp

@@ -19,7 +19,7 @@
 #include "Global.h"
 #include "InputManager.h"
 #include "KeyboardQueue.h"
-#include "Config.h"
+#include "PADConfig.h"
 
 InputDeviceManager *dm = 0;
 

pcsx2/PAD/Windows/PAD.cpp

@@ -25,7 +25,8 @@
 #include <sstream>
 #include "resource.h"
 #include "InputManager.h"
-#include "Config.h"
+#include "PADConfig.h"
+#include "PAD.h"
 
 #define PADdefs
 
@@ -37,6 +38,7 @@
 #include "KeyboardQueue.h"
 #include "svnrev.h"
 #include "DualShock3.h"
+#include <timeapi.h>
 
 #define WMA_FORCE_UPDATE (WM_APP + 0x537)
 #define FORCE_UPDATE_WPARAM ((WPARAM)0x74328943)
@@ -328,25 +330,6 @@ void UpdateEnabledDevices(int updateList = 0)
     }
 }
 
-#ifdef _MSC_VER
-BOOL WINAPI DllMain(HINSTANCE hInstance, DWORD fdwReason, void *lpvReserved)
-{
-    hInst = hInstance;
-    if (fdwReason == DLL_PROCESS_ATTACH) {
-        InitializeCriticalSection(&updateLock);
-
-        DisableThreadLibraryCalls(hInstance);
-    } else if (fdwReason == DLL_PROCESS_DETACH) {
-        while (openCount)
-            PADclose();
-        PADshutdown();
-        UninitLibUsb();
-        DeleteCriticalSection(&updateLock);
-    }
-    return 1;
-}
-#endif
-
 void AddForce(ButtonSum *sum, u8 cmd, int delta = 255)
 {
     if (!delta)
@@ -705,7 +688,7 @@ void Update(unsigned int port, unsigned int slot)
         --stateUpdated[0];
 }
 
-void CALLBACK PADupdate(int port)
+void PADupdate(int port)
 {
     Update(port + 3, 0);
 }
@@ -715,18 +698,6 @@ inline void SetVibrate(int port, int slot, int motor, u8 val)
     pads[port][slot].nextVibrate[motor] = val;
 }
 
-u32 CALLBACK PS2EgetLibType(void)
-{
-    return PS2E_LT_PAD;
-}
-
-u32 CALLBACK PS2EgetLibVersion2(u32 type)
-{
-    if (type == PS2E_LT_PAD)
-        return (PS2E_PAD_VERSION << 16) | VERSION;
-    return 0;
-}
-
 #ifdef _MSC_VER
 // Used in about and config screens.
 void GetNameAndVersionString(wchar_t *out)
@@ -739,24 +710,8 @@ void GetNameAndVersionString(wchar_t *out)
 }
 #endif
 
-char *CALLBACK PS2EgetLibName(void)
-{
-#if defined(PCSX2_DEBUG)
-    static char version[50];
-    sprintf(version, "LilyPad Debug (%lld)", SVN_REV);
-    return version;
-#else
-    static char version[50];
-    sprintf(version, "LilyPad (%lld)", SVN_REV);
-    return version;
-#endif
-}
 
-//void CALLBACK PADgsDriverInfo(GSdriverInfo *info) {
+void PADshutdown()
-//	info=info;
-//}
-
-void CALLBACK PADshutdown()
 {
     DEBUG_TEXT_OUT("LilyPad shutdown.\n\n");
     for (int i = 0; i < 8; i++)
@@ -826,7 +781,7 @@ struct QueryInfo
     u8 response[42];
 } query = {0, 0, 0, 0, 0, 0xFF, {0xF3}};
 
-s32 CALLBACK PADinit(u32 flags)
+s32 PADinit(u32 flags)
 {
     // Note:  Won't load settings if already loaded.
     if (LoadSettings() < 0) {
@@ -980,7 +935,7 @@ DWORD WINAPI MaximizeWindowThreadProc(void *lpParameter)
 }
 #endif
 
-void CALLBACK PADconfigure()
+void PADconfigure()
 {
     if (openCount) {
         return;
@@ -1005,7 +960,7 @@ DWORD WINAPI RenameWindowThreadProc(void *lpParameter)
 }
 #endif
 
-s32 CALLBACK PADopen(void *pDsp)
+s32 PADopen(void *pDsp)
 {
     if (openCount++)
         return 0;
@@ -1097,7 +1052,7 @@ s32 CALLBACK PADopen(void *pDsp)
     return 0;
 }
 
-void CALLBACK PADclose()
+void PADclose()
 {
     if (openCount && !--openCount) {
         DEBUG_TEXT_OUT("LilyPad closed\n\n");
@@ -1115,7 +1070,7 @@ void CALLBACK PADclose()
     }
 }
 
-u8 CALLBACK PADstartPoll(int port)
+u8 PADstartPoll(int port)
 {
     DEBUG_NEW_SET();
     port--;
@@ -1148,7 +1103,7 @@ inline int IsDualshock2(u8 port, u8 slot)
            (config.padConfigs[query.port][query.slot].type == GuitarPad && config.GH2);
 }
 
-u8 CALLBACK PADpoll(u8 value)
+u8 PADpoll(u8 value)
 {
     DEBUG_IN(value);
     if (query.lastByte + 1 >= query.numBytes) {
@@ -1460,40 +1415,12 @@ u8 CALLBACK PADpoll(u8 value)
 // returns: 1 if supports pad1
 //			2 if supports pad2
 //			3 if both are supported
-u32 CALLBACK PADquery()
+u32 PADquery()
 {
     return 3;
 }
 
-#ifdef _MSC_VER
+keyEvent *PADkeyEvent()
-INT_PTR CALLBACK AboutDialogProc(HWND hWndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam)
-{
-    if (uMsg == WM_INITDIALOG) {
-        wchar_t idString[100];
-        GetNameAndVersionString(idString);
-        SetDlgItemTextW(hWndDlg, IDC_VERSION, idString);
-    } else if (uMsg == WM_COMMAND && (LOWORD(wParam) == IDOK || LOWORD(wParam) == IDCANCEL)) {
-        EndDialog(hWndDlg, 0);
-        return 1;
-    }
-    return 0;
-}
-#endif
-
-
-void CALLBACK PADabout()
-{
-#ifdef _MSC_VER
-    DialogBox(hInst, MAKEINTRESOURCE(IDD_ABOUT), 0, AboutDialogProc);
-#endif
-}
-
-s32 CALLBACK PADtest()
-{
-    return 0;
-}
-
-keyEvent *CALLBACK PADkeyEvent()
 {
     // If running both pads, ignore every other call.  So if two keys pressed in same interval...
     static char eventCount = 0;
@@ -1559,7 +1486,7 @@ struct PadPluginFreezeData
     QueryInfo query;
 };
 
-s32 CALLBACK PADfreeze(int mode, freezeData *data)
+s32 PADfreeze(int mode, freezeData *data)
 {
     if (!data) {
         printf("LilyPad savestate null pointer!\n");
@@ -1628,7 +1555,7 @@ s32 CALLBACK PADfreeze(int mode, freezeData *data)
     return 0;
 }
 
-u32 CALLBACK PADreadPort1(PadDataS *pads)
+u32 PADreadPort1(PadDataS *pads)
 {
     PADstartPoll(1);
     PADpoll(0x42);
@@ -1638,7 +1565,7 @@ u32 CALLBACK PADreadPort1(PadDataS *pads)
     return 0;
 }
 
-u32 CALLBACK PADreadPort2(PadDataS *pads)
+u32 PADreadPort2(PadDataS *pads)
 {
     PADstartPoll(2);
     PADpoll(0x42);
@@ -1648,7 +1575,7 @@ u32 CALLBACK PADreadPort2(PadDataS *pads)
     return 0;
 }
 
-s32 CALLBACK PADqueryMtap(u8 port)
+s32 PADqueryMtap(u8 port)
 {
     port--;
     if (port > 1)
@@ -1656,7 +1583,7 @@ s32 CALLBACK PADqueryMtap(u8 port)
     return config.multitap[port];
 }
 
-s32 CALLBACK PADsetSlot(u8 port, u8 slot)
+s32 PADsetSlot(u8 port, u8 slot)
 {
     port--;
     slot--;

pcsx2/PAD/Windows/PAD.h

@@ -0,0 +1,54 @@
+/*  PCSX2 - PS2 Emulator for PCs
+ *  Copyright (C) 2002-2020  PCSX2 Dev Team
+ *
+ *  PCSX2 is free software: you can redistribute it and/or modify it under the terms
+ *  of the GNU Lesser General Public License as published by the Free Software Found-
+ *  ation, either version 3 of the License, or (at your option) any later version.
+ *
+ *  PCSX2 is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+ *  without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+ *  PURPOSE.  See the GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License along with PCSX2.
+ *  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#include <wx/string.h>
+#include <wx/tokenzr.h>
+#include <wx/intl.h>
+#include <wx/log.h>
+#include <wx/filename.h>
+#include "Utilities/pxStreams.h"
+#include "Utilities/Console.h"
+#include <stdio.h>
+#include <assert.h>
+#include "PS2Edefs.h"
+
+#include <windows.h>
+#include <windowsx.h>
+
+#include <array>
+#include <vector>
+#include <map>
+#include <string>
+#include <memory>
+#include <mutex>
+#include <queue>
+
+
+s32 PADinit();
+void PADshutdown();
+s32 PADopen(void* pDsp);
+void PADclose();
+u32 PADquery();
+s32 PADsetSlot(u8 port, u8 slot);
+s32 PADfreeze(int mode, freezeData* data);
+u8 PADstartPoll(int pad);
+u8 PADpoll(u8 value);
+keyEvent* PADkeyEvent();
+void PADupdate(int pad);
+void PADconfigure();
+//void PADDoFreezeOut(void* dest);
+//void PADDoFreezeIn(pxInputStream& infp);

pcsx2/PAD/Windows/PADConfig.cpp

@@ -15,11 +15,12 @@
  *  with PCSX2.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include "PrecompiledHeader.h"
 #include "Global.h"
 
 #include "resource.h"
 #include "InputManager.h"
-#include "Config.h"
+#include "PADConfig.h"
 
 #include "Tooltips.h"
 #include "Diagnostics.h"
@@ -31,7 +32,9 @@
 #include <Shlwapi.h>
 
 // Needed to know if raw input is available.  It requires XP or higher.
-#include "RawInput.h"
+#include "PADRawInput.h"
+#include <commdlg.h>
+#include <timeapi.h>
 
 //max len 24 wchar_t
 const wchar_t *padTypes[] = {

pcsx2/PAD/Windows/PADRawInput.cpp

@@ -15,6 +15,7 @@
  *  with PCSX2.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include "PrecompiledHeader.h"
 #include "Global.h"
 #include "InputManager.h"
 #include "WindowsMessaging.h"

pcsx2/PAD/Windows/XInputEnum.cpp

@@ -22,7 +22,7 @@
 #include "VKey.h"
 #include "InputManager.h"
 #include "XInputEnum.h"
-#include "Config.h"
+#include "PADConfig.h"
 
 // Extra enum
 #define XINPUT_GAMEPAD_GUIDE 0x0400

pcsx2/windows/VCprojects/pcsx2.vcxproj

@@ -289,7 +289,7 @@
     <ClCompile Include="..\..\IopGte.cpp" />
     <ClCompile Include="..\..\IPC.cpp" />
     <ClCompile Include="..\..\FW.cpp" />
-    <ClCompile Include="..\..\PAD\Windows\Config.cpp" />
+    <ClCompile Include="..\..\PAD\Windows\PADConfig.cpp" />
     <ClCompile Include="..\..\PAD\Windows\DeviceEnumerator.cpp" />
     <ClCompile Include="..\..\PAD\Windows\Diagnostics.cpp" />
     <ClCompile Include="..\..\PAD\Windows\DirectInput.cpp" />
@@ -299,7 +299,7 @@
     <ClCompile Include="..\..\PAD\Windows\InputManager.cpp" />
     <ClCompile Include="..\..\PAD\Windows\KeyboardQueue.cpp" />
     <ClCompile Include="..\..\PAD\Windows\PAD.cpp" />
-    <ClCompile Include="..\..\PAD\Windows\RawInput.cpp" />
+    <ClCompile Include="..\..\PAD\Windows\PADRawInput.cpp" />
     <ClCompile Include="..\..\PAD\Windows\Tooltips.cpp" />
     <ClCompile Include="..\..\PAD\Windows\VKey.cpp" />
     <ClCompile Include="..\..\PAD\Windows\WindowsKeyboard.cpp" />
@@ -648,7 +648,8 @@
     <ClInclude Include="..\..\IopGte.h" />
     <ClInclude Include="..\..\IPC.h" />
     <ClInclude Include="..\..\FW.h" />
-    <ClInclude Include="..\..\PAD\Windows\Config.h" />
+    <ClInclude Include="..\..\PAD\Windows\PAD.h" />
+    <ClInclude Include="..\..\PAD\Windows\PADConfig.h" />
     <ClInclude Include="..\..\PAD\Windows\DeviceEnumerator.h" />
     <ClInclude Include="..\..\PAD\Windows\Diagnostics.h" />
     <ClInclude Include="..\..\PAD\Windows\DirectInput.h" />
@@ -657,7 +658,7 @@
     <ClInclude Include="..\..\PAD\Windows\HidDevice.h" />
     <ClInclude Include="..\..\PAD\Windows\InputManager.h" />
     <ClInclude Include="..\..\PAD\Windows\KeyboardQueue.h" />
-    <ClInclude Include="..\..\PAD\Windows\RawInput.h" />
+    <ClInclude Include="..\..\PAD\Windows\PADRawInput.h" />
     <ClInclude Include="..\..\PAD\Windows\resource.h" />
     <ClInclude Include="..\..\PAD\Windows\Tooltips.h" />
     <ClInclude Include="..\..\PAD\Windows\usb.h" />
@@ -888,7 +889,7 @@
     <ResourceCompile Include="..\..\..\3rdparty\wxwidgets3.0\include\wx\msw\wx.rc">
       <AdditionalIncludeDirectories>$(SolutionDir)3rdparty\wxwidgets3.0\$(PlatformName);$(SolutionDir)3rdparty\wxwidgets3.0\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ResourceCompile>
-    <ResourceCompile Include="..\..\PAD\Windows\LilyPad.rc" />
+    <ResourceCompile Include="..\..\PAD\Windows\PAD.rc" />
     <ResourceCompile Include="..\..\SPU2\Windows\SPU2.rc" />
     <ResourceCompile Include="..\..\DEV9\Win32\DEV9ghzdrk.rc" />
     <ResourceCompile Include="..\..\USB\usb-pad\dx\versionproxy.rc" />

pcsx2/windows/VCprojects/pcsx2.vcxproj.filters

@@ -1211,9 +1211,6 @@
       <Filter>System\Ps2\USB\shared</Filter>
     </ClCompile>
     <ClCompile Include="..\..\DEV9\net.cpp" />
-    <ClCompile Include="..\..\PAD\Windows\Config.cpp">
-      <Filter>System\Ps2\PAD</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\PAD\Windows\DeviceEnumerator.cpp">
       <Filter>System\Ps2\PAD</Filter>
     </ClCompile>
@@ -1238,9 +1235,6 @@
     <ClCompile Include="..\..\PAD\Windows\KeyboardQueue.cpp">
       <Filter>System\Ps2\PAD</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\PAD\Windows\RawInput.cpp">
-      <Filter>System\Ps2\PAD</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\PAD\Windows\Tooltips.cpp">
       <Filter>System\Ps2\PAD</Filter>
     </ClCompile>
@@ -1265,6 +1259,12 @@
     <ClCompile Include="..\..\PAD\Windows\PAD.cpp">
       <Filter>System\Ps2\PAD</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\PAD\Windows\PADConfig.cpp">
+      <Filter>System\Ps2\PAD</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\PAD\Windows\PADRawInput.cpp">
+      <Filter>System\Ps2\PAD</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\Patch.h">
@@ -1966,9 +1966,6 @@
     <ClInclude Include="..\..\USB\Win32\resource_usb.h">
       <Filter>System\Ps2\USB\Win32</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\PAD\Windows\Config.h">
-      <Filter>System\Ps2\PAD</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\PAD\Windows\DeviceEnumerator.h">
       <Filter>System\Ps2\PAD</Filter>
     </ClInclude>
@@ -1993,9 +1990,6 @@
     <ClInclude Include="..\..\PAD\Windows\KeyboardQueue.h">
       <Filter>System\Ps2\PAD</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\PAD\Windows\RawInput.h">
-      <Filter>System\Ps2\PAD</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\PAD\Windows\resource.h">
       <Filter>System\Ps2\PAD</Filter>
     </ClInclude>
@@ -2023,6 +2017,15 @@
     <ClInclude Include="..\..\PAD\Windows\XInputEnum.h">
       <Filter>System\Ps2\PAD</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\PAD\Windows\PADConfig.h">
+      <Filter>System\Ps2\PAD</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\PAD\Windows\PADRawInput.h">
+      <Filter>System\Ps2\PAD</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\PAD\Windows\PAD.h">
+      <Filter>System\Ps2\PAD</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="..\wxResources.rc">
@@ -2046,7 +2049,7 @@
     <ResourceCompile Include="..\..\USB\Win32\USBDialog.rc">
       <Filter>System\Ps2\USB\Win32</Filter>
     </ResourceCompile>
-    <ResourceCompile Include="..\..\PAD\Windows\LilyPad.rc">
+    <ResourceCompile Include="..\..\PAD\Windows\PAD.rc">
       <Filter>System\Ps2\PAD</Filter>
     </ResourceCompile>
   </ItemGroup>