rhodes 2.0.3 → 2.1.0

data/platform/shared/ruby/ext/webview/webview.i

@@ -23,7 +23,7 @@ extern void rho_webview_set_cookie(const char* url, const char* cookie);
 %}
 
 %typemap(default) int index {
-  $1 = 0;
+  $1 = -1;
 }
 
 extern void refresh(int index);

data/platform/shared/ruby/ext/webview/webview_wrap.c

@@ -998,10 +998,10 @@ extern "C" {
 /* Global Ruby hash table to store Trackings from C/C++
    structs to Ruby Objects. */
 static VALUE swig_ruby_trackings;
-
-/* Global variable that stores a reference to the ruby
-   hash table delete function. */
-static ID swig_ruby_hash_delete = 0;
+
+/* Global variable that stores a reference to the ruby
+   hash table delete function. */
+static ID swig_ruby_hash_delete = 0;
 
 /* Setup a Ruby hash table to store Trackings */
 SWIGRUNTIME void SWIG_RubyInitializeTrackings(void) {
@@ -1011,9 +1011,9 @@ SWIGRUNTIME void SWIG_RubyInitializeTrackings(void) {
   swig_ruby_trackings = rb_hash_new();
   rb_gc_register_address(&swig_ruby_trackings);
   
-  /* Now store a reference to the hash table delete function
-     so that we only have to look it up once.*/
-  swig_ruby_hash_delete = rb_intern("delete");
+  /* Now store a reference to the hash table delete function
+     so that we only have to look it up once.*/
+  swig_ruby_hash_delete = rb_intern("delete");
 }
 
 /* Get a Ruby number to reference a pointer */
@@ -1724,7 +1724,7 @@ _wrap_refresh(int argc, VALUE *argv, VALUE self) {
   int ecode1 = 0 ;
   
   {
-    arg1 = 0;
+    arg1 = -1;
   }
   if ((argc < 0) || (argc > 1)) {
     rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc); SWIG_fail;
@@ -1754,7 +1754,7 @@ _wrap_navigate(int argc, VALUE *argv, VALUE self) {
   int ecode2 = 0 ;
   
   {
-    arg2 = 0;
+    arg2 = -1;
   }
   if ((argc < 1) || (argc > 2)) {
     rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc); SWIG_fail;
@@ -1789,7 +1789,7 @@ _wrap_current_location(int argc, VALUE *argv, VALUE self) {
   VALUE vresult = Qnil;
   
   {
-    arg1 = 0;
+    arg1 = -1;
   }
   if ((argc < 0) || (argc > 1)) {
     rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc); SWIG_fail;
@@ -1822,7 +1822,7 @@ _wrap_execute_js(int argc, VALUE *argv, VALUE self) {
   VALUE vresult = Qnil;
   
   {
-    arg2 = 0;
+    arg2 = -1;
   }
   if ((argc < 1) || (argc > 2)) {
     rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc); SWIG_fail;

data/platform/shared/ruby/file.c

@@ -1019,15 +1019,16 @@ rb_file_directory_p(VALUE obj, VALUE fname)
 //RHO
 #ifdef DOSISH
 /*    int ret = 1;
-    int fd;
+    int fd;*/
+    DWORD res = 0;
     if (TYPE(fname) != T_STRING)
         rb_raise(rb_eTypeError, "argument is not a string");
-    
+/*    
     fd = open(RSTRING_PTR(fname), O_RDONLY);
     if (fd == -1) return Qfalse;
     (void)close(fd);
     return Qtrue; */
-    DWORD res = GetFileAttributesA(RSTRING_PTR(fname));
+    res = GetFileAttributesA(RSTRING_PTR(fname));
     if (res == INVALID_FILE_ATTRIBUTES)
         return Qfalse;
     if ( res&FILE_ATTRIBUTE_DIRECTORY )
@@ -1202,6 +1203,8 @@ static VALUE
 rb_file_exist_p(VALUE obj, VALUE fname)
 {
 //RHO
+   struct stat st;
+
 #ifdef DOSISH
 /*    int ret = 1;
     int fd;
@@ -1212,17 +1215,22 @@ rb_file_exist_p(VALUE obj, VALUE fname)
     if (fd == -1) return Qfalse;
     (void)close(fd);
     return Qtrue; */
-    DWORD res = GetFileAttributesA(RSTRING_PTR(fname));
-    if (res == INVALID_FILE_ATTRIBUTES)
-        return Qfalse;
+    if (TYPE(fname) == T_STRING) 
+    {
+        DWORD res = 0;
+        if ( !*RSTRING_PTR(fname))
+            return Qfalse;
+
+        res = GetFileAttributesA(RSTRING_PTR(fname));
+        if (res == INVALID_FILE_ATTRIBUTES)
+            return Qfalse;
+
+        return Qtrue;
+    }
+#endif
 
-    return Qtrue;
-#else
-    struct stat st;
-    
     if (rb_stat(fname, &st) < 0) return Qfalse;
     return Qtrue;
-#endif
 //RHO
 }
 

data/platform/shared/ruby/linux/ruby/config.h

@@ -198,14 +198,6 @@
 #define RUBY_SETJMP(env) _setjmp(env)
 #define RUBY_LONGJMP(env,val) _longjmp(env,val)
 #define RUBY_JMP_BUF jmp_buf
-#define HAVE_STRUCT_TM_TM_ZONE 1
-#define HAVE_TM_ZONE 1
-#define HAVE_STRUCT_TM_TM_GMTOFF 1
-#define HAVE_DAYLIGHT 1
-#define HAVE_VAR_TIMEZONE 1
-#define TYPEOF_VAR_TIMEZONE long
-#define HAVE_TIMEZONE 1
-#define TIMEZONE_VOID 1
 #define NEGATIVE_TIME_T 1
 #define POSIX_SIGNAL 1
 #define GETPGRP_VOID 1
@@ -284,5 +276,13 @@ typedef unsigned long rlim_t;
 #  define HAVE_PTHREAD_ATTR_SETINHERITSCHED 1
 #  define HAVE_BACKTRACE 1
 #  define HAVE_LOG2 1
+#  define HAVE_STRUCT_TM_TM_GMTOFF 1
+#  define HAVE_STRUCT_TM_TM_ZONE 1
+#  define HAVE_TM_ZONE 1
+#  define HAVE_DAYLIGHT 1
+#  define HAVE_VAR_TIMEZONE 1
+#  define TYPEOF_VAR_TIMEZONE long
+#  define HAVE_TIMEZONE 1
+#  define TIMEZONE_VOID 1
 #endif // OS_ANDROID
 

data/platform/shared/ruby/strftime.c

@@ -65,6 +65,10 @@
 #endif
 #include <math.h>
 
+#ifdef OS_ANDROID
+char *rho_timezone();
+#endif
+
 /* defaults: season to taste */
 #define SYSV_EXT	1	/* stuff in System V ascftime routine */
 #define SUNOS_EXT	1	/* stuff in SunOS strftime routine */
@@ -505,7 +509,7 @@ rb_strftime(char *s, size_t maxsize, const char *format, const struct tm *timept
 				off = -timezone / 60;
 #endif
 #else /* !HAVE_VAR_TIMEZONE */
-#ifdef HAVE_GETTIMEOFDAY
+#if defined(HAVE_GETTIMEOFDAY) && !defined(OS_ANDROID)
 				gettimeofday(&tv, &zone);
 				off = -zone.tz_minuteswest;
 #else
@@ -546,6 +550,9 @@ rb_strftime(char *s, size_t maxsize, const char *format, const struct tm *timept
 				tp = "UTC";
 				break;
 			}
+#ifdef OS_ANDROID
+      tp = rho_timezone();
+#else
 #ifdef HAVE_TZNAME
 			i = (daylight && timeptr->tm_isdst > 0); /* 0 or 1 */
 			tp = tzname[i];
@@ -567,6 +574,7 @@ rb_strftime(char *s, size_t maxsize, const char *format, const struct tm *timept
 #endif /* HAVE_TM_NAME */
 #endif /* HAVE_TM_ZONE */
 #endif /* HAVE_TZNAME */
+#endif /* OS_ANDROID */
 			i = strlen(tp);
 			break;
 

data/platform/shared/ruby/wince/io_wce.c

@@ -18,22 +18,27 @@
 #include "common/RhoMutexLock.h"
 
 extern int _errno;
+#define map_errno rb_w32_map_errno
 
 int rb_w32_rename(const char *oldname, const char *newname)
 {
 	wchar_t *wold, *wnew;
-	BOOL rc;
+	int ret = 0;
 
 	wold = wce_mbtowc(oldname);
 	wnew = wce_mbtowc(newname);
 
 	/* replace with MoveFile. */
-	rc = MoveFileW(wold, wnew);
+	if ( MoveFileW(wold, wnew) == FALSE )
+    {
+        errno = map_errno(GetLastError());
+        ret = -1;
+    }
 
 	free(wold);
 	free(wnew);
 
-	return rc==TRUE ? 0 : -1;
+	return ret;
 }
 
 int _rename(const char *oldname, const char *newname)
@@ -41,17 +46,25 @@ int _rename(const char *oldname, const char *newname)
     return rb_w32_rename(oldname, newname);
 }
 
-int rb_w32_unlink(const char *file)
+int rb_w32_unlink(const char *path)
 {
-	wchar_t *wfile;
-	BOOL rc;
+	wchar_t *wfile = wce_mbtowc(path);
+    int ret = 0;
 
-	/* replace with DeleteFile. */
-	wfile = wce_mbtowc(file);
-	rc = DeleteFileW(wfile);
-	free(wfile);
+	const DWORD attr = GetFileAttributes(path);
+	if (attr != (DWORD)-1 && (attr & FILE_ATTRIBUTE_READONLY)) {
+	    SetFileAttributes(path, attr & ~FILE_ATTRIBUTE_READONLY);
+	}
+	if (DeleteFileW(wfile) == FALSE) {
+	    errno = map_errno(GetLastError());
+	    ret = -1;
+	    if (attr != (DWORD)-1 && (attr & FILE_ATTRIBUTE_READONLY)) {
+		SetFileAttributes(path, attr);
+	    }
+	}
 
-	return rc==TRUE ? 0 : -1;
+	free(wfile);
+    return ret;
 }
 
 int _unlink(const char *file)
@@ -213,7 +226,10 @@ int _open(const char *path, int oflag, va_list arg)
 
     fNumber = get_NewFileNumber();
     if ( fNumber == 0 )
+    {
+    	errno = EMFILE;
         return -1;
+    }
 
     wfile = wce_mbtowc(path);
     if ( (osfh = CreateFileW( wfile,
@@ -249,6 +265,7 @@ int _open(const char *path, int oflag, va_list arg)
         return fNumber;
     }
 
+    errno = rb_w32_map_errno(lasterror);
     return -1;
 }
 /*
@@ -299,7 +316,12 @@ int _read(int fd, void *buffer, int length)
 	DWORD dw;
     HANDLE fHandle = get_OSHandleByFileNumber(fd);
 
-	ReadFile( fHandle, buffer, length, &dw, NULL );
+	if ( ReadFile( fHandle, buffer, length, &dw, NULL ) == FALSE )
+    {
+        errno = map_errno(GetLastError());
+        return -1;
+    }
+
 	return (int)dw;
 }
 
@@ -316,17 +338,22 @@ int _write(int fd, const void *buffer, unsigned count)
 {
     DWORD dw;
     if ( fd < 0 ) {
-      //char* buf = (char*) malloc(count+1);
-	  //memcpy(buf,buffer,count);
-	  //buf[count] = 0;
-	  //printf("%s",buf);
-	  //free(buf);
-	  //dw = count;
-	  //TBD: fix output of the long strings
-      dw = fwrite( buffer, 1, count, stdout);
+        //char* buf = (char*) malloc(count+1);
+        //memcpy(buf,buffer,count);
+        //buf[count] = 0;
+        //printf("%s",buf);
+        //free(buf);
+        //dw = count;
+        //TBD: fix output of the long strings
+        dw = fwrite( buffer, 1, count, stdout);
     } else {
-      HANDLE fHandle = get_OSHandleByFileNumber(fd);
-      WriteFile( fHandle, buffer, count, &dw, NULL );
+        HANDLE fHandle = get_OSHandleByFileNumber(fd);
+        if ( WriteFile( fHandle, buffer, count, &dw, NULL ) == FALSE )
+        {
+            errno = map_errno(GetLastError());
+            return -1;
+        }
+
     }
     return (int)dw;
 }
@@ -342,7 +369,7 @@ rb_w32_write(int fd, const void *buf, size_t size)
 
 long _lseek(int fd, long offset, int origin)
 {
-	DWORD flag, ret;
+	DWORD flag, ret = 0;
     HANDLE fHandle = get_OSHandleByFileNumber(fd);
 	switch(origin)
 	{
@@ -352,8 +379,13 @@ long _lseek(int fd, long offset, int origin)
 	default:       flag = FILE_CURRENT; break;
 	}
 
-	ret = SetFilePointer( fHandle, offset, NULL, flag );
-	return ret==0xFFFFFFFF ? -1 : 0;
+	if ( SetFilePointer( fHandle, offset, NULL, flag ) == 0xFFFFFFFF )
+    {
+        errno = map_errno(GetLastError());
+        ret = -1;
+    }
+
+	return ret ? -1 : 0;
 }
 /*
 long _lseeki64(int handle, long offset, int origin)
@@ -375,7 +407,8 @@ long _findfirst( char *file, struct _finddata_t *fi )
 	h = FindFirstFileA( file, &fda );
 	if( h==NULL )
 	{
-		errno = EINVAL; return -1;
+		errno = map_errno(GetLastError());
+        return -1;
 	}
 
 	fi->attrib      = fda.dwFileAttributes;
@@ -399,7 +432,8 @@ int _findnext( long fd, struct _finddata_t *fi )
 
 	if( b==FALSE )
 	{
-		errno = ENOENT; return -1;
+		errno = map_errno(GetLastError());
+        return -1;
 	}
 
 	fi->attrib      = fda.dwFileAttributes;
@@ -415,10 +449,16 @@ int _findnext( long fd, struct _finddata_t *fi )
 int _findclose( long fd )
 {
 	BOOL b;
+    int ret = 0;
     HANDLE fHandle = get_OSHandleByFileNumber(fd);
     set_FileNumber(fd,0);
-	b = FindClose( fHandle );
-	return b==FALSE ? -1 : 0;
+	if ( FindClose( fHandle ) == FALSE )
+    {
+        errno = map_errno(GetLastError());
+        ret = -1;
+    }
+
+	return ret;
 }
 
 /* below functions unsupported... */

data/platform/shared/ruby/wince/sys/stat.c

@@ -13,7 +13,7 @@
 #include <time.h>
 #include "..\wince.h" /* for wce_mbtowc */
 
-
+time_t wce_FILETIME2time_t(const FILETIME* f);
 int _stat(const char *filename, struct _stat *st)
 {
 	DWORD dwAttribute;

data/platform/shared/ruby/wince/sys/timeb.c

@@ -6,6 +6,7 @@
 #include <time.h>
 #include <sys/timeb.h>
 
+time_t wce_FILETIME2time_t(const FILETIME* f);
 
 int ftime(struct timeb *tp)
 {

data/platform/shared/ruby/wince/wince.h

@@ -199,6 +199,7 @@ void wce_SetCurrentDir();
 #define FILE_TYPE_REMOTE    0x8000
 #define WNOHANG -1
 
+#undef stati64
 #define stati64 stat
 
 BOOL GetHandleInformation(

data/platform/shared/rubyext/GeoLocation.cpp

@@ -19,14 +19,28 @@ using namespace common;
 namespace rubyext{
 
 IMPLEMENT_LOGCLASS(CGeoLocation,"GeoLocation");
+CGeoLocation* CGeoLocation::m_pInstance = 0;
 
-CGeoLocation::CGeoLocation()
+/*static*/ CGeoLocation* CGeoLocation::Create(common::IRhoClassFactory* factory)
 {
-    m_nGeoPingTimeoutSec = 0;
+    if ( m_pInstance ) 
+        return m_pInstance;
+
+    m_pInstance = new CGeoLocation(factory);
+    return m_pInstance;
+}
+
+/*static*/void CGeoLocation::Destroy()
+{
+    if ( m_pInstance )
+        delete m_pInstance;
+
+    m_pInstance = 0;
 }
 
-void CGeoLocation::init(common::IRhoClassFactory* pFactory)
+CGeoLocation::CGeoLocation(common::IRhoClassFactory* pFactory)
 {
+    m_nGeoPingTimeoutSec = 0;
     m_NetRequest = pFactory->createNetRequest();
 }
 
@@ -98,11 +112,11 @@ void CGeoLocation::setPingTimeoutSec( int nTimeout )
 	if (nNewTimeout == 0)
 		nNewTimeout = getDefaultPingTimeoutSec();
 	
-	if ( nNewTimeout != m_nGeoPingTimeoutSec)
-	{
+	//if ( nNewTimeout != m_nGeoPingTimeoutSec)
+	//{
 		m_nGeoPingTimeoutSec = nNewTimeout;
 		rho_geoimpl_settimeout(m_nGeoPingTimeoutSec);
-	}
+	//}
 }
 
 int CGeoLocation::getGeoTimeoutSec()
@@ -145,12 +159,14 @@ int CGeoLocation::getGeoTimeoutSec()
 
 extern "C" {
 
+using namespace rho::rubyext;
+
 void rho_geo_set_notification( const char *url, char* params, int timeout_sec)
 {
     if ( url && *url )
         rho_geo_known_position();
 
-    RHODESAPP().getGeo().setGeoCallback(url, params, timeout_sec, false);
+    CGeoLocation::getInstance()->setGeoCallback(url, params, timeout_sec, false);
 }
 
 void rho_geo_set_view_notification( const char *url, char* params, int timeout_sec)
@@ -158,22 +174,22 @@ void rho_geo_set_view_notification( const char *url, char* params, int timeout_s
     if ( url && *url )
         rho_geo_known_position();
 
-    RHODESAPP().getGeo().setGeoCallback(url, params, timeout_sec, true);
+    CGeoLocation::getInstance()->setGeoCallback(url, params, timeout_sec, true);
 }
 
 void rho_geo_callcallback()
 {
-    RHODESAPP().getGeo().callGeoCallback(false);
+    CGeoLocation::getInstance()->callGeoCallback(false);
 }
 
 void rho_geo_callcallback_error()
 {
-    RHODESAPP().getGeo().callGeoCallback(true);
+    CGeoLocation::getInstance()->callGeoCallback(true);
 }
 
 int rho_geo_gettimeout_sec()
 {
-    return RHODESAPP().getGeo().getGeoTimeoutSec();
+    return CGeoLocation::getInstance()->getGeoTimeoutSec();
 }
 
 double rho_geo_haversine_distance(double lat1, double lon1, double lat2, double lon2)

data/platform/shared/rubyext/GeoLocation.h

@@ -33,9 +33,15 @@ private:
     CGeoNotification m_ViewNotify, m_Notify;
     common::CMutex   m_mxNotify;
 
+    static CGeoLocation* m_pInstance;
+
+    CGeoLocation(common::IRhoClassFactory* pFactory);
+
 public:
-    CGeoLocation();
-    void init(common::IRhoClassFactory* pFactory);
+
+    static CGeoLocation* Create(common::IRhoClassFactory* factory);
+    static void Destroy();
+    static CGeoLocation* getInstance(){ return m_pInstance; }
 
     void setGeoCallback(const char *url, char* params, int timeout_sec, boolean bView);
     void callGeoCallback(boolean bError, boolean bRunInThread=false);

data/platform/shared/rubyext/RhoAppAdapter.cpp

@@ -0,0 +1,41 @@
+#include "common/RhoAppAdapter.h"
+#include "ruby/ext/rho/rhoruby.h"
+
+namespace rho {
+const _CRhoAppAdapter& RhoAppAdapter = _CRhoAppAdapter();
+
+/*static*/ String _CRhoAppAdapter::getMessageText(const char* szName)
+{
+    return rho_ruby_getMessageText(szName);
+}
+
+/*static*/ String _CRhoAppAdapter::getErrorText(int nError)
+{
+    return rho_ruby_getErrorText(nError);
+}
+
+/*static*/ int  _CRhoAppAdapter::getErrorFromResponse(net::INetResponse& resp)
+{
+    if ( !resp.isResponseRecieved())
+        return ERR_NETWORK;
+
+    if ( resp.isUnathorized() )
+    	return ERR_UNATHORIZED;
+
+    if ( !resp.isOK() )
+    	return ERR_REMOTESERVER;
+
+    return ERR_NONE;
+}
+
+/*static*/ void  _CRhoAppAdapter::loadServerSources(const String& strSources)
+{
+    rho_ruby_loadserversources(strSources.c_str());
+}
+
+/*static*/ const char* _CRhoAppAdapter::getRhoDBVersion()
+{
+	return rho_ruby_getRhoDBVersion();
+}
+	
+}

data/platform/shared/rubyext/System.cpp

@@ -14,23 +14,6 @@ extern VALUE rho_sys_get_locale();
 extern int rho_sys_get_screen_width();
 extern int rho_sys_get_screen_height();
 
-static const char* getPlatformProp()
-{
-#if defined(OS_MACOSX)
-	return "APPLE";
-#elif defined(OS_WINDOWS) || defined (OS_WINCE)
-	return "WINDOWS";
-#elif defined(OS_SYMBIAN)
-	return "SYMBIAN";
-#elif defined(OS_ANDROID)
-    return "ANDROID";
-#elif defined(OS_LINUX)
-    return "LINUX";
-#else
-	return "UNKNOWN";
-#endif			
-}
-
 VALUE rho_sys_get_property(char* szPropName) 
 {
 	if (!szPropName || !*szPropName) 
@@ -41,7 +24,7 @@ VALUE rho_sys_get_property(char* szPropName)
         return res;
 
 	if (strcasecmp("platform",szPropName) == 0) 
-        return rho_ruby_create_string(getPlatformProp());
+        return rho_ruby_create_string(rho_rhodesapp_getplatform());
 
 	if (strcasecmp("has_network",szPropName) == 0) 
         return rho_sys_has_network();

data/platform/shared/rubyext/WebView.h

@@ -1,6 +1,8 @@
 #ifndef _RHOWEBVIEW_H_
 #define _RHOWEBVIEW_H_
 
+//#include "../ruby/include/ruby.h"
+
 #ifdef __cplusplus
 extern "C" {
 #endif //__cplusplus
@@ -11,7 +13,7 @@ void rho_webview_navigate_back();
 const char* rho_webview_execute_js(const char* js, int index);
 const char* rho_webview_current_location(int index);
 int rho_webview_active_tab();
-void rho_webview_set_menu_items(VALUE valMenu);
+void rho_webview_set_menu_items(unsigned long valMenu);
 void rho_webview_full_screen_mode(int enable);
 
 #ifdef __cplusplus

data/platform/shared/sync/ClientRegister.cpp

@@ -1,6 +1,7 @@
 #include "ClientRegister.h"
 #include "sync/SyncThread.h"
 #include "common/RhoConf.h"
+#include "common/RhodesApp.h"
 
 namespace rho{
 namespace sync{
@@ -33,8 +34,6 @@ CClientRegister* CClientRegister::m_pInstance = 0;
 
 CClientRegister::CClientRegister(common::IRhoClassFactory* factory,const char* device_pin) : CRhoThread(factory) 
 {
-	m_sysInfo = factory->createSystemInfo();
-
 	m_strDevicePin = device_pin;
 	m_NetRequest = factory->createNetRequest();
     m_nPollInterval = POLL_INTERVAL_SECONDS;
@@ -83,7 +82,7 @@ String CClientRegister::getRegisterBody(const String& strClientID)
 	int port = RHOCONF().getInt("push_port");
 
     return CSyncThread::getSyncEngine().getProtocol().getClientRegisterBody( strClientID, m_strDevicePin, 
-        port > 0 ? port : DEFAULT_PUSH_PORT, m_sysInfo->getPlatform());
+        port > 0 ? port : DEFAULT_PUSH_PORT, rho_rhodesapp_getplatform());
 }
 
 boolean CClientRegister::doRegister(CSyncEngine& oSync) 

data/platform/shared/sync/ClientRegister.h

@@ -3,7 +3,6 @@
 
 #include "logging/RhoLog.h"
 #include "common/RhoThread.h"
-#include "common/ISystemInfo.h"
 #include "net/INetRequest.h"
 #include "common/IRhoClassFactory.h"
 
@@ -22,7 +21,6 @@ class CClientRegister : public common::CRhoThread
     DEFINE_LOGCLASS;
 
 	static CClientRegister* m_pInstance;
-    common::CAutoPtr<common::ISystemInfo>  m_sysInfo;
 	common::CAutoPtr<net::INetRequest>     m_NetRequest;
 	String                                 m_strDevicePin;
     unsigned int                           m_nPollInterval;