archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-16 05:58:45 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge branch 'PHP-7.2' into PHP-7.3

Browse source 
* PHP-7.2:
  Fix callbacks
  bump version
This commit is contained in:
Anatol Belski 2018-08-02 21:40:50 +02:00
commit cd07fa48ba
4 changed files with 8 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

9
ext/com_dotnet/com_iterator.c
View file

@ -80,7 +80,7 @@ static void com_iter_get_key(zend_object_iterator *iter, zval *key)
} }
} }
static int com_iter_move_forwards(zend_object_iterator *iter) static void com_iter_move_forwards(zend_object_iterator *iter)
{ {
struct php_com_iterator *I = (struct php_com_iterator*)Z_PTR(iter->data); struct php_com_iterator *I = (struct php_com_iterator*)Z_PTR(iter->data);
unsigned long n_fetched; unsigned long n_fetched;
@ -101,18 +101,18 @@ static int com_iter_move_forwards(zend_object_iterator *iter)
} else { } else {
/* indicate that there are no more items */ /* indicate that there are no more items */
I->key = (ulong)-1; I->key = (ulong)-1;
return FAILURE; return;
} }
} else { } else {
/* safe array */ /* safe array */
if (I->key >= (ULONG) I->sa_max) { if (I->key >= (ULONG) I->sa_max) {
I->key = (ulong)-1; I->key = (ulong)-1;
return FAILURE; return;
} }
I->key++; I->key++;
if (php_com_safearray_get_elem(&I->safe_array, &I->v, (LONG)I->key) == 0) { if (php_com_safearray_get_elem(&I->safe_array, &I->v, (LONG)I->key) == 0) {
I->key = (ulong)-1; I->key = (ulong)-1;
return FAILURE; return;
} }
} }
@ -120,7 +120,6 @@ static int com_iter_move_forwards(zend_object_iterator *iter)
php_com_zval_from_variant(&ptr, &I->v, I->code_page); php_com_zval_from_variant(&ptr, &I->v, I->code_page);
/* php_com_wrap_variant(ptr, &I->v, I->code_page); */ /* php_com_wrap_variant(ptr, &I->v, I->code_page); */
ZVAL_COPY_VALUE(&I->zdata, &ptr); ZVAL_COPY_VALUE(&I->zdata, &ptr);
return SUCCESS;
} }

4
ext/com_dotnet/com_saproxy.c
View file

@ -512,15 +512,13 @@ static void saproxy_iter_get_key(zend_object_iterator *iter, zval *key)
} }
} }
static int saproxy_iter_move_forwards(zend_object_iterator *iter) static void saproxy_iter_move_forwards(zend_object_iterator *iter)
{ {
php_com_saproxy_iter *I = (php_com_saproxy_iter*)Z_PTR(iter->data); php_com_saproxy_iter *I = (php_com_saproxy_iter*)Z_PTR(iter->data);
if (++I->key >= I->imax) { if (++I->key >= I->imax) {
I->key = -1; I->key = -1;
return FAILURE;
} }
return SUCCESS;
} }
static const zend_object_iterator_funcs saproxy_iter_funcs = { static const zend_object_iterator_funcs saproxy_iter_funcs = {

4
ext/com_dotnet/com_typeinfo.c
View file

@ -220,9 +220,9 @@ PHP_COM_DOTNET_API int php_com_import_typelib(ITypeLib *TL, int mode, int codepa
} }
/* Type-library stuff */ /* Type-library stuff */
void php_com_typelibrary_dtor(void *pDest) void php_com_typelibrary_dtor(zval *pDest)
{ {
ITypeLib **Lib = (ITypeLib**)pDest; ITypeLib **Lib = (ITypeLib**)Z_PTR_P(pDest);
ITypeLib_Release(*Lib); ITypeLib_Release(*Lib);
} }

2
ext/com_dotnet/php_com_dotnet_internal.h
View file

@ -172,7 +172,7 @@ PHP_COM_DOTNET_API ITypeLib *php_com_load_typelib_via_cache(char *search_string,
PHP_COM_DOTNET_API ITypeLib *php_com_load_typelib(char *search_string, int codepage); PHP_COM_DOTNET_API ITypeLib *php_com_load_typelib(char *search_string, int codepage);
PHP_COM_DOTNET_API int php_com_import_typelib(ITypeLib *TL, int mode, PHP_COM_DOTNET_API int php_com_import_typelib(ITypeLib *TL, int mode,
int codepage); int codepage);
void php_com_typelibrary_dtor(void *pDest); void php_com_typelibrary_dtor(zval *pDest);
ITypeInfo *php_com_locate_typeinfo(char *typelibname, php_com_dotnet_object *obj, char *dispname, int sink); ITypeInfo *php_com_locate_typeinfo(char *typelibname, php_com_dotnet_object *obj, char *dispname, int sink);
int php_com_process_typeinfo(ITypeInfo *typeinfo, HashTable *id_to_name, int printdef, GUID *guid, int codepage); int php_com_process_typeinfo(ITypeInfo *typeinfo, HashTable *id_to_name, int printdef, GUID *guid, int codepage);