diff --git a/src/SPC/store/SourcePatcher.php b/src/SPC/store/SourcePatcher.php
index 233a2e157..7ce2d2002 100644
--- a/src/SPC/store/SourcePatcher.php
+++ b/src/SPC/store/SourcePatcher.php
@@ -634,7 +634,13 @@ public static function patchGDWin32(): bool
                 FileSystem::replaceFileStr(SOURCE_PATH . '/php-src/ext/gd/libgd/gdft.c', '#ifndef MSWIN32', '#ifndef _WIN32');
             }
             // custom config.w32, because official config.w32 is hard-coded many things
-            $origin = $ver_id >= 80100 ? file_get_contents(ROOT_DIR . '/src/globals/extra/gd_config_81.w32') : file_get_contents(ROOT_DIR . '/src/globals/extra/gd_config_80.w32');
+            if ($ver_id >= 80500) {
+                $origin = file_get_contents(ROOT_DIR . '/src/globals/extra/gd_config_85.w32');
+            } elseif ($ver_id >= 80100) {
+                $origin = file_get_contents(ROOT_DIR . '/src/globals/extra/gd_config_81.w32');
+            } else {
+                $origin = file_get_contents(ROOT_DIR . '/src/globals/extra/gd_config_80.w32');
+            }
             file_put_contents(SOURCE_PATH . '/php-src/ext/gd/config.w32.bak', file_get_contents(SOURCE_PATH . '/php-src/ext/gd/config.w32'));
             return file_put_contents(SOURCE_PATH . '/php-src/ext/gd/config.w32', $origin) !== false;
         }
diff --git a/src/globals/extra/gd_config_85.w32 b/src/globals/extra/gd_config_85.w32
new file mode 100644
index 000000000..e980b003e
--- /dev/null
+++ b/src/globals/extra/gd_config_85.w32
@@ -0,0 +1,94 @@
+// vim:ft=javascript
+
+ARG_WITH("gd", "Bundled GD support", "yes");
+
+if (PHP_GD != "no") {
+    // check for gd.h (required)
+    if (!CHECK_HEADER_ADD_INCLUDE("gd.h", "CFLAGS_GD", PHP_GD + ";ext\\gd\\libgd")) {
+        ERROR("gd not enabled; libraries and headers not found");
+    }
+
+    // zlib ext support (required)
+    if (!CHECK_LIB("zlib_a.lib;zlib.lib", "gd", PHP_GD)) {
+        ERROR("gd not enabled; zlib not enabled");
+    }
+
+    // libjpeg lib support
+    if (CHECK_LIB("libjpeg_a.lib;libjpeg.lib", "gd", PHP_GD) &&
+        CHECK_HEADER_ADD_INCLUDE("jpeglib.h", "CFLAGS_GD", PHP_GD + ";" + PHP_PHP_BUILD + "\\include")) {
+        AC_DEFINE("HAVE_LIBJPEG", 1, "JPEG support");
+        AC_DEFINE("HAVE_GD_JPG", 1, "JPEG support");
+    }
+
+    // libpng16 lib support
+    if (CHECK_LIB("libpng_a.lib;libpng.lib", "gd", PHP_GD) &&
+        CHECK_HEADER_ADD_INCLUDE("png.h", "CFLAGS_GD", PHP_GD +  ";" + PHP_PHP_BUILD + "\\include\\libpng16")) {
+        AC_DEFINE("HAVE_LIBPNG", 1, "PNG support");
+        AC_DEFINE("HAVE_GD_PNG", 1, "PNG support");
+    }
+
+    // freetype lib support
+    if (CHECK_LIB("libfreetype_a.lib;libfreetype.lib", "gd", PHP_GD) &&
+        CHECK_HEADER_ADD_INCLUDE("ft2build.h", "CFLAGS_GD", PHP_GD + ";" + PHP_PHP_BUILD + "\\include\\freetype2;" + PHP_PHP_BUILD + "\\include\\freetype")) {
+        AC_DEFINE("HAVE_LIBFREETYPE", 1, "FreeType support");
+        AC_DEFINE("HAVE_GD_FREETYPE", 1, "FreeType support");
+    }
+
+    // xpm lib support
+    if (CHECK_LIB("libXpm_a.lib", "gd", PHP_GD) &&
+        CHECK_HEADER_ADD_INCLUDE("xpm.h", "CFLAGS_GD", PHP_GD + ";" + PHP_PHP_BUILD + "\\include\\X11")) {
+        AC_DEFINE("HAVE_LIBXPM", 1, "XPM support");
+        AC_DEFINE("HAVE_GD_XPM", 1, "XPM support");
+    }
+
+    // iconv lib support
+    if ((CHECK_LIB("libiconv_a.lib;libiconv.lib", "gd", PHP_GD) || CHECK_LIB("iconv_a.lib;iconv.lib", "gd", PHP_GD)) &&
+        CHECK_HEADER_ADD_INCLUDE("iconv.h", "CFLAGS_GD", PHP_GD)) {
+        AC_DEFINE("HAVE_LIBICONV", 1, "Iconv support");
+    }
+
+    // libwebp lib support
+    if ((CHECK_LIB("libwebp_a.lib", "gd", PHP_GD) || CHECK_LIB("libwebp.lib", "gd", PHP_GD)) &&
+        CHECK_LIB("libsharpyuv.lib", "gd", PHP_GD) &&
+        CHECK_HEADER_ADD_INCLUDE("decode.h", "CFLAGS_GD", PHP_GD + ";" + PHP_PHP_BUILD + "\\include\\webp") &&
+        CHECK_HEADER_ADD_INCLUDE("encode.h", "CFLAGS_GD", PHP_GD + ";" + PHP_PHP_BUILD + "\\include\\webp")) {
+        AC_DEFINE("HAVE_LIBWEBP", 1, "WebP support");
+        AC_DEFINE("HAVE_GD_WEBP", 1, "WebP support");
+    }
+
+    // libavif lib support
+    if (CHECK_LIB("avif_a.lib", "gd", PHP_GD) &&
+        CHECK_LIB("aom_a.lib", "gd", PHP_GD) &&
+        CHECK_HEADER_ADD_INCLUDE("avif.h", "CFLAGS_GD", PHP_GD + ";" + PHP_PHP_BUILD + "\\include\\avif")) {
+        ADD_FLAG("CFLAGS_GD", "/D HAVE_LIBAVIF /D HAVE_GD_AVIF");
+    } else if (CHECK_LIB("avif.lib", "gd", PHP_GD) &&
+        CHECK_HEADER_ADD_INCLUDE("avif.h", "CFLAGS_GD", PHP_GD + ";" + PHP_PHP_BUILD + "\\include\\avif")) {
+        ADD_FLAG("CFLAGS_GD", "/D HAVE_LIBAVIF /D HAVE_GD_AVIF");
+    }
+
+    CHECK_LIB("User32.lib", "gd", PHP_GD);
+    CHECK_LIB("Gdi32.lib", "gd", PHP_GD);
+
+    EXTENSION("gd", "gd.c", null, "-Iext/gd/libgd");
+    ADD_SOURCES("ext/gd/libgd", "gd.c \
+        gdcache.c gdfontg.c gdfontl.c gdfontmb.c gdfonts.c gdfontt.c \
+        gdft.c gd_gd2.c gd_gd.c gd_gif_in.c gd_gif_out.c gdhelpers.c gd_io.c gd_io_dp.c \
+        gd_io_file.c gd_io_ss.c gd_jpeg.c gdkanji.c gd_png.c gd_ss.c \
+        gdtables.c gd_topal.c gd_wbmp.c gdxpm.c wbmp.c gd_xbm.c gd_security.c gd_transform.c \
+        gd_filter.c gd_rotate.c gd_color_match.c gd_webp.c gd_avif.c \
+        gd_crop.c gd_interpolation.c gd_matrix.c gd_bmp.c gd_tga.c", "gd");
+
+    AC_DEFINE('HAVE_LIBGD', 1, 'GD support');
+    AC_DEFINE('HAVE_GD_BUNDLED', 1, "Bundled GD");
+    AC_DEFINE('HAVE_GD_BMP', 1, "BMP support");
+    AC_DEFINE('HAVE_GD_TGA', 1, "TGA support");
+    ADD_FLAG("CFLAGS_GD", " \
+/D PHP_GD_EXPORTS=1 \
+/D HAVE_GD_GET_INTERPOLATION \
+    ");
+    if (ICC_TOOLSET) {
+        ADD_FLAG("LDFLAGS_GD", "/nodefaultlib:libcmt");
+    }
+
+    PHP_INSTALL_HEADERS("", "ext/gd ext/gd/libgd");
+}
diff --git a/src/globals/test-extensions.php b/src/globals/test-extensions.php
index 8de87d56b..c5a9d10b2 100644
--- a/src/globals/test-extensions.php
+++ b/src/globals/test-extensions.php
@@ -31,11 +31,11 @@
     // 'ubuntu-22.04-arm', // bin/spc-gnu-docker for arm64
     // 'ubuntu-24.04-arm', // bin/spc for arm64
     // 'windows-2022', // .\bin\spc.ps1
-    'windows-2025', // .\bin\spc.ps1
+    'windows-2025',
 ];
 
 // whether enable thread safe
-$zts = false;
+$zts = true;
 
 $no_strip = false;
 
@@ -50,8 +50,8 @@
 
 // If you want to test your added extensions and libs, add below (comma separated, example `bcmath,openssl`).
 $extensions = match (PHP_OS_FAMILY) {
-    'Linux', 'Darwin' => 'pdo_odbc',
-    'Windows' => 'zlib,phar,mbstring,mbregex,sockets',
+    'Linux', 'Darwin' => 'pgsql',
+    'Windows' => 'gd,zlib,mbstring,filter',
 };
 
 // If you want to test shared extensions, add them below (comma separated, example `bcmath,openssl`).
@@ -74,7 +74,7 @@
 // You can use `common`, `bulk`, `minimal` or `none`.
 // note: combination is only available for *nix platform. Windows must use `none` combination
 $base_combination = match (PHP_OS_FAMILY) {
-    'Linux', 'Darwin' => 'bulk',
+    'Linux', 'Darwin' => 'minimal',
     'Windows' => 'none',
 };
 
@@ -89,7 +89,7 @@ function _getCombination(string $type = 'common'): string
         'common' => 'bcmath,bz2,calendar,ctype,curl,dom,exif,fileinfo,filter,ftp,gd,gmp,iconv,xml,mbstring,mbregex,' .
             'mysqlnd,openssl,pcntl,pdo,pdo_mysql,pdo_sqlite,phar,posix,redis,session,simplexml,soap,sockets,' .
             'sqlite3,tokenizer,xmlwriter,xmlreader,zlib,zip',
-        'bulk' => 'apcu,bcmath,bz2,calendar,ctype,curl,dba,dom,event,exif,fileinfo,filter,ftp,gd,gmp,iconv,imagick,' .
+        'bulk' => 'apcu,bcmath,bz2,calendar,ctype,curl,dba,dom,event,exif,fileinfo,filter,ftp,gd,gmp,iconv,imagick,imap,' .
             'intl,mbregex,mbstring,mysqli,mysqlnd,opcache,openssl,pcntl,pdo,pdo_mysql,pdo_pgsql,pdo_sqlite,pgsql,phar,' .
             'posix,protobuf,readline,redis,session,shmop,simplexml,soap,sockets,sodium,sqlite3,swoole,sysvmsg,sysvsem,' .
             'sysvshm,tokenizer,xml,xmlreader,xmlwriter,xsl,zip,zlib',