rhodes 3.3.5 → 3.4.2

data/platform/shared/unzip/zip.h

@@ -0,0 +1,255 @@
+#if defined(WIN32) || defined(_WIN32_WCE)
+#else
+#define ZIP_STD
+
+#endif
+
+#ifdef ZIP_STD
+#include <stdio.h>
+#include <stdlib.h>
+#include <stdarg.h>
+#include <time.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <memory.h>
+#include <string.h>
+#include <ctype.h>
+
+// # i n c l u d e "zip.h"
+//
+typedef unsigned short WORD;
+#define _tcslen strlen
+#define _tcsicmp stricmp
+#define _tcsncpy strncpy
+#define _tcsstr strstr
+#define INVALID_HANDLE_VALUE 0
+#ifndef _T
+#define _T(s) s
+#endif
+#ifndef S_IWUSR
+#define S_IWUSR 0000200
+#define S_ISDIR(m) (((m) & _S_IFMT) == _S_IFDIR)
+#define S_ISREG(m) (((m) & _S_IFMT) == _S_IFREG)
+#endif
+
+//
+#else
+#include <windows.h>
+#include <tchar.h>
+#include <ctype.h>
+#include <stdio.h>
+// # i n c l u d e "z i p.h"
+#endif
+
+#ifndef _zip_H
+#define _zip_H
+//
+#ifdef ZIP_STD
+#include <time.h>
+#define DECLARE_HANDLE(name) struct name##__ { int unused; }; typedef struct name##__ *name
+#ifndef MAX_PATH
+#define MAX_PATH 1024
+#endif
+typedef unsigned long DWORD;
+typedef char TCHAR;
+typedef FILE* HANDLE;
+typedef time_t FILETIME;
+#endif
+
+// ZIP functions -- for creating zip files
+// This file is a repackaged form of the Info-Zip source code available
+// at www.info-zip.org. The original copyright notice may be found in
+// zip.cpp. The repackaging was done by Lucian Wischik to simplify and
+// extend its use in Windows/C++. Also to add encryption and unicode.
+
+
+#ifndef _unzip_H
+DECLARE_HANDLE(HZIP);
+#endif
+// An HZIP identifies a zip file that is being created
+
+typedef DWORD ZRESULT;
+// return codes from any of the zip functions. Listed later.
+
+HZIP CreateZip(const TCHAR *fn, const char *password);
+HZIP CreateZip(void *buf,unsigned int len, const char *password);
+HZIP CreateZipHandle(HANDLE h, const char *password);
+// CreateZip - call this to start the creation of a zip file.
+// As the zip is being created, it will be stored somewhere:
+// to a pipe:              CreateZipHandle(hpipe_write);
+// in a file (by handle):  CreateZipHandle(hfile);
+// in a file (by name):    CreateZip("c:\\test.zip");
+// in memory:              CreateZip(buf, len);
+// or in pagefile memory:  CreateZip(0, len);
+// The final case stores it in memory backed by the system paging file,
+// where the zip may not exceed len bytes. This is a bit friendlier than
+// allocating memory with new[]: it won't lead to fragmentation, and the
+// memory won't be touched unless needed. That means you can give very
+// large estimates of the maximum-size without too much worry.
+// As for the password, it lets you encrypt every file in the archive.
+// (This api doesn't support per-file encryption.)
+// Note: because pipes don't allow random access, the structure of a zipfile
+// created into a pipe is slightly different from that created into a file
+// or memory. In particular, the compressed-size of the item cannot be
+// stored in the zipfile until after the item itself. (Also, for an item added
+// itself via a pipe, the uncompressed-size might not either be known until
+// after.) This is not normally a problem. But if you try to unzip via a pipe
+// as well, then the unzipper will not know these things about the item until
+// after it has been unzipped. Therefore: for unzippers which don't just write
+// each item to disk or to a pipe, but instead pre-allocate memory space into
+// which to unzip them, then either you have to create the zip not to a pipe,
+// or you have to add items not from a pipe, or at least when adding items
+// from a pipe you have to specify the length.
+// Note: for windows-ce, you cannot close the handle until after CloseZip.
+// but for real windows, the zip makes its own copy of your handle, so you
+// can close yours anytime.
+
+
+ZRESULT ZipAdd(HZIP hz,const TCHAR *dstzn, const TCHAR *fn);
+ZRESULT ZipAdd(HZIP hz,const TCHAR *dstzn, void *src,unsigned int len);
+ZRESULT ZipAddHandle(HZIP hz,const TCHAR *dstzn, HANDLE h);
+ZRESULT ZipAddHandle(HZIP hz,const TCHAR *dstzn, HANDLE h, unsigned int len);
+ZRESULT ZipAddFolder(HZIP hz,const TCHAR *dstzn, const TCHAR *fn);
+// ZipAdd - call this for each file to be added to the zip.
+// dstzn is the name that the file will be stored as in the zip file.
+// The file to be added to the zip can come
+// from a pipe:  ZipAddHandle(hz,"file.dat", hpipe_read);
+// from a file:  ZipAddHandle(hz,"file.dat", hfile);
+// from a filen: ZipAdd(hz,"file.dat", "c:\\docs\\origfile.dat");
+// from memory:  ZipAdd(hz,"subdir\\file.dat", buf,len);
+// (folder):     ZipAddFolder(hz,"subdir");
+// Note: if adding an item from a pipe, and if also creating the zip file itself
+// to a pipe, then you might wish to pass a non-zero length to the ZipAddHandle
+// function. This will let the zipfile store the item's size ahead of the
+// compressed item itself, which in turn makes it easier when unzipping the
+// zipfile from a pipe.
+
+ZRESULT ZipGetMemory(HZIP hz, void **buf, unsigned long *len);
+// ZipGetMemory - If the zip was created in memory, via ZipCreate(0,len),
+// then this function will return information about that memory block.
+// buf will receive a pointer to its start, and len its length.
+// Note: you can't add any more after calling this.
+
+ZRESULT CloseZip(HZIP hz);
+// CloseZip - the zip handle must be closed with this function.
+
+unsigned int FormatZipMessage(ZRESULT code, TCHAR *buf,unsigned int len);
+// FormatZipMessage - given an error code, formats it as a string.
+// It returns the length of the error message. If buf/len points
+// to a real buffer, then it also writes as much as possible into there.
+
+
+
+// These are the result codes:
+#define ZR_OK         0x00000000     // nb. the pseudo-code zr-recent is never returned,
+#define ZR_RECENT     0x00000001     // but can be passed to FormatZipMessage.
+// The following come from general system stuff (e.g. files not openable)
+#define ZR_GENMASK    0x0000FF00
+#define ZR_NODUPH     0x00000100     // couldn't duplicate the handle
+#define ZR_NOFILE     0x00000200     // couldn't create/open the file
+#define ZR_NOALLOC    0x00000300     // failed to allocate some resource
+#define ZR_WRITE      0x00000400     // a general error writing to the file
+#define ZR_NOTFOUND   0x00000500     // couldn't find that file in the zip
+#define ZR_MORE       0x00000600     // there's still more data to be unzipped
+#define ZR_CORRUPT    0x00000700     // the zipfile is corrupt or not a zipfile
+#define ZR_READ       0x00000800     // a general error reading the file
+// The following come from mistakes on the part of the caller
+#define ZR_CALLERMASK 0x00FF0000
+#define ZR_ARGS       0x00010000     // general mistake with the arguments
+#define ZR_NOTMMAP    0x00020000     // tried to ZipGetMemory, but that only works on mmap zipfiles, which yours wasn't
+#define ZR_MEMSIZE    0x00030000     // the memory size is too small
+#define ZR_FAILED     0x00040000     // the thing was already failed when you called this function
+#define ZR_ENDED      0x00050000     // the zip creation has already been closed
+#define ZR_MISSIZE    0x00060000     // the indicated input file size turned out mistaken
+#define ZR_PARTIALUNZ 0x00070000     // the file had already been partially unzipped
+#define ZR_ZMODE      0x00080000     // tried to mix creating/opening a zip 
+// The following come from bugs within the zip library itself
+#define ZR_BUGMASK    0xFF000000
+#define ZR_NOTINITED  0x01000000     // initialisation didn't work
+#define ZR_SEEK       0x02000000     // trying to seek in an unseekable file
+#define ZR_NOCHANGE   0x04000000     // changed its mind on storage, but not allowed
+#define ZR_FLATE      0x05000000     // an internal error in the de/inflation code
+
+
+
+
+
+
+// e.g.
+//
+// (1) Traditional use, creating a zipfile from existing files
+//     HZIP hz = CreateZip("c:\\simple1.zip",0);
+//     ZipAdd(hz,"znsimple.bmp", "c:\\simple.bmp");
+//     ZipAdd(hz,"znsimple.txt", "c:\\simple.txt");
+//     CloseZip(hz);
+//
+// (2) Memory use, creating an auto-allocated mem-based zip file from various sources
+//     HZIP hz = CreateZip(0,100000, 0);
+//     // adding a conventional file...
+//     ZipAdd(hz,"src1.txt",  "c:\\src1.txt");
+//     // adding something from memory...
+//     char buf[1000]; for (int i=0; i<1000; i++) buf[i]=(char)(i&0x7F);
+//     ZipAdd(hz,"file.dat",  buf,1000);
+//     // adding something from a pipe...
+//     HANDLE hread,hwrite; CreatePipe(&hread,&hwrite,NULL,0);
+//     HANDLE hthread = CreateThread(0,0,ThreadFunc,(void*)hwrite,0,0);
+//     ZipAdd(hz,"unz3.dat",  hread,1000);  // the '1000' is optional.
+//     WaitForSingleObject(hthread,INFINITE);
+//     CloseHandle(hthread); CloseHandle(hread);
+//     ... meanwhile DWORD WINAPI ThreadFunc(void *dat)
+//                   { HANDLE hwrite = (HANDLE)dat;
+//                     char buf[1000]={17};
+//                     DWORD writ; WriteFile(hwrite,buf,1000,&writ,NULL);
+//                     CloseHandle(hwrite);
+//                     return 0;
+//                   }
+//     // and now that the zip is created, let's do something with it:
+//     void *zbuf; unsigned long zlen; ZipGetMemory(hz,&zbuf,&zlen);
+//     HANDLE hfz = CreateFile("test2.zip",GENERIC_WRITE,0,0,CREATE_ALWAYS,FILE_ATTRIBUTE_NORMAL,0);
+//     DWORD writ; WriteFile(hfz,zbuf,zlen,&writ,NULL);
+//     CloseHandle(hfz);
+//     CloseZip(hz);
+//
+// (3) Handle use, for file handles and pipes
+//     HANDLE hzread,hzwrite; CreatePipe(&hzread,&hzwrite,0,0);
+//     HANDLE hthread = CreateThread(0,0,ZipReceiverThread,(void*)hzread,0,0);
+//     HZIP hz = CreateZipHandle(hzwrite,0);
+//     // ... add to it
+//     CloseZip(hz);
+//     CloseHandle(hzwrite);
+//     WaitForSingleObject(hthread,INFINITE);
+//     CloseHandle(hthread);
+//     ... meanwhile DWORD WINAPI ZipReceiverThread(void *dat)
+//                   { HANDLE hread = (HANDLE)dat;
+//                     char buf[1000];
+//                     while (true)
+//                     { DWORD red; ReadFile(hread,buf,1000,&red,NULL);
+//                       // ... and do something with this zip data we're receiving
+//                       if (red==0) break;
+//                     }
+//                     CloseHandle(hread);
+//                     return 0;
+//                   }
+
+
+
+// Now we indulge in a little skullduggery so that the code works whether
+// the user has included just zip or both zip and unzip.
+// Idea: if header files for both zip and unzip are present, then presumably
+// the cpp files for zip and unzip are both present, so we will call
+// one or the other of them based on a dynamic choice. If the header file
+// for only one is present, then we will bind to that particular one.
+ZRESULT CloseZipZ(HZIP hz);
+unsigned int FormatZipMessageZ(ZRESULT code, char *buf,unsigned int len);
+bool IsZipHandleZ(HZIP hz);
+#ifdef _unzip_H
+#undef CloseZip
+#define CloseZip(hz) (IsZipHandleZ(hz)?CloseZipZ(hz):CloseZipU(hz))
+#else
+#define CloseZip CloseZipZ
+#define FormatZipMessage FormatZipMessageZ
+#endif
+
+
+
+#endif

data/platform/win32/RubyWin/RubyWin.sln

@@ -1,6 +1,6 @@
 
-Microsoft Visual Studio Solution File, Format Version 9.00
-# Visual Studio 2005
+Microsoft Visual Studio Solution File, Format Version 10.00
+# Visual Studio 2008
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "RubyWin", "RubyWin.vcproj", "{03398AE0-9A56-4B08-B089-0BF5396983C1}"
 	ProjectSection(ProjectDependencies) = postProject
 		{AA77BEC0-2A60-4589-A784-7D78F60B35B6} = {AA77BEC0-2A60-4589-A784-7D78F60B35B6}

data/platform/win32/RubyWin/RubyWin.vcproj

@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="windows-1251"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="8.00"
+	Version="9.00"
 	Name="RubyWin"
 	ProjectGUID="{03398AE0-9A56-4B08-B089-0BF5396983C1}"
 	RootNamespace="RubyWin"
 	Keyword="Win32Proj"
+	TargetFrameworkVersion="131072"
 	>
 	<Platforms>
 		<Platform
@@ -66,6 +67,8 @@
 				LinkIncremental="2"
 				GenerateDebugInformation="true"
 				SubSystem="1"
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="0"
 				TargetMachine="1"
 			/>
 			<Tool
@@ -86,9 +89,6 @@
 			<Tool
 				Name="VCAppVerifierTool"
 			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
 			<Tool
 				Name="VCPostBuildEventTool"
 			/>
@@ -144,6 +144,8 @@
 				SubSystem="1"
 				OptimizeReferences="2"
 				EnableCOMDATFolding="2"
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="0"
 				TargetMachine="1"
 			/>
 			<Tool
@@ -164,9 +166,6 @@
 			<Tool
 				Name="VCAppVerifierTool"
 			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
 			<Tool
 				Name="VCPostBuildEventTool"
 			/>

data/platform/wm/RhoLib/RhoLib.vcproj

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="windows-1251"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="9,00"
+	Version="9.00"
 	Name="RhoLib"
 	ProjectGUID="{F196A418-11F1-4067-9F4F-BCC7D70E6EC5}"
 	RootNamespace="RhoLib"
@@ -145,9 +145,10 @@
 				Name="VCCLCompilerTool"
 				Optimization="0"
 				AdditionalIncludeDirectories="../../shared/ruby;../../shared"
-				PreprocessorDefinitions="_DEBUG;DEBUG;WIN32;_WINDOWS"
+				PreprocessorDefinitions="_DEBUG;DEBUG;WIN32;_WINDOWS;RHODES_WIN32"
 				MinimalRebuild="true"
 				RuntimeLibrary="1"
+				TreatWChar_tAsBuiltInType="false"
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
 				DebugInformationFormat="3"
@@ -688,8 +689,9 @@
 				Name="VCCLCompilerTool"
 				Optimization="2"
 				AdditionalIncludeDirectories="../../shared/ruby;../../shared"
-				PreprocessorDefinitions="_NDEBUG;NDEBUG;WIN32;_WINDOWS"
+				PreprocessorDefinitions="_NDEBUG;NDEBUG;WIN32;_WINDOWS;RHODES_WIN32"
 				RuntimeLibrary="0"
+				TreatWChar_tAsBuiltInType="false"
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
 				DebugInformationFormat="3"
@@ -2840,6 +2842,22 @@
 					>
 				</File>
 			</Filter>
+			<Filter
+				Name="push"
+				>
+				<File
+					RelativePath="..\..\shared\common\push\IRhoPushClient.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\shared\common\push\RhoPushManager.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\shared\common\push\RhoPushManager.cpp"
+					>
+				</File>
+			</Filter>
 		</Filter>
 		<Filter
 			Name="logging"
@@ -2964,6 +2982,10 @@
 				RelativePath="..\..\shared\rubyext\System.cpp"
 				>
 			</File>
+			<File
+				RelativePath="..\..\shared\rubyext\ZipFiles.cpp"
+				>
+			</File>
 			<File
 				RelativePath="..\..\shared\rubyext\WebView.h"
 				>
@@ -2980,6 +3002,14 @@
 				RelativePath="..\..\shared\unzip\unzip.h"
 				>
 			</File>
+			<File
+				RelativePath="..\..\shared\unzip\zip.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\shared\unzip\zip.h"
+				>
+			</File>
 		</Filter>
 	</Files>
 	<Globals>

data/platform/wm/build/rhodes.nsi

@@ -7,28 +7,29 @@
 ;======================================================
 ; Installer Information
  
-  Name %APPNAME% #"Rhodes Installer"
-  OutFile "RhodesBundle.exe"
-  InstallDir %APPINSTALLDIR% #C:\Rhodes
+  Name %APPNAME%
+  OutFile "%OUTPUTFILE%"
+  InstallDir %APPINSTALLDIR%
   BrandingText " "
 
 ;======================================================
 ; Modern Interface Configuration
  
-  !define MUI_ICON %APPICON% #"icon.ico" 
-  !define MUI_UNICON %APPICON% #"icon.ico"     
+  !define MUI_ICON %APPICON%
+  !define MUI_UNICON %APPICON%
   !define MUI_HEADERIMAGE
   !define MUI_ABORTWARNING
   !define MUI_COMPONENTSPAGE_SMALLDESC
   !define MUI_HEADERIMAGE_BITMAP_NOSTRETCH
-  !define MUI_FINISHPAGE_SHOWREADME $INSTDIR\README.html
+  %README_PRESENT%!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"
+  !define MUI_FINISHPAGE_TEXT %FINISHPAGE_TEXT%
   
 ;======================================================
 ; Pages
  
   !insertmacro MUI_PAGE_WELCOME
+  %LICENSE_PRESENT%!insertmacro MUI_PAGE_LICENSE "LICENSE.txt"
   !insertmacro MUI_PAGE_COMPONENTS
   !insertmacro MUI_PAGE_DIRECTORY
   !insertmacro MUI_PAGE_INSTFILES
@@ -46,56 +47,90 @@
 ;======================================================
 ; Sections
 
+RequestExecutionLevel admin #NOTE: You still need to check user rights with UserInfo!
+
 # start default section
 section
-     
+    SetShellVarContext all
+
     # 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"
+    SetOutPath "$SMPROGRAMS\%GROUP_NAME%"
+
+    # create shortcuts
+    createShortCut "$SMPROGRAMS\%GROUP_NAME%\%APPNAME%.lnk" "$INSTDIR\%APP_EXECUTABLE%"
+    createShortCut "$SMPROGRAMS\%GROUP_NAME%\Uninstall %APPNAME%.lnk" "$INSTDIR\uninstall.exe"
+    createShortCut "$DESKTOP\%APPNAME%.lnk" "$INSTDIR\%APP_EXECUTABLE%" "" "$INSTDIR\icon.ico" 0
 
     # 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$\""
-    
+    WriteRegStr HKCU "Software\Microsoft\Windows\CurrentVersion\Uninstall\%APPNAME%" \
+                 "DisplayName" "%APPNAME% %APPVERSION%"
+    WriteRegStr HKCU "Software\Microsoft\Windows\CurrentVersion\Uninstall\%APPNAME%" \
+                 "UninstallString" "$\"$INSTDIR\uninstall.exe$\""
+    WriteRegStr HKCU "Software\Microsoft\Windows\CurrentVersion\Uninstall\%APPNAME%" \
+                 "DisplayIcon" "$\"$INSTDIR\uninstall.exe$\""
+    WriteRegStr HKCU "Software\Microsoft\Windows\CurrentVersion\Uninstall\%APPNAME%" \
+                 "Publisher" "%GROUP_NAME%"
+    WriteRegDWORD HKCU "Software\Microsoft\Windows\CurrentVersion\Uninstall\%APPNAME%" \
+                 "NoModify" 1
+    WriteRegDWORD HKCU "Software\Microsoft\Windows\CurrentVersion\Uninstall\%APPNAME%" \
+                 "NoRepair" 1
+
+    # update installed rhodes applications catalogue
+    #WriteRegStr HKCU "Software\Rhomobile\%APPNAME%" "" ""
+    WriteRegStr HKCU "Software\%VENDOR%\%APPNAME%" "InstallDir" "$INSTDIR"
+    WriteRegStr HKCU "Software\%VENDOR%\%APPNAME%" "Executable" "$INSTDIR\%APP_EXECUTABLE%"
+    WriteRegStr HKCU "Software\%VENDOR%\%APPNAME%" "Uninstaller" "$INSTDIR\uninstall.exe"
+    WriteRegStr HKCU "Software\%VENDOR%\%APPNAME%" "DisplayName" "%APPNAME% %APPVERSION%"
+
 sectionEnd
  
 # uninstaller section start
 section "uninstall"
- 
+    SetShellVarContext all
+
+    # confirmation dialog
+    MessageBox MB_YESNO|MB_ICONQUESTION "Do you want to uninstall %APPNAME%?" IDNO NoUninstallLabel
+
     # 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"
+    delete "$SMPROGRAMS\%GROUP_NAME%\%APPNAME%.lnk"
+    delete "$SMPROGRAMS\%GROUP_NAME%\Uninstall %APPNAME%.lnk"
+    delete "$DESKTOP\%APPNAME%.lnk"
+    RMDir "$SMPROGRAMS\%GROUP_NAME%"
+
+    # remove information in 'unistall programs' in contorol panel
+    DeleteRegKey HKCU "Software\Microsoft\Windows\CurrentVersion\Uninstall\%APPNAME%"
+
+    # remove app from installed rhodes applications catalogue
+    DeleteRegKey HKCU "Software\Rhomobile\%APPNAME%"
 
     # remove $INSTDIR
     RMDir /r /REBOOTOK $INSTDIR
 
+    NoUninstallLabel:
+
 # uninstaller section end
 sectionEnd
 
 
-Section %SECTION_NAME% appSection #"Rhodes" appSection
- 
+Section %SECTION_NAME% appSection
   SetOutPath $INSTDIR
  
+  %LICENSE_FILE%
+  %README_FILE%
   File /r "rho"
-  File %APP_EXECUTABLE% #"rhodes-system-api-samples.exe"
+  File %APP_EXECUTABLE%
+  File *.dll
+  File *.manifest
+  File /r "imageformats"
+  File "icon.ico"
 
 SectionEnd
 
@@ -103,7 +138,7 @@ SectionEnd
 ;Descriptions
  
   ;Language strings
-  LangString DESC_InstallApp ${LANG_ENGLISH} %SECTOIN_TITLE% #"This installs Eclipse with RhoStudio."
+  LangString DESC_InstallApp ${LANG_ENGLISH} %SECTOIN_TITLE%
   
   ;Assign language strings to sections
   
@@ -113,204 +148,3 @@ SectionEnd
 
 ;======================================================
 ;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