From 7791c9dd78ac36ce0c518d888768bf8b81ba755e Mon Sep 17 00:00:00 2001 From: ergo720 <45463469+ergo720@users.noreply.github.com> Date: Sat, 6 Nov 2021 15:33:14 +0100 Subject: [PATCH] Review remarks --- CMakeLists.txt | 6 +++--- README.md | 2 +- projects/cxbx/CMakeLists.txt | 4 ++-- projects/cxbxr-emu/CMakeLists.txt | 4 ++-- projects/libusb/CMakeLists.txt | 8 ++++---- src/common/input/InputManager.cpp | 4 ++-- src/common/input/LibusbDevice.cpp | 2 +- src/gui/resource/Cxbx.rc | 8 ++++---- 8 files changed, 19 insertions(+), 19 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 75d255a0a..c33006fce 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -63,9 +63,9 @@ file (GLOB CXBXR_HEADER_COMMON "${CXBXR_ROOT_DIR}/src/common/input/DInputKeyboardCodes.h" "${CXBXR_ROOT_DIR}/src/common/input/DInputKeyboardMouse.h" "${CXBXR_ROOT_DIR}/src/common/input/layout_xbox_device.h" + "${CXBXR_ROOT_DIR}/src/common/input/LibusbDevice.h" "${CXBXR_ROOT_DIR}/src/common/input/InputDevice.h" "${CXBXR_ROOT_DIR}/src/common/input/InputManager.h" - "${CXBXR_ROOT_DIR}/src/common/input/LibusbDevice.h" "${CXBXR_ROOT_DIR}/src/common/input/SdlJoystick.h" "${CXBXR_ROOT_DIR}/src/common/input/XInputPad.h" "${CXBXR_ROOT_DIR}/src/common/input/RawDevice.h" @@ -105,8 +105,8 @@ file (GLOB CXBXR_HEADER_GUIv1 "${CXBXR_ROOT_DIR}/src/common/input/EmuDevice.h" "${CXBXR_ROOT_DIR}/src/common/input/InputWindow.h" "${CXBXR_ROOT_DIR}/src/gui/controllers/DlgDukeControllerConfig.h" - "${CXBXR_ROOT_DIR}/src/gui/controllers/DlgSBControllerConfig.h" "${CXBXR_ROOT_DIR}/src/gui/controllers/DlgLibusbControllerConfig.h" + "${CXBXR_ROOT_DIR}/src/gui/controllers/DlgSBControllerConfig.h" "${CXBXR_ROOT_DIR}/src/gui/DlgAbout.h" "${CXBXR_ROOT_DIR}/src/gui/DlgAudioConfig.h" "${CXBXR_ROOT_DIR}/src/gui/DlgInputConfig.h" @@ -273,8 +273,8 @@ file (GLOB CXBXR_SOURCE_GUIv1 "${CXBXR_ROOT_DIR}/src/common/input/EmuDevice.cpp" "${CXBXR_ROOT_DIR}/src/common/input/InputWindow.cpp" "${CXBXR_ROOT_DIR}/src/gui/controllers/DlgDukeControllerConfig.cpp" - "${CXBXR_ROOT_DIR}/src/gui/controllers/DlgSBControllerConfig.cpp" "${CXBXR_ROOT_DIR}/src/gui/controllers/DlgLibusbControllerConfig.cpp" + "${CXBXR_ROOT_DIR}/src/gui/controllers/DlgSBControllerConfig.cpp" "${CXBXR_ROOT_DIR}/src/gui/DlgAbout.cpp" "${CXBXR_ROOT_DIR}/src/gui/DlgAudioConfig.cpp" "${CXBXR_ROOT_DIR}/src/gui/DlgInputConfig.cpp" diff --git a/README.md b/README.md index 4231696f9..8fb4a02bc 100644 --- a/README.md +++ b/README.md @@ -15,7 +15,7 @@ Cxbx-Reloaded is an emulator for running Microsoft Xbox (and eventually, Chihiro * [32-bit (x86) Visual C++ 2019 Redistributable](https://aka.ms/vs/16/release/vc_redist.x86.exe) * [Npcap *(used for network emulation)*](https://nmap.org/npcap/#download) * Make sure to enable winpcap compatibility mode! - * WinUSB *(optional, only needed for USB pass-through of original xbox controllers and the steel battalion controller)* + * WinUSB compliant driver *(optional, only needed for USB pass-through of original xbox controllers and the steel battalion controller)* ### Wine **NOTICE: Please use the latest stable release version of Wine. If it does not work for you, then roll back to Wine 5.0.3 which is the last known working version.** diff --git a/projects/cxbx/CMakeLists.txt b/projects/cxbx/CMakeLists.txt index ce6159d2b..750a101c9 100644 --- a/projects/cxbx/CMakeLists.txt +++ b/projects/cxbx/CMakeLists.txt @@ -12,13 +12,13 @@ include_directories( "${CXBXR_ROOT_DIR}/src/common" "${CXBXR_ROOT_DIR}/src/common/Win32" "${CXBXR_ROOT_DIR}/import/OpenXDK/include" + "${CXBXR_ROOT_DIR}/import/DirectX9/include" "${CXBXR_ROOT_DIR}/import/distorm/include" "${CXBXR_ROOT_DIR}/import/glew-2.0.0/include" - "${CXBXR_ROOT_DIR}/import/DirectX9/include" + "${CXBXR_ROOT_DIR}/import/libusb/libusb" "${CXBXR_ROOT_DIR}/import/simpleini" "${CXBXR_ROOT_DIR}/import/winpcap/Include" "${CXBXR_ROOT_DIR}/import/xxHash" - "${CXBXR_ROOT_DIR}/import/libusb/libusb" ) link_directories( diff --git a/projects/cxbxr-emu/CMakeLists.txt b/projects/cxbxr-emu/CMakeLists.txt index fbd086e43..184c15eae 100644 --- a/projects/cxbxr-emu/CMakeLists.txt +++ b/projects/cxbxr-emu/CMakeLists.txt @@ -15,13 +15,13 @@ include_directories( "${CXBXR_ROOT_DIR}/src/common" "${CXBXR_ROOT_DIR}/src/common/Win32" "${CXBXR_ROOT_DIR}/import/OpenXDK/include" + "${CXBXR_ROOT_DIR}/import/DirectX9/include" "${CXBXR_ROOT_DIR}/import/distorm/include" "${CXBXR_ROOT_DIR}/import/glew-2.0.0/include" - "${CXBXR_ROOT_DIR}/import/DirectX9/include" + "${CXBXR_ROOT_DIR}/import/libusb/libusb" "${CXBXR_ROOT_DIR}/import/simpleini" "${CXBXR_ROOT_DIR}/import/winpcap/Include" "${CXBXR_ROOT_DIR}/import/xxHash" - "${CXBXR_ROOT_DIR}/import/libusb/libusb" ) link_directories( diff --git a/projects/libusb/CMakeLists.txt b/projects/libusb/CMakeLists.txt index 297938261..fb9a71fef 100644 --- a/projects/libusb/CMakeLists.txt +++ b/projects/libusb/CMakeLists.txt @@ -14,13 +14,13 @@ include_directories( "${CXBXR_ROOT_DIR}/import/libusb/libusb") file (GLOB HEADERS - "${CXBXR_ROOT_DIR}/import/libusb/libusb/msvc/config.h" - "${CXBXR_ROOT_DIR}/import/libusb/libusb/os/events_windows.h" "${CXBXR_ROOT_DIR}/import/libusb/libusb/libusb.h" "${CXBXR_ROOT_DIR}/import/libusb/libusb/libusbi.h" - "${CXBXR_ROOT_DIR}/import/libusb/libusb/os/threads_windows.h" "${CXBXR_ROOT_DIR}/import/libusb/libusb/version.h" "${CXBXR_ROOT_DIR}/import/libusb/libusb/version_nano.h" + "${CXBXR_ROOT_DIR}/import/libusb/libusb/msvc/config.h" + "${CXBXR_ROOT_DIR}/import/libusb/libusb/os/events_windows.h" + "${CXBXR_ROOT_DIR}/import/libusb/libusb/os/threads_windows.h" "${CXBXR_ROOT_DIR}/import/libusb/libusb/os/windows_common.h" "${CXBXR_ROOT_DIR}/import/libusb/libusb/os/windows_usbdk.h" "${CXBXR_ROOT_DIR}/import/libusb/libusb/os/windows_winusb.h" @@ -29,11 +29,11 @@ file (GLOB HEADERS file (GLOB SOURCES "${CXBXR_ROOT_DIR}/import/libusb/libusb/core.c" "${CXBXR_ROOT_DIR}/import/libusb/libusb/descriptor.c" - "${CXBXR_ROOT_DIR}/import/libusb/libusb/os/events_windows.c" "${CXBXR_ROOT_DIR}/import/libusb/libusb/hotplug.c" "${CXBXR_ROOT_DIR}/import/libusb/libusb/io.c" "${CXBXR_ROOT_DIR}/import/libusb/libusb/strerror.c" "${CXBXR_ROOT_DIR}/import/libusb/libusb/sync.c" + "${CXBXR_ROOT_DIR}/import/libusb/libusb/os/events_windows.c" "${CXBXR_ROOT_DIR}/import/libusb/libusb/os/threads_windows.c" "${CXBXR_ROOT_DIR}/import/libusb/libusb/os/windows_common.c" "${CXBXR_ROOT_DIR}/import/libusb/libusb/os/windows_usbdk.c" diff --git a/src/common/input/InputManager.cpp b/src/common/input/InputManager.cpp index 23f7ba75d..343caa791 100644 --- a/src/common/input/InputManager.cpp +++ b/src/common/input/InputManager.cpp @@ -759,8 +759,8 @@ void InputDeviceManager::HotplugHandler(bool is_sdl) lck.unlock(); XInput::PopulateDevices(); - // Unfortunately, as documented in this issue https://github.com/libusb/libusb/issues/86, when this was written libusb did not yet support - // device hotplug on Windows, so we add the below call here. This will only work if rawinput detects the libusb device. + // When this was written, libusb did not yet support device hotplug on Windows, as documented in this issue https://github.com/libusb/libusb/issues/86. + // So we add the below call here. This will only work if rawinput detects the libusb device. Libusb::PopulateDevices(); } diff --git a/src/common/input/LibusbDevice.cpp b/src/common/input/LibusbDevice.cpp index eeddac1de..c21b32f6c 100644 --- a/src/common/input/LibusbDevice.cpp +++ b/src/common/input/LibusbDevice.cpp @@ -32,7 +32,7 @@ #include "core\kernel\support\Emu.h" #include "core\hle\XAPI\Xapi.h" -// Sanitiy check: ensure out libusb version is high enough for libusb_get_device_descriptor to succeed and to pass nullptr to libusb_interrupt_transfer +// Sanity check: ensure that our libusb version is high enough for libusb_get_device_descriptor to succeed and to pass nullptr to libusb_interrupt_transfer static_assert(LIBUSB_API_VERSION >= 0x01000105); diff --git a/src/gui/resource/Cxbx.rc b/src/gui/resource/Cxbx.rc index 155a8f34e..6f6719ab2 100644 --- a/src/gui/resource/Cxbx.rc +++ b/src/gui/resource/Cxbx.rc @@ -202,13 +202,13 @@ BEGIN PUSHBUTTON "Test",IDC_RUMBLE_TEST,95,11,45,14,BS_FLAT END -IDD_LIBUSB_CFG DIALOGEX 0, 0, 230, 35 +IDD_LIBUSB_CFG DIALOGEX 0, 0, 250, 35 STYLE DS_SETFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU FONT 8, "Verdana", 0, 0, 0x1 BEGIN - COMBOBOX IDC_LIBUSB_LIST,15,11,100,15,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - PUSHBUTTON "Refresh",IDC_REFRESH_DEVICES,120,11,45,14,BS_FLAT - PUSHBUTTON "Test",IDC_LIBUSB_TEST,170,11,45,14,BS_FLAT + COMBOBOX IDC_LIBUSB_LIST,15,11,120,15,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + PUSHBUTTON "Refresh",IDC_REFRESH_DEVICES,140,11,45,14,BS_FLAT + PUSHBUTTON "Test",IDC_LIBUSB_TEST,190,11,45,14,BS_FLAT END IDD_SBC_CFG DIALOGEX 0, 0, 854, 280