cvs: php4 /ext/rpc handler.h rpc.c /ext/rpc/com com.c com_wrapper.c /ext/rpc/skeleton skeleton.c skeleton.h

phanto Fri Jul 19 12:18:59 2002 EDT Added files: /php4/ext/rpc/skeleton skeleton.c skeleton.h Modified files: /php4/ext/rpc handler.h rpc.c /php4/ext/rpc/com com.c com_wrapper.c Log: - added a skeleton for new layers - a bit cleanup

Index: php4/ext/rpc/handler.h diff -u php4/ext/rpc/handler.h:1.11 php4/ext/rpc/handler.h:1.12 --- php4/ext/rpc/handler.h:1.11 Thu Jul 18 14:31:34 2002 +++ php4/ext/rpc/handler.h Fri Jul 19 12:18:58 2002 @@ -90,7 +90,7 @@ int (*rpc_name)(rpc_string hash, rpc_string *name, void *data, int type); int (*rpc_ctor)(rpc_string class_name, void **data, int num_args, zval **args[]); int (*rpc_dtor)(void *data); - int (*rpc_describe)(rpc_string method_name, void *data, char **arg_types); + int (*rpc_describe)(rpc_string method_name, void *data, char **arg_types, unsigned char **ref_types); int (*rpc_call)(rpc_string method_name, void **data, zval *return_value, int num_args, zval **args[]); int (*rpc_get)(rpc_string property_name, zval *return_value, void **data); int (*rpc_set)(rpc_string property_name, zval *value, void **data); Index: php4/ext/rpc/rpc.c diff -u php4/ext/rpc/rpc.c:1.13 php4/ext/rpc/rpc.c:1.14 --- php4/ext/rpc/rpc.c:1.13 Thu Jul 18 14:31:34 2002 +++ php4/ext/rpc/rpc.c Fri Jul 19 12:18:58 2002 @@ -381,6 +381,7 @@ static union _zend_function* rpc_get_method(zval *object, char *method, int method_len TSRMLS_DC) { zend_function *function; + unsigned char *ref_types = NULL; GET_INTERNAL(intern); if (zend_ts_hash_find(&(intern->function_table), method, method_len + 1, &function) != SUCCESS) { @@ -394,11 +395,11 @@ method_name.str = method; method_name.len = method_len; - RPC_HT(intern)->rpc_describe(method_name, intern->data, &arg_types); + RPC_HT(intern)->rpc_describe(method_name, intern->data, &arg_types, &ref_types); } zif = (zend_internal_function *) emalloc(sizeof(zend_internal_function)); - zif->arg_types = NULL; + zif->arg_types = ref_types; zif->function_name = method; zif->handler = ZEND_FN(rpc_call); zif->scope = intern->ce; Index: php4/ext/rpc/com/com.c diff -u php4/ext/rpc/com/com.c:1.10 php4/ext/rpc/com/com.c:1.11 --- php4/ext/rpc/com/com.c:1.10 Thu Jul 18 14:31:35 2002 +++ php4/ext/rpc/com/com.c Fri Jul 19 12:18:58 2002 @@ -19,7 +19,6 @@ #define _WIN32_DCOM #include "../rpc.h" -#include "../php_rpc.h" #include "../handler.h" #include "com.h" @@ -35,7 +34,7 @@ static int com_name(rpc_string, rpc_string *, void *, int); static int com_ctor(rpc_string, void **, int , zval ***); static int com_dtor(void *); -static int com_describe(rpc_string, void *, char **); +static int com_describe(rpc_string, void *, char **, unsigned char **); static int com_call(rpc_string, void **, zval *, int, zval ***); static int com_get(rpc_string, zval *, void **); static int com_set(rpc_string, zval *, void **); @@ -454,7 +453,7 @@ return SUCCESS; } -static int com_describe(rpc_string method_name, void *data, char **arg_types) +static int com_describe(rpc_string method_name, void *data, char **arg_types, unsigned char **ref_types) { return SUCCESS; } Index: php4/ext/rpc/com/com_wrapper.c diff -u php4/ext/rpc/com/com_wrapper.c:1.81 php4/ext/rpc/com/com_wrapper.c:1.82 --- php4/ext/rpc/com/com_wrapper.c:1.81 Thu Jul 18 14:31:35 2002 +++ php4/ext/rpc/com/com_wrapper.c Fri Jul 19 12:18:59 2002 @@ -18,7 +18,7 @@ | Wez Furlong <wez@thebrainroom.com> | +----------------------------------------------------------------------+ */ -/* $Id: com_wrapper.c,v 1.81 2002/07/18 18:31:35 phanto Exp $ */ +/* $Id: com_wrapper.c,v 1.82 2002/07/19 16:18:59 phanto Exp $ */ /* * This module implements support for COM components that support the IDispatch * interface. Both local (COM) and remote (DCOM) components can be accessed. @@ -857,7 +857,7 @@ while (SUCCEEDED(TypeInfo->lpVtbl->GetVarDesc(TypeInfo, j, &pVarDesc))) { BSTR bstr_ids; zend_constant c; - zval exists, results; + zval exists, results, value; char *const_name; TypeInfo->lpVtbl->GetNames(TypeInfo, pVarDesc->memid, &bstr_ids, 1, &NameCount); @@ -883,10 +883,16 @@ continue; } - php_variant_to_zval(pVarDesc->lpvarValue, &c.value, CP_ACP); - c.flags = mode; + php_variant_to_zval(pVarDesc->lpvarValue, &value, CP_ACP); + /* we only import enumerations (=int) */ + if (Z_TYPE(value) == IS_LONG) { + c.flags = mode; + c.value.type = IS_LONG; + c.value.value.lval = Z_LVAL(value); + c.module_number = 0; /* the module number is not available here */ - zend_register_constant(&c TSRMLS_CC); + zend_register_constant(&c TSRMLS_CC); + } j++; } Index: php4/ext/rpc/skeleton/skeleton.c +++ php4/ext/rpc/skeleton/skeleton.c /* +----------------------------------------------------------------------+ | PHP Version 4 | +----------------------------------------------------------------------+ | Copyright (c) 1997-2002 The PHP Group | +----------------------------------------------------------------------+ | This source file is subject to version 2.02 of the PHP license, | | that is bundled with this package in the file LICENSE, and is | | available at through the world-wide-web at | | http://www.php.net/license/2_02.txt. | | If you did not receive a copy of the PHP license and are unable to | | obtain it through the world-wide-web, please send a note to | | license@php.net so we can mail you a copy immediately. | +----------------------------------------------------------------------+ | Author: Harald Radi <h.radi@nme.at> | +----------------------------------------------------------------------+ */ #include "../rpc.h" #include "../handler.h" #include "skeleton.h" /* protos */ static int skeleton_hash(rpc_string, rpc_string *, void *, int, char *, int); static int skeleton_name(rpc_string, rpc_string *, void *, int); static int skeleton_ctor(rpc_string, void **, int , zval ***); static int skeleton_dtor(void *); static int skeleton_describe(rpc_string, void *, char **, unsigned char **); static int skeleton_call(rpc_string, void **, zval *, int, zval ***); static int skeleton_get(rpc_string, zval *, void **); static int skeleton_set(rpc_string, zval *, void **); static int skeleton_skeletonpare(void **, void **); static int skeleton_has_property(rpc_string, void **); static int skeleton_unset_property(rpc_string, void **); static int skeleton_get_properties(HashTable **, void **); /* register rpc callback function */ RPC_REGISTER_HANDLERS_START(skeleton) FALSE, /* poolable TRUE|FALSE*/ DONT_HASH, /* hash function name lookups to avoid reflection of the object for each * method call. hashing is done either by mapping only the function name * to a coresponding method id or by taking the whole method signature into * account. possible values: * DONT_HASH|HASH_AS_INT|HASH_AS_STRING| * HASH_AS_INT_WITH_SIGNATURE|HASH_AS_STRING_WITH_SIGNATURE */ skeleton_hash, /* the hash function, can be NULL */ skeleton_name, /* the reverse hash function, can be NULL */ skeleton_ctor, /* constructor */ skeleton_dtor, /* destructor */ skeleton_describe, /* function to reflect methods to get information about parameter types. * parameters can be forced to be by reference this way. can be NULL. */ skeleton_call, /* method call handler */ skeleton_get, /* property get handler */ skeleton_set, /* property set handler */ skeleton_compare, /* compare handler, can be NULL */ skeleton_has_property, /* reflection functions, skeleton_unset_property, * can be NULL skeleton_get_properties */ RPC_REGISTER_HANDLERS_END() /* register ini settings */ RPC_INI_START(skeleton) /* TODO: palce your ini entries here */ RPC_INI_END() /* register userspace functions */ RPC_FUNCTION_ENTRY_START(skeleton) /* TODO: add your userspace functions here */ ZEND_FE(skeleton_function, NULL) RPC_FUNCTION_ENTRY_END() /* register class methods */ RPC_METHOD_ENTRY_START(skeleton) /* TODO: add your class methods here */ ZEND_FALIAS(method, skeleton_function, NULL) RPC_METHOD_ENTRY_END() /* init function that is called before the class is registered * so you can do any tricky stuff in here */ RPC_INIT_FUNCTION(skeleton) { /* TODO: place your init stuff here */ } RPC_SHUTDOWN_FUNCTION(skeleton) { /* TODO: place your shutdown stuff here */ } /* rpc handler functions */ static int skeleton_hash(rpc_string name, rpc_string *hash, void *data, int num_args, char *arg_types, int type) { /* TODO: implement your hash function here. if you have specified any of the HASH_AS_INT constants, simply set * hash->str to NULL and set hash->len to the int hash value. * arg_types is a zend_parse_parameters() like string containing the types of the parameters passed enabling you * to find the best match if you want to hash WITH_SIGNATURE. * type is one of CLASS|METHOD|PROPERTY. */ hash->str = strdup(name.str); hash->len = name.len; return SUCCESS; } static int skeleton_name(rpc_string hash, rpc_string *name, void *data, int type) { /* TODO: do the opposite of what you did above */ return FAILURE; } static int skeleton_ctor(rpc_string class_name, void **data, int num_args, zval **args[]) { /* TODO: use *data as a pointer to your internal data. if you want to enable your instances for * pooling or to be used as singletons then you have to use malloc() and free() instead of * emalloc() and efree() because emalloc()'ed memory will be efree()'ed on script shutdown. * ATTENTION: take care about possible memory holes when you use malloc() * calls to the handler functions are mutual exclusive per userspace instance, thus if you use * the same internal datastructure accross multiple userspace instances of php objects you have * to care for thread safety yourself (this again applies only if you want to make your instances * poolable/singleton-able), if you have an internal data structure per instance, then you don't * have to care for thread safety as the handler functions are locked by a mutex. */ return SUCCESS; } static int skeleton_dtor(void *data) { /* TODO: free everything you alloc'ed above */ return SUCCESS; } static int skeleton_describe(rpc_string method_name, void *data, char **arg_types, unsigned char **ref_types) { /* TODO: return a zend_parse_parameters() like string in arg_types to describe the * parameters taken by the specific function. if one of the parameters should be forced be reference then * you have to set ref_types to an array describing the function parameters as you would in the * ZEND_FE() macro as the last parameter. */ return SUCCESS; } static int skeleton_call(rpc_string method_name, void **data, zval *return_value, int num_args, zval **args[]) { /* TODO: implement call handler. if you passed back an arg_types string in the describe function the arguments * are already converted to the corresponding types, if there are too few or too much, a warning is already issued. * if arg_types was NULL you have to check for the right parameter count and types yourself. */ return SUCCESS; } static int skeleton_get(rpc_string property_name, zval *return_value, void **data) { /* TODO: implement get handler */ return SUCCESS; } static int skeleton_set(rpc_string property_name, zval *value, void **data) { /* TODO: implement set handler */ return SUCCESS; } static int skeleton_compare(void **data1, void **data2) { /* TODO: implement compare handler */ return SUCCESS; } static int skeleton_has_property(rpc_string property_name, void **data) { /* TODO: implement has property handler */ return SUCCESS; } static int skeleton_unset_property(rpc_string property_name, void **data) { /* TODO: implement unset property handler */ return SUCCESS; } static int skeleton_get_properties(HashTable **properties, void **data) { /* TODO: implement get properties handler */ return SUCCESS; } /* custom functions */ ZEND_FUNCTION(skeleton_function) { } Index: php4/ext/rpc/skeleton/skeleton.h +++ php4/ext/rpc/skeleton/skeleton.h /* +----------------------------------------------------------------------+ | PHP Version 4 | +----------------------------------------------------------------------+ | Copyright (c) 1997-2002 The PHP Group | +----------------------------------------------------------------------+ | This source file is subject to version 2.02 of the PHP license, | | that is bundled with this package in the file LICENSE, and is | | available at through the world-wide-web at | | http://www.php.net/license/2_02.txt. | | If you did not receive a copy of the PHP license and are unable to | | obtain it through the world-wide-web, please send a note to | | license@php.net so we can mail you a copy immediately. | +----------------------------------------------------------------------+ | Author: Harald Radi <h.radi@nme.at> | +----------------------------------------------------------------------+ */ /* TODO: include this file in ext/rpc/layer.h and add your handlers to * the handler_entries[] array. */ #ifndef SKELETON_H #define SKELETON_H #include "../handler.h" #include "../php_rpc.h" RPC_DECLARE_HANDLER(skeleton); /* TODO: define your functions here */ ZEND_FUNCTION(skeleton_function); /**/ #endif /* SKELETON_H */