From 4574844c52cdb4cf2d6c6f35925b2171f2d1887b Mon Sep 17 00:00:00 2001 From: Pierre Joye Date: Thu, 25 Nov 2010 23:06:12 +0000 Subject: [PATCH] - cleanup broken double definition of php_win_err and rename it while being there --- Zend/zend_language_scanner.c | 2 +- Zend/zend_language_scanner_defs.h | 2 +- ext/com_dotnet/com_com.c | 10 +++++----- ext/com_dotnet/com_dotnet.c | 4 ++-- ext/com_dotnet/com_misc.c | 2 +- ext/com_dotnet/com_olechar.c | 4 ++-- ext/com_dotnet/com_variant.c | 6 +++--- ext/com_dotnet/php_com_dotnet_internal.h | 3 --- win32/winutil.c | 3 ++- win32/winutil.h | 4 ++-- 10 files changed, 19 insertions(+), 21 deletions(-) diff --git a/Zend/zend_language_scanner.c b/Zend/zend_language_scanner.c index 1e60e83e0d..2d2429feb6 100644 --- a/Zend/zend_language_scanner.c +++ b/Zend/zend_language_scanner.c @@ -1,4 +1,4 @@ -/* Generated by re2c 0.13.5 on Wed Nov 24 08:41:46 2010 */ +/* Generated by re2c 0.13.5 on Thu Nov 25 23:17:48 2010 */ #line 1 "Zend/zend_language_scanner.l" /* +----------------------------------------------------------------------+ diff --git a/Zend/zend_language_scanner_defs.h b/Zend/zend_language_scanner_defs.h index 49cd2e1bff..0e06acf556 100644 --- a/Zend/zend_language_scanner_defs.h +++ b/Zend/zend_language_scanner_defs.h @@ -1,4 +1,4 @@ -/* Generated by re2c 0.13.5 on Wed Nov 24 08:41:46 2010 */ +/* Generated by re2c 0.13.5 on Thu Nov 25 23:17:48 2010 */ #line 3 "Zend/zend_language_scanner_defs.h" enum YYCONDTYPE { diff --git a/ext/com_dotnet/com_com.c b/ext/com_dotnet/com_com.c index 795e6b5a86..10d09e3dd6 100644 --- a/ext/com_dotnet/com_com.c +++ b/ext/com_dotnet/com_com.c @@ -224,7 +224,7 @@ PHP_FUNCTION(com_create_instance) if (FAILED(res)) { char *werr, *msg; - werr = php_win_err(res); + werr = php_win32_error_to_msg(res); spprintf(&msg, 0, "Failed to create COM object `%s': %s", module_name, werr); LocalFree(werr); @@ -383,7 +383,7 @@ HRESULT php_com_invoke_helper(php_com_dotnet_object *obj, DISPID id_member, case DISP_E_PARAMNOTFOUND: case DISP_E_TYPEMISMATCH: - desc = php_win_err(hr); + desc = php_win32_error_to_msg(hr); spprintf(&msg, 0, "Parameter %d: %s", arg_err, desc); LocalFree(desc); break; @@ -399,7 +399,7 @@ HRESULT php_com_invoke_helper(php_com_dotnet_object *obj, DISPID id_member, /* else fall through */ default: - desc = php_win_err(hr); + desc = php_win32_error_to_msg(hr); spprintf(&msg, 0, "Error [0x%08x] %s", hr, desc); LocalFree(desc); break; @@ -481,7 +481,7 @@ int php_com_do_invoke_byref(php_com_dotnet_object *obj, char *name, int namelen, if (FAILED(hr)) { char *winerr = NULL; char *msg = NULL; - winerr = php_win_err(hr); + winerr = php_win32_error_to_msg(hr); spprintf(&msg, 0, "Unable to lookup `%s': %s", name, winerr); LocalFree(winerr); php_com_throw_exception(hr, msg TSRMLS_CC); @@ -640,7 +640,7 @@ int php_com_do_invoke(php_com_dotnet_object *obj, char *name, int namelen, hr = php_com_get_id_of_name(obj, name, namelen, &dispid TSRMLS_CC); if (FAILED(hr)) { - winerr = php_win_err(hr); + winerr = php_win32_error_to_msg(hr); spprintf(&msg, 0, "Unable to lookup `%s': %s", name, winerr); LocalFree(winerr); php_com_throw_exception(hr, msg TSRMLS_CC); diff --git a/ext/com_dotnet/com_dotnet.c b/ext/com_dotnet/com_dotnet.c index 4361b4646a..2bd837e314 100644 --- a/ext/com_dotnet/com_dotnet.c +++ b/ext/com_dotnet/com_dotnet.c @@ -199,7 +199,7 @@ PHP_FUNCTION(com_dotnet_create_instance) hr = dotnet_init(&where TSRMLS_CC); if (FAILED(hr)) { char buf[1024]; - char *err = php_win_err(hr); + char *err = php_win32_error_to_msg(hr); snprintf(buf, sizeof(buf), "Failed to init .Net runtime [%s] %s", where, err); if (err) LocalFree(err); @@ -278,7 +278,7 @@ PHP_FUNCTION(com_dotnet_create_instance) if (ret == FAILURE) { char buf[1024]; - char *err = php_win_err(hr); + char *err = php_win32_error_to_msg(hr); snprintf(buf, sizeof(buf), "Failed to instantiate .Net object [%s] [0x%08x] %s", where, hr, err); if (err && err[0]) { LocalFree(err); diff --git a/ext/com_dotnet/com_misc.c b/ext/com_dotnet/com_misc.c index 8320c97a3b..86641fc550 100644 --- a/ext/com_dotnet/com_misc.c +++ b/ext/com_dotnet/com_misc.c @@ -33,7 +33,7 @@ void php_com_throw_exception(HRESULT code, char *message TSRMLS_DC) { int free_msg = 0; if (message == NULL) { - message = php_win_err(code); + message = php_win32_error_to_msg(code); free_msg = 1; } zend_throw_exception(php_com_exception_class_entry, message, (long)code TSRMLS_CC); diff --git a/ext/com_dotnet/com_olechar.c b/ext/com_dotnet/com_olechar.c index 116619344f..430031ba74 100644 --- a/ext/com_dotnet/com_olechar.c +++ b/ext/com_dotnet/com_olechar.c @@ -54,7 +54,7 @@ PHPAPI OLECHAR *php_com_string_to_olestring(char *string, uint string_len, int c } if (!ok) { - char *msg = php_win_err(GetLastError()); + char *msg = php_win32_error_to_msg(GetLastError()); php_error_docref(NULL TSRMLS_CC, E_WARNING, "Could not convert string to unicode: `%s'", msg); @@ -87,7 +87,7 @@ PHPAPI char *php_com_olestring_to_string(OLECHAR *olestring, uint *string_len, i } if (!ok) { - char *msg = php_win_err(err); + char *msg = php_win32_error_to_msg(err); php_error_docref(NULL TSRMLS_CC, E_WARNING, "Could not convert string from unicode: `%s'", msg); diff --git a/ext/com_dotnet/com_variant.c b/ext/com_dotnet/com_variant.c index f0308856ec..65b8f3cee1 100644 --- a/ext/com_dotnet/com_variant.c +++ b/ext/com_dotnet/com_variant.c @@ -446,7 +446,7 @@ PHP_FUNCTION(com_variant_create_instance) if (FAILED(res)) { char *werr, *msg; - werr = php_win_err(res); + werr = php_win32_error_to_msg(res); spprintf(&msg, 0, "Variant type conversion failed: %s", werr); LocalFree(werr); @@ -1022,7 +1022,7 @@ PHP_FUNCTION(variant_set_type) } else { char *werr, *msg; - werr = php_win_err(res); + werr = php_win32_error_to_msg(res); spprintf(&msg, 0, "Variant type conversion failed: %s", werr); LocalFree(werr); @@ -1056,7 +1056,7 @@ PHP_FUNCTION(variant_cast) } else { char *werr, *msg; - werr = php_win_err(res); + werr = php_win32_error_to_msg(res); spprintf(&msg, 0, "Variant type conversion failed: %s", werr); LocalFree(werr); diff --git a/ext/com_dotnet/php_com_dotnet_internal.h b/ext/com_dotnet/php_com_dotnet_internal.h index 5f480126aa..8a31dfcffd 100644 --- a/ext/com_dotnet/php_com_dotnet_internal.h +++ b/ext/com_dotnet/php_com_dotnet_internal.h @@ -29,9 +29,6 @@ #include #include "win32/winutil.h" -/* brain-death in winutil.h defines the macro to hide the useful function... */ -#undef php_win_err - typedef struct _php_com_dotnet_object { zend_object zo; diff --git a/win32/winutil.c b/win32/winutil.c index ce4f1ba57f..f82478b72f 100644 --- a/win32/winutil.c +++ b/win32/winutil.c @@ -22,7 +22,7 @@ #include "php.h" #include -PHPAPI char *php_win_err(int error) +PHPAPI char *php_win32_error_to_msg(int error) { char *buf = NULL; @@ -75,3 +75,4 @@ PHPAPI int php_win32_get_random_bytes(unsigned char *buf, size_t size) { /* {{{ return FAILURE; } /* }}} */ + diff --git a/win32/winutil.h b/win32/winutil.h index 5f8efe0a9e..bb72696cec 100644 --- a/win32/winutil.h +++ b/win32/winutil.h @@ -16,8 +16,8 @@ +----------------------------------------------------------------------+ */ -PHPAPI char *php_win_err(int error); +PHPAPI char *php_win32_error_to_msg(int error); -#define php_win_err() php_win_err(GetLastError()) +#define php_win_err() php_win32_error_to_msg(GetLastError()) int php_win32_check_trailing_space(const char * path, const int path_len); PHPAPI php_win32_get_random_bytes(unsigned char *buf, size_t size); -- 2.40.0