[[ LC 6.7.7 RC 2 ]] Merge release-6.7.7 into develop-7.0

livecodesebastien · livecodesebastien · commit 0831a1d0685b · 2015-07-28T16:50:46.000+01:00
diff --git a/builder/server_builder.livecodescript b/builder/server_builder.livecodescript
@@ -103,7 +103,9 @@ command serverBuilderRun pPlatform, pEdition
          end if
       end repeat
       
-      repeat for each word tDriver in "dbsqlite dbmysql dbpostgresql dbodbc dboracle"
+      // SN-2015-06-25: [[ ServerBuilder ]] DBoracle has never been in the Server zip.
+      //  Removed to suppress the builder warning
+      repeat for each word tDriver in "dbsqlite dbmysql dbpostgresql dbodbc"
          get tEngineFolder & slash & "server-" & tDriver & tLibExtension
          if there is a file it then
             builderLog "message", "Adding driver '" & tDriver & "'"
diff --git a/docs/notes/bugfix-11569.md b/docs/notes/bugfix-11569.md
@@ -0,0 +1 @@
+#   Scrolling a group crashes LiveCode when hiding scrollbar
diff --git a/docs/notes/bugfix-15590.md b/docs/notes/bugfix-15590.md
@@ -0,0 +1 @@
+#   Crop image within a repeat loop causes crash to desktop after a few iterations
diff --git a/docs/notes/bugfix-15619.md b/docs/notes/bugfix-15619.md
@@ -0,0 +1 @@
+# Opening sqlite on iOS return "revdberror,invalid database type"
diff --git a/docs/notes/bugfix-15625.md b/docs/notes/bugfix-15625.md
@@ -0,0 +1 @@
+# "record sound" is not replacing existing sound file
diff --git a/docs/notes/bugfix-15642.md b/docs/notes/bugfix-15642.md
@@ -0,0 +1 @@
+# revZip fails to open archive in 64-bit iOS
diff --git a/engine/engine.gyp b/engine/engine.gyp
@@ -692,5 +692,40 @@
 				],
 			}
 		],
+		[
+			'OS == "ios"',
+			{
+				'targets':
+				[
+					{
+						'target_name': 'standalone-app-bundle',
+						'product_name': 'Standalone-Community-App',
+			
+						'includes':
+						[
+							'app-bundle-template.gypi',
+						],
+			
+						'variables':
+						{
+							'app_plist': 'rsrc/Standalone-Info.plist',
+						},
+			
+						'dependencies':
+						[
+							'kernel-standalone',
+							'security-community',
+						],
+			
+						'sources':
+						[
+							'src/dummy.cpp',
+						],
+
+						'app_plist': 'rsrc/standalone-mobile-Info.plist',
+					},
+				],
+			},
+		],
 	],
 }
diff --git a/engine/src/control.cpp b/engine/src/control.cpp
@@ -1835,6 +1835,8 @@ Exec_stat MCControl::setsbprop(Properties which, bool p_enable,
 			}
 			else
 			{
+				// PM-2015-07-16: [[ Bug 11569 ]] Unset CS_HSCROLL when the hscrollBar of a control is set to false
+			    state &= ~CS_HSCROLL;
 				delete hsb;
 				hsb = NULL;
 				if (opened)
@@ -1876,6 +1878,8 @@ Exec_stat MCControl::setsbprop(Properties which, bool p_enable,
 			}
 			else
 			{
+				// PM-2015-07-16: [[ Bug 11569 ]] Unset CS_VSCROLL when the vscrollBar of a control is set to false
+				state &= ~CS_VSCROLL;
 				delete vsb;
 				vsb = NULL;
 				if (opened)
diff --git a/engine/src/image_rep.cpp b/engine/src/image_rep.cpp
@@ -312,7 +312,8 @@ void MCLoadableImageRep::UnlockBitmapFrame(uindex_t p_index, MCBitmapFrame *p_fr
 	if (m_frames == nil)
 		ConvertToMCGFrames(m_locked_frames, m_frame_count, false);
 	
-	MCImageFreeFrames(m_locked_frames, m_lock_count);
+	// PM-2015-07-13: [[ Bug 15590 ]] Free the correct number of frames
+	MCImageFreeFrames(m_locked_frames, m_frame_count);
 	m_locked_frames = nil;
 	
 	Release();
diff --git a/engine/src/iutil.cpp b/engine/src/iutil.cpp
@@ -462,6 +462,9 @@ void MCImage::crop(MCRectangle *newrect)
 	unlockbitmap(t_bitmap);
 
 	/* UNCHECKED */ setbitmap(t_cropimage, 1.0);
+	
+	// PM-2015-07-13: [[ Bug 15590 ]] Fix memory leak
+	MCImageFreeBitmap(t_cropimage);
 
 	uint32_t t_pixwidth, t_pixheight;
 	getgeometry(t_pixwidth, t_pixheight);
diff --git a/engine/src/mac-qt-recorder.mm b/engine/src/mac-qt-recorder.mm
@@ -723,8 +723,17 @@ static bool available_compression_ids(void *context, unsigned int p_id, const ch
     [m_observer stopTimer];
     SGStop(m_seq_grab);
     
+	// PM-2015-07-22: [[ Bug 15625 ]] Make sure we properly recreate the exported file, if it already exists
+	MCS_unlink(m_filename);
     exportToSoundFile(m_temp_file, m_filename);
-    
+	MCS_unlink(m_temp_file);
+
+	if (m_filename != nil)
+		MCCStringFree(m_filename);
+
+	if (m_temp_file != nil)
+		MCCStringFree(m_temp_file);
+
     if (m_channel != NULL)
     {
         SGDisposeChannel(m_seq_grab, m_channel);
diff --git a/ide-support/revsaveasstandalone.livecodescript b/ide-support/revsaveasstandalone.livecodescript
@@ -290,7 +290,6 @@ on revSaveAsStandalone pStack, pFolder, pPreview
       
       put the mainStack of stack pStack into pStack
       set the defaultStack to pStack
-      put the destroyStack of stack pStack into tOldDestroy
       try
          if sStandaloneSettingsA["ios"] or sStandaloneSettingsA["android"] then
             local tOutputMobileFolder
@@ -327,7 +326,6 @@ on revSaveAsStandalone pStack, pFolder, pPreview
          end if
       catch tError
          revAbort
-         set the destroyStack of stack pStack to tOldDestroy
          if word 1 of tError = "Standalone:" then 
             if revTestEnvironment() then
                return word 2 to -1 of tError
@@ -345,7 +343,6 @@ on revSaveAsStandalone pStack, pFolder, pPreview
       end try
       
       revReset
-      set the destroyStack of stack pStack to tOldDestroy
       
       if revStandaloneGetWarnings() is not empty then
          set the cWarnings of stack "revBuildResults" to revStandaloneGetWarnings()
@@ -549,10 +546,6 @@ private command revCreateStandalone pStack, pFolder
       dispatch "savingStandalone" to stack tStackFileName
    end try
    
-   // SN-2015-07-16: [[ ObjectDeletion ]] Make sure that the stack won't get removed from
-   //  memory (now it would get deleted sooner after that it used to do)
-   set the destroyStack of stack pStack to false
-   
    --build a list of output directories
    if last char of pFolder is not slash then 
       put slash after pFolder
diff --git a/libexternal/libexternal.gyp b/libexternal/libexternal.gyp
@@ -69,5 +69,22 @@
 				],
 			}
 		},
+		{
+			'target_name': 'libExternal-symbol-exports',
+			'type': 'none',
+			
+			'direct_dependent_settings':
+			{				
+				'variables':
+				{
+					'ios_external_symbols': 
+					[ 
+						'_getXtable', 
+						'_setExternalInterfaceVersion', 
+						'_configureSecurity',
+					],
+				},
+			},
+		},
 	],
 }
diff --git a/libexternal/src/external.c b/libexternal/src/external.c
@@ -112,7 +112,7 @@ static ExternalDeleteCallback s_delete = NULL;
 
 static ExternalSecurityHandler *s_security_handlers = NULL;
 
-#if defined(_LINUX) || defined(__MACOSX) || defined(TARGET_SUBPLATFORM_ANDROID)
+#if !defined(_WIN32)
 void getXtable(ExternalOperationCallback p_operations[], ExternalDeleteCallback p_delete, const char **r_name, ExternalDeclaration **r_table, ExternalDeleteCallback *r_external_delete) __attribute__((visibility("default")));
 void configureSecurity(ExternalSecurityHandler *p_handlers) __attribute__((visibility("default")));
 void setExternalInterfaceVersion(unsigned int p_version) __attribute__((visibility("default")));
diff --git a/revdb/revdb.gyp b/revdb/revdb.gyp
@@ -9,6 +9,7 @@
 		'revdb_sources':
 		[
 			'src/revdb.cpp',
+			'src/iossupport.cpp',
 			'src/osxsupport.cpp',
 			'src/unxsupport.cpp',
 			'src/w32support.cpp',
@@ -553,6 +554,7 @@
 			[
 				'../libcore/libcore.gyp:libCore',
 				'../libexternal/libexternal.gyp:libExternal',
+				'../libexternal/libexternal.gyp:libExternal-symbol-exports',
 			],
 			
 			'include_dirs':
@@ -570,11 +572,6 @@
 				'INFOPLIST_FILE': 'rsrc/revdb-Info.plist',
 			},
 			
-			'variables':
-			{
-				'ios_external_symbols': [ '_getXtable' ],
-			},
-			
 			'all_dependent_settings':
 			{
 				'variables':
@@ -592,6 +589,24 @@
 						'product_extension': '',
 					},
 				],
+				[
+					'OS == "mac" or OS == "ios"',
+					{
+						'sources!': 
+						[
+							'src/unxsupport.cpp',
+						],
+					},
+				],
+				[
+					'OS != "ios"',
+					{
+						'sources!':
+						[
+							'src/iossupport.cpp',
+						],
+					},
+				],
 			],
 		},
 		{
@@ -622,6 +637,11 @@
 				'<@(revdb_sources)',
 			],
 			
+			'sources!':
+			[
+				'src/iossupport.cpp',
+			],
+			
 			'all_dependent_settings':
 			{
 				'variables':
diff --git a/revdb/src/dbdrivercommon.cpp b/revdb/src/dbdrivercommon.cpp
@@ -18,12 +18,8 @@ along with LiveCode.  If not see <http://www.gnu.org/licenses/>.  */
 
 #if defined(_WINDOWS) || defined(_WINDOWS_SERVER)
 #define LIBRARY_EXPORT __declspec(dllexport)
-#elif defined(_MACOSX) || defined (_MAC_SERVER)
-#define LIBRARY_EXPORT
-#elif defined(_LINUX) || defined (_LINUX_SERVER)
-#define LIBRARY_EXPORT
-#elif defined(TARGET_SUBPLATFORM_IPHONE) || defined(TARGET_SUBPLATFORM_ANDROID)
-#define LIBRARY_EXPORT
+#else
+#define LIBRARY_EXPORT __attribute__((__visibility__("default")))
 #endif
 
 // Default implementations for DBField
diff --git a/revdb/src/dbmysqlapi.cpp b/revdb/src/dbmysqlapi.cpp
@@ -18,12 +18,8 @@ along with LiveCode.  If not see <http://www.gnu.org/licenses/>.  */
 
 #if defined(_WINDOWS)
 #define LIBRARY_EXPORT __declspec(dllexport)
-#elif defined(_MACOSX)
-#define LIBRARY_EXPORT
-#elif defined(_LINUX)
-#define LIBRARY_EXPORT
-#elif defined(TARGET_SUBPLATFORM_IPHONE) || defined(TARGET_SUBPLATFORM_ANDROID)
-#define LIBRARY_EXPORT
+#else
+#define LIBRARY_EXPORT __attribute__((__visibility__("default")))
 #endif
 
 unsigned int *DBObject::idcounter = NULL;
diff --git a/revdb/src/dbodbcapi.cpp b/revdb/src/dbodbcapi.cpp
@@ -18,10 +18,8 @@ along with LiveCode.  If not see <http://www.gnu.org/licenses/>.  */
 
 #if defined(_WINDOWS)
 #define LIBRARY_EXPORT __declspec(dllexport)
-#elif defined(_MACOSX)
-#define LIBRARY_EXPORT
-#elif defined(_LINUX)
-#define LIBRARY_EXPORT
+#else
+#define LIBRARY_EXPORT __attribute__((__visibility__("default")))
 #endif
 
 unsigned int *DBObject::idcounter = NULL;
diff --git a/revdb/src/dbpostgresqlapi.cpp b/revdb/src/dbpostgresqlapi.cpp
@@ -18,12 +18,8 @@ along with LiveCode.  If not see <http://www.gnu.org/licenses/>.  */
 
 #if defined(_WINDOWS)
 #define LIBRARY_EXPORT __declspec(dllexport)
-#elif defined(_MACOSX)
-#define LIBRARY_EXPORT
-#elif defined(_LINUX)
-#define LIBRARY_EXPORT
-#elif defined(TARGET_PLATFORM_MOBILE) && defined(TARGET_SUBPLATFORM_IPHONE)
-#define LIBRARY_EXPORT
+#else
+#define LIBRARY_EXPORT __attribute__((__visibility__("default")))
 #endif
 
 unsigned int *DBObject::idcounter = NULL;
diff --git a/revdb/src/dbsqliteapi.cpp b/revdb/src/dbsqliteapi.cpp
@@ -18,12 +18,8 @@ along with LiveCode.  If not see <http://www.gnu.org/licenses/>.  */
 
 #if defined(_WINDOWS)
 #define LIBRARY_EXPORT __declspec(dllexport)
-#elif defined(_MACOSX)
-#define LIBRARY_EXPORT
-#elif defined(_LINUX)
-#define LIBRARY_EXPORT
-#elif defined(TARGET_SUBPLATFORM_IPHONE) || defined(TARGET_SUBPLATFORM_ANDROID)
-#define LIBRARY_EXPORT
+#else
+#define LIBRARY_EXPORT __attribute__((__visibility__("default")))
 #endif
 
 unsigned int *DBObject::idcounter = NULL;
diff --git a/tools/extract-debug-symbols.sh b/tools/extract-debug-symbols.sh
@@ -62,6 +62,11 @@ done
 
 }
 
+# If the OS is iOS and this is a debug build, do nothing
+if [ "$os" == "ios" -a "$BUILDTYPE" == "Debug" ] ; then
+	exit 0
+fi
+
 case $os in
 	linux|android)
 		extract_linux_or_android ${inputs}

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+# Scrolling a group crashes LiveCode when hiding scrollbar`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+# Crop image within a repeat loop causes crash to desktop after a few iterations`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+# Opening sqlite on iOS return "revdberror,invalid database type"`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+# "record sound" is not replacing existing sound file`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+# revZip fails to open archive in 64-bit iOS`
Original file line number	Diff line number	Diff line change
`@@ -1835,6 +1835,8 @@ Exec_stat MCControl::setsbprop(Properties which, bool p_enable,`
`1835`	`1835`	`}`
`1836`	`1836`	`else`
`1837`	`1837`	`{`
	`1838`	`+ // PM-2015-07-16: [[ Bug 11569 ]] Unset CS_HSCROLL when the hscrollBar of a control is set to false`
	`1839`	`+ state &= ~CS_HSCROLL;`
`1838`	`1840`	`delete hsb;`
`1839`	`1841`	`hsb = NULL;`
`1840`	`1842`	`if (opened)`
`@@ -1876,6 +1878,8 @@ Exec_stat MCControl::setsbprop(Properties which, bool p_enable,`
`1876`	`1878`	`}`
`1877`	`1879`	`else`
`1878`	`1880`	`{`
	`1881`	`+ // PM-2015-07-16: [[ Bug 11569 ]] Unset CS_VSCROLL when the vscrollBar of a control is set to false`
	`1882`	`+ state &= ~CS_VSCROLL;`
`1879`	`1883`	`delete vsb;`
`1880`	`1884`	`vsb = NULL;`
`1881`	`1885`	`if (opened)`