rhodes 2.0.3 → 2.1.0

data/platform/wm/build/wm.rake

@@ -29,8 +29,16 @@ def sign (cabfile)
 end
 
 namespace "config" do
-  task :wm => ["config:common"] do
-    $config["platform"] = "wm"
+  task :set_wm_platform do
+    $current_platform = "wm" unless $current_platform
+  end
+  
+  task :set_win32_platform do
+    $current_platform = "win32" unless $current_platform
+  end
+  
+
+  task :wm => [:set_wm_platform, "config:common"] do
     $rubypath = "res/build-tools/RhoRuby.exe" #path to RubyMac
     $builddir = $config["build"]["wmpath"] + "/build"
     $vcbindir = $config["build"]["wmpath"] + "/bin"
@@ -49,11 +57,11 @@ namespace "config" do
 
     $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
+    #$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
 
@@ -97,24 +105,59 @@ namespace "build" do
       chdir $startdir
     end
 
-    task :devrhobundle => "win32:devrhobundle"
-  end
+    task :devrhobundle => ["config:set_wm_platform", "win32:devrhobundle"]
+    end
   
   namespace "win32" do
-    task :devrhobundle => ["wm:rhobundle"] 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'] = 'win32'
+          ENV['PWD'] = $startdir
+          ENV['RHO_ROOT'] = ENV['PWD']
+          ENV['TARGET_TEMP_DIR'] = File.join(ENV['PWD'], "platform", "wm", "bin", "win32", "rhodes", "Debug")
+          ENV['TEMP_FILES_DIR'] = File.join(ENV['PWD'], "platform", "wm", "bin", "win32", "extensions", ext)
+          ENV['VCBUILD'] = $vcbuild
+          ENV['SDK'] = $sdk
+
+          puts Jake.run("build.bat", [], extpath)
+          break
+        end
+      end
+    end
+
+#    desc "Build win32 rhobundle"
+    task :rhobundle => ["config:wm", :extensions] do
+      Rake::Task["build:bundle:noxruby"].execute
+    end
+
+
+  
+    task :devrhobundle => ["config:set_win32_platform", :rhobundle] do
         win32rhopath = 'platform/wm/bin/win32/rhodes/Debug/rho/'
         mkdir_p win32rhopath
+        namepath = File.join(win32rhopath,"name.txt")        
+        old_appname = File.read(namepath) if File.exists?(namepath)
+        
         rm_rf win32rhopath + 'lib'      
         rm_rf win32rhopath + 'apps'
+        rm_rf win32rhopath + 'db' if old_appname != $appname
         
         cp_r $srcdir + '/lib', win32rhopath
         cp_r $srcdir + '/apps', win32rhopath      
         cp_r $srcdir + '/db', win32rhopath      
+        
+        File.open(namepath, "w") { |f| f.write($appname) }      
+        
     end
   end
 
-  #desc "Build rhode for win32"
-  task :win32 => ["config:wm", "build:win32:devrhobundle"] do
+  #desc "Build rhodes for win32"
+  task :win32 => ["config:set_win32_platform", "config:wm", "build:win32:devrhobundle"] do
     chdir $config["build"]["wmpath"]
 
     args = ['/M4', 'rhodes.sln', '"debug|win32"']
@@ -256,8 +299,20 @@ namespace "run" do
   end
  
   namespace "win32" do
-  
-    task :spec => ["build:win32"] do
+
+    task :delete_db do
+        db_path = 'platform/wm/bin/win32/rhodes/Debug/rho/db'
+        rm_rf db_path if File.exists?(db_path)    
+    end
+    
+    task :spec => [:delete_db, "build:win32"] do
+        #remove log file
+        win32rhopath = 'platform/wm/bin/win32/rhodes/Debug/rho/'
+        win32logpath = File.join(win32rhopath,"RhoLog.txt")        
+        win32logpospath = File.join(win32rhopath,"RhoLog.txt_pos")        
+        rm_rf win32logpath if File.exists?(win32logpath)
+        rm_rf win32logpospath if File.exists?(win32logpospath)
+        
         Jake.before_run_spec
         start = Time.now
         
@@ -270,6 +325,10 @@ namespace "run" do
         $stdout.flush
         chdir $startdir
     end
+
+    task :phone_spec do
+      Jake.run_spec_app('win32', 'phone_spec')
+    end
     
   end
   

data/platform/wm/rhodes/Alert.cpp

@@ -141,7 +141,7 @@ LRESULT CAlertDialog::OnInitDialog(UINT /*uMsg*/, WPARAM /*wParam*/, LPARAM /*lP
 	//get text metrics
 	dc.GetTextMetrics(&tm);
 
-	int msgWidth  =  m_message.length() * (tm.tmAveCharWidth * 1.3) + (2 * INDENT);
+	int msgWidth  =  (int)(m_message.length() * (tm.tmAveCharWidth * 1.3) + (2 * INDENT));
 	int msgHeight =  tm.tmHeight + tm.tmExternalLeading + tm.tmInternalLeading;
 
 	int desiredDlgWidth = iconRect.right + msgWidth + (INDENT * 2);

data/platform/wm/rhodes/MainWindow.cpp

@@ -403,6 +403,13 @@ LRESULT CMainWindow::OnFullscreenCommand (WORD /*wNotifyCode*/, WORD /*wID*/, HW
 	return 0;
 };
 
+LRESULT CMainWindow::OnRefreshCommand(WORD /*wNotifyCode*/, WORD /*wID*/, HWND /*hWndCtl*/, BOOL& /*bHandled*/)
+{
+    if (m_spIWebBrowser2)
+        m_spIWebBrowser2->Refresh();
+    return 0;
+}
+
 LRESULT CMainWindow::OnNavigateCommand(WORD /*wNotifyCode*/, WORD /*wID*/, HWND hWndCtl, BOOL& /*bHandled*/)
 {
 	LPTSTR wcurl = (LPTSTR)hWndCtl;
@@ -433,16 +440,21 @@ LRESULT CMainWindow::OnPosChanged(UINT /*uMsg*/, WPARAM /*wParam*/, LPARAM lPara
 
 LRESULT CMainWindow::OnTakePicture(UINT /*uMsg*/, WPARAM /*wParam*/, LPARAM lParam, BOOL& /*bHandled*/) 
 {
+	TCHAR image_uri[MAX_PATH];
+    HRESULT status;
 #if defined (_WIN32_WCE)
 	Camera camera;
-	TCHAR image_uri[MAX_PATH];
-	HRESULT status = camera.takePicture(this->m_hWnd,image_uri);
+	status = camera.takePicture(this->m_hWnd,image_uri);
+#else
+    //TODO: show browse file dialog
+    wsprintf( image_uri, L"%s", L"dashboard.PNG");
+    status = S_OK;
+#endif
 
     RHODESAPP().callCameraCallback( (const char*)lParam, rho::common::convertToStringA(image_uri),
         (status!= S_OK && status != S_FALSE ? "Error" : ""), status == S_FALSE);
 
     free ((void *)lParam);
-#endif    
 	return 0;
 }
 
@@ -578,7 +590,14 @@ void __stdcall CMainWindow::OnBrowserTitleChange(BSTR bstrTitleText)
     if ( strTitle.length() > 0 )
         SetWindowText(convertToStringW(strTitle).c_str());
     else
-        SetWindowText(OLE2CT(bstrTitleText));
+    {
+        LPCTSTR szTitle = OLE2CT(bstrTitleText);
+        if ( szTitle && 
+            (_tcsncmp(szTitle, _T("http:"), 5) == 0 || _tcscmp(szTitle, _T("about:blank"))==0 ))
+            return;
+
+        SetWindowText(szTitle);
+    }
 }
 
 void __stdcall CMainWindow::OnNavigateComplete2(IDispatch* pDisp, VARIANT * pvtURL)

data/platform/wm/rhodes/MainWindow.h

@@ -74,11 +74,12 @@ public:
         MESSAGE_HANDLER(WM_ACTIVATE, OnActivate)
         MESSAGE_HANDLER(WM_SETTINGCHANGE, OnSettingChange)
         MESSAGE_HANDLER(WM_DESTROY, OnDestroy)
-        MESSAGE_HANDLER(WM_SETTEXT, OnSetText)
+        //MESSAGE_HANDLER(WM_SETTEXT, OnSetText)
 		MESSAGE_HANDLER(WM_PAINT, OnPaint)
         COMMAND_ID_HANDLER(IDM_EXIT, OnExitCommand)
         COMMAND_ID_HANDLER(IDM_NAVIGATE_BACK, OnNavigateBackCommand)
         COMMAND_ID_HANDLER(IDM_SK1_EXIT, OnBackCommand)
+        COMMAND_ID_HANDLER(IDM_REFRESH, OnRefreshCommand)
 		COMMAND_ID_HANDLER(IDM_NAVIGATE, OnNavigateCommand)
         COMMAND_ID_HANDLER(IDM_LOG,OnLogCommand)
 		COMMAND_ID_HANDLER(ID_FULLSCREEN, OnFullscreenCommand)
@@ -109,6 +110,7 @@ private:
     LRESULT OnExitCommand(WORD /*wNotifyCode*/, WORD /*wID*/, HWND /*hWndCtl*/, BOOL& /*bHandled*/);
     LRESULT OnBackCommand(WORD /*wNotifyCode*/, WORD /*wID*/, HWND /*hWndCtl*/, BOOL& /*bHandled*/);
     LRESULT OnNavigateBackCommand(WORD /*wNotifyCode*/, WORD /*wID*/, HWND /*hWndCtl*/, BOOL& /*bHandled*/);
+    LRESULT OnRefreshCommand(WORD /*wNotifyCode*/, WORD /*wID*/, HWND /*hWndCtl*/, BOOL& /*bHandled*/);
     LRESULT OnNavigateCommand(WORD /*wNotifyCode*/, WORD /*wID*/, HWND /*hWndCtl*/, BOOL& /*bHandled*/);
 	LRESULT OnLogCommand(WORD /*wNotifyCode*/, WORD /*wID*/, HWND /*hWndCtl*/, BOOL& /*bHandled*/);
 	LRESULT OnFullscreenCommand (WORD /*wNotifyCode*/, WORD /*wID*/, HWND /*hWndCtl*/, BOOL& /*bHandled*/);

data/platform/wm/rhodes/Rhodes.cpp

@@ -143,7 +143,7 @@ public :
 #endif
 			
 
-        ::SetThreadPriority(GetCurrentThread(),10);
+        //::SetThreadPriority(GetCurrentThread(),10);
 
 		//Check for bundle directory is exists.
 		HANDLE hFind;
@@ -210,7 +210,7 @@ public :
 			NULL, 
 			&g_hNotify);
 #else
-		//rho_clientregister_create("win32_client");
+		rho_clientregister_create("win32_client");
 #endif
 
         return S_OK;
@@ -491,9 +491,9 @@ extern "C" void Init_openssl(void)
 {
 }
 
-extern "C" void Init_digest(void)
-{
-}
+//extern "C" void Init_digest(void)
+//{
+//}
 
 extern "C" void Init_fcntl(void)
 {
@@ -502,6 +502,7 @@ extern "C" void Init_fcntl(void)
 extern "C" void Init_NavBar(void)
 {
 }
+
 /*BOOL EnumRhodesWindowsProc(HWND hwnd,LPARAM lParam)
 {
 	char buf[255] = {0};

data/platform/wm/rhodes/Vibrate.cpp

@@ -22,7 +22,7 @@ CVibrate::~CVibrate ()
 
 void CVibrate::createCVibrate()
 {
-    static CVibrate instance(createClassFactory());
+    static CVibrate instance(rho_impl_createClassFactory());
     m_pInstance = &instance;
 }
 

data/platform/wm/rhodes/camera/Camera.cpp

@@ -45,9 +45,9 @@ HRESULT Camera::takePicture(HWND hwndOwner,LPTSTR pszFilename) {
 
 	create_folder(pszFilename);
 
-    LPCTSTR szExt = wcsrchr(pszFilename, '.');
+    //LPCTSTR szExt = wcsrchr(pszFilename, '.');
     TCHAR filename[256];
-	generate_filename(filename,szExt);
+	generate_filename(filename,L".jpg");
 
     // Set the SHCAMERACAPTURE structure.
     ZeroMemory(&shcc, sizeof(shcc));

data/platform/wm/rhodes/phonebook/phonebook.cpp

@@ -54,6 +54,7 @@ VALUE getallPhonebookRecords(void* pb) {
 #if defined (_WIN32_WCE)
 	if (pb) {
 		CNativeAddressBook* phonebook = (CNativeAddressBook*)pb;
+        VALUE valGc = rho_ruby_disable_gc();
         CHoldRubyValue hash(rho_ruby_createHash());
 		
 		std::vector<CABRecord*> records;
@@ -69,6 +70,7 @@ VALUE getallPhonebookRecords(void* pb) {
 			records.pop_back();
 		}
 
+        rho_ruby_enable_gc(valGc);
 		return hash;
 	}
 #endif

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

@@ -6,7 +6,7 @@
 
 namespace rho{
 namespace common{
-IRhoClassFactory* createClassFactory()
+IRhoClassFactory* rho_impl_createClassFactory()
 {
     return new rho::common::CRhoClassFactory;
 }
@@ -14,14 +14,9 @@ IRhoClassFactory* createClassFactory()
 }
 
 extern "C" {
-void rho_sync_create()
-{
-    rho::sync::CSyncThread::Create(rho::common::createClassFactory());
-}
-
 void rho_clientregister_create(const char* szDevicePin)
 {
-    rho::sync::CClientRegister::Create(rho::common::createClassFactory(), szDevicePin);
+    rho::sync::CClientRegister::Create(rho::common::rho_impl_createClassFactory(), szDevicePin);
 }
 
 void rho_clientregister_destroy()

data/platform/wm/rhodes/rho/common/RhoClassFactory.h

@@ -3,7 +3,6 @@
 #include "common/IRhoClassFactory.h"
 #include "../net/NetRequest.h"
 #include "RhoThreadImpl.h"
-#include "SystemInfoImpl.h"
 
 namespace rho {
 namespace common {
@@ -22,11 +21,6 @@ public:
         return new CRhoThreadImpl;
     }
 
-    virtual ISystemInfo* createSystemInfo()
-    {
-        return new CSystemInfoImpl;
-    }
-
     net::ISSL* createSSLEngine()
     {
         return null;

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

@@ -1,6 +1,7 @@
 #pragma once
 
 #include "common/IRhoThreadImpl.h"
+#include "logging/RhoLog.h"
 
 namespace rho{
 namespace common{

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

@@ -39,7 +39,7 @@ INetResponse* CNetRequest::doRequest( const char* method, const String& strUrl,
 
 String CNetRequest::resolveUrl(const String& strUrl)
 {
-    return RHODESAPP().canonicalizeRhoUrl(strUrl);
+    return RHODESAPPBASE().canonicalizeRhoUrl(strUrl);
 }
 
 void CNetRequest::cancel()

data/platform/wm/rhodes/rho/net/NetRequest.h

@@ -1,6 +1,7 @@
 #pragma once
 
 #include "net/INetRequest.h"
+#include "logging/RhoLog.h"
 
 namespace rho {
 namespace net {

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

@@ -96,7 +96,7 @@ CNetRequestImpl::CNetRequestImpl(CNetRequest* pParent, const char* method, const
 
         m_strReqUrlW = m_uri.lpszUrlPath;
         m_strReqUrlW += m_uri.lpszExtraInfo;
-        DWORD dwFlags = INTERNET_FLAG_KEEP_CONNECTION|INTERNET_FLAG_NO_CACHE_WRITE|INTERNET_FLAG_NO_COOKIES;
+        DWORD dwFlags = INTERNET_FLAG_KEEP_CONNECTION|INTERNET_FLAG_NO_CACHE_WRITE|INTERNET_FLAG_NO_COOKIES|INTERNET_FLAG_NO_AUTO_REDIRECT;
         if ( m_uri.lpszScheme && wcsicmp(m_uri.lpszScheme,L"https")==0)
             dwFlags |= INTERNET_FLAG_SECURE;
 
@@ -336,14 +336,16 @@ void CNetRequestImpl::readResponse(CNetResponseImpl* pNetResp)
             return;
     }
 
-    if ( nCode != 200 && nCode != 206 && nCode != 416 )
+    //if ( nCode != 200 && nCode != 206 && nCode != 416 )
+    if ( nCode >= 400 && nCode != 416 )
     {
-        LOG(ERROR) + "An error occured connecting to the sync source: " + szHttpRes + " returned.";
+        LOG(ERROR) + "An error occured connecting to the server: " + szHttpRes + " returned.";
 
         // If we're unauthorized, delete any cookies that might have been
         // stored so we don't reuse them later
         if ( nCode == 401 && m_pSession ) 
         {
+            LOG(ERROR) + "Unauthorize error.Client will be logged out";
             m_pSession->logout();
         }
 	}
@@ -400,6 +402,9 @@ CNetResponseImpl* CNetRequestImpl::downloadFile(common::CRhoFile& oFile)
         if ( isError() )
             break;
 
+        if ( pNetResp->getRespCode() == 200 )
+            oFile.movePosToStart();
+            
         if ( pNetResp->getRespCode() == 416 )
         {
             pNetResp->setResponseCode(206);

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

@@ -2,6 +2,7 @@
 
 #include <wininet.h>
 #include "net/INetRequest.h"
+#include "logging/RhoLog.h"
 
 namespace rho {
 namespace common {

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

@@ -301,24 +301,27 @@ int rho_sysimpl_get_property(char* szPropName, VALUE* resValue)
         return 1;
 #else
 		HKEY hKey;
+        int nRes = 0;
 		if (RegOpenKeyEx( HKEY_LOCAL_MACHINE, _T("Ident"),
 			0, KEY_READ, &hKey ) != ERROR_SUCCESS)
-			return 0;
+			return nRes;
 
 		DWORD dwType = REG_SZ;
 		DWORD dwDataSize = 0;
-		if ( RegQueryValueEx( hKey, _T("name"), 0, &dwType, (PBYTE)NULL,
-			&dwDataSize ) != ERROR_SUCCESS)
-			return 0;
+		if ( RegQueryValueEx( hKey, _T("name"), 0, &dwType, (PBYTE)NULL, &dwDataSize ) == ERROR_SUCCESS)
+        {
+		    CAtlString deviceName;
+		    RegQueryValueEx( hKey, _T("name"), 0, &dwType, 
+                (PBYTE)deviceName.GetBuffer((dwDataSize/sizeof(TCHAR) + sizeof(TCHAR))), &dwDataSize );
+            deviceName.ReleaseBuffer();
 
-		std::vector<wchar_t> deviceName(dwDataSize + 1);
-		RegQueryValueEx( hKey, _T("name"), 0, &dwType, (PBYTE)&deviceName[0], &dwDataSize );
-		char *s = wce_wctomb(&deviceName[0]);
-		*resValue = rho_ruby_create_string(s);
-		::free(s);
+		    *resValue = rho_ruby_create_string( convertToStringA(deviceName.GetString()).c_str() );
+
+            nRes = 1;
+        }
 
 		RegCloseKey(hKey);
-		return 1;
+		return nRes;
 #endif
 	}
 

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

@@ -7,6 +7,9 @@
 #include "common/StringConverter.h"
 #include "MainWindow.h"
 
+#undef DEFAULT_LOGCATEGORY
+#define DEFAULT_LOGCATEGORY "WebView"
+
 using namespace rho;
 using namespace rho::common;
 extern "C" {
@@ -14,11 +17,18 @@ HWND getMainWnd();
 
 void rho_webview_refresh(int index) 
 {
-    rho_webview_navigate(RHODESAPP().getCurrentUrl().c_str(),0);
+//rho_webview_navigate(RHODESAPP().getCurrentUrl().c_str(),0);
+    ::PostMessage( getMainWnd(), WM_COMMAND, IDM_REFRESH, (LPARAM)index );
 }
 
 void rho_webview_navigate(const char* url, int index) 
 {
+    if ( !url )
+    {
+        RAWLOG_ERROR("WebView.navigate failed: url is nil");
+        return;
+    }
+
     String strUrl = RHODESAPP().canonicalizeRhoUrl(url);
     ::PostMessage( getMainWnd(), WM_COMMAND, IDM_NAVIGATE, (LPARAM)_tcsdup(convertToStringW(strUrl).c_str()) );
 }

data/platform/wm/rhodes/rhodes.vcproj

@@ -188,6 +188,7 @@
 				LinkIncremental="2"
 				GenerateDebugInformation="true"
 				SubSystem="0"
+				AdditionalLibraryDirectories="$(OutDir)"
 				StackReserveSize="196608"
 				StackCommitSize="4096"
 				ImportLibrary="$(OutDir)/Rhodes.lib"
@@ -567,6 +568,7 @@
 				OutputFile="$(OutDir)/rhodes.exe"
 				LinkIncremental="1"
 				GenerateDebugInformation="false"
+				AdditionalLibraryDirectories="$(OutDir)"
 				SubSystem="0"
 				StackReserveSize="196608"
 				StackCommitSize="4096"
@@ -732,7 +734,7 @@
 				Name="VCCLCompilerTool"
 				ExecutionBucket="7"
 				Optimization="2"
-				AdditionalIncludeDirectories="../../shared/shttpd/src/;../../shared/ruby;../../shared/syncengine;../../shared/json;../sqlite3;../../shared/unzip"
+				AdditionalIncludeDirectories="../../shared;./rho;../../shared/ruby;../../shared/wtl80/include;."
 				PreprocessorDefinitions="_WIN32_WCE=$(CEVER);UNDER_CE=$(CEVER);WINCE;$(PLATFORMDEFINES);NDEBUG;$(ARCHFAM);$(_ARCHFAM_);_UNICODE;UNICODE;POCKETPC2003_UI_MODEL;POCKETPC2003_UI_MODEL"
 				RuntimeLibrary="0"
 				WarningLevel="3"
@@ -950,6 +952,10 @@
 				RelativePath=".\menubar.h"
 				>
 			</File>
+			<File
+				RelativePath=".\OkCancelModalDialog.h"
+				>
+			</File>
 			<File
 				RelativePath=".\resource.h"
 				>
@@ -970,10 +976,6 @@
 				RelativePath=".\Vibrate.h"
 				>
 			</File>
-			<File
-				RelativePath=".\OkCancelModalDialog.h"
-				>
-			</File>
 		</Filter>
 		<Filter
 			Name="Resource Files"
@@ -1036,10 +1038,6 @@
 					RelativePath=".\rho\common\RhoThreadImpl.h"
 					>
 				</File>
-				<File
-					RelativePath=".\rho\common\SystemInfoImpl.h"
-					>
-				</File>
 			</Filter>
 			<Filter
 				Name="rubyext"
@@ -1133,6 +1131,25 @@
 				</FileConfiguration>
 			</File>
 		</Filter>
+		<Filter
+			Name="signature"
+			>
+			<File
+				RelativePath=".\signature\Signature.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\signature\Signature.h"
+				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCustomBuildTool"
+					/>
+				</FileConfiguration>
+			</File>
+		</Filter>
 	</Files>
 	<Globals>
 		<Global

data/platform/wm/rhodes/signature/Signature.cpp

@@ -0,0 +1,28 @@
+#include "stdafx.h"
+
+#if defined(_WIN32_WCE)
+#include <aygshell.h>
+#endif
+#include <atltime.h>
+#include "ext/rho/rhoruby.h"
+#include "../MainWindow.h"
+#include "Signature.h"
+#include "common/RhodesApp.h"
+
+#ifdef _MSC_VER
+// warning C4800: 'int' : forcing to bool 'true' or 'false' (performance warning)
+#pragma warning ( disable : 4800 )
+#endif
+
+extern "C" HWND getMainWnd();
+
+#if defined(_WIN32_WCE)
+// strdup is implemented as part of ruby CE port
+extern "C" char *strdup(const char * str);
+extern "C" wchar_t* wce_mbtowc(const char* a);
+#endif
+
+
+
+void rho_signature_take_signature(char* callback_url, char* image_format) {
+}

data/platform/wm/rhodes/signature/Signature.h

@@ -0,0 +1,3 @@
+
+
+extern "C" void rho_signature_take_signature(char* callback_url, char* image_format);

data/platform/wm/rhodes/stdafx.h

@@ -90,6 +90,11 @@
 #include <atlmisc.h>
 #include <atlctrls.h>
 #include <atldlgs.h>
+
+#if defined(WIN32_PLATFORM_WFSP) && !defined(_TPCSHELL_H_)
+#include <tpcshell.h>
+#endif
+
 #define _WTL_CE_NO_ZOOMSCROLL
 #include <atlwince.h>
 

data/platform/wm/rubylib/rubylib.vcproj

@@ -770,7 +770,7 @@
 			OutputDirectory="..\bin\$(PlatformName)\$(ProjectName)\$(ConfigurationName)"
 			IntermediateDirectory="..\bin\$(PlatformName)\$(ProjectName)\$(ConfigurationName)"
 			ConfigurationType="4"
-			CharacterSet="1"
+			CharacterSet="2"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
@@ -791,11 +791,11 @@
 				Name="VCCLCompilerTool"
 				ExecutionBucket="7"
 				Optimization="2"
-				AdditionalIncludeDirectories="..\..\shared\ruby\.;..\..\shared\ruby\include;..\..\shared\ruby\wince;..\..\shared\ruby\wince\sys;..\..\shared\ruby\win32;..\..\shared\ruby\generated;..\..\shared\ruby\rhoruby;..\sqlite3"
+				AdditionalIncludeDirectories="..\..\shared\ruby\.;..\..\shared\ruby\include;..\..\shared\ruby\wince;..\..\shared\ruby\wince\sys;..\..\shared\ruby\win32;..\..\shared\ruby\generated;..\..\shared\ruby\rhoruby;..\..\shared"
 				PreprocessorDefinitions="NDEBUG;_WIN32_WCE=$(CEVER);UNDER_CE;$(PLATFORMDEFINES);WINCE;_LIB;$(ARCHFAM);$(_ARCHFAM_);_UNICODE;UNICODE"
 				RuntimeLibrary="0"
 				UsePrecompiledHeader="0"
-				WarningLevel="3"
+				WarningLevel="0"
 				DebugInformationFormat="3"
 			/>
 			<Tool
@@ -1568,6 +1568,14 @@
 						>
 					</File>
 				</Filter>
+				<Filter
+					Name="signature"
+					>
+					<File
+						RelativePath="..\..\shared\ruby\ext\signature\signature_wrap.c"
+						>
+					</File>
+				</Filter>
 				<Filter
 					Name="stringio"
 					>

data/platform/wm/syncengine/syncengine.vcproj

@@ -791,7 +791,7 @@
 				Name="VCCLCompilerTool"
 				ExecutionBucket="7"
 				Optimization="2"
-				AdditionalIncludeDirectories="..\..\shared\ruby\wince;..\..\shared\json;..\sqlite3"
+				AdditionalIncludeDirectories="..\..\shared\ruby\wince;..\..\shared\json;..\..\shared"
 				PreprocessorDefinitions="NDEBUG;_WIN32_WCE=$(CEVER);UNDER_CE;$(PLATFORMDEFINES);WINCE;_LIB;$(ARCHFAM);$(_ARCHFAM_);_UNICODE;UNICODE"
 				RuntimeLibrary="0"
 				UsePrecompiledHeader="0"