- Make com work with new object model

Andi Gutmans · Andi Gutmans · commit ff39e51fdf5b · 2001-08-12T04:31:14.000Z
diff --git a/ext/com/com.h b/ext/com/com.h
@@ -21,20 +21,18 @@ typedef struct comval_ {
 
 #define ZVAL_COM(z,o) {																\
 			zval *handle;															\
+			HashTable *properties;													\
 																					\
-			/* OBJECTS_FIXME */														\
-			Z_TYPE_P(z) = IS_OBJECT;												\
-			Z_OBJCE_P(z) = &com_class_entry;										\
-																					\
-			ALLOC_HASHTABLE(Z_OBJPROP_P(z));										\
-			zend_hash_init(Z_OBJPROP_P(z), 0, NULL, ZVAL_PTR_DTOR, 0);				\
+			ALLOC_HASHTABLE(properties);											\
+			zend_hash_init(properties, 0, NULL, ZVAL_PTR_DTOR, 0);					\
 																					\
 			ALLOC_ZVAL(handle);														\
 			INIT_PZVAL(handle);														\
 			ZVAL_LONG(handle, zend_list_insert((o), IS_COM));						\
 																					\
 			zval_copy_ctor(handle);													\
-			zend_hash_index_update(Z_OBJPROP_P(z), 0, &handle, sizeof(zval *), NULL);	\
+			zend_hash_index_update(properties, 0, &handle, sizeof(zval *), NULL);	\
+			object_and_properties_init(z, &com_class_entry, properties);			\
 		}
 
 #define RETVAL_COM(o)	ZVAL_COM(&return_value, o)
diff --git a/ext/com/conversion.c b/ext/com/conversion.c
@@ -758,6 +758,8 @@ PHPAPI int php_variant_to_pval(VARIANT *var_arg, pval *pval_arg, int persistent,
 				}
 				else
 				{
+					TSRMLS_FETCH();
+
 					ALLOC_COM(obj);
 					php_COM_set(obj, V_DISPATCH(var_arg), TRUE);
 
diff --git a/ext/rpc/com/com_wrapper.h b/ext/rpc/com/com_wrapper.h
@@ -21,20 +21,18 @@ typedef struct comval_ {
 
 #define ZVAL_COM(z,o) {																\
 			zval *handle;															\
+			HashTable *properties;													\
 																					\
-			/* OBJECTS_FIXME */														\
-			Z_TYPE_P(z) = IS_OBJECT;												\
-			Z_OBJCE_P(z) = &com_class_entry;										\
-																					\
-			ALLOC_HASHTABLE(Z_OBJPROP_P(z));										\
-			zend_hash_init(Z_OBJPROP_P(z), 0, NULL, ZVAL_PTR_DTOR, 0);				\
+			ALLOC_HASHTABLE(properties);											\
+			zend_hash_init(properties, 0, NULL, ZVAL_PTR_DTOR, 0);					\
 																					\
 			ALLOC_ZVAL(handle);														\
 			INIT_PZVAL(handle);														\
 			ZVAL_LONG(handle, zend_list_insert((o), IS_COM));						\
 																					\
 			zval_copy_ctor(handle);													\
-			zend_hash_index_update(Z_OBJPROP_P(z), 0, &handle, sizeof(zval *), NULL);	\
+			zend_hash_index_update(properties, 0, &handle, sizeof(zval *), NULL);	\
+			object_and_properties_init(z, &com_class_entry, properties);			\
 		}
 
 #define RETVAL_COM(o)	ZVAL_COM(&return_value, o)
diff --git a/ext/rpc/com/conversion.c b/ext/rpc/com/conversion.c
@@ -758,6 +758,8 @@ PHPAPI int php_variant_to_pval(VARIANT *var_arg, pval *pval_arg, int persistent,
 				}
 				else
 				{
+					TSRMLS_FETCH();
+
 					ALLOC_COM(obj);
 					php_COM_set(obj, V_DISPATCH(var_arg), TRUE);
 

Original file line number	Diff line number	Diff line change
`@@ -21,20 +21,18 @@ typedef struct comval_ {`
`21`	`21`
`22`	`22`	`#define ZVAL_COM(z,o) { \`
`23`	`23`	`zval *handle; \`
	`24`	`+ HashTable *properties; \`
`24`	`25`	`\`
`25`		`- /* OBJECTS_FIXME */ \`
`26`		`- Z_TYPE_P(z) = IS_OBJECT; \`
`27`		`- Z_OBJCE_P(z) = &com_class_entry; \`
`28`		`- \`
`29`		`- ALLOC_HASHTABLE(Z_OBJPROP_P(z)); \`
`30`		`- zend_hash_init(Z_OBJPROP_P(z), 0, NULL, ZVAL_PTR_DTOR, 0); \`
	`26`	`+ ALLOC_HASHTABLE(properties); \`
	`27`	`+ zend_hash_init(properties, 0, NULL, ZVAL_PTR_DTOR, 0); \`
`31`	`28`	`\`
`32`	`29`	`ALLOC_ZVAL(handle); \`
`33`	`30`	`INIT_PZVAL(handle); \`
`34`	`31`	`ZVAL_LONG(handle, zend_list_insert((o), IS_COM)); \`
`35`	`32`	`\`
`36`	`33`	`zval_copy_ctor(handle); \`
`37`		`- zend_hash_index_update(Z_OBJPROP_P(z), 0, &handle, sizeof(zval *), NULL); \`
	`34`	`+ zend_hash_index_update(properties, 0, &handle, sizeof(zval *), NULL); \`
	`35`	`+ object_and_properties_init(z, &com_class_entry, properties); \`
`38`	`36`	`}`
`39`	`37`
`40`	`38`	`#define RETVAL_COM(o) ZVAL_COM(&return_value, o)`
Original file line number	Diff line number	Diff line change
`@@ -758,6 +758,8 @@ PHPAPI int php_variant_to_pval(VARIANT var_arg, pval pval_arg, int persistent,`
`758`	`758`	`}`
`759`	`759`	`else`
`760`	`760`	`{`
	`761`	`+ TSRMLS_FETCH();`
	`762`	`+`
`761`	`763`	`ALLOC_COM(obj);`
`762`	`764`	`php_COM_set(obj, V_DISPATCH(var_arg), TRUE);`
`763`	`765`