Merge branch 'testbed'

This ended up fetching SDL3 which broke the build

This reverts commit 643ce9207c.

.github/labeler.yml

@@ -1,111 +1,75 @@
 # Labels are in alphabetical order.
 
 cmake:
-- changed-files:
+  - 'CMake*'
-  - any-glob-to-any-file:
+  - '**/CMakeLists.txt'
-    - 'CMake*'
+  - '**/*.cmake'
-    - '**/CMakeLists.txt'
-    - '**/*.cmake'
 
 cpu-emulation:
-- changed-files:
+  - 'src/devices/x86/**'
-  - any-glob-to-any-file:
-    - 'src/devices/x86/**'
 
 deployment:
-- changed-files:
+  - '*.yml'
-  - any-glob-to-any-file:
+  - '.github/workflows/CI.yml'
-    - '*.yml'
-    - '.github/workflows/CI.yml'
 
 file-system:
-- changed-files:
+  - 'src/core/kernel/support/EmuFile*'
-  - any-glob-to-any-file:
-    - 'src/core/kernel/support/EmuFile*'
 
 graphics:
-- changed-files:
+  - 'src/core/hle/D3D8/**'
-  - any-glob-to-any-file:
+  - 'src/core/hle/XGRAPHIC/**'
-    - 'src/core/hle/D3D8/**'
+  - 'src/devices/video/**'
-    - 'src/core/hle/XGRAPHIC/**'
+  - 'src/gui/*Video*'
-    - 'src/devices/video/**'
-    - 'src/gui/*Video*'
 
 HLE:
-- changed-files:
+  - 'src/core/hle/**'
-  - any-glob-to-any-file:
+  - 'src/core/kernel/**'
-    - 'src/core/hle/**'
-    - 'src/core/kernel/**'
 
 informational:
-- changed-files:
+  - '**/*Logging*'
-  - any-glob-to-any-file:
+  - '**/*Logging*/**'
-    - '**/*Logging*'
+  - '**/README.md'
-    - '**/*Logging*/**'
-    - '**/README.md'
 
 input:
-- changed-files:
+  - 'src/common/input/**'
-  - any-glob-to-any-file:
+  - 'src/core/hle/XAPI/input/**'
-    - 'src/common/input/**'
+  - 'src/devices/usb/**'
-    - 'src/core/hle/XAPI/input/**'
+  - 'src/gui/controllers/**'
-    - 'src/devices/usb/**'
+  - 'src/gui/*Input*'
-    - 'src/gui/controllers/**'
-    - 'src/gui/*Input*'
 
 kernel:
-- changed-files:
+  - 'src/core/kernel/**'
-  - any-glob-to-any-file:
-    - 'src/core/kernel/**'
 
 LLE:
-- changed-files:
+  - 'src/devices/**'
-  - any-glob-to-any-file:
-    - 'src/devices/**'
 
 memory:
-- changed-files:
+  - 'src/core/kernel/memory-manager/**'
-  - any-glob-to-any-file:
-    - 'src/core/kernel/memory-manager/**'
 
 networking:
-- changed-files:
+  - 'src/core/hle/XONLINE/**'
-  - any-glob-to-any-file:
+  - 'src/devices/network/**'
-    - 'src/core/hle/XONLINE/**'
+  - 'src/gui/*Network*'
-    - 'src/devices/network/**'
-    - 'src/gui/*Network*'
 
 sound:
-- changed-files:
+  - 'src/common/audio/**'
-  - any-glob-to-any-file:
+  - 'src/core/hle/DSOUND/**'
-    - 'src/common/audio/**'
+  - 'src/core/hle/XACTENG/**'
-    - 'src/core/hle/DSOUND/**'
+  - 'src/devices/audio/**'
-    - 'src/core/hle/XACTENG/**'
+  - 'src/gui/*Audio*'
-    - 'src/devices/audio/**'
-    - 'src/gui/*Audio*'
 
 modules:
-- changed-files:
+  - 'import/**'
-  - any-glob-to-any-file:
-    - 'import/**'
 
 threading:
-- changed-files:
+  - 'src/core/kernel/support/EmuFS*'
-  - any-glob-to-any-file:
-    - 'src/core/kernel/support/EmuFS*'
 
 timing:
-- changed-files:
+  - 'src/common/Timer*'
-  - any-glob-to-any-file:
-    - 'src/common/Timer*'
 
 user interface:
-- changed-files:
+  - 'src/core/common/imgui/*'
-  - any-glob-to-any-file:
+  - 'src/gui/**'
-    - 'src/core/common/imgui/*'
-    - 'src/gui/**'
 
 xbdm:
-- changed-files:
+  - 'src/common/xbdm/**'
-  - any-glob-to-any-file:
-    - 'src/common/xbdm/**'

.github/workflows/CI.yml

@@ -30,21 +30,19 @@ jobs:
       fail-fast: false
       matrix:
         configuration: [Release, Debug]
-        vsver: [2019]
+        vsver: [2022]
-        winver: [7]
-        sdkver: [10.0.22621.0]
     steps:
       - uses: actions/checkout@v4
         with:
           submodules: recursive
       - name: Generate CMake files
-        run: cmake -B build -A Win32,version=${{ matrix.sdkver }} -DCMAKE_SYSTEM_VERSION=${{ matrix.winver }}
+        run: cmake -B build -A Win32
       - name: Build
         run: cmake --build build --config ${{ matrix.configuration }} -j $env:NUMBER_OF_PROCESSORS
       - name: Prepare artifacts
         if: matrix.configuration == 'Release'
         run: cmake --install build --config ${{ matrix.configuration }} --prefix artifacts
-      - uses: actions/upload-artifact@v4
+      - uses: actions/upload-artifact@v3
         if: matrix.configuration == 'Release'
         with:
           name: CxbxReloaded-${{ matrix.configuration }}-VS${{ matrix.vsver }}
@@ -61,7 +59,7 @@ jobs:
     steps:
       - uses: actions/checkout@v4
       - name: Download artifacts
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@v3
         with:
           path: artifacts
       - name: Re-zip artifacts

.github/workflows/autoclose.yml

@@ -7,9 +7,9 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v3
       - name: Automatically close issues that don't follow the issue template
-        uses: ergo720/auto-close-issues@v1
+        uses: ergo720/auto-close-issues@v1.0.4
         with:
           github-token: ${{ secrets.GITHUB_TOKEN }}
           issue-close-message: "@${issue.user.login}: your issue has been automatically closed because it does not follow the issue template."  # optional property

.github/workflows/pull-request.yml

@@ -7,7 +7,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Labeler
-        uses: actions/labeler@v5
+        uses: actions/labeler@v4
         with:
           repo-token: ${{ secrets.GITHUB_TOKEN }}
           sync-labels: true

.gitmodules

@@ -1,6 +1,6 @@
 [submodule "import/subhook"]
 	path = import/subhook
-	url = https://github.com/Cxbx-Reloaded/subhook.git
+	url = https://github.com/Zeex/subhook.git
 	shallow = true
 [submodule "import/cs_x86"]
 	path = import/cs_x86

import/SDL2

@@ -1 +1 @@
-Subproject commit fa24d868ac2f8fd558e4e914c9863411245db8fd
+Subproject commit b424665e0899769b200231ba943353a5fee1b6b6

projects/cxbx/CMakeLists.txt

@@ -46,7 +46,7 @@ if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "MSVC")
   # Enable Chihiro work
   CHIHIRO_WORK
  )
-
+ 
  # Reference: https://docs.microsoft.com/en-us/cpp/build/reference/compiler-options-listed-alphabetically
  add_compile_options(
   # Catch synchronous (C++) exceptions only
@@ -68,7 +68,7 @@ XXH_INLINE_ALL
 )
 
 file (GLOB RESOURCES
-
+ 
  "${CXBXR_ROOT_DIR}/CONTRIBUTORS"
  "${CXBXR_ROOT_DIR}/COPYING"
  "${CXBXR_ROOT_DIR}/README.md"
@@ -90,7 +90,7 @@ source_group(TREE ${CXBXR_ROOT_DIR}/import PREFIX import FILES
  ${CXBXR_SOURCE_EMU_IMPORT}
 )
 
-source_group(TREE ${CXBXR_ROOT_DIR}/src PREFIX source FILES
+source_group(TREE ${CXBXR_ROOT_DIR}/src PREFIX source FILES 
  ${CXBXR_SOURCE_GUIv1}
  ${CXBXR_SOURCE_COMMON}
 )
@@ -121,7 +121,7 @@ if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "MSVC")
 
  # Reference: https://docs.microsoft.com/en-us/cpp/build/reference/compiler-options-listed-alphabetically
  # /Zi   = create a PDB file without affecting optimization
- # /Ob3  = Controls inline expansion of functions.
+ # /Ob2  = Controls inline expansion of functions.
  # /Oi   = Generate intrinsic functions
  # /Ot   = In favor of using fast code than small code
  # /GL   = Whole program optimization
@@ -132,7 +132,7 @@ if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "MSVC")
  # Set optimization options for release build
  set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} \
   /Zi \
-  /Ob3 \
+  /Ob2 \
   /Oi \
   /Ot \
   /GL \
@@ -142,7 +142,7 @@ if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "MSVC")
   /Qpar \
   "
  )
-
+ 
  # disable optimization for CxbxKrnl.cpp file
  set_source_files_properties(
   ${CXBXR_KRNL_CPP} PROPERTIES COMPILE_FLAGS "/Od /GL-"
@@ -150,7 +150,7 @@ if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "MSVC")
 endif()
 
 # Windows libraries
-set(WINS_LIB
+set(WINS_LIB 
  legacy_stdio_definitions
  d3d9
  d3dcompiler
@@ -170,7 +170,6 @@ set(WINS_LIB
  comctl32
  XINPUT9_1_0
  Iphlpapi
- Dwmapi
 )
 
 target_link_libraries(cxbx

projects/cxbxr-emu/CMakeLists.txt

@@ -131,7 +131,7 @@ if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "MSVC")
  # Set optimization options for release build
  set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} \
   /Zi \
-  /Ob3 \
+  /Ob2 \
   /Oi \
   /Ot \
   /GL \
@@ -144,7 +144,7 @@ if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "MSVC")
 endif()
 
 # Windows libraries
-set(WINS_LIB
+set(WINS_LIB 
  legacy_stdio_definitions
  d3d9
  d3dcompiler

src/core/hle/JVS/JVS.cpp

@@ -178,7 +178,7 @@ void JVS_Init()
 	std::string baseBoardBackupRamPath = "backup_ram.bin";
 
 	if (!JVS_LoadFile((romPath + "\\" + baseBoardQcFirmwarePath).c_str(), g_BaseBoardQcFirmware)) {
-		CxbxrAbort("Failed to load base board firmware: %s", baseBoardQcFirmwarePath.c_str());
+		("Failed to load base board firmware: %s", baseBoardQcFirmwarePath.c_str());
 	}
 
 	if (!JVS_LoadFile((romPath + "\\" + baseBoardScFirmwarePath).c_str(), g_BaseBoardScFirmware)) {

src/core/kernel/exports/EmuKrnlIo.cpp

@@ -281,17 +281,6 @@ XBSYSAPI EXPORTNUM(66) xbox::ntstatus_xt NTAPI xbox::IoCreateFile
 	// Force ShareAccess to all 
 	ShareAccess = FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE;
 
-	// Force set DELETE permission flag if write attributes flag is set.
-	// Testcase: dashupdate.xbe (4928, untested with other versions but newer dashupdate did not call for deletion on fail).
-	if (DesiredAccess & FILE_WRITE_ATTRIBUTES) {
-		DesiredAccess |= DELETE;
-	}
-
-	// Force sanitize before call to NtDll::NtCreateFile
-	// Testcase:
-	//  * Exhibition Demo discs - Attempt to create music folder fail internally which then show unable to copy soundtrack dialog.
-	FileAttributes &= FILE_ATTRIBUTE_VALID_FLAGS;
-
     if (SUCCEEDED(ret))
     {
         // redirect to NtCreateFile

src/devices/Xbox.cpp

@@ -153,8 +153,7 @@ void InitXboxHardware(HardwareModel hardwareModel)
 
 	// Create devices
 	g_MCPX = new MCPXDevice(mcpx_revision);
-
+// TODO: For Chihiro, different games modes require different DIP switch settings
-	// TODO: For Chihiro, different games modes require different DIP switch settings
 	// Chihiro FilterBoard dip-switches 6,7,8 change this value!
 	g_SMC = new SMCDevice(smc_revision, IS_CHIHIRO(hardwareModel) ? 0 : 1); // 0 = AV_PACK_SCART, 1 = AV_PACK_HDTV. Chihiro doesn't support HDTV!
 	                                                                        // SMC uses different AV_PACK values than the Kernel
@@ -165,7 +164,7 @@ void InitXboxHardware(HardwareModel hardwareModel)
 	g_ADM1032 = new ADM1032Device();
 	g_USB0 = new USBDevice();
 
-	if (IS_CHIHIRO(hardwareModel)) {
+	if (g_bIsChihiro) {
         g_MediaBoard = new MediaBoard();
         char MediaBoardMountPath[xbox::max_path];
         g_EmuShared->GetTitleMountPath(MediaBoardMountPath);

src/devices/chihiro/MediaBoard.cpp

@@ -63,7 +63,6 @@ uint32_t MediaBoard::LpcRead(uint32_t addr, int size)
 		case 0x4020: return 0x00A0;     // XBAM String (SEGABOOT reports Media Board is not present if these values change)
 		case 0x4022: return 0x4258;     // Continued
 		case 0x4024: return 0x4D41;     // Continued
-		// TODO: Find a way to make the switch between Type-1 and Type-3 (internal value holder maybe?)
 		case 0x40F0: return 0x0000;     // Media Board Type (Type-1 vs Type-3), 0x0000 = Type-1, 0x0100 = Type-3
 		case 0x40F4: return 0x03;       // 1GB
 	}

src/devices/chihiro/MediaBoard.h

@@ -61,7 +61,7 @@ typedef struct {
     uint8_t day;                // 0x2B
     uint8_t videoMode;          // 0x2C unknown bitmask, resolutions + horizontal/vertical
     uint8_t unknown3;
-    uint8_t type3Compatible;    // 0x2E (Type-3 compatible titles have this set to 1)
+    uint8_t type3Compatible;    // 0x2E (Type-3 compatibile titles have this set to 1)
     uint8_t unknown4;
     char gameId[8];             // 0x30
     uint32_t regionFlags;       // 0x38

src/gui/WndMain.cpp

@@ -56,8 +56,6 @@
 #undef GetSystemMetrics // Force remove DirectX 8's multimon.h defined function (redirect to xGetSystemMetrics).
 #include <WinUser.h> // For GetSystemMetrics
 
-#include <dwmapi.h> // For DwmSetWindowAttribute
-
 #include <io.h>
 #include <shlobj.h>
 
@@ -325,10 +323,6 @@ LRESULT CALLBACK WndMain::WndProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lP
 			ChangeWindowMessageFilterEx(hwnd, WM_COPYDATA, MSGFLT_ALLOW, nullptr);
 			ChangeWindowMessageFilterEx(hwnd, 0x0049, MSGFLT_ALLOW, nullptr);
 
-			// Remove rounded corners from the render window on Windows 11
-			const DWM_WINDOW_CORNER_PREFERENCE corner_preference = DWMWCP_DONOTROUND;
-			DwmSetWindowAttribute(hwnd, DWMWA_WINDOW_CORNER_PREFERENCE, &corner_preference, sizeof(corner_preference));
-
             m_bCreated = true;
         }
         break;