@next2d/builder 0.1.10 → 0.2.0

package/docs/xbox.md

@@ -0,0 +1,145 @@
+# Xbox（試作・開発段階 / Prototype under development）
+
+[日本語](#日本語) | [English](#english)
+
+## 日本語
+
+Xbox対応はGDK向けネイティブホストの試作・開発段階。Xbox実機での動作確認・配布対応は完了していない。
+以下は開発環境での検証手順。
+
+### STEP1：検証範囲に必要な環境を用意する
+
+| 検証範囲 | ユーザーが用意するもの |
+|---|---|
+| ホスト生成・アセット準備のみ | macOS / Linuxでも実行できる。 |
+| C++ホストのビルド | Windows、Visual Studio 2022、Microsoft GDK、CMake 3.26以降。現行builderはVisual Studio 2022ジェネレーターを指定する。 |
+| Xbox実機での検証 | コンソール向けGDK開発環境とXbox開発機（devkit）。PC向けのGDK検証環境とは区別して用意する。 |
+
+### STEP2：ゲーム設定とV8を用意する
+
+ゲームルートの `MicrosoftGame.config` にゲーム固有の値を設定する。
+未配置の場合は初回のホスト生成でテンプレートから作られるため、生成後に内容を確認・変更する。
+
+V8はJavaScript実行エンジン。通常はbuilderがビルド済みライブラリを取得し、自前ビルドを使う場合だけパスを指定する。
+描画用のDawn（WebGPU → D3D12）はCMakeのFetchContentが取得するため、初回取得にはネットワーク接続が必要。
+
+Windowsでのビルド時は、次の優先順でV8を解決する。
+
+1. `--v8-root` で指定したパス
+2. 環境変数 `V8_ROOT`
+3. キャッシュ済みのビルド済みV8
+4. Next2D/builderのGitHub Releasesからダウンロード
+
+ビルド済みV8は `build-v8` ワークフローで作成・公開する構成になっている。
+取得対象のバージョンとリビジョンはbuilder側で固定し、取得後はキャッシュを再利用する。
+自前のV8を使用する場合:
+
+```bat
+npx @next2d/builder --platform xbox --env prd --v8-root C:\path\to\v8
+```
+
+公開しているWindows x64用V8の利用と、Xboxコンソール向けの互換性検証は別の作業。
+コンソール向けにはGDKツールチェーンでの調整・再ビルドを含む検証が残っている。
+
+### STEP3：ホストを生成・ビルドする
+
+ゲームルートで実行する。
+
+```sh
+npx @next2d/builder --platform xbox --env prd
+```
+
+builder同梱のC++ / CMakeテンプレートから `xbox/` を生成・更新し、`MicrosoftGame.config` を反映する。
+Webビルド結果とホストスクリプトを `assets.pak` / `assets.rc` にまとめ、実行ファイルへの埋め込み用に配置する。
+このホストはV8とDawnを使い、ElectronやWebViewは使用しない。
+
+| 実行環境・引数 | コマンドの到達点 |
+|---|---|
+| Windows | V8を解決し、CMakeでGDK向けの構成・ビルドを実行する。対象環境での検証が必要。 |
+| Windows + `--open` / `--preview` | CMakeで構成した後、Visual Studioのソリューションを開く。実行・デバッグはVisual Studio側で行う。 |
+| macOS / Linux | ホスト生成とアセット準備までで終了する。GDK向け実行ファイルは生成しない。 |
+
+### STEP4：生成物と対象環境での動作を確認する
+
+コマンドの終了だけでXbox向けの配布物が完成したとは判断せず、生成物とログを確認する。
+
+`xbox-host-ci` ワークフローには、ラスタライザーとstbの回帰テスト、Windows APIを使う一部機能のテスト、
+V8依存ソースのコンパイル確認、Game Core APIの確認を用意している。
+これらはホスト全体のリンクやXbox実機での動作を保証するものではない。
+Dawn / GDKを含む統合ビルドと、ゲームを使った実機検証が必要。
+
+今後の検証・調整対象は、描画、Worker、入力、音声、テキスト、保存処理、性能、配布設定など。
+詳細なホスト構成・自前V8のビルド・機能ごとの実装状況は、
+[ホストテンプレートの開発資料](../templates/xbox/README.md)を参照する。
+同じ資料は生成先の `xbox/README.md` にも配置される。
+
+## English
+
+Xbox support is a prototype GDK native host under development. Xbox hardware validation and distribution support are not complete.
+The following steps are for development testing.
+
+### STEP1: Prepare the environment for your validation scope
+
+| Validation scope | What you need to prepare |
+|---|---|
+| Host generation and asset preparation only | Also works on macOS / Linux. |
+| Building the C++ host | Windows, Visual Studio 2022, Microsoft GDK and CMake 3.26 or later. The current builder selects the Visual Studio 2022 generator. |
+| Testing on Xbox hardware | A console GDK development environment and Xbox development hardware (devkit), distinct from a PC GDK testing environment. |
+
+### STEP2: Prepare game configuration and V8
+
+Set game-specific values in `MicrosoftGame.config` at the game root.
+If absent, it is created from the template during initial host generation; review and edit it afterward.
+
+V8 is the JavaScript engine. The builder normally downloads a prebuilt library; specify a path only when using your own build.
+CMake FetchContent acquires Dawn (WebGPU → D3D12) for rendering, so the first download requires network access.
+
+For Windows builds, V8 is resolved in this order:
+
+1. The path passed with `--v8-root`
+2. The `V8_ROOT` environment variable
+3. A cached prebuilt V8
+4. A download from the Next2D/builder GitHub Releases
+
+The `build-v8` workflow is configured to build and publish prebuilt V8 libraries.
+The builder pins the download version and revision and reuses the cache after downloading.
+To use your own V8 build:
+
+```bat
+npx @next2d/builder --platform xbox --env prd --v8-root C:\path\to\v8
+```
+
+Using the published Windows x64 V8 library and validating Xbox console compatibility are separate tasks.
+Console support still needs validation, including adjustments or rebuilds with the GDK toolchain.
+
+### STEP3: Generate and build the host
+
+Run from the game root:
+
+```sh
+npx @next2d/builder --platform xbox --env prd
+```
+
+The builder creates or updates `xbox/` from its bundled C++ / CMake templates and applies `MicrosoftGame.config`.
+It packs the web build output and host scripts into `assets.pak` / `assets.rc` for embedding in the executable.
+The host uses V8 and Dawn, without Electron or WebView.
+
+| Environment / options | What the command completes |
+|---|---|
+| Windows | Resolves V8, then configures and builds the GDK target with CMake. Target-environment validation is still needed. |
+| Windows + `--open` / `--preview` | Opens the Visual Studio solution after CMake configuration. Run and debug from Visual Studio. |
+| macOS / Linux | Stops after host generation and asset preparation; no GDK executable is built. |
+
+### STEP4: Check the output and target-environment behavior
+
+Command completion alone does not mean an Xbox distribution package is ready; inspect the output and logs.
+
+The `xbox-host-ci` workflow includes rasterizer and stb regression tests, tests for selected Windows API functionality,
+compilation checks for V8-dependent sources and Game Core API checks.
+These checks do not guarantee that the complete host links or runs on Xbox hardware.
+An integrated build with Dawn / GDK and testing with a game on the target hardware are still required.
+
+Remaining validation and adjustments cover rendering, Workers, input, audio, text, save handling, performance and distribution settings.
+For the detailed host architecture, instructions for building V8 yourself and implementation status by feature,
+see the [host template development notes](../templates/xbox/README.md).
+The same notes are copied to the generated `xbox/README.md`.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@next2d/builder",
-  "version": "0.1.10",
+  "version": "0.2.0",
   "description": "Multi-platform builder for Next2d Framework, supporting export to various platforms such as macOS, Windows, iOS, Android and Web(HTML)",
   "author": "Toshiyuki Ienaga <ienaga@next2d.app>",
   "license": "MIT",
@@ -29,7 +29,8 @@
   },
   "files": [
     "dist",
-    "templates"
+    "templates",
+    "docs"
   ],
   "repository": {
     "type": "git",
@@ -38,20 +39,16 @@
   "bin": {
     "@next2d/builder": "dist/index.js"
   },
-  "dependencies": {
-    "@electron-forge/core": "^7.11.2",
-    "@types/node": "^26.1.2",
-    "picocolors": "^1.1.1",
-    "vite": "^8.2.0"
-  },
   "devDependencies": {
-    "@eslint/eslintrc": "^3.3.6",
+    "@eslint/eslintrc": "^3.3.7",
     "@eslint/js": "^10.0.1",
-    "@typescript-eslint/eslint-plugin": "^8.65.0",
-    "@typescript-eslint/parser": "^8.65.0",
-    "eslint": "^10.8.0",
+    "@types/node": "^26.6.2",
+    "@typescript-eslint/eslint-plugin": "^8.70.1",
+    "@typescript-eslint/parser": "^8.70.1",
+    "eslint": "^10.11.0",
     "eslint-plugin-unused-imports": "^4.4.1",
-    "globals": "^17.8.0",
-    "typescript": "^6.0.3"
+    "globals": "^17.12.0",
+    "typescript": "^6.0.3",
+    "vite": "^8.3.0"
   }
 }

package/templates/electron/entitlements.plist

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+    <key>com.apple.security.cs.allow-jit</key>
+    <true/>
+    <key>com.apple.security.cs.disable-library-validation</key>
+    <true/>
+    <key>com.apple.security.cs.allow-dyld-environment-variables</key>
+    <true/>
+</dict>
+</plist>

package/templates/electron/index.js

@@ -0,0 +1,95 @@
+const { app, BrowserWindow, Menu, net, protocol, screen, session } = require("electron");
+const path = require("node:path");
+const fs = require("node:fs");
+const { pathToFileURL } = require("node:url");
+const { resolveAssetPath, CSP } = require("./local-assets.cjs");
+const config = require("./runtime-config.json");
+// Keep saves in a stable user directory even if the visible game name changes.
+app.setName(config.appName);
+app.setPath("userData", path.join(app.getPath("appData"), config.appId));
+const assetRoot = app.isPackaged
+    ? path.join(process.resourcesPath, "resources")
+    : path.join(__dirname, "resources");
+
+// A fixed secure origin supports fetch, module scripts, workers and localStorage.
+protocol.registerSchemesAsPrivileged([{
+    scheme: "next2d",
+    privileges: { standard: true, secure: true, supportFetchAPI: true, corsEnabled: true, stream: true }
+}]);
+
+const startURL = "next2d://game/index.html";
+let mainWindow;
+const createWindow = async () => {
+    const { width, height } = screen.getPrimaryDisplay().workAreaSize;
+    mainWindow = new BrowserWindow({
+        width: Math.min(config.window.width, width),
+        height: Math.min(config.window.height, height),
+        title: config.appName,
+        fullscreen: config.window.fullscreen,
+        ...(config.icon ? { icon: path.join(assetRoot, config.icon) } : {}),
+        useContentSize: true,
+        backgroundColor: "#000000",
+        autoHideMenuBar: true,
+        show: false,
+        webPreferences: { nodeIntegration: false, contextIsolation: true, sandbox: true }
+    });
+    mainWindow.webContents.setWindowOpenHandler(() => ({ action: "deny" }));
+    mainWindow.webContents.on("will-navigate", (event, url) => {
+        if (!resolveAssetPath(assetRoot, url)) {
+            event.preventDefault();
+        }
+    });
+    mainWindow.webContents.on("before-input-event", (event, input) => {
+        if (input.type !== "keyDown") {
+            return;
+        }
+        if (input.key === "F11" || (input.alt && input.key === "Enter")) {
+            mainWindow.setFullScreen(!mainWindow.isFullScreen());
+            event.preventDefault();
+        } else if (input.key === "Escape" && mainWindow.isFullScreen()) {
+            mainWindow.setFullScreen(false);
+            event.preventDefault();
+        }
+    });
+    mainWindow.webContents.on("render-process-gone", (_event, details) => {
+        console.error("Renderer exited:", details.reason);
+        app.exit(1);
+    });
+    mainWindow.once("ready-to-show", () => mainWindow.show());
+    await mainWindow.loadURL(startURL);
+};
+
+app.whenReady().then(async () => {
+    Menu.setApplicationMenu(process.platform === "darwin" ? Menu.buildFromTemplate([
+        { role: "appMenu" }, { role: "editMenu" }, { role: "windowMenu" }
+    ]) : null);
+    session.defaultSession.setPermissionRequestHandler((_contents, permission, callback) => {
+        callback(permission === "fullscreen");
+    });
+    session.defaultSession.setPermissionCheckHandler((_contents, permission) => permission === "fullscreen");
+    protocol.handle("next2d", async (request) => {
+        let asset = resolveAssetPath(assetRoot, request.url);
+        if (!asset || request.method !== "GET") {
+            return new Response("Not found", { status: 404 });
+        }
+        // Framework SPA routes use history.pushState (e.g. /home); reload the entry.
+        if (!path.extname(asset) && !fs.existsSync(asset)) {
+            asset = path.join(assetRoot, "index.html");
+        }
+        try {
+            const response = await net.fetch(pathToFileURL(asset).href);
+            const headers = new Headers(response.headers);
+            headers.set("Content-Security-Policy", CSP);
+            return new Response(response.body, { status: response.status, headers });
+        } catch {
+            return new Response("Not found", { status: 404 });
+        }
+    });
+    await createWindow();
+}).catch((error) => {
+    console.error(error);
+    app.exit(1);
+});
+
+// Closing the game must stop Steam's "Running" status, including on macOS.
+app.on("window-all-closed", () => app.quit());

package/templates/electron/local-assets.cjs

@@ -0,0 +1,24 @@
+const path = require("node:path");
+
+const CSP = "default-src 'self' data: blob:; script-src 'self' 'wasm-unsafe-eval'; worker-src 'self' blob: data:; style-src 'self' 'unsafe-inline'; object-src 'none'; base-uri 'none'";
+const resolveAssetPath = (root, requestURL) => {
+    try {
+        const url = new URL(requestURL);
+        if (url.protocol !== "next2d:" || url.host !== "game" || url.username || url.password) {
+            return null;
+        }
+        const name = decodeURIComponent(url.pathname);
+        if (name.includes("\0") || name.includes("\\")) {
+            return null;
+        }
+        const file = path.resolve(root, `.${name === "/" ? "/index.html" : name}`);
+        const relative = path.relative(root, file);
+        if (!relative || relative === ".." || relative.startsWith(`..${path.sep}`) || path.isAbsolute(relative)) {
+            return null;
+        }
+        return file;
+    } catch {
+        return null;
+    }
+};
+module.exports = { CSP, resolveAssetPath };

package/templates/electron/package.json

@@ -0,0 +1,11 @@
+{
+  "name": "next2d-game",
+  "version": "1.0.0",
+  "description": "Next2D desktop game",
+  "private": true,
+  "type": "commonjs",
+  "main": "index.js",
+  "devDependencies": {
+    "electron": "44.4.3"
+  }
+}

package/templates/xbox/src/platform/StbTextRasterizer.cpp

@@ -192,16 +192,18 @@ bool ComputeLayout(const std::string& css_font, const std::wstring& text, Layout
     stbtt_GetFontVMetrics(&lo.font->info, &lo.ascent, &lo.descent, &line_gap);
     lo.cps = ToCodepoints(text);
 
+    // Keep layout arithmetic in double; stb's bitmap API still takes float.
+    const double scale = lo.scale;
     double x = 0;
     for (size_t i = 0; i < lo.cps.size(); ++i) {
         int advance = 0, lsb = 0;
         stbtt_GetCodepointHMetrics(&lo.font->info, static_cast<int>(lo.cps[i]), &advance, &lsb);
-        x += advance * lo.scale;
+        x += advance * scale;
         if (i + 1 < lo.cps.size()) {
             x += stbtt_GetCodepointKernAdvance(
                      &lo.font->info,
                      static_cast<int>(lo.cps[i]),
-                     static_cast<int>(lo.cps[i + 1])) * lo.scale;
+                     static_cast<int>(lo.cps[i + 1])) * scale;
         }
     }
     lo.width = x;
@@ -239,9 +241,10 @@ bool MeasureText(const std::string& css_font, const std::wstring& text,
     if (!ComputeLayout(css_font, text, lo)) {
         return false;
     }
+    const double scale = lo.scale;
     out.width   = lo.width;
-    out.ascent  = lo.ascent * lo.scale;
-    out.descent = -lo.descent * lo.scale;   // stbtt の descent は負値
+    out.ascent  = lo.ascent * scale;
+    out.descent = -static_cast<double>(lo.descent) * scale;   // stbtt の descent は負値
     return true;
 }
 
@@ -256,8 +259,9 @@ bool RasterizeText(const std::string& css_font, const std::wstring& text,
         return false;
     }
 
-    const double ascent_px  = lo.ascent * lo.scale;
-    const double descent_px = -lo.descent * lo.scale;
+    const double scale = lo.scale;
+    const double ascent_px  = lo.ascent * scale;
+    const double descent_px = -static_cast<double>(lo.descent) * scale;
     const int width  = std::max(1, static_cast<int>(std::ceil(lo.width)) + 2);
     const int height = std::max(1, static_cast<int>(std::ceil(ascent_px + descent_px)) + 2);
     const int baseline = static_cast<int>(std::ceil(ascent_px)) + 1;
@@ -272,7 +276,7 @@ bool RasterizeText(const std::string& css_font, const std::wstring& text,
 
         int x0 = 0, y0 = 0, x1 = 0, y1 = 0;
         const float shift_x =
-            static_cast<float>(pen_x + lsb * lo.scale - std::floor(pen_x + lsb * lo.scale));
+            static_cast<float>(pen_x + lsb * scale - std::floor(pen_x + lsb * scale));
         stbtt_GetCodepointBitmapBoxSubpixel(
             &lo.font->info, cp, lo.scale, lo.scale, shift_x, 0, &x0, &y0, &x1, &y1);
 
@@ -284,7 +288,7 @@ bool RasterizeText(const std::string& css_font, const std::wstring& text,
                 &lo.font->info, glyph.data(), gw, gh, gw,
                 lo.scale, lo.scale, shift_x, 0, cp);
 
-            const int dst_x = static_cast<int>(std::floor(pen_x + lsb * lo.scale));
+            const int dst_x = static_cast<int>(std::floor(pen_x + lsb * scale));
             const int dst_y = baseline + y0;
             for (int yy = 0; yy < gh; ++yy) {
                 const int py = dst_y + yy;
@@ -298,10 +302,10 @@ bool RasterizeText(const std::string& css_font, const std::wstring& text,
             }
         }
 
-        pen_x += advance * lo.scale;
+        pen_x += advance * scale;
         if (i + 1 < lo.cps.size()) {
             pen_x += stbtt_GetCodepointKernAdvance(
-                         &lo.font->info, cp, static_cast<int>(lo.cps[i + 1])) * lo.scale;
+                         &lo.font->info, cp, static_cast<int>(lo.cps[i + 1])) * scale;
         }
     }
 

package/templates/xbox/tests/check_local.sh

@@ -2,7 +2,8 @@
 # macOS / Linux で Windows 実機なしに実行できる検証をまとめて回す。
 #   1. RasterCore 単体テスト (実行)
 #   2. RasterCore 単体テスト (ASan/UBSan)
-#   3. V8 依存ソースの構文チェック (実 V8 ヘッダに対して。Windows API 非依存の12ファイル)
+#   3. stb 境界値・デコード回帰テスト (通常 + ASan/UBSan)
+#   4. V8 依存ソースの構文チェック (実 V8 ヘッダに対して)
 #
 # 使い方:
 #   tests/check_local.sh [V8_INCLUDE_DIR]
@@ -13,16 +14,23 @@ cd "$(dirname "$0")/.."
 V8_TAG="13.7.152.19"
 V8INC="${1:-}"
 
-echo "== 1/3 RasterCore unit tests =="
+echo "== 1/4 RasterCore unit tests =="
 c++ -std=c++17 -Wall -Wextra -O1 -o /tmp/next2d_raster_test tests/raster_test.cpp
 /tmp/next2d_raster_test
 
-echo "== 2/3 RasterCore unit tests (ASan/UBSan) =="
+echo "== 2/4 RasterCore unit tests (ASan/UBSan) =="
 c++ -std=c++17 -g -fsanitize=address,undefined -fno-omit-frame-pointer \
     -o /tmp/next2d_raster_test_asan tests/raster_test.cpp
 /tmp/next2d_raster_test_asan
 
-echo "== 3/3 V8-dependent sources syntax check (V8 ${V8_TAG}) =="
+echo "== 3/4 stb safety regression tests =="
+c++ -std=c++17 -O1 -o /tmp/next2d_stb_safety_test tests/stb_safety_test.cpp
+/tmp/next2d_stb_safety_test
+c++ -std=c++17 -g -fsanitize=address,undefined -fno-omit-frame-pointer \
+    -o /tmp/next2d_stb_safety_test_asan tests/stb_safety_test.cpp
+/tmp/next2d_stb_safety_test_asan
+
+echo "== 4/4 V8-dependent sources syntax check (V8 ${V8_TAG}) =="
 if [ -z "${V8INC}" ]; then
     if [ ! -d ".v8_headers/include" ]; then
         git clone --depth 1 --branch "${V8_TAG}" --filter=blob:none --sparse \

package/templates/xbox/tests/stb_safety_test.cpp

@@ -0,0 +1,126 @@
+// Regression tests for local stb patches. No Windows SDK, V8 or external assets.
+#include <climits>
+#include <cstdio>
+#include <cstdlib>
+#include <vector>
+
+// Record allocation attempts without allocating huge buffers in boundary tests.
+static size_t last_allocation = 0;
+static void* TestMalloc(size_t size)
+{
+    last_allocation = size;
+    return size > 64 * 1024 * 1024 ? nullptr : std::malloc(size);
+}
+static void* TestRealloc(void* data, size_t size)
+{
+    last_allocation = size;
+    return size > 64 * 1024 * 1024 ? nullptr : std::realloc(data, size);
+}
+
+#define STBI_MALLOC TestMalloc
+#define STBI_REALLOC TestRealloc
+#define STBI_FREE std::free
+#define STBI_NO_STDIO
+#define STB_IMAGE_IMPLEMENTATION
+#include "../third_party/stb_image.h"
+
+#define STB_VORBIS_NO_STDIO
+#define STB_VORBIS_NO_PUSHDATA_API
+#include "../third_party/stb_vorbis.c"
+
+static int failures = 0;
+static int checks = 0;
+#define EXPECT(condition) do { ++checks; if (!(condition)) { \
+    ++failures; std::printf("not ok - line %d: %s\n", __LINE__, #condition); } } while (0)
+
+static void Test16BitConversion()
+{
+    auto* pixel = static_cast<stbi__uint16*>(std::malloc(3 * sizeof(stbi__uint16)));
+    pixel[0] = 123; pixel[1] = 456; pixel[2] = 789;
+    auto* rgba = stbi__convert_format16(pixel, 3, 4, 1, 1);
+    EXPECT(rgba != nullptr);
+    if (rgba) {
+        EXPECT(rgba[0] == 123 && rgba[1] == 456 && rgba[2] == 789 && rgba[3] == 65535);
+        std::free(rgba);
+    }
+
+    // The original unsigned product wraps to zero for these dimensions.
+    // Conversion must reject the size before allocating or reading input pixels.
+    const unsigned int dimensions[][2] = {{65536, 8192}, {UINT_MAX, 1}, {1, UINT_MAX}};
+    for (const auto& size : dimensions) {
+        pixel = static_cast<stbi__uint16*>(std::malloc(3 * sizeof(stbi__uint16)));
+        last_allocation = 0;
+        rgba = stbi__convert_format16(pixel, 3, 4, size[0], size[1]);
+        EXPECT(rgba == nullptr);
+        EXPECT(last_allocation == 0);
+        std::free(rgba);
+    }
+}
+
+static void TestAnimatedGif()
+{
+    // Original fixture: 1x1, black/red palette. Frame 2 restores frame 1;
+    // transparent frame 3 must therefore show red, not read before the buffer.
+    std::vector<stbi_uc> gif = {
+        'G', 'I', 'F', '8', '9', 'a', 1, 0, 1, 0, 0x80, 0, 0,
+        0, 0, 0, 255, 0, 0
+    };
+    const stbi_uc controls[] = {4, 12, 5};
+    const stbi_uc pixels[] = {0x4c, 0x44, 0x44};
+    for (int i = 0; i < 3; ++i) {
+        gif.insert(gif.end(), {0x21, 0xf9, 4, controls[i], 1, 0, 0, 0,
+            0x2c, 0, 0, 0, 0, 1, 0, 1, 0, 0, 2, 2, pixels[i], 1, 0});
+    }
+    gif.push_back(0x3b);
+    int* delays = nullptr;
+    int width = 0, height = 0, frames = 0, components = 0;
+    stbi_uc* rgba = stbi_load_gif_from_memory(gif.data(), static_cast<int>(gif.size()),
+        &delays, &width, &height, &frames, &components, 4);
+    EXPECT(rgba != nullptr);
+    EXPECT(width == 1 && height == 1 && frames == 3 && components == 4);
+    if (rgba && frames == 3) {
+        EXPECT(rgba[0] == 255 && rgba[1] == 0 && rgba[2] == 0 && rgba[3] == 255);
+        EXPECT(rgba[4] == 0 && rgba[5] == 0 && rgba[6] == 0 && rgba[7] == 255);
+        EXPECT(rgba[8] == 255 && rgba[9] == 0 && rgba[10] == 0 && rgba[11] == 255);
+    }
+    EXPECT(delays != nullptr);
+    if (delays && frames == 3) EXPECT(delays[0] == 10 && delays[1] == 10 && delays[2] == 10);
+    stbi_image_free(rgba);
+    stbi_image_free(delays);
+
+    // Oversized canvas is rejected before any pixel buffer is allocated.
+    gif[6] = gif[7] = gif[8] = gif[9] = 255;
+    last_allocation = 0;
+    rgba = stbi_load_gif_from_memory(gif.data(), static_cast<int>(gif.size()),
+        &delays, &width, &height, &frames, &components, 4);
+    EXPECT(rgba == nullptr);
+    EXPECT(last_allocation == 0);
+    stbi_image_free(rgba);
+    stbi_image_free(delays);
+}
+
+static void TestVorbisSeekBounds()
+{
+    unsigned char bytes[16] = {};
+    stb_vorbis decoder = {};
+    decoder.stream_start = bytes;
+    decoder.stream_end = bytes + sizeof(bytes);
+    for (unsigned int offset : {0U, 15U, 16U, 17U, UINT_MAX, 0U}) {
+        const bool valid = offset < sizeof(bytes);
+        EXPECT(set_file_offset(&decoder, offset) == static_cast<int>(valid));
+        EXPECT(decoder.eof == static_cast<int>(!valid));
+        EXPECT(decoder.stream == (valid ? bytes + offset : decoder.stream_end));
+    }
+    decoder.stream_end = decoder.stream_start;
+    EXPECT(set_file_offset(&decoder, 0) == 0);
+    EXPECT(decoder.eof == 1 && decoder.stream == decoder.stream_end);
+}
+
+int main()
+{
+    Test16BitConversion();
+    TestAnimatedGif();
+    TestVorbisSeekBounds();
+    std::printf("stb safety: %d checks, %d failures\n", checks, failures);
+    return failures ? 1 : 0;
+}

package/templates/xbox/third_party/LICENSES.md

@@ -12,3 +12,18 @@
 | dr_wav.h | https://github.com/mackron/dr_libs | public domain (Unlicense) / MIT-0 のデュアル |
 
 いずれも各ファイル末尾に原文のライセンス条文が含まれる。
+
+## ローカル修正 / Local patches
+
+同梱の stb には以下の修正を適用している。更新時は再適用の要否を確認し、
+`tests/stb_safety_test.cpp` と既存のプラットフォームテストを実行する。
+
+The vendored stb files include these local patches. When updating upstream code,
+check whether they are still needed and run `tests/stb_safety_test.cpp` and the
+existing platform tests.
+
+| ファイル / File | 修正 / Patch |
+|---|---|
+| stb_image.h | メモリサイズを乗算前に拡張し、16bit変換・GIFフレーム追加時のオーバーフローを検証。GIFの過去フレーム参照をバッファ内に修正。 / Widen operands before size multiplication, validate overflow in 16-bit conversion and GIF frame growth, and keep GIF previous-frame references inside the buffer. |
+| stb_truetype.h | ビットマップの確保・初期化サイズを `size_t` で乗算。 / Multiply bitmap allocation and initialization sizes in `size_t`. |
+| stb_vorbis.c | ポインタ加算前に入力サイズとシーク位置を比較。 / Check seek offsets against the input size before pointer arithmetic. |