rhodes 1.5.5 → 2.0.0.beta1

data/platform/shared/sync/SyncThread.h

@@ -18,7 +18,7 @@ namespace sync {
 class CSyncThread : public common::CRhoThread
 {
 public:
-    enum ESyncCommands{ scNone = 0, scSyncAll, scSyncOne, scSyncOneByUrl, scChangePollInterval, scExit, scLogin, scSearchOne};
+    enum ESyncCommands{ scNone = 0, scSyncAll, scSyncOne, scChangePollInterval, scExit, scLogin, scSearchOne};
 
 private:
 
@@ -82,20 +82,19 @@ public:
     public:
 	    String m_strFrom;
         boolean m_bSyncChanges;
-        int     m_nProgressStep;
+        rho::Vector<rho::String> m_arSources;
 
-        CSyncSearchCommand(String from, String params, int source_id, boolean sync_changes, int nProgressStep) : CSyncCommand(CSyncThread::scSearchOne,params,source_id, false)
+        CSyncSearchCommand(String from, String params, rho::Vector<rho::String>& arSources, boolean sync_changes, int nProgressStep) : CSyncCommand(CSyncThread::scSearchOne,params,nProgressStep, false)
 	    {
 		    m_strFrom = from;
             m_bSyncChanges = sync_changes;
-            m_nProgressStep = nProgressStep;
+            m_arSources = arSources;
 	    }
     };
 
 private:
     static CSyncThread* m_pInstance;
 
-    static db::CDBAdapter  m_oDBAdapter;
     CSyncEngine     m_oSyncEngine;
     common::CAutoPtr<common::IRhoClassFactory> m_ptrFactory;
 	int           m_nPollInterval;
@@ -108,14 +107,12 @@ public:
     static void Destroy();
     static CSyncThread* getInstance(){ return m_pInstance; }
     static CSyncEngine& getSyncEngine(){ return m_pInstance->m_oSyncEngine; }
-    static db::CDBAdapter& getDBAdapter(){ return m_pInstance->m_oDBAdapter; }
 
     void addSyncCommand(CSyncCommand* pSyncCmd);
 
 	virtual void run();
 
 	void setPollInterval(int nInterval);
-
 private:
     CSyncThread(common::IRhoClassFactory* factory);
     int getLastSyncInterval();
@@ -140,10 +137,8 @@ void rho_sync_destroy();
 
 void rho_sync_doSyncAllSources(int show_status_popup);
 void rho_sync_doSyncSource(unsigned long nSrcID,int show_status_popup);
-void rho_sync_doSearchSource(int source_id, const char *from, const char *params, bool sync_changes, int nProgressStep, const char* callback, const char* callback_params);
+void rho_sync_doSearch(unsigned long ar_sources, const char *from, const char *params, bool sync_changes, int nProgressStep, const char* callback, const char* callback_params);
 void rho_sync_doSyncSourceByUrl(const char* szSrcID);
-void rho_sync_lock();
-void rho_sync_unlock();
 void rho_sync_login(const char *login, const char *password, const char* callback);
 int rho_sync_logged_in();
 void rho_sync_logout();
@@ -156,19 +151,11 @@ void rho_sync_addobjectnotify(int nSrcID, const char* szObject);
 void rho_sync_cleanobjectnotify();
 int rho_sync_get_pagesize();
 void rho_sync_set_pagesize(int nPageSize);
-void rho_sync_set_initial_notification(const char *url, char* params);
-void rho_sync_clear_initial_notification();
-void rho_sync_set_threaded_mode(int b);
-
-//struct sqlite3;
-int rho_sync_openDB(const char* szDBPath);
-int rho_sync_closeDB();
-int rho_db_startUITransaction();
-int rho_db_commitUITransaction();
-int rho_db_rollbackUITransaction();
-int rho_db_destroy_table(const char* szTableName);
-void* rho_db_get_handle();
-unsigned long rho_sync_get_attrs(int nSrcID);
+void rho_sync_set_bulk_notification(const char *url, char* params);
+void rho_sync_clear_bulk_notification();
+
+unsigned long rho_sync_get_attrs(const char* szPartition, int nSrcID);
+unsigned long rho_sync_is_blob_attr(const char* szPartition, int source_id, const char* szAttrName);
 int rho_sync_get_lastsync_objectcount(int nSrcID);
 
 #ifdef __cplusplus

data/platform/shared/unzip/unzip.cpp

@@ -3,7 +3,8 @@
 #define _CRT_SECURE_NO_WARNINGS
 #endif
 
-#ifdef __SYMBIAN32__
+#if defined(WIN32) || defined(_WIN32_WCE)
+#else
 #define ZIP_STD
 #endif
 
@@ -4288,7 +4289,7 @@ HZIP OpenZipInternal(void *z,unsigned int len,DWORD flags, const char *password)
   han->flag=1; han->unz=unz; return (HZIP)han;
 }
 HZIP OpenZipHandle(HANDLE h, const char *password) {return OpenZipInternal((void*)h,0,ZIP_HANDLE,password);}
-HZIP OpenZip(const TCHAR *fn, const char *password) {return OpenZipInternal((void*)fn,0,ZIP_FILENAME,password);}
+HZIP OpenZipFile(const TCHAR *fn, const char *password) {return OpenZipInternal((void*)fn,0,ZIP_FILENAME,password);}
 HZIP OpenZip(void *z,unsigned int len, const char *password) {return OpenZipInternal(z,len,ZIP_MEMORY,password);}
 
 

data/platform/shared/unzip/unzip.h

@@ -5,7 +5,8 @@
 extern "C" {
 #endif
 
-#ifdef __SYMBIAN32__
+#if defined(WIN32) || defined(_WIN32_WCE)
+#else
 #define ZIP_STD
 #endif
 
@@ -51,6 +52,9 @@ typedef struct
 
 //HZIP OpenZip(const TCHAR *fn, const char *password);
 HZIP OpenZip(void *z,unsigned int len, const char *password);
+
+HZIP OpenZipFile(const TCHAR *fn, const char *password);
+
 HZIP OpenZipHandle(HANDLE h, const char *password);
 // OpenZip - opens a zip file and returns a handle with which you can
 // subsequently examine its contents. You can open a zip file from:

data/platform/shared/wtl80/include/atlapp.h

@@ -188,15 +188,6 @@ inline int WINAPI lstrlenA(LPCSTR lpszString)
   #define PtrToInt( p ) ((INT)(INT_PTR) (p) )
 #endif
 
-#else // !(_ATL_VER >= 0x0800)
-
-#ifdef lstrlenW
-  #undef lstrlenW
-  #define lstrlenW (int)::wcslen
-#endif // lstrlenW
-
-#define lstrlenA (int)strlen
-
 #ifndef lstrcpyn
   inline LPTSTR lstrcpyn(LPTSTR lpstrDest, LPCTSTR lpstrSrc, int nLength)
   {
@@ -228,6 +219,15 @@ inline int WINAPI lstrlenA(LPCSTR lpszString)
   }
 #endif // !lstrcpyn
 
+#else // !(_ATL_VER >= 0x0800)
+
+#ifdef lstrlenW
+  #undef lstrlenW
+  #define lstrlenW (int)::wcslen
+#endif // lstrlenW
+
+#define lstrlenA (int)strlen
+
 #ifdef TrackPopupMenu
   #undef TrackPopupMenu
 #endif // TrackPopupMenu
@@ -731,7 +731,7 @@ namespace SecureHelper
 		}
 		else if(cchCount == _TRUNCATE)
 		{
-			cchCount = min(cchDest - 1, size_t(lstrlenA(lpstrSrc)));
+			cchCount = min(cchDest - 1, size_t(::lstrlenA(lpstrSrc)));
 			nRet = STRUNCATE;
 		}
 		else if(cchDest <= cchCount)

data/platform/wm/RhoLib/RhoLib.vcproj

@@ -761,6 +761,14 @@
 		<Filter
 			Name="common"
 			>
+			<File
+				RelativePath="..\..\shared\common\AppMenu.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\shared\common\AppMenu.h"
+				>
+			</File>
 			<File
 				RelativePath="..\..\shared\common\AutoPointer.h"
 				>
@@ -977,10 +985,34 @@
 				RelativePath="..\..\shared\rubyext\GeoLocation.h"
 				>
 			</File>
+			<File
+				RelativePath="..\..\shared\rubyext\RhoRuby.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\shared\rubyext\RhoRuby.h"
+				>
+			</File>
 			<File
 				RelativePath="..\..\shared\rubyext\System.cpp"
 				>
 			</File>
+			<File
+				RelativePath="..\..\shared\rubyext\WebView.h"
+				>
+			</File>
+		</Filter>
+		<Filter
+			Name="unzip"
+			>
+			<File
+				RelativePath="..\..\shared\unzip\unzip.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\shared\unzip\unzip.h"
+				>
+			</File>
 		</Filter>
 	</Files>
 	<Globals>

data/platform/wm/build/build_inf.js

@@ -2,6 +2,8 @@ var fso,output_file;
 
 //TBD need to move sources and settings to a separate config files
 
+var stdout = WScript.StdOut;
+
 var settings = new Object();
 settings['wm6'] = ['Windows Mobile 6 Professional SDK (ARMV4I)','VersionMin=5.02','VersionMax=6.99'];
 
@@ -150,7 +152,39 @@ function fill_copyfiles_sections(es,f) {
 	}
 }
 
-function pinf(platform,es,name,vendor) {
+function expand_extensions(platform) {
+	var ret = new Array();
+	var folder = fso.GetFolder("..\\bin\\" + settings[platform][0] + "\\rhodes\\Release\\");
+	var fc = new Enumerator(folder.files);
+   	for (; !fc.atEnd(); fc.moveNext()) {
+   		var name = fc.item().Name;
+   		if (name.indexOf(".dll") != -1) {
+   			stdout.WriteLine("name: " + name);
+   			var f = new Object();
+   			f.name = name;
+			ret.push(f);
+		}
+   	}
+	return ret;
+}
+
+function fill_extensions_source_disk_files(exts) {
+	for (var i in exts) {
+		var line = "\"" + exts[i].name + "\"=1";
+		stdout.WriteLine("Add ext source disk file: " + line);
+		p(line);
+	}
+}
+
+function fill_extensions_files(exts) {
+	for (var i in exts) {
+		var line = "\"" + exts[i].name + "\",\"" + exts[i].name + "\",,0";
+		stdout.WriteLine("Add ext file: " + line);
+		p(line);
+	}
+}
+
+function pinf(platform,es,exts,name,vendor) {
 
 	p("[Version]");
 	p("Signature=\"$Windows NT$\"");
@@ -180,6 +214,7 @@ function pinf(platform,es,name,vendor) {
 	p("");
 	p("[SourceDisksFiles]");
 	p("\"rhodes.exe\"=1");
+	fill_extensions_source_disk_files(exts);
 	var f = get_source_disks_files(es);
 	p("");
 	p("[DestinationDirs]");
@@ -189,6 +224,7 @@ function pinf(platform,es,name,vendor) {
 	p("");
 	p("[CopyToInstallDir]");
 	p("\"rhodes.exe\",\"rhodes.exe\",,0");
+	fill_extensions_files(exts);
 	p("");
 	fill_copyfiles_sections(es,f);
 	p("");
@@ -211,7 +247,8 @@ function main() {
     sources['apps']= ["apps",args(4)+"/apps"];
 
 	var es = expand_sources(sources);
-	pinf(args(1),es,args(2),args(3));
+	var exts = expand_extensions(args(1));
+	pinf(args(1),es,exts,args(2),args(3));
 
 	output_file.Close();
-}
+}

data/platform/wm/build/wm.rake

@@ -1,27 +1,86 @@
+#
+
+def sign (cabfile)	
+	puts "Singing .cab file"
+	
+	cabsigntool = $cabwiz[0, $cabwiz.index("CabWiz")] + "Security\\CabSignTool\\cabsigntool" if $config["env"]["paths"]["cabwiz"]
+	cabsigntool = "cabsigntool" if cabsigntool.nil?
+	
+	signature = $config["build"]["wmsign"]
+	cab_in  = cabfile
+	cab_out = cabfile
+	
+	#TODO: need better solution, maybe just let know users on wiki to add bin dir of MS SDKs to PATH variable
+	#Assuming that MS SDKs intalled to default path on c: or d: disk
+	if Dir.exists?("C:\\Program Files\\Microsoft SDKs\\Windows\\v6.0A\\bin")
+		ENV['PATH'] = ENV['PATH'] + "C:\\Program Files\\Microsoft SDKs\\Windows\\v6.0A\\bin" + ";"
+	end
+	if Dir.exists?("D:\\Program Files\\Microsoft SDKs\\Windows\\v6.0A\\bin")
+		ENV['PATH'] = ENV['PATH'] + "D:\\Program Files\\Microsoft SDKs\\Windows\\v6.0A\\bin" + ";"
+	end
+	
+	if system(cabsigntool + " "  + cab_in + " " + cab_out + " -F " + signature)
+		puts "\nSigned successfully.\n\n"
+	else
+		puts "\nFailed to sign .cab file!\n\n"
+	end
+	
+	$stdout.flush
+end
+
 namespace "config" do
   task :wm => ["config:common"] do
     $config["platform"] = "wm"
     $rubypath = "res/build-tools/RhoRuby.exe" #path to RubyMac
     $builddir = $config["build"]["wmpath"] + "/build"
     $vcbindir = $config["build"]["wmpath"] + "/bin"
-    
+    $appname = $app_config["name"].nil? ? "Rhodes" : $app_config["name"] 
     $bindir = $app_path + "/bin"
     $rhobundledir =  $app_path + "/RhoBundle"
     $srcdir =  $bindir + "/RhoBundle"
     $targetdir = $bindir + "/target/wm6p"
     $tmpdir =  $bindir +"/tmp"
-    $vcbuild = "vcbuild"
+    $vcbuild = $config["env"]["paths"]["vcbuild"]
+    $vcbuild = "vcbuild" if $vcbuild.nil?
+    $cabwiz = File.join($config["env"]["paths"]["cabwiz"], "cabwiz.exe") if $config["env"]["paths"]["cabwiz"]
+    $cabwiz = "cabwiz" if $cabwiz.nil?
     $sdk = "Windows Mobile 6 Professional SDK (ARMV4I)"
     $sdk = $app_config["wmsdk"] unless $app_config["wmsdk"].nil?
 
     $excludelib = ['**/builtinME.rb','**/ServeME.rb','**/dateME.rb','**/rationalME.rb']
+
+    $app_config["extensions"] = [] unless $app_config["extensions"].is_a? Array
+    if $app_config["wm"] and $app_config["wm"]["extensions"]
+      $app_config["extensions"] += $app_config["wm"]["extensions"]
+      $app_config["wm"]["extensions"] = nil
+    end
   end
 end
 
 namespace "build" do
   namespace "wm" do
+    task :extensions => "config:wm" do
+      $app_config["extensions"].each do |ext|
+        $app_config["extpaths"].each do |p|
+          extpath = File.join(p, ext, 'ext')
+          next unless File.exists? File.join(extpath, "build.bat")
+
+          ENV['RHO_PLATFORM'] = 'wm'
+          ENV['PWD'] = $startdir
+          ENV['RHO_ROOT'] = ENV['PWD']
+          ENV['TARGET_TEMP_DIR'] = File.join(ENV['PWD'], "platform", "wm", "bin", $sdk, "rhodes", "Release")
+          ENV['TEMP_FILES_DIR'] = File.join(ENV['PWD'], "platform", "wm", "bin", $sdk, "extensions", ext)
+          ENV['VCBUILD'] = $vcbuild
+          ENV['SDK'] = $sdk
+
+          puts Jake.run("build.bat", [], extpath)
+          break
+        end
+      end
+    end
+
 #    desc "Build wm rhobundle"
-    task :rhobundle => ["config:wm"] do
+    task :rhobundle => ["config:wm", :extensions] do
       Rake::Task["build:bundle:noxruby"].execute
     end
 
@@ -75,20 +134,20 @@ namespace "device" do
   namespace "wm" do
     desc "Build production for device or emulator"
     task :production => ["config:wm","build:wm:rhobundle","build:wm:rhodes"] do
-      
+	
       chdir $builddir
       
       cp $app_path + "/icon/icon.ico", "../rhodes/resources" if File.exists? $app_path + "/icon/icon.ico"
 
-      args = ['build_inf.js', 'rhodes.inf', 'wm6', '"' + $app_config["name"] +'"', $app_config["vendor"], '"' + $srcdir + '"']
+      args = ['build_inf.js', $appname + ".inf", 'wm6', '"' + $app_config["name"] +'"', $app_config["vendor"], '"' + $srcdir + '"']
       puts Jake.run('cscript',args)
       unless $? == 0
         puts "Error running build_inf"
         exit 1
       end        
       
-      args = ['rhodes.inf']
-      puts Jake.run($config["env"]["paths"]["cabwiz"] + "/cabwiz.exe",args)
+      args = [$appname + ".inf"]
+      puts Jake.run($cabwiz, args)
       unless $? == 0
         puts "Error running cabwiz"
         exit 1
@@ -103,9 +162,13 @@ namespace "device" do
 
       mkdir_p $bindir if not File.exists? $bindir
       mkdir_p $targetdir if not File.exists? $targetdir
-      mv "rhodes.inf", $targetdir
-      mv "rhodes.cab", $targetdir
+      mv $appname + ".inf", $targetdir
+      mv $appname + ".cab", $targetdir
 
+	if (not $config["build"]["wmsign"].nil?) and $config["build"]["wmsign"] != ""
+       		sign $targetdir + '/' +  $appname + ".cab";
+	  end
+	  
       rm_f "cleanup.js"
 
       chdir $startdir
@@ -134,6 +197,29 @@ namespace "clean" do
 end
 
 namespace "run" do
+
+  namespace "wm" do
+
+    desc "Build and run on the Windows Phone"
+    task :dev => ["device:wm:production"] do
+   	  cd $startdir + "/res/build-tools"
+	  detool = "detool.exe"    
+	  args   = ['dev', $targetdir + '/' +  $appname + ".cab", $appname]
+	  puts "\nStarting application on the device"
+	  puts "Please, connect you device via ActiveSync.\n\n"
+	  puts Jake.run(detool,args)
+    end
+
+    desc "Build and run on WM6 emulator"
+    task :emu => ["device:wm:production"] do
+  	  cd $startdir + "/res/build-tools"
+	  detool = "detool.exe"
+	  args   = ['emu', '"Windows Mobile 6 Professional Emulator"', $targetdir + '/' +  $appname + ".cab", $appname]
+	  puts "\nStarting application on the WM6 emulator\n\n"
+	  puts Jake.run(detool,args)
+    end
+  end
+	
   desc "Run win32" 
   task :win32 => ["build:win32"] do
     args = [' ']