Catch up to upstream + fix P2P multi-process Steam-ID routing

.github/workflows/emu-build-all-win-vs22.yml

@@ -0,0 +1,123 @@
+name: "Build emu (Windows)"
+
+on:
+  workflow_call:
+    # needed since it allows this to become a reusable workflow
+  workflow_dispatch:
+    # allows manual trigger
+
+permissions:
+  contents: "write"
+
+env:
+  PREMAKE_ACTION: "vs2022"
+  DEPS_CACHE_KEY: "emu-deps-win"
+  DEPS_CACHE_DIR: "build/deps/win"
+
+  THIRD_PARTY_BASE_DIR: "third-party"
+
+  # https://docs.github.com/en/actions/reference/runners/github-hosted-runners#standard-github-hosted-runners-for-public-repositories
+  MAX_PARALLEL_JOBS: 4
+
+jobs:
+  deps:
+    name: "Restore or build deps"
+    if: ${{ !cancelled() }}
+    uses: "./.github/workflows/emu-deps-win-vs22.yml"
+
+  builds-matrix-win:
+    name: "build"
+    needs: ["deps"]
+    runs-on: "windows-2022"
+    if: ${{ !cancelled() }}
+    continue-on-error: true
+
+    strategy:
+      fail-fast: false
+      matrix:
+        prj: [
+            # regular api
+            "api_regular",
+            # (experimental) api + client
+            "api_experimental",
+            "steamclient_experimental_stub",
+            # client (experimental) + loader + extra dll + gameoverlaylib
+            "steamclient_experimental",
+            "steamclient_experimental_loader",
+            "steamclient_experimental_extra",
+            "lib_game_overlay_renderer",
+            # steam old lib
+            "lib_steam_old",
+            # tools
+            "tool_lobby_connect",
+            "tool_generate_interfaces",
+          ]
+        arch: ["x64", "Win32"]
+        cfg: ["debug", "release"]
+
+        exclude:
+          - prj: lib_steam_old
+            arch: x64
+
+    steps:
+      # clone branch
+      - name: "Checkout branch"
+        uses: actions/checkout@v6
+
+      # ensure we have msbuild
+      - name: "Add MSBuild to PATH"
+        uses: microsoft/setup-msbuild@v3
+
+      # on Windows Git will auto change line ending to CRLF, not preferable
+      - name: "Ensure LF line ending"
+        shell: "cmd"
+        working-directory: "${{ github.workspace }}"
+        run: |
+          git config --local core.autocrlf false
+          git config --system core.autocrlf false
+          git config --global core.autocrlf false
+
+      # deps
+      - name: "Restore deps"
+        id: "emu-deps-cache-step"
+        uses: actions/cache@v5
+        with:
+          key: "${{ env.DEPS_CACHE_KEY }}-${{ env.PREMAKE_ACTION }}"
+          path: "${{ env.DEPS_CACHE_DIR }}/${{ env.PREMAKE_ACTION }}"
+
+      # extra helpers/tools, these are not built inside the deps build dir
+      - name: "Clone third-party build helpers (common/win)"
+        uses: actions/checkout@v6
+        with:
+          ref: "third-party/common/win"
+          path: "${{env.THIRD_PARTY_BASE_DIR}}/common/win"
+
+      - name: "Clone third-party deps (build/win)"
+        uses: actions/checkout@v6
+        with:
+          ref: "third-party/build/win"
+          path: "${{env.THIRD_PARTY_BASE_DIR}}/build/win"
+
+      # generate project files
+      - name: "Generate project files"
+        shell: "cmd"
+        working-directory: "${{ github.workspace }}"
+        run: |
+          "${{env.THIRD_PARTY_BASE_DIR}}\common\win\premake\premake5.exe" --file=premake5.lua --genproto --emubuild=${{ github.sha }} --dosstub --winrsrc --winsign --os=windows vs2022
+
+      # build target
+      - name: "Build target"
+        shell: "cmd"
+        working-directory: "${{ github.workspace }}/build/project/vs2022/win"
+        run: |
+          msbuild /nologo /target:${{ matrix.prj }} /m:1 -p:CL_MPCount=${{ env.MAX_PARALLEL_JOBS }} /v:n /p:Configuration=${{ matrix.cfg }},Platform=${{ matrix.arch }} gbe.sln
+
+      # upload artifact/package to github Actions
+      - name: "Upload target package"
+        uses: actions/upload-artifact@v7
+        with:
+          name: "emu-win-vs22-${{ matrix.prj }}-${{ matrix.cfg }}-${{ matrix.arch }}-${{ github.sha }}"
+          path: "build/win"
+          if-no-files-found: "error"
+          compression-level: 9
+          retention-days: 1

.github/workflows/emu-deps-win-vs22.yml

@@ -0,0 +1,78 @@
+name: "Emu third-party dependencies (Windows vs22)"
+
+on:
+  workflow_call:
+    # needed since it allows this to become a reusable workflow
+  workflow_dispatch:
+    # allows manual trigger
+
+permissions:
+  contents: "write"
+
+env:
+  PREMAKE_ACTION: "vs2022"
+  DEPS_CACHE_KEY: "emu-deps-win"
+  DEPS_CACHE_DIR: "build/deps/win"
+
+  PACKAGE_BASE_DIR: "build/package/win"
+  THIRD_PARTY_BASE_DIR: "third-party"
+
+  # https://docs.github.com/en/actions/reference/runners/github-hosted-runners#standard-github-hosted-runners-for-public-repositories
+  MAX_PARALLEL_JOBS: 4
+
+jobs:
+  deps-build:
+    runs-on: "windows-2022"
+    if: ${{ !cancelled() }}
+
+    steps:
+      # on Windows Git will auto change line ending to CRLF, not preferable
+      - name: "Ensure LF line ending"
+        shell: "cmd"
+        working-directory: ${{ github.workspace }}
+        run: |
+          git config --local core.autocrlf false
+          git config --system core.autocrlf false
+          git config --global core.autocrlf false
+
+      - name: "Lookup cache for deps"
+        id: "emu-deps-cache-step"
+        uses: actions/cache@v5
+        with:
+          key: "${{ env.DEPS_CACHE_KEY }}-${{ env.PREMAKE_ACTION }}"
+          path: "${{ env.DEPS_CACHE_DIR }}/${{ env.PREMAKE_ACTION }}"
+          lookup-only: true # don't restore cache if found
+
+      # we need branch because it has build scripts
+      - name: "Checkout branch"
+        if: steps.emu-deps-cache-step.outputs.cache-hit != 'true'
+        uses: actions/checkout@v6
+
+      - name: "Clone third-party deps (common/win)"
+        if: steps.emu-deps-cache-step.outputs.cache-hit != 'true'
+        uses: actions/checkout@v6
+        with:
+          ref: "third-party/common/win"
+          path: "${{env.THIRD_PARTY_BASE_DIR}}/common/win"
+
+      - name: "Clone third-party deps (deps/win)"
+        if: steps.emu-deps-cache-step.outputs.cache-hit != 'true'
+        uses: actions/checkout@v6
+        with:
+          ref: "third-party/deps/win"
+          path: "${{env.THIRD_PARTY_BASE_DIR}}/deps/win"
+
+      - name: "Clone third-party deps (deps/common)"
+        if: steps.emu-deps-cache-step.outputs.cache-hit != 'true'
+        uses: actions/checkout@v6
+        with:
+          ref: "third-party/deps/common"
+          path: "${{env.THIRD_PARTY_BASE_DIR}}/deps/common"
+
+      - name: "Build deps"
+        if: steps.emu-deps-cache-step.outputs.cache-hit != 'true'
+        shell: "cmd"
+        working-directory: "${{ github.workspace }}"
+        run: |
+          set "CMAKE_GENERATOR=Visual Studio 17 2022"
+          "${{env.THIRD_PARTY_BASE_DIR}}\common\win\premake\premake5.exe" --file=premake5-deps.lua --64-build --32-build --all-ext --all-build --j=${{ env.MAX_PARALLEL_JOBS }} --verbose --clean --os=windows vs2022

.github/workflows/emu-pull-request.yml

@@ -24,6 +24,11 @@ jobs:
     if: ${{ !cancelled() }}
     uses: "./.github/workflows/emu-build-all-win.yml"
 
+  emu-win-all-vs22:
+    name: "win vs22"
+    if: ${{ !cancelled() }}
+    uses: "./.github/workflows/emu-build-all-win-vs22.yml"
+
   emu-linux-all:
     name: "linux"
     if: ${{ !cancelled() }}

.github/workflows/migrate_gse-build-win-vs22.yml

@@ -0,0 +1,68 @@
+name: "Build migrate_gse script (Windows)"
+
+on:
+  workflow_call:
+    # needed since it allows this to become a reusable workflow
+  workflow_dispatch:
+    # allows manual trigger
+
+permissions:
+  contents: "write"
+
+env:
+  ARTIFACT_NAME: "migrate_gse-win-vs22-${{ github.sha }}"
+  SCRIPT_BASE_DIR: "tools/migrate_gse"
+  PACKAGE_BASE_DIR: "tools/migrate_gse/bin/win"
+
+  THIRD_PARTY_BASE_DIR: "third-party"
+
+jobs:
+  build:
+    runs-on: "windows-2022"
+
+    steps:
+      - name: "Set up Python 3.12"
+        uses: actions/setup-python@v6
+        with:
+          python-version: "3.12"
+
+      # on Windows Git will auto change line ending to CRLF, not preferable
+      - name: "Ensure LF line ending"
+        shell: "cmd"
+        working-directory: "${{ github.workspace }}"
+        run: |
+          git config --local core.autocrlf false
+          git config --system core.autocrlf false
+          git config --global core.autocrlf false
+
+      - name: "Checkout branch"
+        uses: actions/checkout@v6
+
+      # extra helpers/tools, these are not built inside the deps build dir
+      - name: "Clone third-party deps (build/win)"
+        uses: actions/checkout@v6
+        with:
+          ref: "third-party/build/win"
+          path: "${{env.THIRD_PARTY_BASE_DIR}}/build/win"
+
+      # env
+      - name: "Install env"
+        shell: cmd
+        working-directory: "${{ env.SCRIPT_BASE_DIR }}"
+        run: recreate_venv_win.bat
+
+      # build
+      - name: "Rebuild"
+        shell: cmd
+        working-directory: "${{ env.SCRIPT_BASE_DIR }}"
+        run: rebuild_win.bat
+
+      # upload artifact
+      - name: "Upload build package"
+        uses: actions/upload-artifact@v7
+        with:
+          name: "${{ env.ARTIFACT_NAME }}"
+          path: "${{ env.PACKAGE_BASE_DIR }}/"
+          if-no-files-found: "error"
+          compression-level: 9
+          retention-days: 1

.github/workflows/migrate_gse-pull-request.yml

@@ -16,6 +16,12 @@ jobs:
     if: ${{ !cancelled() }}
     uses: "./.github/workflows/migrate_gse-build-win.yml"
 
+  script-win-vs22:
+    name: "Migrate GSE win vs22"
+    if: ${{ !cancelled() }}
+    uses: "./.github/workflows/migrate_gse-build-win-vs22.yml"
+
+
   script-linux:
     name: "Migrate GSE linux"
     if: ${{ !cancelled() }}

.gitmodules

@@ -11,12 +11,12 @@
 [submodule "third-party/common/win"]
   path = third-party/common/win
   url = ./
-  branch = third-party/common/win
+	branch = third-party/common/win
 
 [submodule "third-party/common/linux"]
   path = third-party/common/linux
   url = ./
-  branch = third-party/common/linux
+	branch = third-party/common/linux
 
 [submodule "third-party/deps/win"]
   path = third-party/deps/win
@@ -31,4 +31,4 @@
 [submodule "third-party/deps/common"]
   path = third-party/deps/common
   url = ./
-  branch = third-party/deps/common
+	branch = third-party/deps/common

README.md

@@ -36,7 +36,9 @@ You can find helper guides, scripts, and tools here:
 
 **(These guides, scripts, and tools are maintained by their authors.)**
 
-* **[GBE Fork Tools](https://github.com/Detanup01/gbe_fork_tools)**
+* **[gbe_fork_tools](https://github.com/Detanup01/gbe_fork_tools)**
+* **[gen.emu.sharp](https://github.com/otavepto/gen.emu.sharp)**
+* **[gse_fork_tools](https://github.com/alex47exe/gse_fork_tools)**
 * **[Semuexec](https://gitlab.com/detiam/Semuexec)**
 * **[Steam Emu Utility](https://github.com/turusudiro/SteamEmuUtility)**
 * **[How to use Goldberg Emulator](https://rentry.co/goldberg_emulator)**
@@ -142,8 +144,8 @@ The only times you'll need to rebuild them is either when their separete build f
 Open CMD in the repo folder, then run the following
 * To build using `Visual Studio`
   ```batch
-  set "CMAKE_GENERATOR=Visual Studio 17 2022"
-  third-party\common\win\premake\premake5.exe --file=premake5-deps.lua --64-build --32-build   --all-ext --all-build --verbose --os=windows vs2022
+  set "CMAKE_GENERATOR=Visual Studio 18 2026"
+  third-party\common\win\premake\premake5.exe --file=premake5-deps.lua --64-build --32-build   --all-ext --all-build --verbose --os=windows vs2026
   ```
 * To build using `MSYS2` **this is currently experimental and will not work due to ABI differences**  
   <details>
@@ -194,14 +196,14 @@ This will:
 Open CMD in the repo folder, then run the following
 * For `Visual Studio 2022`
   ```batch
-  third-party\common\win\premake\premake5.exe --file=premake5.lua --genproto --os=windows vs2022
+  third-party\common\win\premake\premake5.exe --file=premake5.lua --genproto --os=windows vs2026
   ```  
-  You can then go to the folder `build\project\vs2022\win` and open the produced `.sln` file in Visual Studio.  
-  Or, if you prefer to do it from command line, open the `Developer Command Prompt for VS 2022` inside the above folder, then:  
+  You can then go to the folder `build\project\vs2026\win` and open the produced `.sln` file in Visual Studio.  
+  Or, if you prefer to do it from command line, open the `Developer Command Prompt for VS 2026` inside the above folder, then:  
   ```batch
-  msbuild /nologo /v:n /p:Configuration=release,Platform=Win32 gbe.sln
+  msbuild /nologo /v:n /p:Configuration=release,Platform=Win32 gbe.slnx
 
-  msbuild /nologo /v:n /p:Configuration=release,Platform=x64 gbe.sln
+  msbuild /nologo /v:n /p:Configuration=release,Platform=x64 gbe.slnx
   ```
 
 * For `MSYS2` **this is currently experimental and will not work due to ABI differences**  
@@ -310,7 +312,7 @@ Open CMD in the repos's directory, then run this script
 ```batch
 package_win.bat <build_folder>
 ```
-`build_folder` is any folder inside `build\win`, for example: `vs2022\release`  
+`build_folder` is any folder inside `build\win`, for example: `vs2026\release`  
 The above example will create a `.7z` archive inside `build\package\win\`
 
 ### On Linux: