From 9eb78a0a19627b549f67697aaabd4f32e670e5f4 Mon Sep 17 00:00:00 2001
From: GovanifY <gauvain@govanify.com>
Date: Wed, 4 Nov 2020 14:26:46 +0100
Subject: [PATCH] USB: windows support!

---
 pcsx2/CMakeLists.txt                          |  8 +--
 pcsx2/USB/USB.cpp                             |  2 +-
 .../USB/Win32/{Config.cpp => Config_usb.cpp}  | 54 +++-----------
 pcsx2/USB/Win32/{Config.h => Config_usb.h}    |  0
 pcsx2/USB/configuration.cpp                   |  2 +-
 .../shared/{inifile.cpp => inifile_usb.cpp}   |  2 +-
 pcsx2/USB/shared/{inifile.h => inifile_usb.h} |  0
 .../shared/{rawinput.cpp => rawinput_usb.cpp} |  2 +-
 .../USB/shared/{rawinput.h => rawinput_usb.h} |  0
 .../USB/shared/{shared.cpp => shared_usb.cpp} |  4 +-
 pcsx2/USB/shared/{shared.h => shared_usb.h}   |  0
 ...it_win32.cpp => api_init_win32_eyetoy.cpp} |  0
 pcsx2/USB/usb-eyetoy/cam-windows.cpp          |  2 +-
 pcsx2/USB/usb-eyetoy/usb-eyetoy-webcam.cpp    |  2 +-
 ..._init_win32.cpp => api_init_win32_hid.cpp} |  0
 pcsx2/USB/usb-hid/raw/rawinput.cpp            |  2 +-
 pcsx2/USB/usb-hid/raw/rawinput.h              |  2 +-
 pcsx2/USB/usb-hid/usb-hid.cpp                 |  2 +-
 ..._init_win32.cpp => api_init_win32_mic.cpp} |  0
 pcsx2/USB/usb-mic/audiodev-wasapi.cpp         |  2 +-
 pcsx2/USB/usb-mic/usb-headset.cpp             |  2 +-
 pcsx2/USB/usb-mic/usb-mic-logitech.cpp        |  2 +-
 pcsx2/USB/usb-mic/usb-mic-singstar.cpp        |  2 +-
 pcsx2/USB/usb-msd/usb-msd-win32.cpp           |  2 +-
 ..._init_win32.cpp => api_init_win32_pad.cpp} |  0
 pcsx2/USB/usb-pad/dx/dinput-config.cpp        |  2 +-
 pcsx2/USB/usb-pad/dx/usb-pad-dx.h             |  2 +-
 pcsx2/USB/usb-pad/raw/usb-pad-raw.cpp         |  2 +-
 pcsx2/USB/usb-pad/raw/usb-pad-raw.h           |  2 +-
 pcsx2/USB/usb-pad/usb-pad.cpp                 |  2 +-
 pcsx2/USB/usb-pad/usb-seamic.cpp              |  2 +-
 pcsx2/windows/VCprojects/pcsx2.vcxproj        | 24 +++----
 .../windows/VCprojects/pcsx2.vcxproj.filters  | 72 +++++++++----------
 33 files changed, 83 insertions(+), 119 deletions(-)
 rename pcsx2/USB/Win32/{Config.cpp => Config_usb.cpp} (90%)
 rename pcsx2/USB/Win32/{Config.h => Config_usb.h} (100%)
 rename pcsx2/USB/shared/{inifile.cpp => inifile_usb.cpp} (99%)
 rename pcsx2/USB/shared/{inifile.h => inifile_usb.h} (100%)
 rename pcsx2/USB/shared/{rawinput.cpp => rawinput_usb.cpp} (99%)
 rename pcsx2/USB/shared/{rawinput.h => rawinput_usb.h} (100%)
 rename pcsx2/USB/shared/{shared.cpp => shared_usb.cpp} (95%)
 rename pcsx2/USB/shared/{shared.h => shared_usb.h} (100%)
 rename pcsx2/USB/usb-eyetoy/{api_init_win32.cpp => api_init_win32_eyetoy.cpp} (100%)
 rename pcsx2/USB/usb-hid/{api_init_win32.cpp => api_init_win32_hid.cpp} (100%)
 rename pcsx2/USB/usb-mic/{api_init_win32.cpp => api_init_win32_mic.cpp} (100%)
 rename pcsx2/USB/usb-pad/{api_init_win32.cpp => api_init_win32_pad.cpp} (100%)

diff --git a/pcsx2/CMakeLists.txt b/pcsx2/CMakeLists.txt
index a01da381e8..9916898815 100644
--- a/pcsx2/CMakeLists.txt
+++ b/pcsx2/CMakeLists.txt
@@ -354,8 +354,8 @@ set(pcsx2USBSources
 	USB/usb-eyetoy/jo_mpeg.cpp
 	USB/usb-eyetoy/usb-eyetoy-webcam.cpp
 	USB/usb-hid/usb-hid.cpp
-	USB/shared/shared.cpp
-	USB/shared/inifile.cpp
+	USB/shared/shared_usb.cpp
+	USB/shared/inifile_usb.cpp
 	USB/shared/ringbuffer.cpp
 	USB/icon_buzz_24.cpp
 	USB/usb-msd/usb-msd-gtk.cpp
@@ -417,8 +417,8 @@ set(pcsx2USBHeaders
 	USB/usb-hid/hidproxy.h
 	USB/usb-hid/usb-hid.h
 	USB/usb-hid/noop.h
-	USB/shared/shared.h
-	USB/shared/inifile.h
+	USB/shared/shared_usb.h
+	USB/shared/inifile_usb.h
 	USB/shared/ringbuffer.h
 	USB/linux/ini.h
 	USB/linux/actualfile.h
diff --git a/pcsx2/USB/USB.cpp b/pcsx2/USB/USB.cpp
index d8a02ec47e..10f1991ed4 100644
--- a/pcsx2/USB/USB.cpp
+++ b/pcsx2/USB/USB.cpp
@@ -25,7 +25,7 @@
 #include "osdebugout.h"
 #include "qemu-usb/USBinternal.h"
 #include "qemu-usb/desc.h"
-#include "shared/shared.h"
+#include "shared/shared_usb.h"
 #include "deviceproxy.h"
 
 #define PSXCLK 36864000 /* 36.864 Mhz */
diff --git a/pcsx2/USB/Win32/Config.cpp b/pcsx2/USB/Win32/Config_usb.cpp
similarity index 90%
rename from pcsx2/USB/Win32/Config.cpp
rename to pcsx2/USB/Win32/Config_usb.cpp
index 6e4a2887bd..37292ca66f 100644
--- a/pcsx2/USB/Win32/Config.cpp
+++ b/pcsx2/USB/Win32/Config_usb.cpp
@@ -17,13 +17,14 @@
 #include "AppCoreThread.h"
 #include "../USB.h"
 #include "resource.h"
-#include "Config.h"
+#include "Config_usb.h"
 #include "../deviceproxy.h"
 #include "../usb-pad/padproxy.h"
 #include "../usb-mic/audiodeviceproxy.h"
 #include "../configuration.h"
+#include "../shared/inifile_usb.h"
 
-HINSTANCE hInst;
+HINSTANCE hInstUSB;
 extern bool configChanged;
 
 void SysMessageA(const char* fmt, ...)
@@ -79,7 +80,7 @@ void PopulateAPIs(HWND hW, int port)
 	std::string selApi = GetSelectedAPI(std::make_pair(port, devName));
 
 	std::string var;
-	if (LoadSetting(nullptr, port, rd.Name(devtype), N_DEVICE_API, var))
+	if (LoadSetting(nullptr, port, rd.Name(devtype), N_DEVICE_API, str_to_wstr(var)))
 		OSDebugOut(L"Current API: %S\n", var.c_str());
 	else
 	{
@@ -104,7 +105,7 @@ void PopulateAPIs(HWND hW, int port)
 	SendDlgItemMessage(hW, port ? IDC_COMBO_API1 : IDC_COMBO_API2, CB_SETCURSEL, sel, 0);
 }
 
-BOOL CALLBACK ConfigureDlgProc(HWND hW, UINT uMsg, WPARAM wParam, LPARAM lParam)
+BOOL CALLBACK ConfigureDlgProcUSB(HWND hW, UINT uMsg, WPARAM wParam, LPARAM lParam)
 {
 
 	int port;
@@ -196,7 +197,7 @@ BOOL CALLBACK ConfigureDlgProc(HWND hW, UINT uMsg, WPARAM wParam, LPARAM lParam)
 									if (it == list.end())
 										break;
 									std::string api = *it;
-									Win32Handles handles(hInst, hW);
+									Win32Handles handles(hInstUSB, hW);
 									if (device->Configure(port, api, &handles) == RESULT_FAILED)
 										SysMessage(TEXT("Some settings may not have been saved!\n"));
 								}
@@ -233,50 +234,13 @@ BOOL CALLBACK ConfigureDlgProc(HWND hW, UINT uMsg, WPARAM wParam, LPARAM lParam)
 	return FALSE;
 }
 
-
-EXPORT_C_(BOOL)
-AboutDlgProc(HWND hW, UINT uMsg, WPARAM wParam, LPARAM lParam)
-{
-	switch (uMsg)
-	{
-		case WM_INITDIALOG:
-			return TRUE;
-
-		case WM_COMMAND:
-			switch (LOWORD(wParam))
-			{
-				case IDOK:
-					EndDialog(hW, FALSE);
-					return TRUE;
-			}
-	}
-	return FALSE;
-}
-
 void USBconfigure()
 {
 	ScopedCoreThreadPause paused_core;
 	RegisterDevice::Register();
-	DialogBox(hInst,
+	DialogBox(hInstUSB,
 			  MAKEINTRESOURCE(IDD_CONFIG),
 			  GetActiveWindow(),
-			  (DLGPROC)ConfigureDlgProc);
+			  (DLGPROC)ConfigureDlgProcUSB);
 	paused_core.AllowResume();
-}
-
-EXPORT_C_(void)
-USBabout()
-{
-	DialogBox(hInst,
-			  MAKEINTRESOURCE(IDD_ABOUT),
-			  GetActiveWindow(),
-			  (DLGPROC)AboutDlgProc);
-}
-
-BOOL APIENTRY DllMain(HANDLE hModule,
-					  DWORD dwReason,
-					  LPVOID lpReserved)
-{
-	hInst = (HINSTANCE)hModule;
-	return TRUE;
-}
+}
\ No newline at end of file
diff --git a/pcsx2/USB/Win32/Config.h b/pcsx2/USB/Win32/Config_usb.h
similarity index 100%
rename from pcsx2/USB/Win32/Config.h
rename to pcsx2/USB/Win32/Config_usb.h
diff --git a/pcsx2/USB/configuration.cpp b/pcsx2/USB/configuration.cpp
index 24200e8d4a..375531e8f0 100644
--- a/pcsx2/USB/configuration.cpp
+++ b/pcsx2/USB/configuration.cpp
@@ -17,7 +17,7 @@
 #include "osdebugout.h"
 #include "deviceproxy.h"
 #include "configuration.h"
-#include "shared/inifile.h"
+#include "shared/inifile_usb.h"
 #include "platcompat.h"
 #include <map>
 #include <vector>
diff --git a/pcsx2/USB/shared/inifile.cpp b/pcsx2/USB/shared/inifile_usb.cpp
similarity index 99%
rename from pcsx2/USB/shared/inifile.cpp
rename to pcsx2/USB/shared/inifile_usb.cpp
index f355621198..f229e0923e 100644
--- a/pcsx2/USB/shared/inifile.cpp
+++ b/pcsx2/USB/shared/inifile_usb.cpp
@@ -14,7 +14,7 @@
  */
 
 #include "PrecompiledHeader.h"
-#include "inifile.h"
+#include "inifile_usb.h"
 #include <algorithm>
 #include <iostream>
 #include <fstream>
diff --git a/pcsx2/USB/shared/inifile.h b/pcsx2/USB/shared/inifile_usb.h
similarity index 100%
rename from pcsx2/USB/shared/inifile.h
rename to pcsx2/USB/shared/inifile_usb.h
diff --git a/pcsx2/USB/shared/rawinput.cpp b/pcsx2/USB/shared/rawinput_usb.cpp
similarity index 99%
rename from pcsx2/USB/shared/rawinput.cpp
rename to pcsx2/USB/shared/rawinput_usb.cpp
index e679bc3b64..892744124d 100644
--- a/pcsx2/USB/shared/rawinput.cpp
+++ b/pcsx2/USB/shared/rawinput_usb.cpp
@@ -14,7 +14,7 @@
  */
 
 #include "PrecompiledHeader.h"
-#include "rawinput.h"
+#include "rawinput_usb.h"
 #include <cstdio>
 #include <vector>
 #include <algorithm>
diff --git a/pcsx2/USB/shared/rawinput.h b/pcsx2/USB/shared/rawinput_usb.h
similarity index 100%
rename from pcsx2/USB/shared/rawinput.h
rename to pcsx2/USB/shared/rawinput_usb.h
diff --git a/pcsx2/USB/shared/shared.cpp b/pcsx2/USB/shared/shared_usb.cpp
similarity index 95%
rename from pcsx2/USB/shared/shared.cpp
rename to pcsx2/USB/shared/shared_usb.cpp
index 8d1fa6206d..8806235014 100644
--- a/pcsx2/USB/shared/shared.cpp
+++ b/pcsx2/USB/shared/shared_usb.cpp
@@ -14,11 +14,11 @@
  */
 
 #include "PrecompiledHeader.h"
-#include "shared.h"
+#include "shared_usb.h"
 #include <stdexcept>
 
 #if defined(BUILD_RAW)
-#include "rawinput.h"
+#include "rawinput_usb.h"
 #endif
 
 namespace shared
diff --git a/pcsx2/USB/shared/shared.h b/pcsx2/USB/shared/shared_usb.h
similarity index 100%
rename from pcsx2/USB/shared/shared.h
rename to pcsx2/USB/shared/shared_usb.h
diff --git a/pcsx2/USB/usb-eyetoy/api_init_win32.cpp b/pcsx2/USB/usb-eyetoy/api_init_win32_eyetoy.cpp
similarity index 100%
rename from pcsx2/USB/usb-eyetoy/api_init_win32.cpp
rename to pcsx2/USB/usb-eyetoy/api_init_win32_eyetoy.cpp
diff --git a/pcsx2/USB/usb-eyetoy/cam-windows.cpp b/pcsx2/USB/usb-eyetoy/cam-windows.cpp
index 98559df7f9..7a1a4bb0b9 100644
--- a/pcsx2/USB/usb-eyetoy/cam-windows.cpp
+++ b/pcsx2/USB/usb-eyetoy/cam-windows.cpp
@@ -19,7 +19,7 @@
 #include "usb-eyetoy-webcam.h"
 #include "jo_mpeg.h"
 
-#include "../Win32/Config.h"
+#include "../Win32/Config_usb.h"
 #include "../Win32/resource.h"
 
 namespace usb_eyetoy
diff --git a/pcsx2/USB/usb-eyetoy/usb-eyetoy-webcam.cpp b/pcsx2/USB/usb-eyetoy/usb-eyetoy-webcam.cpp
index 355944b309..cfd659bd06 100644
--- a/pcsx2/USB/usb-eyetoy/usb-eyetoy-webcam.cpp
+++ b/pcsx2/USB/usb-eyetoy/usb-eyetoy-webcam.cpp
@@ -19,7 +19,7 @@
 #include "usb-eyetoy-webcam.h"
 #include "ov519.h"
 #include "../qemu-usb/desc.h"
-#include "../shared/inifile.h"
+#include "../shared/inifile_usb.h"
 
 namespace usb_eyetoy
 {
diff --git a/pcsx2/USB/usb-hid/api_init_win32.cpp b/pcsx2/USB/usb-hid/api_init_win32_hid.cpp
similarity index 100%
rename from pcsx2/USB/usb-hid/api_init_win32.cpp
rename to pcsx2/USB/usb-hid/api_init_win32_hid.cpp
diff --git a/pcsx2/USB/usb-hid/raw/rawinput.cpp b/pcsx2/USB/usb-hid/raw/rawinput.cpp
index 9fb49b547d..21c93191ce 100644
--- a/pcsx2/USB/usb-hid/raw/rawinput.cpp
+++ b/pcsx2/USB/usb-hid/raw/rawinput.cpp
@@ -15,7 +15,7 @@
 
 #include "PrecompiledHeader.h"
 #include "rawinput.h"
-#include "../../Win32/Config.h"
+#include "../../Win32/Config_usb.h"
 #include "../../qemu-usb/input-keymap.h"
 #include "../../qemu-usb/input-keymap-win32-to-qcode.h"
 
diff --git a/pcsx2/USB/usb-hid/raw/rawinput.h b/pcsx2/USB/usb-hid/raw/rawinput.h
index 94df323116..8fa7dccd02 100644
--- a/pcsx2/USB/usb-hid/raw/rawinput.h
+++ b/pcsx2/USB/usb-hid/raw/rawinput.h
@@ -13,7 +13,7 @@
  *  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "../../shared/rawinput.h"
+#include "../../shared/rawinput_usb.h"
 #include "../hidproxy.h"
 #include "../usb-hid.h"
 
diff --git a/pcsx2/USB/usb-hid/usb-hid.cpp b/pcsx2/USB/usb-hid/usb-hid.cpp
index e65c7501c4..f0fc829752 100644
--- a/pcsx2/USB/usb-hid/usb-hid.cpp
+++ b/pcsx2/USB/usb-hid/usb-hid.cpp
@@ -29,7 +29,7 @@
 #include "../qemu-usb/desc.h"
 #include "usb-hid.h"
 #include "../osdebugout.h"
-#include "../shared/inifile.h"
+#include "../shared/inifile_usb.h"
 
 #define CONTAINER_OF(p, type, field) ((type*)((char*)p - ((ptrdiff_t) & ((type*)0)->field)))
 
diff --git a/pcsx2/USB/usb-mic/api_init_win32.cpp b/pcsx2/USB/usb-mic/api_init_win32_mic.cpp
similarity index 100%
rename from pcsx2/USB/usb-mic/api_init_win32.cpp
rename to pcsx2/USB/usb-mic/api_init_win32_mic.cpp
diff --git a/pcsx2/USB/usb-mic/audiodev-wasapi.cpp b/pcsx2/USB/usb-mic/audiodev-wasapi.cpp
index 5e0046a29f..f80c7a94f0 100644
--- a/pcsx2/USB/usb-mic/audiodev-wasapi.cpp
+++ b/pcsx2/USB/usb-mic/audiodev-wasapi.cpp
@@ -22,7 +22,7 @@
 #include <functiondiscoverykeys_devpkey.h>
 #include <process.h>
 #include "audiodev-wasapi.h"
-#include "../Win32/Config.h"
+#include "../Win32/Config_usb.h"
 #include "../Win32/resource.h"
 
 #define SafeRelease(x) \
diff --git a/pcsx2/USB/usb-mic/usb-headset.cpp b/pcsx2/USB/usb-mic/usb-headset.cpp
index f667840f82..86ae650ba3 100644
--- a/pcsx2/USB/usb-mic/usb-headset.cpp
+++ b/pcsx2/USB/usb-mic/usb-headset.cpp
@@ -27,7 +27,7 @@
 #include "PrecompiledHeader.h"
 #include "../qemu-usb/vl.h"
 #include "../qemu-usb/desc.h"
-#include "../shared/inifile.h"
+#include "../shared/inifile_usb.h"
 #include <assert.h>
 
 #include "audio.h"
diff --git a/pcsx2/USB/usb-mic/usb-mic-logitech.cpp b/pcsx2/USB/usb-mic/usb-mic-logitech.cpp
index 1e16a353c0..6bc1c20e3a 100644
--- a/pcsx2/USB/usb-mic/usb-mic-logitech.cpp
+++ b/pcsx2/USB/usb-mic/usb-mic-logitech.cpp
@@ -17,7 +17,7 @@
 #include "usb-mic-singstar.h"
 #include "audio.h"
 #include "../qemu-usb/desc.h"
-#include "../shared/inifile.h"
+#include "../shared/inifile_usb.h"
 
 namespace usb_mic
 {
diff --git a/pcsx2/USB/usb-mic/usb-mic-singstar.cpp b/pcsx2/USB/usb-mic/usb-mic-singstar.cpp
index 29c9bff5cb..0fbf8faf7e 100644
--- a/pcsx2/USB/usb-mic/usb-mic-singstar.cpp
+++ b/pcsx2/USB/usb-mic/usb-mic-singstar.cpp
@@ -28,7 +28,7 @@
 #include "../qemu-usb/vl.h"
 #include "../qemu-usb/desc.h"
 #include "usb-mic-singstar.h"
-#include "../shared/inifile.h"
+#include "../shared/inifile_usb.h"
 #include <assert.h>
 
 static FILE* file = NULL;
diff --git a/pcsx2/USB/usb-msd/usb-msd-win32.cpp b/pcsx2/USB/usb-msd/usb-msd-win32.cpp
index 42e08acc26..acbe584012 100644
--- a/pcsx2/USB/usb-msd/usb-msd-win32.cpp
+++ b/pcsx2/USB/usb-msd/usb-msd-win32.cpp
@@ -16,7 +16,7 @@
 #include "PrecompiledHeader.h"
 #include <commdlg.h>
 #include "usb-msd.h"
-#include "../Win32/Config.h"
+#include "../Win32/Config_usb.h"
 #include "../Win32/resource.h"
 
 namespace usb_msd
diff --git a/pcsx2/USB/usb-pad/api_init_win32.cpp b/pcsx2/USB/usb-pad/api_init_win32_pad.cpp
similarity index 100%
rename from pcsx2/USB/usb-pad/api_init_win32.cpp
rename to pcsx2/USB/usb-pad/api_init_win32_pad.cpp
diff --git a/pcsx2/USB/usb-pad/dx/dinput-config.cpp b/pcsx2/USB/usb-pad/dx/dinput-config.cpp
index 9922d4739f..18056decfd 100644
--- a/pcsx2/USB/usb-pad/dx/dinput-config.cpp
+++ b/pcsx2/USB/usb-pad/dx/dinput-config.cpp
@@ -28,7 +28,7 @@
 #include "versionproxy.h"
 
 #include "usb-pad-dx.h"
-#include "../../shared/inifile.h"
+#include "../../shared/inifile_usb.h"
 
 namespace usb_pad
 {
diff --git a/pcsx2/USB/usb-pad/dx/usb-pad-dx.h b/pcsx2/USB/usb-pad/dx/usb-pad-dx.h
index 17771f536d..7aa6e3a969 100644
--- a/pcsx2/USB/usb-pad/dx/usb-pad-dx.h
+++ b/pcsx2/USB/usb-pad/dx/usb-pad-dx.h
@@ -14,7 +14,7 @@
  */
 
 #include "../padproxy.h"
-#include "../../Win32/Config.h"
+#include "../../Win32/Config_usb.h"
 
 namespace usb_pad
 {
diff --git a/pcsx2/USB/usb-pad/raw/usb-pad-raw.cpp b/pcsx2/USB/usb-pad/raw/usb-pad-raw.cpp
index 119f33536a..ec646e3ad6 100644
--- a/pcsx2/USB/usb-pad/raw/usb-pad-raw.cpp
+++ b/pcsx2/USB/usb-pad/raw/usb-pad-raw.cpp
@@ -15,7 +15,7 @@
 
 #include "PrecompiledHeader.h"
 #include "../../USB.h"
-#include "../../Win32/Config.h"
+#include "../../Win32/Config_usb.h"
 #include "usb-pad-raw.h"
 
 namespace usb_pad
diff --git a/pcsx2/USB/usb-pad/raw/usb-pad-raw.h b/pcsx2/USB/usb-pad/raw/usb-pad-raw.h
index bdc556b4d3..728b314eb7 100644
--- a/pcsx2/USB/usb-pad/raw/usb-pad-raw.h
+++ b/pcsx2/USB/usb-pad/raw/usb-pad-raw.h
@@ -20,7 +20,7 @@
 #include <atomic>
 #include "../padproxy.h"
 #include "../usb-pad.h"
-#include "../../shared/rawinput.h"
+#include "../../shared/rawinput_usb.h"
 #include "../../readerwriterqueue/readerwriterqueue.h"
 
 namespace usb_pad
diff --git a/pcsx2/USB/usb-pad/usb-pad.cpp b/pcsx2/USB/usb-pad/usb-pad.cpp
index 72e752af24..65306c50fb 100644
--- a/pcsx2/USB/usb-pad/usb-pad.cpp
+++ b/pcsx2/USB/usb-pad/usb-pad.cpp
@@ -17,7 +17,7 @@
 #include "padproxy.h"
 #include "usb-pad.h"
 #include "../qemu-usb/desc.h"
-#include "../shared/inifile.h"
+#include "../shared/inifile_usb.h"
 
 namespace usb_pad
 {
diff --git a/pcsx2/USB/usb-pad/usb-seamic.cpp b/pcsx2/USB/usb-pad/usb-seamic.cpp
index 8c0ad13601..1ab91828a8 100644
--- a/pcsx2/USB/usb-pad/usb-seamic.cpp
+++ b/pcsx2/USB/usb-pad/usb-seamic.cpp
@@ -18,7 +18,7 @@
 #include "usb-pad.h"
 #include "../qemu-usb/desc.h"
 #include "../usb-mic/usb-mic-singstar.h"
-#include "../shared/inifile.h"
+#include "../shared/inifile_usb.h"
 
 namespace usb_pad
 {
diff --git a/pcsx2/windows/VCprojects/pcsx2.vcxproj b/pcsx2/windows/VCprojects/pcsx2.vcxproj
index 1d2337e697..8e7b91f749 100644
--- a/pcsx2/windows/VCprojects/pcsx2.vcxproj
+++ b/pcsx2/windows/VCprojects/pcsx2.vcxproj
@@ -364,26 +364,26 @@
     <ClCompile Include="..\..\USB\qemu-usb\usb-ohci.cpp" />
     <ClCompile Include="..\..\USB\qemu-usb\vl.cpp" />
     <ClCompile Include="..\..\USB\shared\hidapi.cpp" />
-    <ClCompile Include="..\..\USB\shared\inifile.cpp" />
-    <ClCompile Include="..\..\USB\shared\rawinput.cpp" />
+    <ClCompile Include="..\..\USB\shared\inifile_usb.cpp" />
+    <ClCompile Include="..\..\USB\shared\rawinput_usb.cpp" />
     <ClCompile Include="..\..\USB\shared\ringbuffer.cpp" />
-    <ClCompile Include="..\..\USB\shared\shared.cpp" />
-    <ClCompile Include="..\..\USB\usb-eyetoy\api_init_win32.cpp" />
+    <ClCompile Include="..\..\USB\shared\shared_usb.cpp" />
+    <ClCompile Include="..\..\USB\usb-eyetoy\api_init_win32_eyetoy.cpp" />
     <ClCompile Include="..\..\USB\usb-eyetoy\cam-windows.cpp" />
     <ClCompile Include="..\..\USB\usb-eyetoy\jo_mpeg.cpp" />
     <ClCompile Include="..\..\USB\usb-eyetoy\jpgd\jpgd.cpp" />
     <ClCompile Include="..\..\USB\usb-eyetoy\usb-eyetoy-webcam.cpp" />
-    <ClCompile Include="..\..\USB\usb-hid\api_init_win32.cpp" />
+    <ClCompile Include="..\..\USB\usb-hid\api_init_win32_hid.cpp" />
     <ClCompile Include="..\..\USB\usb-hid\raw\rawinput.cpp" />
     <ClCompile Include="..\..\USB\usb-hid\usb-hid.cpp" />
-    <ClCompile Include="..\..\USB\usb-mic\api_init_win32.cpp" />
+    <ClCompile Include="..\..\USB\usb-mic\api_init_win32_mic.cpp" />
     <ClCompile Include="..\..\USB\usb-mic\audiodev-wasapi.cpp" />
     <ClCompile Include="..\..\USB\usb-mic\usb-headset.cpp" />
     <ClCompile Include="..\..\USB\usb-mic\usb-mic-logitech.cpp" />
     <ClCompile Include="..\..\USB\usb-mic\usb-mic-singstar.cpp" />
     <ClCompile Include="..\..\USB\usb-msd\usb-msd-win32.cpp" />
     <ClCompile Include="..\..\USB\usb-msd\usb-msd.cpp" />
-    <ClCompile Include="..\..\USB\usb-pad\api_init_win32.cpp" />
+    <ClCompile Include="..\..\USB\usb-pad\api_init_win32_pad.cpp" />
     <ClCompile Include="..\..\USB\usb-pad\dx\dinput-config.cpp" />
     <ClCompile Include="..\..\USB\usb-pad\dx\dinput.cpp" />
     <ClCompile Include="..\..\USB\usb-pad\dx\usb-pad-dx.cpp" />
@@ -394,7 +394,7 @@
     <ClCompile Include="..\..\USB\usb-pad\usb-pad.cpp" />
     <ClCompile Include="..\..\USB\usb-pad\usb-seamic.cpp" />
     <ClCompile Include="..\..\USB\USB.cpp" />
-    <ClCompile Include="..\..\USB\Win32\Config.cpp" />
+    <ClCompile Include="..\..\USB\Win32\Config_usb.cpp" />
     <ClCompile Include="..\..\Utilities\FileUtils.cpp" />
     <ClCompile Include="..\..\Dump.cpp" />
     <ClCompile Include="..\..\x86\iMisc.cpp" />
@@ -681,10 +681,10 @@
     <ClInclude Include="..\..\USB\readerwriterqueue\atomicops.h" />
     <ClInclude Include="..\..\USB\readerwriterqueue\readerwriterqueue.h" />
     <ClInclude Include="..\..\USB\shared\hidapi.h" />
-    <ClInclude Include="..\..\USB\shared\inifile.h" />
-    <ClInclude Include="..\..\USB\shared\rawinput.h" />
+    <ClInclude Include="..\..\USB\shared\inifile_usb.h" />
+    <ClInclude Include="..\..\USB\shared\rawinput_usb.h" />
     <ClInclude Include="..\..\USB\shared\ringbuffer.h" />
-    <ClInclude Include="..\..\USB\shared\shared.h" />
+    <ClInclude Include="..\..\USB\shared\shared_usb.h" />
     <ClInclude Include="..\..\USB\usb-eyetoy\cam-windows.h" />
     <ClInclude Include="..\..\USB\usb-eyetoy\jo_mpeg.h" />
     <ClInclude Include="..\..\USB\usb-eyetoy\jpgd\jpgd.h" />
@@ -713,7 +713,7 @@
     <ClInclude Include="..\..\USB\usb-pad\raw\usb-pad-raw.h" />
     <ClInclude Include="..\..\USB\usb-pad\usb-pad.h" />
     <ClInclude Include="..\..\USB\USB.h" />
-    <ClInclude Include="..\..\USB\Win32\Config.h" />
+    <ClInclude Include="..\..\USB\Win32\Config_usb.h" />
     <ClInclude Include="..\..\USB\Win32\resource.h" />
     <ClInclude Include="..\..\Utilities\AsciiFile.h" />
     <ClInclude Include="..\..\Elfheader.h" />
diff --git a/pcsx2/windows/VCprojects/pcsx2.vcxproj.filters b/pcsx2/windows/VCprojects/pcsx2.vcxproj.filters
index 8b9a077596..bef17d4d7e 100644
--- a/pcsx2/windows/VCprojects/pcsx2.vcxproj.filters
+++ b/pcsx2/windows/VCprojects/pcsx2.vcxproj.filters
@@ -1150,30 +1150,9 @@
     <ClCompile Include="..\..\USB\usb-hid\usb-hid.cpp">
       <Filter>System\Ps2\USB\usb-hid</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\USB\shared\inifile.cpp">
-      <Filter>System\Ps2\USB\shared</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\USB\shared\ringbuffer.cpp">
       <Filter>System\Ps2\USB\shared</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\USB\shared\shared.cpp">
-      <Filter>System\Ps2\USB\shared</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\USB\usb-eyetoy\api_init_win32.cpp">
-      <Filter>System\Ps2\USB\usb-eyetoy</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\USB\usb-hid\api_init_win32.cpp">
-      <Filter>System\Ps2\USB\usb-hid</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\USB\usb-mic\api_init_win32.cpp">
-      <Filter>System\Ps2\USB\usb-mic</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\USB\usb-pad\api_init_win32.cpp">
-      <Filter>System\Ps2\USB\usb-pad</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\USB\Win32\Config.cpp">
-      <Filter>System\Ps2\USB\Win32</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\USB\usb-mic\audiodev-wasapi.cpp">
       <Filter>System\Ps2\USB\usb-mic</Filter>
     </ClCompile>
@@ -1183,9 +1162,6 @@
     <ClCompile Include="..\..\USB\shared\hidapi.cpp">
       <Filter>System\Ps2\USB\shared</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\USB\shared\rawinput.cpp">
-      <Filter>System\Ps2\USB\shared</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\USB\qemu-usb\input-keymap-win32-to-qcode.cpp">
       <Filter>System\Ps2\USB\qemu-usb</Filter>
     </ClCompile>
@@ -1210,6 +1186,30 @@
     <ClCompile Include="..\..\USB\usb-pad\raw\usb-pad-raw.cpp">
       <Filter>System\Ps2\USB\usb-pad\raw</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\USB\usb-pad\api_init_win32_pad.cpp">
+      <Filter>System\Ps2\USB\usb-pad</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\USB\usb-mic\api_init_win32_mic.cpp">
+      <Filter>System\Ps2\USB\usb-mic</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\USB\usb-hid\api_init_win32_hid.cpp">
+      <Filter>System\Ps2\USB\usb-hid</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\USB\usb-eyetoy\api_init_win32_eyetoy.cpp">
+      <Filter>System\Ps2\USB\usb-eyetoy</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\USB\Win32\Config_usb.cpp">
+      <Filter>System\Ps2\USB\Win32</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\USB\shared\shared_usb.cpp">
+      <Filter>System\Ps2\USB\shared</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\USB\shared\inifile_usb.cpp">
+      <Filter>System\Ps2\USB\shared</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\USB\shared\rawinput_usb.cpp">
+      <Filter>System\Ps2\USB\shared</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\Patch.h">
@@ -1866,18 +1866,9 @@
     <ClInclude Include="..\..\USB\usb-hid\usb-hid.h">
       <Filter>System\Ps2\USB\usb-hid</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\USB\shared\inifile.h">
-      <Filter>System\Ps2\USB\shared</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\USB\shared\ringbuffer.h">
       <Filter>System\Ps2\USB\shared</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\USB\shared\shared.h">
-      <Filter>System\Ps2\USB\shared</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\USB\Win32\Config.h">
-      <Filter>System\Ps2\USB\Win32</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\USB\Win32\resource.h">
       <Filter>System\Ps2\USB\Win32</Filter>
     </ClInclude>
@@ -1887,9 +1878,6 @@
     <ClInclude Include="..\..\USB\shared\hidapi.h">
       <Filter>System\Ps2\USB\shared</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\USB\shared\rawinput.h">
-      <Filter>System\Ps2\USB\shared</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\USB\qemu-usb\input-keymap-win32-to-qcode.h">
       <Filter>System\Ps2\USB\qemu-usb</Filter>
     </ClInclude>
@@ -1914,6 +1902,18 @@
     <ClInclude Include="..\..\USB\usb-pad\raw\usb-pad-raw.h">
       <Filter>System\Ps2\USB\usb-pad\raw</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\USB\Win32\Config_usb.h">
+      <Filter>System\Ps2\USB\Win32</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\USB\shared\shared_usb.h">
+      <Filter>System\Ps2\USB\shared</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\USB\shared\inifile_usb.h">
+      <Filter>System\Ps2\USB\shared</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\USB\shared\rawinput_usb.h">
+      <Filter>System\Ps2\USB\shared</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="..\wxResources.rc">