Skip to content

Commit 7c95f04

Browse files
author
Harald Radi
committed
adapted to changes from com module
1 parent 22d4282 commit 7c95f04

File tree

2 files changed

+22
-22
lines changed

2 files changed

+22
-22
lines changed

‎ext/dotnet/dotnet.cpp

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ HRESULT dotnet_init() {
7676
return ERROR_SUCCESS;
7777
}
7878

79-
HRESULT dotnet_create(OLECHAR *assembly, OLECHAR *datatype, i_dispatch *object) {
79+
HRESULT dotnet_create(OLECHAR *assembly, OLECHAR *datatype, comval *obj) {
8080
HRESULT hr;
8181

8282
_ObjectHandle *pHandle;
@@ -89,7 +89,7 @@ HRESULT dotnet_create(OLECHAR *assembly, OLECHAR *datatype, i_dispatch *object)
8989
pHandle->Release();
9090
if (FAILED(hr)) return hr;
9191

92-
php_COM_set(object, unwrapped.pdispVal, TRUE);
92+
php_COM_set(obj, unwrapped.pdispVal, TRUE);
9393
return ERROR_SUCCESS;
9494
}
9595

@@ -109,7 +109,7 @@ PHP_FUNCTION(dotnet_load)
109109
HRESULT hr;
110110
pval *assembly_name, *datatype_name, *code_page;
111111
OLECHAR *assembly, *datatype;
112-
i_dispatch *obj;
112+
comval *obj;
113113

114114
switch(ZEND_NUM_ARGS())
115115
{
@@ -121,23 +121,23 @@ PHP_FUNCTION(dotnet_load)
121121
getParameters(ht, 3, &assembly_name, &datatype_name, &code_page);
122122

123123
convert_to_long(code_page);
124-
codepage = code_page->value.lval;
124+
codepage = Z_LVAL_P(code_page);
125125
break;
126126
default:
127127
WRONG_PARAM_COUNT;
128128
break;
129129
}
130130

131131
convert_to_string(assembly_name);
132-
assembly = php_char_to_OLECHAR(assembly_name->value.str.val, assembly_name->value.str.len, codepage);
132+
assembly = php_char_to_OLECHAR(Z_STRVAL_P(assembly_name), Z_STRLEN_P(assembly_name), codepage);
133133

134134
convert_to_string(datatype_name);
135-
datatype = php_char_to_OLECHAR(datatype_name->value.str.val, datatype_name->value.str.len, codepage);
135+
datatype = php_char_to_OLECHAR(Z_STRVAL_P(datatype_name), Z_STRLEN_P(datatype_name), codepage);
136136

137-
obj = (i_dispatch *) emalloc(sizeof(i_dispatch));
137+
ALLOC_COM(obj);
138138

139139
/* obtain IDispatch */
140-
hr=dotnet_create(assembly, datatype, obj);
140+
hr = dotnet_create(assembly, datatype, obj);
141141
efree(assembly);
142142
efree(datatype);
143143
if (FAILED(hr)) {
@@ -148,13 +148,13 @@ PHP_FUNCTION(dotnet_load)
148148
efree(obj);
149149
RETURN_FALSE;
150150
}
151-
if (!obj->i.dispatch) {
151+
if (C_DISPATCH(obj) == NULL) {
152152
php_error(E_WARNING,"Unable to locate %s in assembly %s",datatype_name->value.str.val,assembly_name->value.str.val);
153153
efree(obj);
154154
RETURN_FALSE;
155155
}
156156

157-
RETURN_LONG(zend_list_insert(obj, php_COM_get_le_idispatch()));
157+
RETURN_LONG(zend_list_insert(obj, IS_COM));
158158
}
159159
/* }}} */
160160

@@ -165,7 +165,7 @@ void php_DOTNET_call_function_handler(INTERNAL_FUNCTION_PARAMETERS, zend_propert
165165
zend_overloaded_element *function_name = (zend_overloaded_element *) property_reference->elements_list->tail->data;
166166

167167
if (zend_llist_count(property_reference->elements_list)==1
168-
&& !strcmp(function_name->element.value.str.val, "dotnet")) { /* constructor */
168+
&& !strcmp(Z_STRVAL(function_name->element), "dotnet")) { /* constructor */
169169
pval *object_handle;
170170

171171
PHP_FN(dotnet_load)(INTERNAL_FUNCTION_PARAM_PASSTHRU);

‎ext/rpc/dotnet/dotnet.cpp

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ HRESULT dotnet_init() {
7676
return ERROR_SUCCESS;
7777
}
7878

79-
HRESULT dotnet_create(OLECHAR *assembly, OLECHAR *datatype, i_dispatch *object) {
79+
HRESULT dotnet_create(OLECHAR *assembly, OLECHAR *datatype, comval *obj) {
8080
HRESULT hr;
8181

8282
_ObjectHandle *pHandle;
@@ -89,7 +89,7 @@ HRESULT dotnet_create(OLECHAR *assembly, OLECHAR *datatype, i_dispatch *object)
8989
pHandle->Release();
9090
if (FAILED(hr)) return hr;
9191

92-
php_COM_set(object, unwrapped.pdispVal, TRUE);
92+
php_COM_set(obj, unwrapped.pdispVal, TRUE);
9393
return ERROR_SUCCESS;
9494
}
9595

@@ -109,7 +109,7 @@ PHP_FUNCTION(dotnet_load)
109109
HRESULT hr;
110110
pval *assembly_name, *datatype_name, *code_page;
111111
OLECHAR *assembly, *datatype;
112-
i_dispatch *obj;
112+
comval *obj;
113113

114114
switch(ZEND_NUM_ARGS())
115115
{
@@ -121,23 +121,23 @@ PHP_FUNCTION(dotnet_load)
121121
getParameters(ht, 3, &assembly_name, &datatype_name, &code_page);
122122

123123
convert_to_long(code_page);
124-
codepage = code_page->value.lval;
124+
codepage = Z_LVAL_P(code_page);
125125
break;
126126
default:
127127
WRONG_PARAM_COUNT;
128128
break;
129129
}
130130

131131
convert_to_string(assembly_name);
132-
assembly = php_char_to_OLECHAR(assembly_name->value.str.val, assembly_name->value.str.len, codepage);
132+
assembly = php_char_to_OLECHAR(Z_STRVAL_P(assembly_name), Z_STRLEN_P(assembly_name), codepage);
133133

134134
convert_to_string(datatype_name);
135-
datatype = php_char_to_OLECHAR(datatype_name->value.str.val, datatype_name->value.str.len, codepage);
135+
datatype = php_char_to_OLECHAR(Z_STRVAL_P(datatype_name), Z_STRLEN_P(datatype_name), codepage);
136136

137-
obj = (i_dispatch *) emalloc(sizeof(i_dispatch));
137+
ALLOC_COM(obj);
138138

139139
/* obtain IDispatch */
140-
hr=dotnet_create(assembly, datatype, obj);
140+
hr = dotnet_create(assembly, datatype, obj);
141141
efree(assembly);
142142
efree(datatype);
143143
if (FAILED(hr)) {
@@ -148,13 +148,13 @@ PHP_FUNCTION(dotnet_load)
148148
efree(obj);
149149
RETURN_FALSE;
150150
}
151-
if (!obj->i.dispatch) {
151+
if (C_DISPATCH(obj) == NULL) {
152152
php_error(E_WARNING,"Unable to locate %s in assembly %s",datatype_name->value.str.val,assembly_name->value.str.val);
153153
efree(obj);
154154
RETURN_FALSE;
155155
}
156156

157-
RETURN_LONG(zend_list_insert(obj, php_COM_get_le_idispatch()));
157+
RETURN_LONG(zend_list_insert(obj, IS_COM));
158158
}
159159
/* }}} */
160160

@@ -165,7 +165,7 @@ void php_DOTNET_call_function_handler(INTERNAL_FUNCTION_PARAMETERS, zend_propert
165165
zend_overloaded_element *function_name = (zend_overloaded_element *) property_reference->elements_list->tail->data;
166166

167167
if (zend_llist_count(property_reference->elements_list)==1
168-
&& !strcmp(function_name->element.value.str.val, "dotnet")) { /* constructor */
168+
&& !strcmp(Z_STRVAL(function_name->element), "dotnet")) { /* constructor */
169169
pval *object_handle;
170170

171171
PHP_FN(dotnet_load)(INTERNAL_FUNCTION_PARAM_PASSTHRU);

0 commit comments

Comments
 (0)