wez Sun Mar 2 08:09:48 2003 EDT
Modified files:
/php4/ext/rpc/com com.h
/php4/sapi/activescript classfactory.cpp scriptengine.cpp
Log:
Fix build for activescript sapi
Index: php4/ext/rpc/com/com.h
diff -u php4/ext/rpc/com/com.h:1.5 php4/ext/rpc/com/com.h:1.6
--- php4/ext/rpc/com/com.h:1.5 Mon Feb 10 19:54:26 2003
+++ php4/ext/rpc/com/com.h Sun Mar 2 08:09:47 2003
@@ -22,7 +22,9 @@
#include "../handler.h"
#include "../php_rpc.h"
+#ifndef PHP_COM_DONT_DECLARE_RPC_HANDLER
RPC_DECLARE_HANDLER(com);
+#endif
ZEND_MINIT_FUNCTION(com);
ZEND_MSHUTDOWN_FUNCTION(com);
Index: php4/sapi/activescript/classfactory.cpp
diff -u php4/sapi/activescript/classfactory.cpp:1.2
php4/sapi/activescript/classfactory.cpp:1.3
--- php4/sapi/activescript/classfactory.cpp:1.2 Mon May 20 11:38:19 2002
+++ php4/sapi/activescript/classfactory.cpp Sun Mar 2 08:09:47 2003
@@ -15,13 +15,14 @@
| Authors: Wez Furlong <[EMAIL PROTECTED]> |
+----------------------------------------------------------------------+
*/
-/* $Id: classfactory.cpp,v 1.2 2002/05/20 15:38:19 phanto Exp $ */
+/* $Id: classfactory.cpp,v 1.3 2003/03/02 13:09:47 wez Exp $ */
/* IClassFactory Implementation, and DllXXX function implementation */
#define INITGUID
#define DEBUG_CLASS_FACTORY 0
+#include <winsock2.h>
#include <windows.h>
#include <initguid.h>
Index: php4/sapi/activescript/scriptengine.cpp
diff -u php4/sapi/activescript/scriptengine.cpp:1.5
php4/sapi/activescript/scriptengine.cpp:1.6
--- php4/sapi/activescript/scriptengine.cpp:1.5 Tue Feb 25 01:49:59 2003
+++ php4/sapi/activescript/scriptengine.cpp Sun Mar 2 08:09:47 2003
@@ -15,7 +15,7 @@
| Authors: Wez Furlong <[EMAIL PROTECTED]> |
+----------------------------------------------------------------------+
*/
-/* $Id: scriptengine.cpp,v 1.5 2003/02/25 06:49:59 sniper Exp $ */
+/* $Id: scriptengine.cpp,v 1.6 2003/03/02 13:09:47 wez Exp $ */
/* Implementation Notes:
*
@@ -43,7 +43,11 @@
#include "php_variables.h"
#include "php_ini.h"
#include "php4activescript.h"
+#define PHP_COM_DONT_DECLARE_RPC_HANDLER 1
+#include "ext/rpc/php_rpc.h"
+#include "ext/rpc/rpc_proxy.h"
#include "ext/rpc/com/com.h"
+#include "ext/rpc/com/com_wrapper.h"
#include "ext/rpc/com/php_COM.h"
#include "ext/rpc/com/conversion.h"
}
@@ -612,7 +616,7 @@
if (retval_ptr) {
if (varResult)
- php_pval_to_variant(retval_ptr, varResult, CP_ACP TSRMLS_CC);
+ php_zval_to_variant(retval_ptr, varResult, CP_ACP);
zval_ptr_dtor(&retval_ptr);
}
@@ -792,7 +796,7 @@
if (SUCCEEDED(LoadRegTypeLib(*info->rguidTypeLib,
(USHORT)info->dwMajor,
(USHORT)info->dwMinor,
LANG_NEUTRAL, &TypeLib))) {
- php_COM_load_typelib(TypeLib, CONST_CS
TSRMLS_CC);
+ php_COM_load_typelib(TypeLib, CONST_CS);
TypeLib->Release();
}
}
@@ -1013,7 +1017,7 @@
if (Z_TYPE_PP(tmp) == IS_OBJECT) {
/* FIXME: if this causes an
allocation (emalloc) and we are
* not in the engine thread,
things could get ugly!!! */
- disp =
php_COM_export_object(*tmp TSRMLS_CC);
+ disp =
php_COM_export_object(*tmp);
}
}
@@ -1269,7 +1273,7 @@
trace("Add %s to global namespace\n", name);
- val = php_COM_object_from_dispatch(disp, NULL TSRMLS_CC);
+ val = php_COM_object_from_dispatch(disp);
if (val == NULL) {
disp->Release();
@@ -1312,7 +1316,7 @@
if
(SUCCEEDED(disp->Invoke(func->memid, IID_NULL, 0, func->invkind,
&dispparams, &vres, NULL, NULL))) {
- /* Get it's dispatch */
+ /* Get its dispatch */
IDispatch *sub = NULL;
if (V_VT(&vres) == VT_UNKNOWN)
@@ -1321,12 +1325,12 @@
sub =
V_DISPATCH(&vres);
if (sub) {
- /* find out it's name
*/
+ /* find out its name */
typ->GetDocumentation(func->memid, &funcname, NULL, NULL, NULL);
- name =
php_OLECHAR_to_char(funcname, &namelen, CP_ACP TSRMLS_CC);
+ name =
php_OLECHAR_to_char(funcname, &namelen, CP_ACP, 0);
/* add to namespace */
- zval *subval =
php_COM_object_from_dispatch(sub, NULL TSRMLS_CC);
+ zval *subval =
php_COM_object_from_dispatch(sub);
if (subval) {
ZEND_SET_SYMBOL(&EG(symbol_table), name, subval);
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
