Merge remote-tracking branch 'upstream/develop-9.0' into merge-develop-9.0-12.05.2019

livecodepanos · livecodepanos · commit ac00c29c8da7 · 2019-05-12T16:17:59.000+03:00
diff --git a/docs/guides/LiveCode Builder Language Reference.md b/docs/guides/LiveCode Builder Language Reference.md
@@ -579,7 +579,11 @@ on Android and iOS).
 
 The Obj-C binding string has the following form:
 
-    "objc:[class.](+|-)method[?thread]"
+    "objc:[library>][class.](+|-)method[?thread]"
+
+Here *library* specifies the name of the library or framework to bind to (if no
+library is specified a symbol from the engine executable or a library it is
+linked to is assumed).
 
 Here *class* specifies the name of the class containing the method to
 bind to. If the method is an instance method, the class can be omitted,
diff --git a/docs/lcb/notes/22047.md b/docs/lcb/notes/22047.md
@@ -0,0 +1 @@
+# [22047] Allow nothing to be passed as a variadic argument to a foreign handler
diff --git a/docs/notes/bugfix-12419.md b/docs/notes/bugfix-12419.md
@@ -0,0 +1 @@
+# Fix touch messages not being sent to controls under an mobile scroller control on Android
diff --git a/docs/notes/bugfix-22042.md b/docs/notes/bugfix-22042.md
@@ -0,0 +1 @@
+# Updated SQLite to version 3.28.0
diff --git a/engine/src/java/com/runrev/android/nativecontrol/ScrollerControl.java b/engine/src/java/com/runrev/android/nativecontrol/ScrollerControl.java
@@ -80,6 +80,12 @@ public void onScrollChanged(int l, int t, int oldl, int oldt)
                     ScrollerControl.this.updateScroll(m_dispatching ? m_new_left : m_left, t);
                 super.onScrollChanged(l, t, oldl, oldt);
             }
+            
+            @Override
+            public boolean onInterceptTouchEvent (MotionEvent ev)
+            {
+                return true;
+            }
         };
         m_hscroll = new HorizontalScrollView(p_context) {
             @Override
@@ -89,6 +95,12 @@ public void onScrollChanged(int l, int t, int oldl, int oldt)
                     ScrollerControl.this.updateScroll(l, m_dispatching ? m_new_top : m_top);
                 super.onScrollChanged(l, t, oldl, oldt);
             }
+            
+            @Override
+            public boolean onInterceptTouchEvent (MotionEvent ev)
+            {
+                return true;
+            }
         };
         
         m_inner_hview = new View(p_context) {
diff --git a/extensions/widgets/macbutton/macbutton.lcb b/extensions/widgets/macbutton/macbutton.lcb
@@ -160,7 +160,7 @@ end handler
 
 private type NSUInteger is CULong
 private foreign handler ObjC_NSButtonAlloc() returns ObjcRetainedId binds to "objc:NSButton.+alloc"
-private foreign handler ObjC_NSButtonInit(in pObj as ObjcId) returns ObjcId binds to "objc:NSButton.-init"
+private foreign handler ObjC_NSButtonInit(in pObj as ObjcRetainedId) returns optional ObjcRetainedId binds to "objc:NSButton.-init"
 private foreign handler ObjC_NSButtonSetEnabled(in pObj as ObjcId, in pEnabled as CBool) returns nothing binds to "objc:NSButton.-setEnabled:"
 private foreign handler ObjC_NSButtonSetFont(in pObj as ObjcId, in pFont as ObjcId) returns nothing binds to "objc:NSButton.-setFont:"
 private foreign handler ObjC_NSButtonSetButtonType(in pObj as ObjcId, in pStyle as NSUInteger) returns nothing binds to "objc:NSButton.-setButtonType:"
diff --git a/extensions/widgets/mactextfield/mactextfield.lcb b/extensions/widgets/mactextfield/mactextfield.lcb
@@ -259,7 +259,7 @@ end handler
 
 private type NSUInteger is CULong
 private foreign handler ObjC_NSTextFieldAlloc() returns ObjcRetainedId binds to "objc:NSTextField.+alloc"
-private foreign handler ObjC_NSTextFieldInit(in pObj as ObjcId) returns ObjcId binds to "objc:NSTextField.-init"
+private foreign handler ObjC_NSTextFieldInit(in pObj as ObjcRetainedId) returns optional ObjcRetainedId binds to "objc:NSTextField.-init"
 private foreign handler ObjC_NSTextFieldSetEnabled(in pObj as ObjcId, in pEnabled as CBool) returns nothing binds to "objc:NSTextField.-setEnabled:"
 private foreign handler ObjC_NSTextFieldSetFont(in pObj as ObjcId, in pFont as ObjcId) returns nothing binds to "objc:NSTextField.-setFont:"
 private foreign handler ObjC_NSTextFieldSetBezelStyle(in pObj as ObjcId, in pStyle as NSUInteger) returns nothing binds to "objc:NSTextField.-setBezelStyle:"
diff --git a/ide-support/revsblibrary.livecodescript b/ide-support/revsblibrary.livecodescript
@@ -2189,6 +2189,12 @@ command revSBUpdateSettingsForExtensions pTarget, @xSettingsA
          repeat for each line tLine in tContents
             local tFileData
             put tResourcesFolder & slash & tLine into tFileData["resolved"]
+
+            -- __EnumerateFolder list folders and we only want to add files
+            if there is a folder tFileData["resolved"] then
+               next repeat
+            end if
+
             put tTargetResourceFolder & slash & tLine into tFileData["name"]
             addToList tFileData, xSettingsA["files_computed"]
          end repeat
diff --git a/libscript/src/script-execute.cpp b/libscript/src/script-execute.cpp
@@ -503,24 +503,27 @@ MCScriptExecuteContext::InvokeForeignVarArgument(MCScriptForeignInvocation& p_in
     MCTypeInfoRef t_actual_type = t_resolved_type.type;
     
     // Fetch the promoted type of arg type (sub ints promote to int, and float
-    // promotes to double).
+    // promotes to double) - but only if the actual type is foreign.
     const MCForeignTypeDescriptor *t_desc = nullptr;
     if (MCTypeInfoIsForeign(t_actual_type))
     {
         t_desc = MCForeignTypeInfoGetDescriptor(t_actual_type);
     }
     
     MCTypeInfoRef t_arg_type = t_actual_type;
-    if (t_desc->promote != nullptr)
+    if (t_desc != nullptr)
     {
-        MCResolvedTypeInfo t_resolved_arg_type;
-        if (!ResolveTypeInfo(t_desc->promotedtype,
-                             t_resolved_arg_type))
+        if (t_desc->promote != nullptr)
         {
-            return false;
+            MCResolvedTypeInfo t_resolved_arg_type;
+            if (!ResolveTypeInfo(t_desc->promotedtype,
+                                 t_resolved_arg_type))
+            {
+                return false;
+            }
+            
+            t_arg_type = t_resolved_arg_type.type;
         }
-        
-        t_arg_type = t_resolved_arg_type.type;
     }
     
     // Compute the slot attributes - using the (potentially) promoted type.
diff --git a/tests/_testrunnerbehavior.livecodescript b/tests/_testrunnerbehavior.livecodescript
@@ -139,9 +139,6 @@ private command doRun pInfo
    put tLogForWriting into url ("binfile:" & tLogFilename)
    
    if TesterTapGetWorstResult(tAnalysis) is "FAIL" then
-      if $V is not empty then
-         write tLogForWriting to stdout
-   	  end if
       quit 1
    end if
 end doRun
@@ -325,5 +322,15 @@ command TestRunnerProcessOutput pScriptfile, pCommand, pOutput
 
    TesterLogSummaryLine tTapResults, (TesterGetPrettyTestName(pScriptFile) & ":" && pCommand)
 
+   if TesterTapGetWorstResult(tTapResults) is "FAIL" then
+      if $V is not empty then
+         put textEncode(pOutput, "utf8") into pOutput
+         if the platform is "win32" then
+            replace return with numToChar(13) & numToChar(10) in pOutput
+         end if
+         write pOutput to stderr
+      end if
+   end if
+
    return tTapResults
 end TestRunnerProcessOutput
diff --git a/tests/lcb/vm/foreign-invoke.lcb b/tests/lcb/vm/foreign-invoke.lcb
@@ -26,15 +26,20 @@ foreign handler sprintf(in pTarget as Pointer, in pFormat as ZStringNative, ...)
 foreign handler MCStringCreateWithCString(in pCString as Pointer, out rString as String) returns CBool binds to "<builtin>"
 
 public handler TestForeignInvoke_Varargs()
-   variable tString1 as String
-   variable tString2 as String
+   variable tOutputBuffer as Pointer
    unsafe
-      variable tOutputBuffer as Pointer
       put malloc(4096) into tOutputBuffer
+   end unsafe
 
+   variable tString1 as String
+   unsafe
       sprintf(tOutputBuffer, "no formats")
       MCStringCreateWithCString(tOutputBuffer, tString1)
+   end unsafe
+   test "sprintf works with no variadic arguments" when tString1 is "no formats"
 
+   variable tString2 as String
+   unsafe
       variable tInt as SInt16
       variable tLong as SInt32
       variable tLongLong as SInt64
@@ -47,11 +52,20 @@ public handler TestForeignInvoke_Varargs()
       put 7.5 into tDouble
       sprintf(tOutputBuffer, "%d %ld %lld %.1f %.1lf", tInt, tLong, tLongLong, tFloat, tDouble)
       MCStringCreateWithCString(tOutputBuffer, tString2)
+   end unsafe
+   test "sprintf works with variadic arguments" when tString2 is "1000 1000000000 1000000000000000 3.5 7.5"
+
+   variable tString3 as String
+   unsafe
+      variable tNothing as optional Pointer
+      sprintf(tOutputBuffer, "nullptr %p", tNothing)
+      MCStringCreateWithCString(tOutputBuffer, tString3)
+   end unsafe
+   test "sprintf works with nullptr variadic argument" when tString3 begins with "nullptr "
 
+   unsafe
       free(tOutputBuffer)
    end unsafe
-   test "sprintf works with no variadic arguments" when tString1 is "no formats"
-   test "sprintf works with variadic arguments" when tString2 is "1000 1000000000 1000000000000000 3.5 7.5"
 end handler
 
 --------

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+# [22047] Allow nothing to be passed as a variadic argument to a foreign handler`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+# Fix touch messages not being sent to controls under an mobile scroller control on Android`
Original file line number	Diff line number	Diff line change
`@@ -503,24 +503,27 @@ MCScriptExecuteContext::InvokeForeignVarArgument(MCScriptForeignInvocation& p_in`
`503`	`503`	`MCTypeInfoRef t_actual_type = t_resolved_type.type;`
`504`	`504`
`505`	`505`	`// Fetch the promoted type of arg type (sub ints promote to int, and float`
`506`		`- // promotes to double).`
	`506`	`+ // promotes to double) - but only if the actual type is foreign.`
`507`	`507`	`const MCForeignTypeDescriptor *t_desc = nullptr;`
`508`	`508`	`if (MCTypeInfoIsForeign(t_actual_type))`
`509`	`509`	`{`
`510`	`510`	`t_desc = MCForeignTypeInfoGetDescriptor(t_actual_type);`
`511`	`511`	`}`
`512`	`512`
`513`	`513`	`MCTypeInfoRef t_arg_type = t_actual_type;`
`514`		`- if (t_desc->promote != nullptr)`
	`514`	`+ if (t_desc != nullptr)`
`515`	`515`	`{`
`516`		`- MCResolvedTypeInfo t_resolved_arg_type;`
`517`		`- if (!ResolveTypeInfo(t_desc->promotedtype,`
`518`		`- t_resolved_arg_type))`
	`516`	`+ if (t_desc->promote != nullptr)`
`519`	`517`	`{`
`520`		`- return false;`
	`518`	`+ MCResolvedTypeInfo t_resolved_arg_type;`
	`519`	`+ if (!ResolveTypeInfo(t_desc->promotedtype,`
	`520`	`+ t_resolved_arg_type))`
	`521`	`+ {`
	`522`	`+ return false;`
	`523`	`+ }`
	`524`	`+`
	`525`	`+ t_arg_type = t_resolved_arg_type.type;`
`521`	`526`	`}`
`522`		`-`
`523`		`- t_arg_type = t_resolved_arg_type.type;`
`524`	`527`	`}`
`525`	`528`
`526`	`529`	`// Compute the slot attributes - using the (potentially) promoted type.`