1 files changed, 27 insertions, 26 deletions

diff --git a/ext/dom/xml_common.h b/ext/dom/xml_common.h
index b3259566ff..eb7b7e8909 100644
--- a/ext/dom/xml_common.h
+++ b/ext/dom/xml_common.h
@@ -1,6 +1,6 @@
 /*
   +----------------------------------------------------------------------+
-  | PHP Version 5                                                        |
+  | PHP Version 7                                                        |
   +----------------------------------------------------------------------+
   | Copyright (c) 1997-2015 The PHP Group                                |
   +----------------------------------------------------------------------+
@@ -27,66 +27,67 @@
 typedef libxml_doc_props *dom_doc_propsptr;
 
 typedef struct _dom_object {
-	zend_object  std;
 	void *ptr;
 	php_libxml_ref_obj *document;
 	HashTable *prop_handler;
-	zend_object_handle handle;
+	zend_object std;
 } dom_object;
 
+static inline dom_object *php_dom_obj_from_obj(zend_object *obj) {
+	return (dom_object*)((char*)(obj) - XtOffsetOf(dom_object, std));
+}
+
+#define Z_DOMOBJ_P(zv)  php_dom_obj_from_obj(Z_OBJ_P((zv)))
+
 #ifdef PHP_WIN32
-#	ifdef PHPAPI
-#		undef PHPAPI
-#	endif
 #	ifdef DOM_EXPORTS
-#		define PHPAPI __declspec(dllexport)
-#	else
-#		define PHPAPI __declspec(dllimport)
+#		define PHP_DOM_EXPORT __declspec(dllexport)
+#	elif !defined(DOM_LOCAL_DEFINES) /* Allow to counteract LNK4049 warning. */
+#		define PHP_DOM_EXPORT __declspec(dllimport)
+#   else
+#		define PHP_DOM_EXPORT
 #	endif /* DOM_EXPORTS */
 #elif defined(__GNUC__) && __GNUC__ >= 4
-#	ifdef PHPAPI
-#		undef PHPAPI
-#	endif
-#	define PHPAPI __attribute__ ((visibility("default")))
-#endif /* PHP_WIN32 */
-
-#define PHP_DOM_EXPORT PHPAPI
+#	define PHP_DOM_EXPORT __attribute__ ((visibility("default")))
+#elif defined(PHPAPI)
+#   define PHP_DOM_EXPORT PHPAPI
+#else
+#   define PHP_DOM_EXPORT
+#endif
 
 PHP_DOM_EXPORT extern zend_class_entry *dom_node_class_entry;
 PHP_DOM_EXPORT dom_object *php_dom_object_get_data(xmlNodePtr obj);
-PHP_DOM_EXPORT zval *php_dom_create_object(xmlNodePtr obj, int *found, zval* return_value, dom_object *domobj TSRMLS_DC);
+PHP_DOM_EXPORT zend_bool php_dom_create_object(xmlNodePtr obj, zval* return_value, dom_object *domobj);
 PHP_DOM_EXPORT xmlNodePtr dom_object_get_node(dom_object *obj);
 
 #define DOM_XMLNS_NAMESPACE \
     (const xmlChar *) "http://www.w3.org/2000/xmlns/"
 
 #define NODE_GET_OBJ(__ptr, __id, __prtype, __intern) { \
-	__intern = (php_libxml_node_object *)zend_object_store_get_object(__id TSRMLS_CC); \
+	__intern = Z_LIBXML_NODE_P(__id); \
 	if (__intern->node == NULL || !(__ptr = (__prtype)__intern->node->node)) { \
-  		php_error_docref(NULL TSRMLS_CC, E_WARNING, "Couldn't fetch %s", __intern->std.ce->name);\
+  		php_error_docref(NULL, E_WARNING, "Couldn't fetch %s", \
+			__intern->std.ce->name->val);\
   		RETURN_NULL();\
   	} \
 }
 
 #define DOC_GET_OBJ(__ptr, __id, __prtype, __intern) { \
-	__intern = (php_libxml_node_object *)zend_object_store_get_object(__id TSRMLS_CC); \
+	__intern = Z_LIBXML_NODE_P(__id); \
 	if (__intern->document != NULL) { \
 		if (!(__ptr = (__prtype)__intern->document->ptr)) { \
-  			php_error_docref(NULL TSRMLS_CC, E_WARNING, "Couldn't fetch %s", __intern->std.ce->name);\
+  			php_error_docref(NULL, E_WARNING, "Couldn't fetch %s", __intern->std.ce->name);\
   			RETURN_NULL();\
   		} \
 	} \
 }
 
 #define DOM_RET_OBJ(obj, ret, domobject) \
-	if (!php_dom_create_object(obj, ret, return_value, domobject TSRMLS_CC)) { \
-		php_error_docref(NULL TSRMLS_CC, E_WARNING, "Cannot create required DOM object"); \
-		RETURN_FALSE; \
-	}
+	*ret = php_dom_create_object(obj, return_value, domobject)
 
 #define DOM_GET_THIS(zval) \
 	if (NULL == (zval = getThis())) { \
-		php_error_docref(NULL TSRMLS_CC, E_WARNING, "Underlying object missing"); \
+		php_error_docref(NULL, E_WARNING, "Underlying object missing"); \
 		RETURN_FALSE; \
 	}