make next() return a single value instead of an array with one element

diff --git a/ext/com/COM.c b/ext/com/COM.c
index 0063f426b1834195ff21be7f407fbd0ba256e7df..aeae84ddcfefc9fd2616e06941216f25bfe0029e 100644 (file)
--- a/ext/com/COM.c
+++ b/ext/com/COM.c
@@ -741,6 +741,15 @@ int do_COM_invoke(comval *obj, pval *function_name, VARIANT *var_result, pval **
                        }
                }
 
+               /* return a single element if next() was called without count */
+               if((arg_count == 0) && (count == 1))
+               {
+                       long index[] = {1};
+
+                       SafeArrayGetElement(pSA, index, var_result);
+                       SafeArrayDestroy(pSA);
+               }
+
                return SUCCESS;
        }
        else if(C_HASENUM(obj) && strstr(Z_STRVAL_P(function_name), "reset"))

diff --git a/ext/rpc/com/com_wrapper.c b/ext/rpc/com/com_wrapper.c
index 0063f426b1834195ff21be7f407fbd0ba256e7df..aeae84ddcfefc9fd2616e06941216f25bfe0029e 100644 (file)
--- a/ext/rpc/com/com_wrapper.c
+++ b/ext/rpc/com/com_wrapper.c
@@ -741,6 +741,15 @@ int do_COM_invoke(comval *obj, pval *function_name, VARIANT *var_result, pval **
                        }
                }
 
+               /* return a single element if next() was called without count */
+               if((arg_count == 0) && (count == 1))
+               {
+                       long index[] = {1};
+
+                       SafeArrayGetElement(pSA, index, var_result);
+                       SafeArrayDestroy(pSA);
+               }
+
                return SUCCESS;
        }
        else if(C_HASENUM(obj) && strstr(Z_STRVAL_P(function_name), "reset"))