Windows skipif sections

Author: Girgias

ext/gd/gd.c

@@ -1545,9 +1545,9 @@ static void _php_image_create_from(INTERNAL_FUNCTION_PARAMETERS, int image_type,
 		/* needs to be malloc (persistent) - GD will free() it later */
 		pstr = pestrndup(ZSTR_VAL(buff), ZSTR_LEN(buff), 1);
 		io_ctx = gdNewDynamicCtxEx(ZSTR_LEN(buff), pstr, 0);
+		pefree(pstr, 1);
+		zend_string_release_ex(buff, 0);
 		if (!io_ctx) {
-			pefree(pstr, 1);
-			zend_string_release_ex(buff, 0);
 			php_error_docref(NULL, E_WARNING,"Cannot allocate GD IO context");
 			goto out_err;
 		}
@@ -1558,8 +1558,6 @@ static void _php_image_create_from(INTERNAL_FUNCTION_PARAMETERS, int image_type,
 			im = (*ioctx_func_p)(io_ctx);
 		}
 		io_ctx->gd_free(io_ctx);
-		pefree(pstr, 1);
-		zend_string_release_ex(buff, 0);
 	}
 	/* try and force the stream to be FILE* */
 	else if (php_stream_can_cast(stream, PHP_STREAM_AS_STDIO)) {

tests/output/sapi_windows_vt100_support_non_castable_user_stream.phpt

@@ -2,13 +2,8 @@
 sapi_windows_vt100_support(): uncastable user stream
 --SKIPIF--
 <?php
-if(PHP_OS_FAMILY !== "Windows") {
-    echo "skip Only for Windows systems";
-} elseif (version_compare(
-    PHP_WINDOWS_VERSION_MAJOR.'.'.PHP_WINDOWS_VERSION_MINOR.'.'.PHP_WINDOWS_VERSION_BUILD,
-     '10.0.10586'
-) >= 0) {
-    echo "skip Only for Windows systems < 10.0.10586";
+if (PHP_OS_FAMILY !== "Windows") {
+    die("skip Only for Windows systems");
 }
 ?>
 --FILE--

tests/output/sapi_windows_vt100_support_stream_lose_data.phpt

@@ -2,13 +2,8 @@
 sapi_windows_vt100_support(): casting stream emits data loss
 --SKIPIF--
 <?php
-if(PHP_OS_FAMILY !== "Windows") {
-    echo "skip Only for Windows systems";
-} elseif (version_compare(
-    PHP_WINDOWS_VERSION_MAJOR.'.'.PHP_WINDOWS_VERSION_MINOR.'.'.PHP_WINDOWS_VERSION_BUILD,
-     '10.0.10586'
-) >= 0) {
-    echo "skip Only for Windows systems < 10.0.10586";
+if (PHP_OS_FAMILY !== "Windows") {
+    die("skip Only for Windows systems");
 }
 require __DIR__ . '/../../ext/standard/tests/http/server.inc'; http_server_skipif();
 ?>