wez Sat Dec 6 12:31:40 2003 EDT
Modified files:
/php-src/ext/com_dotnet com_com.c com_extension.c php_com_dotnet.h
Log:
com_create_guid() returns...
Index: php-src/ext/com_dotnet/com_com.c
diff -u php-src/ext/com_dotnet/com_com.c:1.5 php-src/ext/com_dotnet/com_com.c:1.6
--- php-src/ext/com_dotnet/com_com.c:1.5 Fri Nov 28 12:11:16 2003
+++ php-src/ext/com_dotnet/com_com.c Sat Dec 6 12:31:40 2003
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: com_com.c,v 1.5 2003/11/28 17:11:16 wez Exp $ */
+/* $Id: com_com.c,v 1.6 2003/12/06 17:31:40 wez Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -441,3 +441,23 @@
return php_com_do_invoke_by_id(obj, dispid, flags, v, nargs, args TSRMLS_CC);
}
+
+PHP_FUNCTION(com_create_guid)
+{
+ GUID retval;
+ OLECHAR *guid_string;
+
+ if (ZEND_NUM_ARGS() != 0) {
+ ZEND_WRONG_PARAM_COUNT();
+ }
+
+ if (CoCreateGuid(&retval) == S_OK && StringFromCLSID(&retval, &guid_string) ==
S_OK) {
+ Z_TYPE_P(return_value) = IS_STRING;
+ Z_STRVAL_P(return_value) = php_com_olestring_to_string(guid_string,
&Z_STRLEN_P(return_value), CP_ACP, 0);
+
+ CoTaskMemFree(guid_string);
+ } else {
+ RETURN_FALSE;
+ }
+}
+
Index: php-src/ext/com_dotnet/com_extension.c
diff -u php-src/ext/com_dotnet/com_extension.c:1.3
php-src/ext/com_dotnet/com_extension.c:1.4
--- php-src/ext/com_dotnet/com_extension.c:1.3 Fri Oct 17 16:52:17 2003
+++ php-src/ext/com_dotnet/com_extension.c Sat Dec 6 12:31:40 2003
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: com_extension.c,v 1.3 2003/10/17 20:52:17 wez Exp $ */
+/* $Id: com_extension.c,v 1.4 2003/12/06 17:31:40 wez Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -60,6 +60,7 @@
PHP_FE(variant_get_type, NULL)
PHP_FE(variant_set_type, NULL)
PHP_FE(variant_cast, NULL)
+ PHP_FE(com_create_guid, NULL)
{ NULL, NULL, NULL }
};
Index: php-src/ext/com_dotnet/php_com_dotnet.h
diff -u php-src/ext/com_dotnet/php_com_dotnet.h:1.1
php-src/ext/com_dotnet/php_com_dotnet.h:1.2
--- php-src/ext/com_dotnet/php_com_dotnet.h:1.1 Thu Aug 14 12:49:55 2003
+++ php-src/ext/com_dotnet/php_com_dotnet.h Sat Dec 6 12:31:40 2003
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_com_dotnet.h,v 1.1 2003/08/14 16:49:55 wez Exp $ */
+/* $Id: php_com_dotnet.h,v 1.2 2003/12/06 17:31:40 wez Exp $ */
#ifndef PHP_COM_DOTNET_H
#define PHP_COM_DOTNET_H
@@ -40,7 +40,7 @@
PHP_RSHUTDOWN_FUNCTION(com_dotnet);
PHP_MINFO_FUNCTION(com_dotnet);
-PHP_FUNCTION(confirm_com_dotnet_compiled);
+PHP_FUNCTION(com_create_guid);
ZEND_BEGIN_MODULE_GLOBALS(com_dotnet)
zend_bool allow_dcom;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
