rhodes 3.3.3.beta.4 → 3.3.3

data/platform/shared/net/INetRequest.cpp

@@ -71,6 +71,12 @@ boolean CNetRequestHolder::isCancelled()
     return RHODESAPPBASE().canonicalizeRhoUrl(strUrl);
 }
 
+bool CNetRequestHolder::isInsideRequest() const
+{
+	return (m_pReq != 0);
+}
+
+
 CNetRequestWrapper::CNetRequestWrapper(INetRequestImpl* pImpl, CNetRequestHolder* pHolder) : m_pReqImpl(pImpl), m_pHolder(pHolder)
 {
     if ( m_pHolder )
@@ -139,6 +145,7 @@ String CNetRequestWrapper::resolveUrl(const String& strUrl)
 {
     return RHODESAPPBASE().canonicalizeRhoUrl(strUrl);
 }
+
 }
 }
 

data/platform/shared/net/INetRequest.h

@@ -138,6 +138,8 @@ public:
 
     boolean getSslVerifyPeer() {return m_sslVerifyPeer;}
     void setSslVerifyPeer(boolean mode) {m_sslVerifyPeer = mode;}
+    
+    bool isInsideRequest() const;
 };
 
 class CNetRequestWrapper

data/platform/shared/net/RawSocket.cpp

@@ -45,7 +45,7 @@
 
 #include "CompatWince.h"
 
-#if defined(OS_WINDOWS) || defined(OS_WINCE)
+#if defined(WINDOWS_PLATFORM)
 typedef unsigned __int16 uint16_t;
 
 #  ifndef S_ISDIR

data/platform/shared/qt/rhodes/QtMainWindow.cpp

@@ -77,7 +77,7 @@ QtMainWindow::QtMainWindow(QWidget *parent) :
     m_LogicalDpiY(0)
     //TODO: m_SyncStatusDlg
 {
-#ifdef OS_WINDOWS
+#ifdef OS_WINDOWS_DESKTOP
     QPixmap icon(":/images/rho.png");
     QApplication::setWindowIcon(icon);
 #endif

data/platform/shared/qt/rhodes/impl/RhoClassFactoryImpl.h

@@ -29,7 +29,7 @@
 #include "common/RhoPort.h"
 #include "common/RhoDefs.h"
 #include "common/IRhoClassFactory.h"
-#ifdef OS_WINDOWS
+#ifdef OS_WINDOWS_DESKTOP
 #ifdef RHO_SYMBIAN
 #include "rho/common/RhoThreadImpl.h"
 #else // RHO_SYMBIAN
@@ -67,7 +67,7 @@ public:
 
     net::ISSL* createSSLEngine()
     {
-#ifdef OS_WINDOWS
+#ifdef OS_WINDOWS_DESKTOP
         return NULL;
 #else
         return new net::SSLImpl();

data/platform/shared/qt/rhodes/impl/RhoThreadImpl.cpp

@@ -26,7 +26,7 @@
 
 #include "common/RhoDefs.h"
 
-#ifdef OS_WINDOWS
+#ifdef OS_WINDOWS_DESKTOP
 
 #include "common/RhoPort.h"
 #include "RhoThreadImpl.h"
@@ -96,7 +96,7 @@ void CRhoThreadImpl::sleep(unsigned int nTimeout)
     QRhoThread::sleep(nTimeout);
 }
 
-#endif // OS_WINDOWS
+#endif // OS_WINDOWS_DESKTOP
 
 extern "C" {
 

data/platform/shared/qt/rhodes/impl/SystemImpl.cpp

@@ -241,7 +241,7 @@ void rho_sys_app_uninstall(const char *appname)
     RAWLOGC_INFO("SystemImpl", "rho_sys_app_uninstall() has no implementation in RhoSimulator.");
 }
 
-#if !defined(OS_WINDOWS) && !defined(OS_SYMBIAN)
+#if !defined(OS_WINDOWS_DESKTOP) && !defined(OS_SYMBIAN)
 int rho_sys_set_sleeping(int sleeping)
 {
     //TODO: rho_sys_set_sleeping
@@ -266,4 +266,14 @@ RHO_GLOBAL void rho_platform_restart_application()
     RAWLOGC_INFO("SystemImpl", "rho_platform_restart_application() has no implementation in RhoSimulator.");
 }
 
+const char* rho_native_reruntimepath()
+{
+    return rho_native_rhopath();
+}
+
+int MotorolaLicence_check(const char* company, const char* licence)
+{
+    return 1;
+}
+
 } //extern "C"

data/platform/shared/qt/rhodes/main.cpp

@@ -173,17 +173,17 @@ int main(int argc, char *argv[])
 
 #ifdef RHODES_EMULATOR
     if (RHOSIMCONF().getString("debug_host").length() > 0)
-#ifdef OS_WINDOWS
+#ifdef OS_WINDOWS_DESKTOP
         SetEnvironmentVariableA("RHOHOST", RHOSIMCONF().getString("debug_host").c_str() );
-#else // OS_WINDOWS
+#else // !OS_WINDOWS_DESKTOP
         setenv("RHOHOST", RHOSIMCONF().getString("debug_host").c_str(), 1 );
-#endif // OS_WINDOWS
+#endif // OS_WINDOWS_DESKTOP
     if (RHOSIMCONF().getString("debug_port").length() > 0)
-#ifdef OS_WINDOWS
+#ifdef OS_WINDOWS_DESKTOP
         SetEnvironmentVariableA("rho_debug_port", RHOSIMCONF().getString("debug_port").c_str() );
 #else // RHODES_EMULATOR
         setenv("rho_debug_port", RHOSIMCONF().getString("debug_port").c_str(), 1 );
-#endif // OS_WINDOWS
+#endif // OS_WINDOWS_DESKTOP
 #endif // RHODES_EMULATOR
     rho::common::CRhodesApp::Create(m_strRootPath, m_strRootPath, m_strRootPath);
 

data/platform/shared/ruby/ext/alert/alert_wrap.c

@@ -1859,26 +1859,26 @@ SWIG_ruby_failed(void)
 
 
 /*@SWIG:/usr/local/share/swig/2.0.4/ruby/rubyprimtypes.swg,19,%ruby_aux_method@*/
-SWIGINTERN VALUE SWIG_AUX_NUM2LONG(VALUE *args)
+SWIGINTERN VALUE SWIG_AUX_NUM2LL(VALUE *args)
 {
   VALUE obj = args[0];
   VALUE type = TYPE(obj);
-  long *res = (long *)(args[1]);
-  *res = type == T_FIXNUM ? NUM2LONG(obj) : rb_big2long(obj);
+  long long *res = (long long *)(args[1]);
+  *res = type == T_FIXNUM ? NUM2LL(obj) : rb_big2ll(obj);
   return obj;
 }
 /*@SWIG@*/
 
 SWIGINTERN int
-SWIG_AsVal_long (VALUE obj, long* val)
+SWIG_AsVal_long_SS_long (VALUE obj, long long *val)
 {
   VALUE type = TYPE(obj);
   if ((type == T_FIXNUM) || (type == T_BIGNUM)) {
-    long v;
+    long long v;
     VALUE a[2];
     a[0] = obj;
     a[1] = (VALUE)(&v);
-    if (rb_rescue(RUBY_METHOD_FUNC(SWIG_AUX_NUM2LONG), (VALUE)a, RUBY_METHOD_FUNC(SWIG_ruby_failed), 0) != Qnil) {
+    if (rb_rescue(RUBY_METHOD_FUNC(SWIG_AUX_NUM2LL), (VALUE)a, RUBY_METHOD_FUNC(SWIG_ruby_failed), 0) != Qnil) {
       if (val) *val = v;
       return SWIG_OK;
     }
@@ -1890,8 +1890,8 @@ SWIG_AsVal_long (VALUE obj, long* val)
 SWIGINTERN int
 SWIG_AsVal_int (VALUE obj, int *val)
 {
-  long v;
-  int res = SWIG_AsVal_long (obj, &v);
+  long long v = 0;
+  int res = SWIG_AsVal_long_SS_long (obj, &v);
   if (SWIG_IsOK(res)) {
     if ((v < INT_MIN || v > INT_MAX)) {
       return SWIG_OverflowError;

data/platform/shared/ruby/ext/bluetooth/bluetooth_wrap.c

@@ -1887,10 +1887,17 @@ extern void rho_bluetooth_session_write_data(const char* connected_device_name,
   #define SWIG_From_long   LONG2NUM 
 
 
+SWIGINTERNINLINE VALUE 
+SWIG_From_long_SS_long  (long long value)
+{
+  return LL2NUM(value);
+}
+
+
 SWIGINTERNINLINE VALUE
 SWIG_From_int  (int value)
 {    
-  return SWIG_From_long  (value);
+  return SWIG_From_long_SS_long  (value);
 }
 
 
@@ -1980,26 +1987,26 @@ SWIG_ruby_failed(void)
 
 
 /*@SWIG:/usr/local/share/swig/2.0.4/ruby/rubyprimtypes.swg,19,%ruby_aux_method@*/
-SWIGINTERN VALUE SWIG_AUX_NUM2LONG(VALUE *args)
+SWIGINTERN VALUE SWIG_AUX_NUM2LL(VALUE *args)
 {
   VALUE obj = args[0];
   VALUE type = TYPE(obj);
-  long *res = (long *)(args[1]);
-  *res = type == T_FIXNUM ? NUM2LONG(obj) : rb_big2long(obj);
+  long long *res = (long long *)(args[1]);
+  *res = type == T_FIXNUM ? NUM2LL(obj) : rb_big2ll(obj);
   return obj;
 }
 /*@SWIG@*/
 
 SWIGINTERN int
-SWIG_AsVal_long (VALUE obj, long* val)
+SWIG_AsVal_long_SS_long (VALUE obj, long long *val)
 {
   VALUE type = TYPE(obj);
   if ((type == T_FIXNUM) || (type == T_BIGNUM)) {
-    long v;
+    long long v;
     VALUE a[2];
     a[0] = obj;
     a[1] = (VALUE)(&v);
-    if (rb_rescue(RUBY_METHOD_FUNC(SWIG_AUX_NUM2LONG), (VALUE)a, RUBY_METHOD_FUNC(SWIG_ruby_failed), 0) != Qnil) {
+    if (rb_rescue(RUBY_METHOD_FUNC(SWIG_AUX_NUM2LL), (VALUE)a, RUBY_METHOD_FUNC(SWIG_ruby_failed), 0) != Qnil) {
       if (val) *val = v;
       return SWIG_OK;
     }
@@ -2011,8 +2018,8 @@ SWIG_AsVal_long (VALUE obj, long* val)
 SWIGINTERN int
 SWIG_AsVal_int (VALUE obj, int *val)
 {
-  long v;
-  int res = SWIG_AsVal_long (obj, &v);
+  long long v = 0;
+  int res = SWIG_AsVal_long_SS_long (obj, &v);
   if (SWIG_IsOK(res)) {
     if ((v < INT_MIN || v > INT_MAX)) {
       return SWIG_OverflowError;

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

@@ -4,7 +4,7 @@
 #include "ext/rho/rhoruby.h"
 
 extern void take_picture(char* callback_url, rho_param *options_hash);
-extern void choose_picture(char* callback_url);
+extern void choose_picture(char* callback_url, rho_param *options_hash);
 
 extern VALUE get_camera_info(const char* camera_type);
 
@@ -24,6 +24,6 @@ extern VALUE get_camera_info(const char* camera_type);
 
 
 extern void take_picture(char* callback_url, rho_param *options_hash );
-extern void choose_picture(char* callback_url);
+extern void choose_picture(char* callback_url, rho_param *options_hash);
 
 extern VALUE get_camera_info(const char* camera_type);

data/platform/shared/ruby/ext/camera/camera_wrap.c

@@ -1829,7 +1829,7 @@ static VALUE mCamera;
 #include "ext/rho/rhoruby.h"
 
 extern void take_picture(char* callback_url, rho_param *options_hash);
-extern void choose_picture(char* callback_url);
+extern void choose_picture(char* callback_url, rho_param *options_hash);
 
 extern VALUE get_camera_info(const char* camera_type);
 
@@ -1930,11 +1930,15 @@ fail:
 SWIGINTERN VALUE
 _wrap_choose_picture(int argc, VALUE *argv, VALUE self) {
   char *arg1 = (char *) 0 ;
+  rho_param *arg2 = (rho_param *) 0 ;
   int res1 ;
   char *buf1 = 0 ;
   int alloc1 = 0 ;
   
-  if ((argc < 1) || (argc > 1)) {
+  {
+    arg2 = NULL;
+  }
+  if ((argc < 1) || (argc > 2)) {
     rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc); SWIG_fail;
   }
   res1 = SWIG_AsCharPtrAndSize(argv[0], &buf1, NULL, &alloc1);
@@ -1942,11 +1946,22 @@ _wrap_choose_picture(int argc, VALUE *argv, VALUE self) {
     SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "char *","choose_picture", 1, argv[0] ));
   }
   arg1 = (char *)(buf1);
-  choose_picture(arg1);
+  if (argc > 1) {
+    {
+      arg2 = rho_param_fromvalue(argv[1]);
+    }
+  }
+  choose_picture(arg1,arg2);
   if (alloc1 == SWIG_NEWOBJ) free((char*)buf1);
+  {
+    rho_param_free(arg2);
+  }
   return Qnil;
 fail:
   if (alloc1 == SWIG_NEWOBJ) free((char*)buf1);
+  {
+    rho_param_free(arg2);
+  }
   return Qnil;
 }
 

data/platform/shared/ruby/ext/datetimepicker/datetimepicker_wrap.c

@@ -1905,26 +1905,26 @@ SWIG_ruby_failed(void)
 
 
 /*@SWIG:/usr/local/share/swig/2.0.4/ruby/rubyprimtypes.swg,19,%ruby_aux_method@*/
-SWIGINTERN VALUE SWIG_AUX_NUM2LONG(VALUE *args)
+SWIGINTERN VALUE SWIG_AUX_NUM2LL(VALUE *args)
 {
   VALUE obj = args[0];
   VALUE type = TYPE(obj);
-  long *res = (long *)(args[1]);
-  *res = type == T_FIXNUM ? NUM2LONG(obj) : rb_big2long(obj);
+  long long *res = (long long *)(args[1]);
+  *res = type == T_FIXNUM ? NUM2LL(obj) : rb_big2ll(obj);
   return obj;
 }
 /*@SWIG@*/
 
 SWIGINTERN int
-SWIG_AsVal_long (VALUE obj, long* val)
+SWIG_AsVal_long_SS_long (VALUE obj, long long *val)
 {
   VALUE type = TYPE(obj);
   if ((type == T_FIXNUM) || (type == T_BIGNUM)) {
-    long v;
+    long long v;
     VALUE a[2];
     a[0] = obj;
     a[1] = (VALUE)(&v);
-    if (rb_rescue(RUBY_METHOD_FUNC(SWIG_AUX_NUM2LONG), (VALUE)a, RUBY_METHOD_FUNC(SWIG_ruby_failed), 0) != Qnil) {
+    if (rb_rescue(RUBY_METHOD_FUNC(SWIG_AUX_NUM2LL), (VALUE)a, RUBY_METHOD_FUNC(SWIG_ruby_failed), 0) != Qnil) {
       if (val) *val = v;
       return SWIG_OK;
     }
@@ -1936,8 +1936,8 @@ SWIG_AsVal_long (VALUE obj, long* val)
 SWIGINTERN int
 SWIG_AsVal_int (VALUE obj, int *val)
 {
-  long v;
-  int res = SWIG_AsVal_long (obj, &v);
+  long long v = 0;
+  int res = SWIG_AsVal_long_SS_long (obj, &v);
   if (SWIG_IsOK(res)) {
     if ((v < INT_MIN || v > INT_MAX)) {
       return SWIG_OverflowError;
@@ -1948,6 +1948,35 @@ SWIG_AsVal_int (VALUE obj, int *val)
   return res;
 }
 
+
+/*@SWIG:/usr/local/share/swig/2.0.4/ruby/rubyprimtypes.swg,19,%ruby_aux_method@*/
+SWIGINTERN VALUE SWIG_AUX_NUM2LONG(VALUE *args)
+{
+  VALUE obj = args[0];
+  VALUE type = TYPE(obj);
+  long *res = (long *)(args[1]);
+  *res = type == T_FIXNUM ? NUM2LONG(obj) : rb_big2long(obj);
+  return obj;
+}
+/*@SWIG@*/
+
+SWIGINTERN int
+SWIG_AsVal_long (VALUE obj, long* val)
+{
+  VALUE type = TYPE(obj);
+  if ((type == T_FIXNUM) || (type == T_BIGNUM)) {
+    long v;
+    VALUE a[2];
+    a[0] = obj;
+    a[1] = (VALUE)(&v);
+    if (rb_rescue(RUBY_METHOD_FUNC(SWIG_AUX_NUM2LONG), (VALUE)a, RUBY_METHOD_FUNC(SWIG_ruby_failed), 0) != Qnil) {
+      if (val) *val = v;
+      return SWIG_OK;
+    }
+  }
+  return SWIG_TypeError;
+}
+
 SWIGINTERN VALUE
 _wrap_choose(int argc, VALUE *argv, VALUE self) {
   char *arg1 = (char *) 0 ;

data/platform/shared/ruby/ext/geolocation/geolocation_wrap.c

@@ -1940,26 +1940,26 @@ SWIG_ruby_failed(void)
 
 
 /*@SWIG:/usr/local/share/swig/2.0.4/ruby/rubyprimtypes.swg,19,%ruby_aux_method@*/
-SWIGINTERN VALUE SWIG_AUX_NUM2LONG(VALUE *args)
+SWIGINTERN VALUE SWIG_AUX_NUM2LL(VALUE *args)
 {
   VALUE obj = args[0];
   VALUE type = TYPE(obj);
-  long *res = (long *)(args[1]);
-  *res = type == T_FIXNUM ? NUM2LONG(obj) : rb_big2long(obj);
+  long long *res = (long long *)(args[1]);
+  *res = type == T_FIXNUM ? NUM2LL(obj) : rb_big2ll(obj);
   return obj;
 }
 /*@SWIG@*/
 
 SWIGINTERN int
-SWIG_AsVal_long (VALUE obj, long* val)
+SWIG_AsVal_long_SS_long (VALUE obj, long long *val)
 {
   VALUE type = TYPE(obj);
   if ((type == T_FIXNUM) || (type == T_BIGNUM)) {
-    long v;
+    long long v;
     VALUE a[2];
     a[0] = obj;
     a[1] = (VALUE)(&v);
-    if (rb_rescue(RUBY_METHOD_FUNC(SWIG_AUX_NUM2LONG), (VALUE)a, RUBY_METHOD_FUNC(SWIG_ruby_failed), 0) != Qnil) {
+    if (rb_rescue(RUBY_METHOD_FUNC(SWIG_AUX_NUM2LL), (VALUE)a, RUBY_METHOD_FUNC(SWIG_ruby_failed), 0) != Qnil) {
       if (val) *val = v;
       return SWIG_OK;
     }
@@ -1971,8 +1971,8 @@ SWIG_AsVal_long (VALUE obj, long* val)
 SWIGINTERN int
 SWIG_AsVal_int (VALUE obj, int *val)
 {
-  long v;
-  int res = SWIG_AsVal_long (obj, &v);
+  long long v = 0;
+  int res = SWIG_AsVal_long_SS_long (obj, &v);
   if (SWIG_IsOK(res)) {
     if ((v < INT_MIN || v > INT_MAX)) {
       return SWIG_OverflowError;

data/platform/shared/ruby/ext/mapview/mapview_wrap.c

@@ -1864,26 +1864,26 @@ SWIG_ruby_failed(void)
 
 
 /*@SWIG:/usr/local/share/swig/2.0.4/ruby/rubyprimtypes.swg,19,%ruby_aux_method@*/
-SWIGINTERN VALUE SWIG_AUX_NUM2LONG(VALUE *args)
+SWIGINTERN VALUE SWIG_AUX_NUM2LL(VALUE *args)
 {
   VALUE obj = args[0];
   VALUE type = TYPE(obj);
-  long *res = (long *)(args[1]);
-  *res = type == T_FIXNUM ? NUM2LONG(obj) : rb_big2long(obj);
+  long long *res = (long long *)(args[1]);
+  *res = type == T_FIXNUM ? NUM2LL(obj) : rb_big2ll(obj);
   return obj;
 }
 /*@SWIG@*/
 
 SWIGINTERN int
-SWIG_AsVal_long (VALUE obj, long* val)
+SWIG_AsVal_long_SS_long (VALUE obj, long long *val)
 {
   VALUE type = TYPE(obj);
   if ((type == T_FIXNUM) || (type == T_BIGNUM)) {
-    long v;
+    long long v;
     VALUE a[2];
     a[0] = obj;
     a[1] = (VALUE)(&v);
-    if (rb_rescue(RUBY_METHOD_FUNC(SWIG_AUX_NUM2LONG), (VALUE)a, RUBY_METHOD_FUNC(SWIG_ruby_failed), 0) != Qnil) {
+    if (rb_rescue(RUBY_METHOD_FUNC(SWIG_AUX_NUM2LL), (VALUE)a, RUBY_METHOD_FUNC(SWIG_ruby_failed), 0) != Qnil) {
       if (val) *val = v;
       return SWIG_OK;
     }
@@ -1895,8 +1895,8 @@ SWIG_AsVal_long (VALUE obj, long* val)
 SWIGINTERN int
 SWIG_AsVal_int (VALUE obj, int *val)
 {
-  long v;
-  int res = SWIG_AsVal_long (obj, &v);
+  long long v = 0;
+  int res = SWIG_AsVal_long_SS_long (obj, &v);
   if (SWIG_IsOK(res)) {
     if ((v < INT_MIN || v > INT_MAX)) {
       return SWIG_OverflowError;
@@ -1965,10 +1965,17 @@ SWIG_AsCharPtrAndSize(VALUE obj, char** cptr, size_t* psize, int *alloc)
   #define SWIG_From_long   LONG2NUM 
 
 
+SWIGINTERNINLINE VALUE 
+SWIG_From_long_SS_long  (long long value)
+{
+  return LL2NUM(value);
+}
+
+
 SWIGINTERNINLINE VALUE
 SWIG_From_int  (int value)
 {    
-  return SWIG_From_long  (value);
+  return SWIG_From_long_SS_long  (value);
 }
 
 SWIGINTERN VALUE