rhodes 2.0.0.beta7 → 2.0.0.beta8

data/platform/wm/rhodes/memory_helper.cpp

@@ -0,0 +1,273 @@
+#include <stdlib.h>
+#include <string.h>
+#include <stdio.h>
+
+void add_memref(void* pmem, const char* file, int line);
+void del_memref(void* pmem);
+
+extern "C"{
+void    rho_free(void * p)
+{
+    del_memref(p);
+    free(p);
+}
+void    sys_free(void *p)
+{
+    free(p);
+}
+
+void *  rho_malloc(size_t s, const char* file, int line)
+{
+    void* res = malloc(s);
+    add_memref(res, file, line);
+
+    return res;
+}
+void *  rho_calloc(size_t num, size_t size, const char* file, int line)
+{
+    void* res = calloc(num,size);
+    add_memref(res, file, line);
+
+    return res;
+}
+
+size_t  rho_msize(void *)
+{
+    return 0;
+}
+void *  rho_realloc(void *p, size_t s, const char* file, int line)
+{
+    void* res = realloc(p,s);
+    add_memref(res, file, line);
+
+    return res;
+}
+
+char *  rho_strdup(const char * str)
+{
+    char *tmp;
+    int len = strlen(str) + 1;
+
+    tmp = (char*)rho_malloc(len, "rho_strdup", 1);
+    memcpy(tmp, str, len);
+
+    return tmp;
+}
+
+wchar_t *  rho_wcsdup(const wchar_t * str)
+{
+    wchar_t *tmp;
+    int len = (wcslen(str) + 1)*sizeof(wchar_t);
+
+    tmp = (wchar_t*)rho_malloc(len, "rho_wcsdup", 1);
+    memcpy(tmp, str, len);
+
+    return tmp;
+}
+
+}
+
+#include <new>
+//#include <exception>
+
+void* cpp_alloc(size_t size, bool nothrow) {
+  for (;;) {
+    void* p = rho_malloc(size, "cpp_alloc", 1);
+#ifdef PREANSINEW
+    return p;
+#else
+    if (p == NULL) {  // allocation failed
+        if (nothrow) return 0;
+        throw std::bad_alloc();
+    } else {  // allocation success
+      return p;
+    } 
+#endif
+  }
+}
+
+static long g_nCount = -1;
+#include <windows.h>
+#include <atlbase.h>
+#include <atlutil.h>
+
+//#include <map>
+//#include <string>
+void* g_ptr_array[10000];
+int   g_line_array[10000];
+const char*  g_file_array[10000];
+CStringA  g_stack_array[10000];
+
+//typedef std::map<void*,std::string> TObjMap; 
+//static TObjMap* g_Objects;
+static CRITICAL_SECTION s_localLock;
+
+long getObjectCount(){
+    return g_nCount;
+}
+int g_nInsideadd_memref = 0;
+CStringA MyDumpStack();
+void add_memref(void* pmem, const char* file, int line)
+{
+    if (!g_nInsideadd_memref && g_nCount>=0&& strstr(file, "\\gc.c") == 0 &&
+         strstr(file,"\\regexec.c") == 0 )
+    {
+        g_nInsideadd_memref = 1;
+
+        CStringA str = MyDumpStack();
+
+		::EnterCriticalSection(&s_localLock);
+        g_ptr_array[g_nCount] = pmem;
+        g_line_array[g_nCount] = line;
+        g_file_array[g_nCount] = file;
+        g_stack_array[g_nCount] = str;
+		g_nCount++;
+
+        g_nInsideadd_memref = 0;
+		::LeaveCriticalSection(&s_localLock);
+    }
+}
+
+void del_memref(void* pmem)
+{
+    if (g_nCount>=0){
+        ::EnterCriticalSection(&s_localLock);
+
+        for(int i = 0; i<g_nCount; i++)
+        {
+            if ( g_ptr_array[i] == pmem)
+            {
+                g_ptr_array[i] = 0;
+                if ( i == g_nCount-1)
+                    g_nCount--;
+
+                break;
+            }
+        }
+
+        ::LeaveCriticalSection(&s_localLock);
+    }
+
+}
+
+extern "C" void StartMemMonitoring()
+{
+    if (g_nCount<0)
+    {
+    	::InitializeCriticalSection(&s_localLock);
+        g_nCount = 0;
+    }
+}
+
+extern "C" void StopMemMonitoring()
+{
+    if (g_nCount>=0)
+    {
+    	::DeleteCriticalSection(&s_localLock);
+        g_nCount = 0;
+    }
+}
+
+char buf[20];
+#if !defined(_WIN32_WCE)
+extern "C" void dumpAllMemObjs()
+{
+    OutputDebugString(L"START DUMP\r\n");
+
+    for(int i = 0; i<g_nCount; i++)
+    {
+        if ( g_ptr_array[i] )
+        {
+            OutputDebugStringA( g_file_array[i] );
+
+            sprintf(buf, ": %d", g_line_array[i] );
+            OutputDebugStringA( buf );
+
+            OutputDebugStringA( g_stack_array[i] );
+
+            OutputDebugStringA( "\r\n" );
+        }
+    }
+}
+#else
+extern "C" void dumpAllMemObjs()
+{
+}
+#endif
+
+#if !defined(_WIN32_WCE)
+class CTraceClipboardData : public IStackDumpHandler
+{
+public:
+    CStringA m_strStackA;
+    bool m_bStop;
+	void __stdcall OnBegin(){}
+	void __stdcall OnEntry(void *pvAddress, LPCSTR szModule, LPCSTR szSymbol)
+	{
+        if ( m_bStop )
+            return;
+
+		char sz[40];
+		sprintf_s(sz, _countof(sz), "%p: ", pvAddress);
+		SendOut(sz);
+
+        //if (szModule && strcmp(szModule, "kernel32.dll") == 0)
+        //{
+            //m_bStop = true;
+            //return;
+        //}
+
+		if (szModule)
+		{
+			ATLASSERT(szSymbol);
+			SendOut(szModule);
+			SendOut("! ");
+			SendOut(szSymbol);
+		}
+		else
+			SendOut("symbol not found");
+		SendOut("\r\n");
+	}
+
+	void __stdcall OnError(LPCSTR szError)
+	{
+		SendOut(szError);
+	}
+	void __stdcall OnEnd(){	}
+	void SendOut(LPCSTR pszData);
+	CTraceClipboardData();
+	~CTraceClipboardData();
+};
+
+CTraceClipboardData::CTraceClipboardData()//DWORD dwTarget)
+{
+    m_bStop = false;
+}
+
+CTraceClipboardData::~CTraceClipboardData()
+{
+}
+
+void CTraceClipboardData::SendOut(LPCSTR pszData)
+{
+    m_strStackA += pszData;
+	return;
+}
+
+/////////////////////////////////////////////////////////////////////////////
+// AfxDumpStack API
+
+CStringA MyDumpStack()
+{
+	CTraceClipboardData clipboardData;
+
+	AtlDumpStack(&clipboardData);
+
+    return clipboardData.m_strStackA;
+}
+#else
+CStringA MyDumpStack()
+{
+    return CStringA();
+}
+#endif 

data/platform/wm/rhodes/rho/common/RhoThreadImpl.cpp

@@ -15,6 +15,7 @@ static DWORD WINAPI runProc(void* pv) throw()
 {
 	IRhoRunnable* p = static_cast<IRhoRunnable*>(pv);
 	p->run();
+    ::ExitThread(0);
 	return 0;
 }
 

data/platform/wm/rhodes/rho/net/NetRequestImpl.cpp

@@ -6,6 +6,7 @@
 #include "NetRequest.h"
 #include "common/StringConverter.h"
 #include "net/URI.h"
+#include "common/RhoConf.h"
 
 #if defined(_WIN32_WCE)
 #include <connmgr.h>
@@ -62,8 +63,31 @@ CNetRequestImpl::CNetRequestImpl(CNetRequest* pParent, const char* method, const
 			break;
 		}
 
-        m_hConnection = InternetConnect( m_hInternet, m_uri.lpszHostName, m_uri.nPort, _T("anonymous"), NULL, 
-          INTERNET_SERVICE_HTTP, 0, 0 );
+#ifdef OS_WINDOWS
+		if (RHOCONF().isExist("http_proxy_host")) {
+			rho::String login, password;
+			
+			if (RHOCONF().isExist("http_proxy_login"))
+				login = RHOCONF().getString ("http_proxy_login");
+			else
+				login = "anonymous";
+
+			if (RHOCONF().isExist("http_proxy_password"))
+				password = RHOCONF().getString("http_proxy_password");
+
+			m_hConnection = InternetConnect(m_hInternet, m_uri.lpszHostName, m_uri.nPort, 
+											//rho::common::convertToStringW(login).c_str(),
+											//password.length() ? rho::common::convertToStringW(password).c_str() : NULL,
+											_T("baran"), _T("baran"),
+											INTERNET_SERVICE_HTTP, 0, 0);
+		} else {
+			m_hConnection = InternetConnect(m_hInternet, m_uri.lpszHostName, m_uri.nPort, _T("anonymous"), NULL, 
+											INTERNET_SERVICE_HTTP, 0, 0);
+		}
+#else
+        m_hConnection = InternetConnect( m_hInternet, m_uri.lpszHostName, m_uri.nPort, _T("anonymous"), 
+										 NULL, INTERNET_SERVICE_HTTP, 0, 0 );
+#endif
         if ( !m_hConnection ) 
         {
             m_pszErrFunction = L"InternetConnect";
@@ -772,8 +796,27 @@ bool CNetRequestImpl::initConnection(boolean bLocalHost, LPCTSTR url)
     if (m_hInternet)
         return true;
 
+#ifdef OS_WINDOWS
+	if (RHOCONF().isExist("http_proxy_host")) {
+		rho::String proxyName = RHOCONF().getString("http_proxy_host");
+
+		if (RHOCONF().isExist("http_proxy_port")) {
+			proxyName += ":" +  RHOCONF().getString("http_proxy_port");
+		}
+
+		LOG(ERROR) + "PROXY: " + proxyName;
+
+		m_hInternet = InternetOpen(_T("rhodes-wm"), INTERNET_OPEN_TYPE_PROXY, 
+									rho::common::convertToStringW(proxyName).c_str(), 
+									NULL, NULL);
+	} else {
+		m_hInternet = InternetOpen(_T("rhodes-wm"), INTERNET_OPEN_TYPE_PRECONFIG, NULL, NULL, NULL );
+	}
+#else
     m_hInternet = InternetOpen(_T("rhodes-wm"), INTERNET_OPEN_TYPE_PRECONFIG, NULL, NULL, NULL );
-    if ( !m_hInternet ) 
+#endif
+
+	if ( !m_hInternet ) 
     {
         m_pszErrFunction = L"InternetOpen";
         return false;

data/platform/wm/rhodes/rho/rubyext/WebView.cpp

@@ -33,6 +33,8 @@ const char* rho_webview_execute_js(const char* js, int index)
     String strJS = "javascript:";
     strJS += js;
 
+	//RAWTRACEC1("Execute JS: %s", js);
+
     rho_webview_navigate(strJS.c_str(), index);
 	return "";
 }
@@ -60,7 +62,33 @@ void rho_webview_full_screen_mode(int enable)
 
 void rho_webview_set_cookie(const char *url, const char *cookie)
 {
-	::InternetSetCookieA(url, NULL, cookie);
+	URL_COMPONENTSA uri;
+	::memset(&uri, 0, sizeof(uri));
+	uri.dwStructSize = sizeof(uri);
+	uri.dwSchemeLength = 1;
+	uri.dwHostNameLength = 1;
+	uri.dwUrlPathLength = 1;
+	if (!::InternetCrackUrlA(url, ::strlen(url), 0, &uri)) {
+		RAWLOG_ERROR1("WebView.set_cookie: can not parse url: %s", url);
+		return;
+	}
+
+	std::string nurl(uri.lpszScheme, uri.dwSchemeLength);
+	nurl += "://";
+	nurl += std::string(uri.lpszHostName, uri.dwHostNameLength);
+	nurl += std::string(uri.lpszUrlPath, uri.dwUrlPathLength);
+
+	for (const char *c = cookie;;) {
+		const char *s = c;
+		for (; *s != ';' && *s != '\0'; ++s);
+		std::string c1(c, s - c);
+		if (!::InternetSetCookieA(nurl.c_str(), NULL, c1.c_str()))
+			RAWLOG_ERROR1("WebView.set_cookie: can not set cookie for url %s", nurl.c_str());
+		if (*s == '\0')
+			break;
+		for (c = s + 1; *c == ' '; ++c);
+	}
+	
 }
 
 }

data/res/build-tools/db/syncdb.schema

@@ -33,6 +33,7 @@ CREATE TABLE sources (
  last_sync_duration BIGINT default 0,
  last_sync_success BIGINT default 0,
  backend_refresh_time BIGINT default 0,
+ model_type varchar default NULL,
  source_attribs varchar default NULL,
  schema varchar default NULL,
  schema_version varchar default NULL,

data/res/generators/rhogen.rb

@@ -1,7 +1,7 @@
 require 'rubygems'
 require 'templater'
 #TODO: This is temporary, see https://www.pivotaltracker.com/story/show/3399292
-gem "activesupport", "= 2.3.5"
+gem "activesupport", "~> 2.3.5"
 require 'active_support'
 require File.dirname(__FILE__) + '/../../lib/rhodes'
 

data/rhodes.gemspec

@@ -3,7 +3,7 @@ require "lib/rhodes.rb"
 
 Gem::Specification.new do |s|
   s.name = %q{rhodes}
-  s.version = '2.0.0.beta7'
+  s.version = '2.0.0.beta8'
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Rhomobile"]
@@ -22,7 +22,7 @@ Gem::Specification.new do |s|
   s.rubygems_version = %q{1.3.5}
   s.add_dependency('templater', '>= 0.5.0')
   s.add_dependency('rake', '>= 0.8.7')
-  s.add_dependency('activesupport', '>= 2.3.5')
+  s.add_dependency('activesupport', '~> 2.3.5')
   s.add_development_dependency('rdoc', '>= 2.4.3')
   s.executables << 'rhogen'
   s.executables << 'upgrade-rhodes-app'

metadata

@@ -1,13 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: rhodes
 version: !ruby/object:Gem::Version 
+  hash: -1848230044
   prerelease: true
   segments: 
   - 2
   - 0
   - 0
-  - beta7
-  version: 2.0.0.beta7
+  - beta8
+  version: 2.0.0.beta8
 platform: ruby
 authors: 
 - Rhomobile
@@ -22,9 +23,11 @@ dependencies:
   name: templater
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 11
         segments: 
         - 0
         - 5
@@ -36,9 +39,11 @@ dependencies:
   name: rake
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 49
         segments: 
         - 0
         - 8
@@ -50,9 +55,11 @@ dependencies:
   name: activesupport
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
+        hash: 9
         segments: 
         - 2
         - 3
@@ -64,9 +71,11 @@ dependencies:
   name: rdoc
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 25
         segments: 
         - 2
         - 4
@@ -78,9 +87,11 @@ dependencies:
   name: diff-lcs
   prerelease: false
   requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 23
         segments: 
         - 1
         - 1
@@ -336,7 +347,6 @@ files:
 - lib/test/rho_stubs.rb
 - lib/test/syncdb.sqlite
 - LICENSE
-- Manifest.txt
 - platform/android/build/android.rake
 - platform/android/build/androidcommon.rb
 - platform/android/build/libcurl_build.files
@@ -348,6 +358,7 @@ files:
 - platform/android/build/librhomain_build.files
 - platform/android/build/librhosync_build.files
 - platform/android/build/libruby_build.files
+- platform/android/build/libsqlite_build.files
 - platform/android/build/libstlport_build.files
 - platform/android/build/RhodesGEN_build.files
 - platform/android/build/RhodesSRC_build.files
@@ -911,6 +922,8 @@ files:
 - platform/shared/common/SplashScreen.cpp
 - platform/shared/common/SplashScreen.h
 - platform/shared/common/StringConverter.h
+- platform/shared/common/ThreadQueue.cpp
+- platform/shared/common/ThreadQueue.h
 - platform/shared/common/Tokenizer.cpp
 - platform/shared/common/Tokenizer.h
 - platform/shared/curl/include/curl/curl.h
@@ -3374,6 +3387,7 @@ files:
 - platform/wm/rhodes/Macros.h
 - platform/wm/rhodes/MainWindow.cpp
 - platform/wm/rhodes/MainWindow.h
+- platform/wm/rhodes/memory_helper.cpp
 - platform/wm/rhodes/menubar.cpp
 - platform/wm/rhodes/menubar.h
 - platform/wm/rhodes/OkCancelModalDialog.h
@@ -3643,7 +3657,6 @@ files:
 - res/generators/templates/spec/app/spec_runner.rb
 - res/generators/templates/spec/app/SpecRunner/controller.rb
 - res/generators/templates/spec/app/SpecRunner/index.erb
-- rhobuild.yml
 - rhobuild.yml.example
 - rhodes.gemspec
 - spec/framework_spec/app/Account/account.rb
@@ -5401,23 +5414,27 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: rhodes
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 2
 summary: The Rhodes framework is the easiest way to develop NATIVE apps with full device capabilities (GPS, PIM, camera, etc.) for any smartphone.