[PHP-CVS] cvs: php4 /ext/dotnet dotnet.cpp

[Harald Radi]

phanto          Sat Jan 27 19:41:22 2001 EDT

  Modified files:              
    /php4/ext/dotnet    dotnet.cpp 
  Log:
  fixed unicodeconversion and parameter passing bugs in com and dotnet modules
  
Index: php4/ext/dotnet/dotnet.cpp
diff -u php4/ext/dotnet/dotnet.cpp:1.1 php4/ext/dotnet/dotnet.cpp:1.2
--- php4/ext/dotnet/dotnet.cpp:1.1      Sat Aug 26 05:53:13 2000
+++ php4/ext/dotnet/dotnet.cpp  Sat Jan 27 19:41:22 2001
@@ -21,6 +21,13 @@
  * This module implements support for Microsoft .Net components.
  */
 
+/*
+ * 28.1.2001
+ * use external unicode conversion functions
+ *
+ * harald radi <[EMAIL PROTECTED]>
+ */
+
 #ifdef PHP_WIN32
 
 #include <iostream.h>
@@ -30,22 +37,17 @@
 extern "C" {
 #include "php.h"
 #include "php_ini.h"
-
-pval php_COM_get_property_handler(zend_property_reference *property_reference);
 
+OLECHAR *php_char_to_OLECHAR(char *C_str, uint strlen);
+}
 
+pval php_COM_get_property_handler(zend_property_reference *property_reference);
 int php_COM_set_property_handler(zend_property_reference *property_reference, pval 
*value);
-
 char *php_COM_error_message(HRESULT hr);
-
 void php_COM_call_function_handler(INTERNAL_FUNCTION_PARAMETERS, 
zend_property_reference *property_reference);
-
 int php_COM_get_le_idispatch();
-}
-
-
-#include <stdio.h>
 
+#include "../com/conversion.h"
 #include "Mscoree.h"
 #include "mscorlib.h"
 
@@ -56,19 +58,6 @@
 
 static zend_class_entry dotnet_class_entry;
 
-static OLECHAR *php_char_to_OLECHAR(char *C_str, uint strlen)
-{
-       OLECHAR *unicode_str = (OLECHAR *) emalloc(sizeof(OLECHAR)*(strlen+1));
-       OLECHAR *unicode_ptr = unicode_str;
-
-       while (*C_str) {
-               *unicode_ptr++ = (unsigned short) *C_str++;
-       }
-       *unicode_ptr = 0;
-
-       return unicode_str;
-}
-
 HRESULT dotnet_init() {
   HRESULT hr;
 
@@ -156,7 +145,6 @@
 /* }}} */
 
 
-
 void php_DOTNET_call_function_handler(INTERNAL_FUNCTION_PARAMETERS, 
zend_property_reference *property_reference)
 {
        pval *object = property_reference->object;
@@ -182,7 +170,6 @@
        }
 }
 
-
 void php_register_DOTNET_class()
 {
        INIT_OVERLOADED_CLASS_ENTRY(dotnet_class_entry, "DOTNET", NULL,
@@ -236,8 +223,5 @@
 extern "C" {
        ZEND_GET_MODULE(dotnet)
 }
-
-void php_register_DOTNET_class();
-
 
 #endif



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
To contact the list administrators, e-mail: [EMAIL PROTECTED]