rhodes 3.3.1 → 3.3.2.beta.1

data/platform/shared/common/map/GeocodingMapEngine.h

@@ -51,9 +51,9 @@ class GoogleGeoCoding : public IGeoCoding, public CThreadQueue
 private:
     struct Command : public IQueueCommand
     {
-        String address;
-        float latitude;
         float longitude;
+        float latitude;
+        String address;
         bool is_inverse;
         std::auto_ptr<GeoCodingCallback> callback;
 

data/platform/shared/logging/RhoLogConf.cpp

@@ -233,9 +233,9 @@ extern "C" {
 using namespace rho;
 using namespace rho::common;
 
+void rho_logconf_Init_with_separate_user_path(const char* szRootPath, const char* szLogPort, const char* szUserPath)
+{
     
-void rho_logconf_Init(const char* szRootPath, const char* szLogPort){
-
 #ifdef RHODES_EMULATOR
     String strRootPath = szRootPath;
     strRootPath += RHO_EMULATOR_DIR"/";
@@ -243,7 +243,7 @@ void rho_logconf_Init(const char* szRootPath, const char* szLogPort){
 #else
     rho::common::CFilePath oLogPath( szRootPath );
 #endif
-
+    
     //Set defaults
 #ifdef RHO_DEBUG
     LOGCONF().setMinSeverity( L_TRACE );
@@ -255,16 +255,16 @@ void rho_logconf_Init(const char* szRootPath, const char* szLogPort){
     LOGCONF().setLogToOutput(false);
     LOGCONF().setEnabledCategories("");
 #endif//!RHO_DEBUG
-
+    
     LOGCONF().setLogPrefix(true);
-
+    
     rho::String logPath = oLogPath.makeFullPath("rholog.txt");
     LOGCONF().setLogToFile(true);
     LOGCONF().setLogFilePath( logPath.c_str() );
     LOGCONF().setMaxLogFileSize(1024*50);
-
-    rho_conf_Init(szRootPath);
-
+    
+    rho_conf_Init_with_separate_user_path(szRootPath, szUserPath);
+    
     LOGCONF().loadFromConf(RHOCONF());
     if (szLogPort != NULL) {
         LOGCONF().setLogPort(szLogPort);
@@ -272,6 +272,12 @@ void rho_logconf_Init(const char* szRootPath, const char* szLogPort){
     else {
         LOGCONF().setLogPort("");
     }
+        
+}
+    
+    
+void rho_logconf_Init(const char* szRootPath, const char* szLogPort){
+    rho_logconf_Init_with_separate_user_path(szRootPath, szLogPort, szRootPath);
 }
 
 char* rho_logconf_getText() {

data/platform/shared/logging/RhoLogConf.h

@@ -145,6 +145,7 @@ extern "C"{
 #endif //__cplusplus
 
 void rho_logconf_Init(const char* szRootPath, const char* szLogPort);
+void rho_logconf_Init_with_separate_user_path(const char* szRootPath, const char* szLogPort, const char* szUserPath);
 
 char* rho_logconf_getText();
 int   rho_logconf_getTextPos();

data/platform/shared/net/HttpServer.cpp

@@ -275,11 +275,23 @@ static VALUE create_request_hash(String const &application, String const &model,
     return hash;
 }
 
+CHttpServer::CHttpServer(int port, String const &root, String const &user_root)
+    :m_active(false), m_port(port), verbose(true)
+{
+    m_root = CFilePath::normalizePath(root);
+    m_strRhoRoot = m_root.substr(0, m_root.length()-5);
+    m_userroot = CFilePath::normalizePath(user_root);
+    m_strRhoUserRoot = m_userroot;
+}
+    
 CHttpServer::CHttpServer(int port, String const &root)
     :m_active(false), m_port(port), verbose(true)
 {
     m_root = CFilePath::normalizePath(root);
     m_strRhoRoot = m_root.substr(0, m_root.length()-5);
+    m_userroot = CFilePath::normalizePath(root);
+    m_strRhoUserRoot = m_root.substr(0, m_root.length()-5);
+        
 }
 
 CHttpServer::~CHttpServer()
@@ -959,8 +971,8 @@ bool CHttpServer::send_file(String const &path, HeaderList const &hdrs)
     String fullPath = CFilePath::normalizePath(path);
 
     if (String_startsWith(fullPath,"/app/db/db-files") )
-        fullPath = CFilePath::join( RHODESAPP().getRhoRootPath(), path.substr(4) );
-    else if (fullPath.find(m_root) != 0 && fullPath.find(m_strRhoRoot) != 0)
+        fullPath = CFilePath::join( RHODESAPP().getRhoUserPath(), path.substr(4) );
+    else if (fullPath.find(m_root) != 0 && fullPath.find(m_strRhoRoot) != 0 && fullPath.find(m_strRhoUserRoot) != 0)
         fullPath = CFilePath::join( m_root, path );
 	
     if (verbose) RAWTRACE1("Sending file %s...", fullPath.c_str());
@@ -987,7 +999,7 @@ bool CHttpServer::send_file(String const &path, HeaderList const &hdrs)
 
 #endif
 
-    if ( bCheckExist && (stat(fullPath.c_str(), &st) != 0 || !S_ISREG(st.st_mode))) {
+     if ( bCheckExist && (stat(fullPath.c_str(), &st) != 0 || !S_ISREG(st.st_mode))) {
         RAWLOG_ERROR1("The file %s was not found", path.c_str());
         String error = "<html><font size=\"+4\"><h2>404 Not Found.</h2> The file " + path + " was not found.</font></html>";
         send_response(create_response("404 Not Found",error));

data/platform/shared/net/HttpServer.h

@@ -94,6 +94,7 @@ public:
     
 public:
     CHttpServer(int port, String const &root);
+    CHttpServer(int port, String const &root, String const &user_root);
     ~CHttpServer();
     
     void register_uri(String const &uri, callback_t const &callback);
@@ -139,7 +140,7 @@ private:
 private:
     bool m_active;
     int m_port;
-    String m_root, m_strRhoRoot;
+    String m_root, m_userroot, m_strRhoRoot, m_strRhoUserRoot;
     SOCKET m_listener;
     SOCKET m_sock;
     std::map<String, callback_t> m_registered;

data/platform/shared/qt/curl/curl.pro

@@ -11,7 +11,7 @@ INCLUDEPATH += ../..\
 macx {
   DESTDIR = ../../../osx/bin/curl
   OBJECTS_DIR = ../../../osx/bin/curl/tmp
-  DEFINES += USE_RHOSSL
+  DEFINES += USE_SSLEAY USE_OPENSSL # USE_RHOSSL
   HEADERS += ../../curl/lib/config-mac.h
 SOURCES += ../../curl/lib/http_ntlm.c\
 ../../curl/lib/qssl.c\

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

@@ -101,13 +101,13 @@ private:
 private:
     Ui::QtMainWindow *ui;
     QWebInspector *main_webInspector;
+    QtWebInspector* webInspectorWindow;
     IMainWindowCallback* cb;
     std::vector<QWebView*> tabViews;
     std::vector<QWebInspector*> tabInspect;
     QWebView* main_webView;
     QWebInspector* cur_webInspector;
     QTabBarRuntimeParams* cur_tbrp;
-    QtWebInspector* webInspectorWindow;
     QMessageBox *m_alertDialog;
     //TODO: CSyncStatusDlg *m_SyncStatusDlg;
     int m_LogicalDpiX;

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

@@ -53,8 +53,8 @@ bool CMainWindow::mainWindowClosed = false;
 CMainWindow::CMainWindow():
     QObject(),
     m_started(true),
-    qtApplication(NULL),
-    qtMainWindow(NULL)
+    qtMainWindow(NULL),
+    qtApplication(NULL)
     //TODO: m_logView
 {
 }

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

@@ -149,6 +149,7 @@ int main(int argc, char *argv[])
     if ( m_strRhodesPath.length() > 0 )
         RHOSIMCONF().setString("rhodes_path", m_strRhodesPath, false );
     RHOCONF().setString( "rhosim_platform", RHOSIMCONF().getString( "platform"), false);
+    RHOCONF().setString( "app_version", RHOSIMCONF().getString( "app_version"), false);
     RHOSIMCONF().setString( "ext_path", RHOSIMCONF().getString( "ext_path") + CFilePath::join( m_strRhodesPath, "/lib/extensions/debugger;"), false);
     RHOSIMCONF().setString( "ext_path", RHOSIMCONF().getString( "ext_path") + CFilePath::join( m_strRhodesPath, "/lib/extensions/uri;"), false);
     RHOSIMCONF().setString( "ext_path", RHOSIMCONF().getString( "ext_path") + CFilePath::join( m_strRhodesPath, "/lib/extensions/timeout;"), false);
@@ -184,7 +185,7 @@ int main(int argc, char *argv[])
         setenv("rho_debug_port", RHOSIMCONF().getString("debug_port").c_str(), 1 );
 #endif // OS_WINDOWS
 #endif // RHODES_EMULATOR
-    rho::common::CRhodesApp::Create(m_strRootPath);
+    rho::common::CRhodesApp::Create(m_strRootPath, m_strRootPath);
 
     // Create the main application window
 #ifdef RHODES_EMULATOR

data/platform/shared/ruby/ext/rho/rhoruby.c

@@ -76,6 +76,7 @@ extern void Init_RhoSupport(void);
 extern VALUE require_compiled(VALUE fname, VALUE* result);
 extern VALUE RhoPreparePath(VALUE path);
 extern const char* rho_native_rhopath();
+extern const char* rho_native_rhouserpath();
 //extern void RhoSetCurAppPath(char* path);
 
 static VALUE  framework;

data/platform/shared/ruby/ext/rho/rhosupport.c

@@ -60,6 +60,14 @@ VALUE __rhoGetCurrentDir(void)
     return rb_str_new2(rho_native_rhopath());
 }
 
+VALUE __rhoGetUserDir(void)
+{
+    return rb_str_new2(rho_native_rhouserpath());
+}
+
+
+
+
 #ifdef RHODES_EMULATOR
 VALUE __rhoGetRhodesDir(void)
 {
@@ -570,6 +578,7 @@ void Init_RhoSupport()
     rb_define_global_function("__rhoGetRhodesDir", __rhoGetRhodesDir, 0);
 #endif
 	rb_define_global_function("__rhoGetCurrentDir", __rhoGetCurrentDir, 0);
+	rb_define_global_function("__rhoGetUserDir", __rhoGetUserDir, 0);
 	rb_define_global_function("load", rb_load_compiled, 1);
 	rb_define_global_function("__rhoGetCallbackObject", __rhoGetCallbackObject, 1);
 
@@ -583,9 +592,10 @@ void Init_RhoSupport()
 static void Init_RhoBlobs()
 {
     const char* szBlobPath = rho_rhodesapp_getblobsdirpath();
+    const char* szUserPath = rho_rhodesapp_getuserrootpath();
     RAWLOG_INFO1("Init_RhoBlobs: %s", szBlobPath );
 
-    rho_file_recursive_createdir(szBlobPath, rho_native_rhopath());
+    rho_file_recursive_createdir(szBlobPath, szUserPath);
 }
 
 void rhoRubyLogWithSeverity(int severity, VALUE category, VALUE str) {

data/platform/shared/sync/SyncNotify.cpp

@@ -277,8 +277,7 @@ void CSyncNotify::setSyncNotification(int source_id, CSyncNotification* pNotify
 }
 
 CSyncNotification::CSyncNotification(String strUrl, String strParams, boolean bRemoveAfterFire) : 
-    m_strParams(strParams), m_bRemoveAfterFire(bRemoveAfterFire),
-    m_cCallback(null), m_cCallbackData(null)
+    m_strParams(strParams), m_cCallback(null), m_cCallbackData(null), m_bRemoveAfterFire(bRemoveAfterFire)
 {
     if ( strUrl.length() > 0 )
         m_strUrl = RHODESAPPBASE().canonicalizeRhoUrl(strUrl);

data/platform/shared/sync/SyncNotify.h

@@ -50,7 +50,7 @@ struct CSyncNotification
     void*         m_cCallbackData;
 
     boolean m_bRemoveAfterFire;
-    CSyncNotification(): m_cCallback(0), m_cCallbackData(0){m_bRemoveAfterFire = false;}
+    CSyncNotification(): m_cCallback(0), m_cCallbackData(0), m_bRemoveAfterFire(false){}
 
     CSyncNotification(String strUrl, String strParams, boolean bRemoveAfterFire);
     CSyncNotification(RHOC_CALLBACK callback, void* callback_data, boolean bRemoveAfterFire) : 
@@ -171,4 +171,4 @@ private:
 }
 }
 
-extern "C" void alert_show_status(const char* title, const char* message, const char* szHide);
+extern "C" void alert_show_status(const char* title, const char* message, const char* szHide);

data/platform/shared/sync/SyncThread.cpp

@@ -191,6 +191,32 @@ void CSyncThread::setPollInterval(int nInterval)
 
     CThreadQueue::setPollInterval(nInterval);
 }
+    
+void CSyncThread::stopAll() {
+	LOG(INFO)+"STOP sync";
+	
+	if (CSyncThread::getSyncEngine().isSyncing() )
+	{
+		LOG(INFO)+"STOP sync in progress.";
+
+        {
+            synchronized(getCommandLock());
+        
+            getCommands().clear();
+        }
+        
+		CSyncThread::getSyncEngine().stopSyncByUser();
+        CSyncThread::getInstance()->stopWait();
+        
+        while (!CSyncThread::getInstance()->isWaiting()) {
+            CSyncThread::getInstance()->sleep(100);
+        }
+        
+        while( CDBAdapter::isAnyInsideTransaction() )
+			CSyncThread::getInstance()->sleep(100);
+	}
+}
+
 
 String CSyncThread::CSyncCommand::toString()
 {
@@ -251,18 +277,7 @@ unsigned long rho_sync_doSyncSource(unsigned long nSrcID,int show_status_popup,
 
 void rho_sync_stop()
 {
-	LOG(INFO)+"STOP sync";
-	
-	if (CSyncThread::getSyncEngine().isSyncing() )
-	{
-		LOG(INFO)+"STOP sync in progress.";
-
-		CSyncThread::getSyncEngine().stopSyncByUser();
-        CSyncThread::getInstance()->stopWait();
-
-        while( CDBAdapter::isAnyInsideTransaction() )
-			CSyncThread::getInstance()->sleep(100);
-	}
+	CSyncThread::getInstance()->stopAll();
 }
 
 int  rho_sync_issyncing()

data/platform/shared/sync/SyncThread.h

@@ -141,6 +141,8 @@ public:
     static CSyncEngine& getSyncEngine(){ return m_pInstance->m_oSyncEngine; }
 
 	void setPollInterval(int nInterval);
+    
+    void stopAll();
 
     unsigned long getRetValue();
 private:

data/platform/shared/unzip/unzip.cpp

@@ -3894,9 +3894,10 @@ class TUnzip
   TUnzip(const char *pwd) : uf(0), unzbuf(0), currentfile(-1), czei(-1), password(0) {if (pwd!=0) {password=new char[strlen(pwd)+1]; strcpy(password,pwd);}}
   ~TUnzip() {if (password!=0) delete[] password; password=0; if (unzbuf!=0) delete[] unzbuf; unzbuf=0;}
 
-  unzFile uf; int currentfile; ZIPENTRY cze; int czei;
-  char *password;
+  unzFile uf;
   char *unzbuf;            // lazily created and destroyed, used by Unzip
+  int currentfile; ZIPENTRY cze; int czei;
+  char *password;
   TCHAR rootdir[MAX_PATH]; // includes a trailing slash
 
   ZRESULT Open(void *z,unsigned int len,DWORD flags);

data/platform/win32/RhoSimulator/Microsoft.VC80.CRT.manifest

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
+    <noInheritable></noInheritable>
+    <assemblyIdentity type="win32" name="Microsoft.VC80.CRT" version="8.0.50727.6195" processorArchitecture="x86" publicKeyToken="1fc8b3b9a1e18e3b"></assemblyIdentity>
+    <file name="msvcr80.dll" hash="4be3fcf046c4941d7b439da6eb642431b5ff497a" hashalg="SHA1"><asmv2:hash xmlns:asmv2="urn:schemas-microsoft-com:asm.v2" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#"><dsig:Transforms><dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity"></dsig:Transform></dsig:Transforms><dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"></dsig:DigestMethod><dsig:DigestValue>Q4Uf5GRMCh6zH+gPQnd38fABXvo=</dsig:DigestValue></asmv2:hash></file>
+    <file name="msvcp80.dll" hash="f96d6d587819a28ad84cd32783968c7f75169a49" hashalg="SHA1"><asmv2:hash xmlns:asmv2="urn:schemas-microsoft-com:asm.v2" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#"><dsig:Transforms><dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity"></dsig:Transform></dsig:Transforms><dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"></dsig:DigestMethod><dsig:DigestValue>lzYUrJYi1eqc3Wj+vOMljRlkCLY=</dsig:DigestValue></asmv2:hash></file>
+    <file name="msvcm80.dll" hash="b8f788f913a88543f10e1b400e9ae3896676c903" hashalg="SHA1"><asmv2:hash xmlns:asmv2="urn:schemas-microsoft-com:asm.v2" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#"><dsig:Transforms><dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity"></dsig:Transform></dsig:Transforms><dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"></dsig:DigestMethod><dsig:DigestValue>BMaQ6zIuI2qb7Sk3oEQwxv2jsT0=</dsig:DigestValue></asmv2:hash></file>
+</assembly>

data/platform/win32/RhoSimulator/Microsoft.VC80.OpenMP.manifest

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<!-- Copyright © 1981-2001 Microsoft Corporation -->
+<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
+    <noInheritable/>
+    <assemblyIdentity type="win32" name="Microsoft.VC80.OpenMP" version="8.0.50727.6195" processorArchitecture="x86" publicKeyToken="1fc8b3b9a1e18e3b"/>
+    <file name="vcomp.dll" hash="278ed8d9109deaf37b7430b928f9b0aa956b3d4d" hashalg="SHA1"/>
+</assembly>

data/platform/wm/build/rhodes.nsi

@@ -0,0 +1,316 @@
+;======================================================
+; Include
+ 
+  !include "MUI.nsh"
+  !include "LogicLib.nsh"
+ 
+;======================================================
+; Installer Information
+ 
+  Name %APPNAME% #"Rhodes Installer"
+  OutFile "RhodesBundle.exe"
+  InstallDir %APPINSTALLDIR% #C:\Rhodes
+  BrandingText " "
+
+;======================================================
+; Modern Interface Configuration
+ 
+  !define MUI_ICON %APPICON% #"icon.ico" 
+  !define MUI_UNICON %APPICON% #"icon.ico"     
+  !define MUI_HEADERIMAGE
+  !define MUI_ABORTWARNING
+  !define MUI_COMPONENTSPAGE_SMALLDESC
+  !define MUI_HEADERIMAGE_BITMAP_NOSTRETCH
+  !define MUI_FINISHPAGE_SHOWREADME $INSTDIR\README.html
+  !define MUI_FINISHPAGE
+  !define MUI_FINISHPAGE_TEXT %FINISHPAGE_TEXT% #"Thank you for installing Rhodes, Rhoconnect and RhoStudio. \r\n\n\n"
+  
+;======================================================
+; Pages
+ 
+  !insertmacro MUI_PAGE_WELCOME
+  !insertmacro MUI_PAGE_COMPONENTS
+  !insertmacro MUI_PAGE_DIRECTORY
+  !insertmacro MUI_PAGE_INSTFILES
+  #Page custom customerConfig
+  !insertmacro MUI_PAGE_FINISH
+ 
+;======================================================
+; Languages
+ 
+  !insertmacro MUI_LANGUAGE "English"
+ 
+;======================================================
+; Reserve Files 
+
+;======================================================
+; Sections
+
+# start default section
+section
+     
+    # set the installation directory as the destination for the following actions
+    setOutPath $INSTDIR
+ 
+    # create the uninstaller
+    writeUninstaller "$INSTDIR\uninstall.exe"
+ 
+    SetOutPath %SMPROGDIR% #"$SMPROGRAMS\RhoStudio"
+    
+    # create a shortcut named "new shortcut" in the start menu programs directory
+    # point the new shortcut at the program uninstaller
+    createShortCut %SCAPPPATH% %APPEXEPATH% #"$INSTDIR\app.exe"
+    createShortCut %SCUNISTALLPATH% "$INSTDIR\uninstall.exe" #"$SMPROGRAMS\RhoStudio\Uninstall RhoStudio.lnk" "$INSTDIR\uninstall.exe"
+
+    # added information in 'unistall programs' in contorol panel
+    #WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\RhoStudio" \
+    #             "DisplayName" "RhoStudio - RAD tool for develop and debug rhodes/rhoconnect applications"
+    #WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\RhoStudio" \
+    #             "UninstallString" "$\"$INSTDIR\uninstall.exe$\""
+    #WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\RhoStudio" \
+    #             "DisplayIcon" "$\"$INSTDIR\uninstall.exe$\""
+    
+sectionEnd
+ 
+# uninstaller section start
+section "uninstall"
+ 
+    # first, delete the uninstaller
+    delete "$INSTDIR\uninstall.exe"
+ 
+    # second, remove the link from the start menu    
+    delete %SCUNISTALLPATH% #"$SMPROGRAMS\RhoStudio\Uninstall RhoStudio.lnk"
+    delete %SCAPPPATH% #"$SMPROGRAMS\RhoStudio\RhoStudio.lnk"
+    delete %SMPROGDIR% #"$SMPROGRAMS\RhoStudio"
+
+    # remove $INSTDIR
+    RMDir /r /REBOOTOK $INSTDIR
+
+# uninstaller section end
+sectionEnd
+
+
+Section %SECTION_NAME% appSection #"Rhodes" appSection
+ 
+  SetOutPath $INSTDIR
+ 
+  File /r "rho"
+  File %APP_EXECUTABLE% #"rhodes-system-api-samples.exe"
+
+SectionEnd
+
+;======================================================
+;Descriptions
+ 
+  ;Language strings
+  LangString DESC_InstallApp ${LANG_ENGLISH} %SECTOIN_TITLE% #"This installs Eclipse with RhoStudio."
+  
+  ;Assign language strings to sections
+  
+  !insertmacro MUI_FUNCTION_DESCRIPTION_BEGIN
+  !insertmacro MUI_DESCRIPTION_TEXT ${appSection} $(DESC_InstallApp)
+  !insertmacro MUI_FUNCTION_DESCRIPTION_END
+
+;======================================================
+;Functions
+ 
+
+Function FixScriptFilesInDir
+Exch $R0 #path
+Exch
+Exch $R1 #filter
+Exch
+Exch 2
+Exch $R2 #output file
+Exch 2
+Push $R3
+Push $R4
+Push $R5
+Push $R6
+ ClearErrors
+ FindFirst $R3 $R4 "$R0\$R1"
+  FileOpen $R5 $R2 w
+
+ Push $INSTDIR
+ Push "\"
+ Call StrSlash
+ Pop $R6 
+
+ Loop:
+ IfErrors Done
+  StrCmp $R4 "." gotoNextFile
+  StrCmp $R4 ".." gotoNextFile
+
+  ;replace package folder with INSTDIR
+  Push C:/dev/rhodesinstaller
+  Push $R6
+  Push all
+  Push all
+  Push "$R0\$R4"
+  Call AdvReplaceInFile
+  FileWrite $R5 "$R0\$R4$\r$\n"
+  FindNext $R3 $R4
+  Goto Loop
+
+ gotoNextFile:
+  FindNext $R3 $R4
+  Goto Loop
+
+ Done:
+  FileClose $R5
+ FindClose $R3
+Pop $R6
+Pop $R5
+Pop $R4
+Pop $R3
+Pop $R2
+Pop $R1
+Pop $R0
+FunctionEnd
+
+
+
+Function AdvReplaceInFile
+Exch $0 ;file to replace in
+Exch
+Exch $1 ;number to replace after
+Exch
+Exch 2
+Exch $2 ;replace and onwards
+Exch 2
+Exch 3
+Exch $3 ;replace with
+Exch 3
+Exch 4
+Exch $4 ;to replace
+Exch 4
+Push $5 ;minus count
+Push $6 ;universal
+Push $7 ;end string
+Push $8 ;left string
+Push $9 ;right string
+Push $R0 ;file1
+Push $R1 ;file2
+Push $R2 ;read
+Push $R3 ;universal
+Push $R4 ;count (onwards)
+Push $R5 ;count (after)
+Push $R6 ;temp file name
+ 
+  GetTempFileName $R6
+  FileOpen $R1 $0 r ;file to search in
+  FileOpen $R0 $R6 w ;temp file
+   StrLen $R3 $4
+   StrCpy $R4 -1
+   StrCpy $R5 -1
+ 
+loop_read:
+ ClearErrors
+ FileRead $R1 $R2 ;read line
+ IfErrors exit
+ 
+   StrCpy $5 0
+   StrCpy $7 $R2
+ 
+loop_filter:
+   IntOp $5 $5 - 1
+   StrCpy $6 $7 $R3 $5 ;search
+   StrCmp $6 "" file_write2
+   StrCmp $6 $4 0 loop_filter
+ 
+StrCpy $8 $7 $5 ;left part
+IntOp $6 $5 + $R3
+IntCmp $6 0 is0 not0
+is0:
+StrCpy $9 ""
+Goto done
+not0:
+StrCpy $9 $7 "" $6 ;right part
+done:
+StrCpy $7 $8$3$9 ;re-join
+ 
+IntOp $R4 $R4 + 1
+StrCmp $2 all file_write1
+StrCmp $R4 $2 0 file_write2
+IntOp $R4 $R4 - 1
+ 
+IntOp $R5 $R5 + 1
+StrCmp $1 all file_write1
+StrCmp $R5 $1 0 file_write1
+IntOp $R5 $R5 - 1
+Goto file_write2
+ 
+file_write1:
+ FileWrite $R0 $7 ;write modified line
+Goto loop_read
+ 
+file_write2:
+ FileWrite $R0 $R2 ;write unmodified line
+Goto loop_read
+ 
+exit:
+  FileClose $R0
+  FileClose $R1
+ 
+   SetDetailsPrint none
+  Delete $0
+  Rename $R6 $0
+  Delete $R6
+   SetDetailsPrint both
+ 
+Pop $R6
+Pop $R5
+Pop $R4
+Pop $R3
+Pop $R2
+Pop $R1
+Pop $R0
+Pop $9   
+Pop $8
+Pop $7
+Pop $6
+Pop $5
+Pop $0
+Pop $1
+Pop $2
+Pop $3
+Pop $4
+FunctionEnd 
+
+
+; Push $filenamestring (e.g. 'c:\this\and\that\filename.htm')
+; Push "\"
+; Call StrSlash
+; Pop $R0
+; ;Now $R0 contains 'c:/this/and/that/filename.htm'
+Function StrSlash
+  Exch $R3 ; $R3 = needle ("\" or "/")
+  Exch
+  Exch $R1 ; $R1 = String to replacement in (haystack)
+  Push $R2 ; Replaced haystack
+  Push $R4 ; $R4 = not $R3 ("/" or "\")
+  Push $R6
+  Push $R7 ; Scratch reg
+  StrCpy $R2 ""
+  StrLen $R6 $R1
+  StrCpy $R4 "\"
+  StrCmp $R3 "/" loop
+  StrCpy $R4 "/"  
+loop:
+  StrCpy $R7 $R1 1
+  StrCpy $R1 $R1 $R6 1
+  StrCmp $R7 $R3 found
+  StrCpy $R2 "$R2$R7"
+  StrCmp $R1 "" done loop
+found:
+  StrCpy $R2 "$R2$R4"
+  StrCmp $R1 "" done loop
+done:
+  StrCpy $R3 $R2
+  Pop $R7
+  Pop $R6
+  Pop $R4
+  Pop $R2
+  Pop $R1
+  Exch $R3
+FunctionEnd