1 files changed, 39 insertions, 41 deletions

diff --git a/win32/codepage.c b/win32/codepage.c
index 0f90c534b8..5ed0fd50a5 100644
--- a/win32/codepage.c
+++ b/win32/codepage.c
@@ -567,8 +567,8 @@ PHP_FUNCTION(sapi_windows_cp_set)
 	}
 
 	if (ZEND_LONG_UINT_OVFL(id)) {
-		php_error_docref(NULL, E_WARNING, "Argument %d is out of range", id);
-		RETURN_FALSE;
+		zend_argument_value_error(1, "must be between 0 and %u", UINT_MAX);
+		RETURN_THROWS();
 	}
 
 	if (php_win32_console_is_cli_sapi()) {
@@ -624,68 +624,66 @@ PHP_FUNCTION(sapi_windows_cp_is_utf8)
  * Convert string from one codepage to another. */
 PHP_FUNCTION(sapi_windows_cp_conv)
 {
-	char *subj, *ret;
-	size_t subj_len, ret_len, tmpw_len;
+	char *ret;
+	size_t ret_len, tmpw_len;
 	wchar_t *tmpw;
 	const struct php_win32_cp *in_cp, *out_cp;
-	zval *z_in_cp, *z_out_cp;
-
-	if (zend_parse_parameters(ZEND_NUM_ARGS(), "zzs", &z_in_cp, &z_out_cp, &subj, &subj_len) == FAILURE) {
+	zend_string *string_in_codepage = NULL;
+	zend_long int_in_codepage = 0;
+	zend_string *string_out_codepage = NULL;
+	zend_long int_out_codepage = 0;
+	zend_string *subject;
+
+	ZEND_PARSE_PARAMETERS_START(3, 3)
+    	Z_PARAM_STR_OR_LONG(string_in_codepage, int_in_codepage)
+    	Z_PARAM_STR_OR_LONG(string_out_codepage, int_out_codepage)
+    	Z_PARAM_STR(subject)
+    ZEND_PARSE_PARAMETERS_END();
+
+	if (ZEND_SIZE_T_INT_OVFL(ZSTR_LEN(subject))) {
+		zend_argument_value_error(1, "is too long");
 		RETURN_THROWS();
 	}
 
-	if (ZEND_SIZE_T_INT_OVFL(subj_len)) {
-		php_error_docref(NULL, E_WARNING, "String is too long");
-		RETURN_NULL();
-	}
-
-	if (IS_LONG == Z_TYPE_P(z_in_cp)) {
-		if (ZEND_LONG_UINT_OVFL(Z_LVAL_P(z_in_cp))) {
-			php_error_docref(NULL, E_WARNING, "Argument %d is out of range", Z_LVAL_P(z_in_cp));
-			RETURN_NULL();
-		}
-
-		in_cp = php_win32_cp_get_by_id((DWORD)Z_LVAL_P(z_in_cp));
+	if (string_in_codepage != NULL) {
+		in_cp = php_win32_cp_get_by_enc(ZSTR_VAL(string_in_codepage));
 		if (!in_cp) {
-			php_error_docref(NULL, E_WARNING, "Invalid codepage %d", Z_LVAL_P(z_in_cp));
-			RETURN_NULL();
+			zend_argument_value_error(1, "must be a valid charset");
+			RETURN_THROWS();
 		}
 	} else {
-		if (!try_convert_to_string(z_in_cp)) {
-			return;
+		if (ZEND_LONG_UINT_OVFL(int_in_codepage)) {
+			zend_argument_value_error(1, "must be between 0 and %u", UINT_MAX);
+			RETURN_THROWS();
 		}
 
-		in_cp = php_win32_cp_get_by_enc(Z_STRVAL_P(z_in_cp));
+		in_cp = php_win32_cp_get_by_id((DWORD)int_in_codepage);
 		if (!in_cp) {
-			php_error_docref(NULL, E_WARNING, "Invalid charset %s", Z_STRVAL_P(z_in_cp));
-			RETURN_NULL();
+			zend_argument_value_error(1, "must be a valid codepage");
+			RETURN_THROWS();
 		}
 	}
 
-	if (IS_LONG == Z_TYPE_P(z_out_cp)) {
-		if (ZEND_LONG_UINT_OVFL(Z_LVAL_P(z_out_cp))) {
-			php_error_docref(NULL, E_WARNING, "Argument %d is out of range", Z_LVAL_P(z_out_cp));
-			RETURN_NULL();
-		}
-
-		out_cp = php_win32_cp_get_by_id((DWORD)Z_LVAL_P(z_out_cp));
+	if (string_out_codepage != NULL) {
+		out_cp = php_win32_cp_get_by_enc(ZSTR_VAL(string_out_codepage));
 		if (!out_cp) {
-			php_error_docref(NULL, E_WARNING, "Invalid codepage %d", Z_LVAL_P(z_out_cp));
-			RETURN_NULL();
+			zend_argument_value_error(2, "must be a valid charset");
+			RETURN_THROWS();
 		}
 	} else {
-		if (!try_convert_to_string(z_out_cp)) {
-			return;
+		if (ZEND_LONG_UINT_OVFL(int_out_codepage)) {
+			zend_argument_value_error(2, "must be between 0 and %u", UINT_MAX);
+			RETURN_THROWS();
 		}
 
-		out_cp = php_win32_cp_get_by_enc(Z_STRVAL_P(z_out_cp));
+		out_cp = php_win32_cp_get_by_id((DWORD)int_out_codepage);
 		if (!out_cp) {
-			php_error_docref(NULL, E_WARNING, "Invalid charset %s", Z_STRVAL_P(z_out_cp));
-			RETURN_NULL();
+			zend_argument_value_error(2, "must be a valid codepage");
+			RETURN_THROWS();
 		}
 	}
 
-	tmpw = php_win32_cp_conv_to_w(in_cp->id, in_cp->to_w_fl, subj, subj_len, &tmpw_len);
+	tmpw = php_win32_cp_conv_to_w(in_cp->id, in_cp->to_w_fl, ZSTR_VAL(subject), ZSTR_LEN(subject), &tmpw_len);
 	if (!tmpw) {
 		php_error_docref(NULL, E_WARNING, "Wide char conversion failed");
 		RETURN_NULL();