Merge tag 'rel-emu' into emu

Author: Redbot

.github/workflows/build_release_shared.yaml

@@ -18,6 +18,7 @@ on:
 
 env:
   platform: "${{ inputs.client_target == 'emu' && 'Win32' || 'x64' }}"
+  scoop_packages: "sentry-cli"
 
 jobs:
   build:
@@ -135,6 +136,56 @@ jobs:
           }
           $resourceFile | Set-Content $resourceFilePath
 
+      - name: Check Scoop Installation
+        id: check_scoop
+        shell: pwsh
+        run: |
+          $scoopPath = "$env:USERPROFILE\scoop"
+          $packages = "${{ env.scoop_packages }}" -split '\s+'
+          $allInstalled = $true
+
+          if (Test-Path $scoopPath) {
+            foreach ($pkg in $packages) {
+              if (-not (Test-Path "$scoopPath\apps\$pkg")) {
+                $allInstalled = $false
+                break
+              }
+            }
+          } else {
+            $allInstalled = $false
+          }
+
+          $hash = (Get-FileHash -InputStream ([IO.MemoryStream]::new([Text.Encoding]::UTF8.GetBytes("${{ env.scoop_packages }}"))) -Algorithm SHA256).Hash.Substring(0,16)
+
+          echo "scoop_ready=$allInstalled" >> $env:GITHUB_OUTPUT
+          echo "scoop_packages_hash=$hash" >> $env:GITHUB_OUTPUT
+
+      - name: Restore Scoop Cache
+        if: steps.check_scoop.outputs.scoop_ready != 'true'
+        id: restore_scoop_cache
+        uses: actions/cache@v4
+        with:
+          path: '~/scoop'
+          key: ${{ runner.os }}-scoop-${{ steps.check_scoop.outputs.scoop_packages_hash }}
+
+      - name: Install Scoop
+        if: steps.check_scoop.outputs.scoop_ready != 'true' && steps.restore_scoop_cache.outputs.cache-hit != 'true'
+        uses: MinoruSekine/setup-scoop@v4.0.2
+        with:
+          install_scoop: 'true'
+          buckets: extras
+          apps: ${{ env.scoop_packages }}
+          scoop_update: 'true'
+          update_path: 'true'
+
+      - name: Setup Scoop PATH
+        if: steps.check_scoop.outputs.scoop_ready != 'true' && steps.restore_scoop_cache.outputs.cache-hit == 'true'
+        uses: MinoruSekine/setup-scoop@v4.0.2
+        with:
+          install_scoop: 'false'
+          scoop_update: 'false'
+          update_path: 'true'
+
       - name: Setup MSBuild
         uses: microsoft/setup-msbuild@v2
         with:
@@ -147,8 +198,19 @@ jobs:
         run: |
           nuget restore src/MacroQuestCustom.sln
 
-      - name: Handle vcpkg Cache
-        if: false # Disabled for build server speed improvements
+      - name: Check vcpkg Installation
+        id: check_vcpkg
+        shell: pwsh
+        run: |
+          $installedPath = "${{ github.workspace }}/contrib/vcpkg/installed"
+          if ((Test-Path $installedPath) -and (Get-ChildItem $installedPath -Directory | Measure-Object).Count -gt 0) {
+            echo "vcpkg_installed=true" >> $env:GITHUB_OUTPUT
+          } else {
+            echo "vcpkg_installed=false" >> $env:GITHUB_OUTPUT
+          }
+
+      - name: Restore vcpkg Cache
+        if: steps.check_vcpkg.outputs.vcpkg_installed != 'true'
         uses: actions/cache@v4
         with:
           path: |
@@ -172,6 +234,15 @@ jobs:
       - name: Create Symbols Archive
         run: 7z a -tzip -r build/bin/MacroQuest-Symbols.zip build/bin/Release/*.exe build/bin/Release/*.dll build/bin/Release/*.pdb
 
+      - name: Upload Symbols to Sentry
+        env:
+          SENTRY_AUTH_TOKEN: ${{ secrets.SENTRY_AUTH_TOKEN }}
+          SENTRY_ORG: macroquest
+          SENTRY_PROJECT: macroquest
+        shell: pwsh
+        run: |
+          sentry-cli debug-files upload --wait "${{ github.workspace }}\build\bin\Release"
+
       - name: Upload Symbols Artifact
         uses: actions/upload-artifact@v4
         with:

data/resources/CHANGELOG.md

@@ -1,3 +1,15 @@
+## 3/1/2026
+
+Updated to crashpad from the crashpad-backtrace fork we were previously using.
+- For local builders you should remove crashpad-backtrace to prevent conflicts
+- `vcpkg remove crashpad-backtrace:x64-windows-static` and/or `vcpkg remove crashpad-backtrace:x86-windows-static`
+
+### Bug fixes
+
+- live/test: Fix /removeaug (#974)
+- emu: Fix CTargetWnd buff accessor (#975)
+
+
 ## 2/22/2026
 
 ### ImAnim Integration

include/config/crashpad.h.example

@@ -1,14 +1,18 @@
 //
 // To enable automatic submissions, remove the .example extension from
-// this header and set the submissions url to your crashpad submission endpoint.
+// this header and set the submission values for your crash backend.
 //
 
 #pragma once
 
 // Enables crashpad submissions
 #define CRASHPAD_SUBMISSIONS_ENABLED true
 
-// The submission URL used for submitting crash reports
+// Optional environment annotation.
+// #define CRASHPAD_SUBMISSION_ENVIRONMENT "production"
+
+// Crashpad submission endpoint URL.
+// Example: https://crash-reports.example.com/minidump
 #define CRASHPAD_SUBMISSIONS_URL ""
 
 // Enables the rate limit for crash submissions (1/hour)

src/eqlib

@@ -1,4 +1,4 @@
-# Generated from MacroQuest.vcxproj
+# Generated from MacroQuest.vcxproj
 # This file is designed to work with add_subdirectory()
 
 # ---------------------------------------------------------------------
@@ -114,7 +114,7 @@ target_link_libraries(MacroQuest PRIVATE imgui login routing)
 # Include directories
 # ---------------------------------------------------------------------
 target_include_directories(MacroQuest PRIVATE
-    "${VCPKG_IncludeStatic}/crashpad-backtrace"
+    "${VCPKG_IncludeStatic}/crashpad"
     "${CMAKE_SOURCE_DIR}/include"
 )
 

src/loader/CMakeLists.txt

@@ -50,6 +50,12 @@
 #if !defined(CRASHPAD_SUBMISSIONS_RATELIMITED)
 #define CRASHPAD_SUBMISSIONS_RATELIMITED true
 #endif
+#if !defined(CRASHPAD_SUBMISSION_PRODUCT)
+#define CRASHPAD_SUBMISSION_PRODUCT "MQ Loader"
+#endif
+#if !defined(CRASHPAD_SUBMISSION_ENVIRONMENT)
+#define CRASHPAD_SUBMISSION_ENVIRONMENT "unknown"
+#endif
 
 using namespace crashpad;
 CrashpadClient client;
@@ -85,6 +91,24 @@ bool InitializeCrashpad()
 	}
 
 	std::map<std::string, std::string> annotations;
+	annotations["format"] = "minidump";
+	const std::string product = CRASHPAD_SUBMISSION_PRODUCT;
+	if (!product.empty())
+	{
+		annotations["product"] = product;
+	}
+	annotations["version"] = MQMAIN_VERSION;
+	std::string release = MQMAIN_VERSION;
+	if (!product.empty())
+	{
+		release = product + "@" + release;
+	}
+	annotations["sentry[release]"] = release;
+	const std::string environment = CRASHPAD_SUBMISSION_ENVIRONMENT;
+	if (!environment.empty())
+	{
+		annotations["sentry[environment]"] = environment;
+	}
 	std::vector<std::string> arguments;
 
 	// This is the directory you will use to store and queue crash data.
@@ -95,9 +119,7 @@ bool InitializeCrashpad()
 	// crash handlers. This path may be relative.
 	std::string handlerPath(internal_paths::MQRoot + "\\crashpad_handler.exe");
 
-	// This should point to your server dump submission port (labeled as "http/writer"
-	// in the listener configuration pane. Preferrably, the SSL enabled port should
-	// be used. If Backtrace is hosting your instance, the default port is 6098.
+	// This should point to your server dump submission endpoint.
 	std::string url(gCrashpadSubmissionURL);
 
 	if (!gEnableRateLimit)

src/loader/Crashpad.cpp

@@ -73,7 +73,7 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
-      <AdditionalIncludeDirectories>$(VCPKG_IncludeStatic)\crashpad-backtrace;$(MQRoot)include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(VCPKG_IncludeStatic)\crashpad;$(MQRoot)include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     <Link />
     <Manifest />
@@ -83,7 +83,7 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <ClCompile>
-      <AdditionalIncludeDirectories>$(VCPKG_IncludeStatic)\crashpad-backtrace;$(MQRoot)include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(VCPKG_IncludeStatic)\crashpad;$(MQRoot)include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     <Link />
     <Manifest />
@@ -96,7 +96,7 @@
       <Optimization>MaxSpeed</Optimization>
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
-      <AdditionalIncludeDirectories>$(VCPKG_IncludeStatic)\crashpad-backtrace;$(MQRoot)include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(VCPKG_IncludeStatic)\crashpad;$(MQRoot)include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
@@ -110,7 +110,7 @@
       <Optimization>MaxSpeed</Optimization>
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
-      <AdditionalIncludeDirectories>$(VCPKG_IncludeStatic)\crashpad-backtrace;$(MQRoot)include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(VCPKG_IncludeStatic)\crashpad;$(MQRoot)include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>

src/loader/MacroQuest.vcxproj

@@ -6,7 +6,7 @@
 
   ],
   "dependencies": [
-      "crashpad-backtrace",
+      "crashpad",
       "spdlog",
       "wil",
       "date",

src/loader/vcpkg.json

@@ -1,4 +1,4 @@
-crashpad-backtrace
+crashpad
 spdlog
 wil
 date

src/loader/vcpkg_mq.txt

@@ -50,6 +50,12 @@
 #if !defined(CRASHPAD_SUBMISSIONS_RATELIMITED)
 #define CRASHPAD_SUBMISSIONS_RATELIMITED true
 #endif
+#if !defined(CRASHPAD_SUBMISSION_PRODUCT)
+#define CRASHPAD_SUBMISSION_PRODUCT "MacroQuest"
+#endif
+#if !defined(CRASHPAD_SUBMISSION_ENVIRONMENT)
+#define CRASHPAD_SUBMISSION_ENVIRONMENT "unknown"
+#endif
 
 namespace fs = std::filesystem;
 
@@ -89,14 +95,15 @@ static LPTOP_LEVEL_EXCEPTION_FILTER lpCrashpadTopLevelExceptionFilter = nullptr;
 // The original unhandled exception filter. We need to hold this so we can put it back if we unload.
 static LPTOP_LEVEL_EXCEPTION_FILTER lpOrigTopLevelExceptionFilter = nullptr;
 
-// Annotations that should be added to crash reports
-static crashpad::StringAnnotation<32> buildTypeAnnotation("buildType");
-static crashpad::StringAnnotation<32> buildTimestampAnnotation("eqVersion");
-static crashpad::StringAnnotation<32> buildVersionAnnotation("mqVersion");
-static crashpad::StringAnnotation<36> buildCrashIdAnnotation("crashId");
+// Annotations that should be added to crash reports.
+// normal minidump: buildTypeAnnotation("buildType"); Sentry.io: buildTypeAnnotation("sentry[tags][buildType]");
+static crashpad::StringAnnotation<32> buildTypeAnnotation("sentry[tags][buildType]");
+static crashpad::StringAnnotation<32> buildTimestampAnnotation("sentry[tags][eqVersion]");
+static crashpad::StringAnnotation<32> buildVersionAnnotation("sentry[tags][mqVersion]");
+static crashpad::StringAnnotation<36> buildCrashIdAnnotation("sentry[tags][crashId]");
 
-static crashpad::StringAnnotation<MAX_STRING> s_currentCommandAnnotation("mq.command");
-static crashpad::StringAnnotation<MAX_STRING> s_currentMacroData("mq.macro_data");
+static crashpad::StringAnnotation<MAX_STRING> s_currentCommandAnnotation("sentry[tags][mq.command]");
+static crashpad::StringAnnotation<MAX_STRING> s_currentMacroData("sentry[tags][mq.macro_data]");
 
 static std::string s_sessionUuid;
 
@@ -127,6 +134,24 @@ bool InitializeCrashpad()
 		return true;
 
 	std::map<std::string, std::string> annotations;
+	annotations["format"] = "minidump";
+	const std::string product = CRASHPAD_SUBMISSION_PRODUCT;
+	if (!product.empty())
+	{
+		annotations["product"] = product;
+	}
+	annotations["version"] = MQMAIN_VERSION;
+	std::string release = MQMAIN_VERSION;
+	if (!product.empty())
+	{
+		release = product + "@" + release;
+	}
+	annotations["sentry[release]"] = release;
+	const std::string environment = CRASHPAD_SUBMISSION_ENVIRONMENT;
+	if (!environment.empty())
+	{
+		annotations["sentry[environment]"] = environment;
+	}
 	std::vector<std::string> arguments;
 
 	// This is the directory you will use to store and queue crash data.
@@ -137,9 +162,7 @@ bool InitializeCrashpad()
 	// crash handlers. This path may be relative.
 	std::wstring handlerPath(utf8_to_wstring(mq::internal_paths::MQRoot + "\\crashpad_handler.exe"));
 
-	// This should point to your server dump submission port (labeled as "http/writer"
-	// in the listener configuration pane. Preferably, the SSL enabled port should
-	// be used. If Backtrace is hosting your instance, the default port is 6098.
+	// This should point to your server dump submission endpoint.
 	std::string url(gCrashpadSubmissionURL);
 
 	if (!gEnableRateLimit)
@@ -526,7 +549,7 @@ void CrashHandler_SetLastMacroData(const char* macroData)
 
 //----------------------------------------------------------------------------
 
-static crashpad::StringAnnotation<32> s_synthesizedAnnotation("synthesized");
+static crashpad::StringAnnotation<32> s_synthesizedAnnotation("sentry[tags][synthesized]");
 
 void DoCrash(PlayerClient*, const char* szLine)
 {