rhodes 5.5.2 → 5.5.15

data/platform/shared/net/CURLNetRequest.cpp

@@ -54,6 +54,7 @@ class CURLNetResponseImpl : public INetResponse
 	String m_data;
     int   m_nRespCode;
     String m_cookies;
+    String m_errorMessage;
 
 public:
     CURLNetResponseImpl(char const *data, size_t size, int nRespCode)
@@ -81,6 +82,11 @@ public:
     {
         return m_cookies;
     }
+    
+    virtual String getErrorMessage()
+    {
+        return m_errorMessage;
+    }
 
     virtual void setCharData(const char* szData)
     {

data/platform/shared/net/HttpServer.cpp

@@ -81,6 +81,24 @@ typedef unsigned __int16 uint16_t;
 #undef DEFAULT_LOGCATEGORY
 #define DEFAULT_LOGCATEGORY "HttpServer"
 
+
+static bool is_net_trace() {
+    static int res = -1;
+    if (res == -1) {
+        if (rho_conf_getBool("net_trace") ) {
+            res = 1;
+        }
+        else {
+            res = 0;
+        }
+    }
+    return res == 1;
+}
+
+
+
+
+
 //extern "C" void rho_sync_addobjectnotify_bysrcname(const char* szSrcName, const char* szObject);
 
 namespace rho
@@ -1497,8 +1515,13 @@ bool CHttpServer::decide(String const &method, String const &arg_uri, String con
 #ifdef OS_MACOSX
 String CHttpServer::directRequest( const String& method, const String& uri, const String& query, const HeaderList& headers ,const String& body )
 {
+  if (is_net_trace()) {
+      RAWTRACE1("$NetRequestProcess$ PRE LOCK CHttpServer::directRequest uri = %s", uri.c_str());
+  }
   common::CMutexLock lock(m_mxSyncRequest);
-  
+  if (is_net_trace()) {
+      RAWTRACE1("$NetRequestProcess$ POST LOCK CHttpServer::directRequest uri = %s", uri.c_str());
+  }
   String ret;
   if ( m_pQueue != 0 )
   {
@@ -1526,6 +1549,9 @@ String CHttpServer::directRequest( const String& method, const String& uri, cons
     
     ret = m_pQueue->getResponse();
   }
+    if (is_net_trace()) {
+        RAWTRACE1("$NetRequestProcess$ FINISH CHttpServer::directRequest uri = %s", uri.c_str());
+    }
   
   return ret;
  

data/platform/shared/net/INetRequest.cpp

@@ -1,18 +1,18 @@
 /*------------------------------------------------------------------------
 * (The MIT License)
-* 
+*
 * Copyright (c) 2008-2011 Rhomobile, Inc.
-* 
+*
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to deal
 * in the Software without restriction, including without limitation the rights
 * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
 * copies of the Software, and to permit persons to whom the Software is
 * furnished to do so, subject to the following conditions:
-* 
+*
 * The above copyright notice and this permission notice shall be included in
 * all copies or substantial portions of the Software.
-* 
+*
 * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
 * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
 * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -20,7 +20,7 @@
 * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 * THE SOFTWARE.
-* 
+*
 * http://rhomobile.com
 *------------------------------------------------------------------------*/
 
@@ -31,6 +31,28 @@
 #include "common/RhoFilePath.h"
 #include "net/URI.h"
 
+#include "common/RhoConf.h"
+#include "logging/RhoLog.h"
+
+#undef DEFAULT_LOGCATEGORY
+#define DEFAULT_LOGCATEGORY "NetRequestTimer"
+
+
+static bool is_net_trace() {
+    static int res = -1;
+    if (res == -1) {
+        if (rho_conf_getBool("net_trace") ) {
+            res = 1;
+        }
+        else {
+            res = 0;
+        }
+    }
+    return res == 1;
+}
+
+
+
 namespace rho {
 namespace net {
 
@@ -50,12 +72,17 @@ void CNetRequestHolder::setRequest(INetRequestImpl* pReq)
 
 void CNetRequestHolder::cancel()
 {
+    if (is_net_trace()) {
+        RAWTRACE("$NetRequestProcess$ PRE SYNCHRONIZED CNetRequestHolder::cancel() TIMER");
+    }
     synchronized(m_mxReq)
     {
         m_bCancel = true;
         if ( m_pReq != 0 )
             m_pReq->cancel();
-
+        if (is_net_trace()) {
+            RAWTRACE("$NetRequestProcess$ POST SYNCHRONIZED CNetRequestHolder::cancel() TIMER");
+        }
         m_pReq = 0;
     }
 }

data/platform/shared/net/INetRequest.h

@@ -46,6 +46,7 @@ struct INetResponse
     virtual unsigned int getDataSize() = 0;
     virtual int getRespCode() = 0;
     virtual String getCookies() = 0;
+    virtual String getErrorMessage() = 0;
 
     virtual void setCharData(const char* szData) = 0;
 };
@@ -102,6 +103,7 @@ public:
     unsigned int getDataSize(){ return m_netResp->getDataSize(); }
     int getRespCode(){ return m_netResp->getRespCode(); }
     String getCookies(){ return m_netResp->getCookies(); }
+    String getErrorMessage() { return m_netResp->getErrorMessage(); }
 
 	boolean isOK()
 	{

data/platform/shared/qt/RhoSimulator_dev.pro

@@ -1,16 +1,17 @@
 TEMPLATE = subdirs
 SUBDIRS = rubylib rholib sqlite3 syncengine \
 ../../../lib/commonAPI/coreapi/ext/platform/qt/coreapi.pro \
-../../../lib/commonAPI/logCapture/ext/platform/qt/logCapture.pro \
-../../../../rhoconnect-client/ext/rhoconnect-client/ext/platform/qt/rhoconnect-client.pro \
-../../../lib/extensions/digest/ext/digest.pro \
-../../../lib/extensions/digest-md5/ext/digest-md5.pro \
-../../../lib/extensions/digest-sha1/ext/digest-sha1.pro \
-../../../lib/extensions/digest-sha2/ext/digest-sha2.pro \
-../../../lib/extensions/fcntl/ext/fcntl.pro \
-../../../lib/extensions/openssl/ext/openssl.pro \
-../../../lib/extensions/serialport/ext/serialport.pro \
-../../../lib/extensions/zlib/ext/zlib.pro
+#../../../lib/commonAPI/logCapture/ext/platform/qt/logCapture.pro \
+#../../../../rhoconnect-client/ext/rhoconnect-client/ext/platform/qt/rhoconnect-client.pro \
+#../../../lib/extensions/digest/ext/digest.pro \
+#../../../lib/extensions/digest-md5/ext/digest-md5.pro \
+#../../../lib/extensions/digest-sha1/ext/digest-sha1.pro \
+#../../../lib/extensions/digest-sha2/ext/digest-sha2.pro \
+#../../../lib/extensions/fcntl/ext/fcntl.pro \
+#../../../lib/extensions/openssl/ext/openssl.pro \
+#../../../lib/extensions/serialport/ext/serialport.pro \
+../../../lib/extensions/zlib/ext/zlib.pro\
+../../../lib/commonAPI/mediacapture/ext/platform/qt/MediaCapture.pro
 
 unix:!macx {
  # SUBDIRS += curl
@@ -20,3 +21,6 @@ macx {
 }
 CONFIG += ordered
 SUBDIRS += rhodes
+
+QMAKE_CXXFLAGS_RELEASE += -MP9
+QMAKE_CXXFLAGS_DEBUG += -MP9

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

@@ -50,8 +50,8 @@
 #include "statistic/RhoProfiler.h"
 #include <QStylePainter>
 #if QT_VERSION >= 0x050000
-#include <QtWebKit/qtwebkitversion.h>
-#include <QNetworkCookieJar>
+    #include <QtWebKit/qtwebkitversion.h>
+    #include <QNetworkCookieJar>
 #endif
 #include <QResizeEvent>
 #include <QWebFrame>

data/platform/shared/qt/rhodes/iexecutable.h

@@ -0,0 +1,27 @@
+#ifndef IEXECUTABLE_H
+#define IEXECUTABLE_H
+
+#include <QObject>
+#include <QThread>
+#include <QDebug>
+
+class IExecutable : public QObject
+{
+    Q_OBJECT
+public:
+    explicit IExecutable(QObject *parent){
+        moveToThread(parent->thread());
+        //setParent(parent);
+        connect(parent, SIGNAL(destroyed(QObject*)), this, SLOT(deleteLater()));
+        connect(this, SIGNAL(run()), this, SLOT(execute()), Qt::QueuedConnection);
+        qDebug() << "Creating Executable in thred ID 0x" + QString::number((quint32)QThread::currentThreadId(), 16);
+    }
+    virtual ~IExecutable(){}
+
+signals:
+    void run();
+public slots:
+    virtual void execute(){deleteLater();}
+};
+
+#endif // IEXECUTABLE_H

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

@@ -579,6 +579,11 @@ int CMainWindow::tabbarGetCurrent()
 {
     return ((QtMainWindow*)qtMainWindow)->tabbarGetCurrent();
 }
+void *CMainWindow::getQtMainWindow() const
+{
+    return qtMainWindow;
+}
+
 
 // Menu
 void CMainWindow::menuClear()

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

@@ -101,6 +101,7 @@ public:
     void tabbarBadge(int index, const char* badge);
     int tabbarGetCurrent();
 
+
 private:
     bool m_started;
     void* qtMainWindow;
@@ -149,6 +150,8 @@ public:
     void unsetProxyCommand();
     void setProxyCommand(const char* host, const char* port, const char* login, const char* password);
 
+    void *getQtMainWindow() const;
+
 signals:
     void doExitCommand(void);
     void doNavigateBackCommand(void);

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

@@ -38,8 +38,8 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
-#include <qkineticscroller.h>
-#include <qkineticscroller_p.h>
+#include "qkineticscroller.h"
+#include "qkineticscroller_p.h"
 #include <QMap>
 #include <QApplication>
 #include <QDesktopWidget>

data/platform/shared/qt/rhodes/qkineticscroller_p.h

@@ -53,7 +53,7 @@
 #include <QTime>
 #include <QPointer>
 #include <QObject>
-#include <qkineticscroller.h>
+#include "qkineticscroller.h"
 #include <QEvent>
 #if QT_VERSION < 0x040700
 #  include <QTime>

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

@@ -1,6 +1,6 @@
-#include <qtscrollerfilter_p.h>
-#include <qtscrollevent.h>
-#include <qtscroller.h>
+#include "qtscrollerfilter_p.h"
+#include "qtscrollevent.h"
+#include "qtscroller.h"
 #include <QAbstractItemView>
 #include <QScrollBar>
 #include <QGestureEvent>

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

@@ -1,5 +1,5 @@
-#include <qtscrollevent.h>
-#include <qtscrollevent_p.h>
+#include "qtscrollevent.h"
+#include "qtscrollevent_p.h"
 
 /*!
     \class QtScrollPrepareEvent

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

@@ -39,7 +39,7 @@
 **
 ****************************************************************************/
 
-#include <qwebviewkineticscroller.h>
+#include "qwebviewkineticscroller.h"
 #include <QApplication>
 #include <QGraphicsView>
 #include <QWebView>

data/platform/shared/qt/rhodes/qwebviewkineticscroller.h

@@ -42,7 +42,7 @@
 #ifndef QWEBVIEWKINETICSCROLLER_H
 #define QWEBVIEWKINETICSCROLLER_H
 
-#include <qkineticscroller.h>
+#include "qkineticscroller.h"
 #include <QWebView>
 
 QT_BEGIN_HEADER

data/platform/shared/qt/rhodes/rhodes.pro

@@ -1,5 +1,5 @@
 QT += core gui network webkit
-greaterThan(QT_MAJOR_VERSION, 4): QT += widgets webkitwidgets multimedia
+greaterThan(QT_MAJOR_VERSION, 4): QT += widgets webkitwidgets multimedia multimediawidgets
 
 TARGET = RhoSimulator
 TEMPLATE = app
@@ -144,7 +144,8 @@ impl/DateTimePickerImpl.h\
 impl/AlertImpl.h\
 impl/RhoThreadImpl.h\
 RhoSimulator.h\
-RhoNativeApiCall.h
+RhoNativeApiCall.h \
+    iexecutable.h
 
 SOURCES += main.cpp\
 ExternalWebView.cpp\

data/platform/wm/build/wm.rake

@@ -135,8 +135,10 @@ module WM
     $build_persistent_cab = Jake.getBuildBoolProp("persistent")
     $run_on_startup = Jake.getBuildBoolProp("startAtBoot")
     $build_cab = true
-    $is_webkit_engine = $app_config["wm"]["webengine"] == "Webkit" if !$app_config["wm"]["webengine"].nil?
-    $is_webkit_engine = true if $is_webkit_engine.nil?
+    $is_webkit_engine = false
+    #$is_webkit_engine = true if !$app_config["wm"]["extensions"]["webkit"].nil? 
+    #$app_config["wm"]["webengine"] == "webkit" if !$app_config["wm"]["webengine"].nil?
+    #$is_webkit_engine = false if $is_webkit_engine.nil?
 
     if $wk_data_dir.nil?
       $wk_data_dir = File.join($startdir, "libs/data") #"/Program Files" # its fake value for running without symbol extensions. do not delete
@@ -572,15 +574,17 @@ def build_cab
     makePersistentFiles($srcdir, additional_dlls_persistent_paths, nil, $webkit_out_of_process, reg_keys_filename)
   end
 
+=begin
   webkit = 'none'
   if $is_webkit_engine && $webkit_capability 
     webkit = $webkit_out_of_process ? 'out_of_process' : 'in_process'
   end
+=end
 
   #TODO TAU
   webkit = 'none'
   
-  if $is_webkit_engine && $webkit_capability 
+  if $is_webkit_engine #&& $webkit_capability 
     webkit = 'in_process'
   end
   
@@ -1288,6 +1292,7 @@ namespace "build" do
                     
                when 3 # 5.5.0.0
                     format ="Found QT Version : #{$QVersion}"
+                    
                     cp File.join($qtdir, "bin/Qt5Core.dll"), $target_path
                     cp File.join($qtdir, "bin/Qt5WebKitWidgets.dll"), $target_path
                     cp File.join($qtdir, "bin/Qt5Widgets.dll"), $target_path
@@ -1315,7 +1320,6 @@ namespace "build" do
                       Dir.mkdir(target_if_path)
                     end
                     
-                    
                     cp File.join($qtdir, "plugins/imageformats/qgif.dll"), target_if_path
                     cp File.join($qtdir, "plugins/imageformats/qico.dll"), target_if_path
                     cp File.join($qtdir, "plugins/imageformats/qjpeg.dll"), target_if_path
@@ -1324,7 +1328,21 @@ namespace "build" do
                     cp File.join($qtdir, "plugins/imageformats/qtga.dll"), target_if_path
                     cp File.join($qtdir, "plugins/imageformats/qtiff.dll"), target_if_path
                     cp File.join($qtdir, "plugins/imageformats/qwbmp.dll"), target_if_path
-                    
+
+                    targetFile = File.join($target_path, $appname + ".exe")
+                    if File.exists? targetFile
+                      Jake.run3("#{File.join($qtdir, 'bin/windeployqt')} #{targetFile}")
+                    else
+                      targetFile = File.join($target_path, "Rhodes.exe")
+                      if File.exists? targetFile
+                        Jake.run3("#{File.join($qtdir, 'bin/windeployqt')} #{targetFile}")
+                      else
+                        targetFile = File.join($target_path, "RhoLaunch.exe")
+                        if File.exists? targetFile
+                          Jake.run3("#{File.join($qtdir, 'bin/windeployqt')} #{targetFile}")
+                        end
+                      end
+                    end
                else
                     format ="Unknown QT Version : #{$QVersion}"
           end
@@ -1670,10 +1688,11 @@ namespace "device" do
     if !skip_nsis
       vspec_files = ''
        if Jake.getBuildBoolProp('deployqt', $app_config, true)
-         vspec_files += "  File /r \"imageformats\"\n"
-           if($qtversionindex.nil? || $qtversionindex > 1)
-               vspec_files += "  File /r \"platforms\"\n"
-          end
+         #vspec_files += "  File /r \"imageformats\"\n"
+          #if($qtversionindex.nil? || $qtversionindex > 1)
+             #vspec_files += "  File /r \"platforms\"\n"
+          #end
+          vspec_files += "  File /r *.dll\n"
        end
       if Jake.getBuildBoolProp('deploymsvc', $app_config, true) && ($vs_version == 2008)
         vspec_files += "  File *.manifest\n"

data/platform/wm/rhodes/browser/BrowserFactory.cpp

@@ -85,7 +85,7 @@ IBrowserEngine* BrowserFactory::create(HWND hwndParent)
     //TODO TAU
 	//String             xmlConfigType   = rho_wmimpl_get_webengine();
 	String             xmlConfigType;
-    String             rhoConfigType   = RHOCONF().getString("webengine");  
+    String             rhoConfigType   = RHOCONF().getString("webengine");
     
     if (get_app_build_config_item("webengine"))
     {
@@ -110,12 +110,10 @@ IBrowserEngine* BrowserFactory::create(HWND hwndParent)
 
     if (selBrowserType == eNone)
     {
-        selBrowserType = eWebkit;
-        LOG(INFO) + "Browser engine was not set in config`s. Selected Webkit engine automatically.";
+        selBrowserType = eIE;
+        LOG(INFO) + "WebKit extension missing. Selected Internet Explorer engine automatically.";
     } 
 
-	//TAU
-	selBrowserType = eWebkit;
     m_selBrowserType = selBrowserType;
 
     switch (selBrowserType)
@@ -158,4 +156,4 @@ EBrowserEngineType BrowserFactory::getCurrentBrowserType()
 extern "C" bool rho_wmimpl_is_browser_ieforwm()
 {
     return (bool)(rho::eIE == rho::BrowserFactory::getCurrentBrowserType());
-}
+}