- cleanup broken double definition of php_win_err and rename it while being there

diff --git a/Zend/zend_language_scanner.c b/Zend/zend_language_scanner.c
index 1e60e83e0d51a509af3c010368acb7648b0e67fb..2d2429feb673e0d02431df47a31b380ab4dcf46c 100644 (file)
--- 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 49cd2e1bff47926aba1afa6fba42b5bda4ea53e9..0e06acf556e4c5670c7d94a7396ca2030ad2081c 100644 (file)
--- 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 795e6b5a864bb283d81de99c32c7d47d4452e4ec..10d09e3dd67022c5fafe0ccd2ea9ec2ab1a89fdf 100644 (file)
--- 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 4361b4646a38043e42ccd49d0f005de90f7dbf2f..2bd837e3146cf89da9015e1204582c327e452619 100644 (file)
--- 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 8320c97a3b069fc1ebdf90b27632f184da29c844..86641fc550c21b6eb52d73846b41cef4ed95a16b 100644 (file)
--- 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 116619344f9e4ea451b6ea8b305a97940cbae206..430031ba740438d4bfe70322cbee1517a98f9909 100644 (file)
--- 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 f0308856ec02004927763b9c767b4b9f2a50991d..65b8f3cee169ccb5bd8247ddebdb6c23d270e0ca 100644 (file)
--- 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 5f480126aacdc0eb52ac4a0200465553043cc251..8a31dfcffdef15847cbb103f8c30e06363c49dc0 100644 (file)
--- a/ext/com_dotnet/php_com_dotnet_internal.h
+++ b/ext/com_dotnet/php_com_dotnet_internal.h
@@ -29,9 +29,6 @@
 #include <dispex.h>
 #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 ce4f1ba57f4c94fef80ddaf0ed69db4d362ab97c..f82478b72fe996ecc8881af9aaf237140fb0bf74 100644 (file)
--- a/win32/winutil.c
+++ b/win32/winutil.c
@@ -22,7 +22,7 @@
 #include "php.h"
 #include <wincrypt.h>
 
-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 5f8efe0a9e7995b26b9be5dad2f2accf5068c6b3..bb72696cec573ac4e4ffce3caddfaf2d5e7a58c4 100644 (file)
--- 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);