rhodes 7.1.17 → 7.4.1

data/platform/shared/ruby/missing/langinfo.c

@@ -40,7 +40,7 @@
 #if defined _WIN32 || defined __CYGWIN__
 #include <windows.h>
 #if defined _WIN32 && !defined strncasecmp
-#define strncasecmp fpstrnicmp
+#define strncasecmp strnicmp
 #endif
 #endif
 #ifdef HAVE_LANGINFO_H

data/platform/shared/ruby/missing/memmove.c

@@ -3,6 +3,8 @@
 #include "ruby/missing.h"
 #include <stddef.h>
 
+#if _MSC_VER < 1910
+
 void *
 memmove(void *d, const void *s, size_t n)
 {
@@ -20,3 +22,5 @@ memmove(void *d, const void *s, size_t n)
 	    *dst++ = *src++;
     return d;
 }
+
+#endif

data/platform/shared/ruby/posixnames.h

@@ -1,4 +1,4 @@
-#pragma once
+/*#pragma once
 #if defined(POSIXNAME)
 #define fpmkdir _mkdir
 #define fpstrnicmp _strnicmp
@@ -7,10 +7,8 @@
 #define fpchdir _chdir
 #define fpumask _umask
 #define fpstrdup _strdup
-#define fpfileno _fileno
 #define fpdup _dup
 #define fpsetmode _setmode
-#define fpstrdup _strdup
 #define fpclose _close
 #define fptzet _tzet
 #define fpdup2 _dup2
@@ -20,7 +18,6 @@
 #define fpexecve _execve
 #define fpwrite _write
 #define fpfptzset _fptzset
-#define fpwcsdup _wcsdup
 #define fpexecv _execv
 #define fpchmod _chmod
 #define fpfdopen _fdopen
@@ -35,10 +32,8 @@
 #define fpchdir chdir
 #define fpumask umask
 #define fpstrdup strdup
-#define fpfileno fileno
 #define fpdup dup
 #define fpsetmode setmode
-#define fpstrdup strdup
 #define fpclose close
 #define fptzet tzet
 #define fpdup2 dup2
@@ -48,11 +43,10 @@
 #define fpexecve execve
 #define fpwrite write
 #define fpfptzset fptzset
-#define fpwcsdup wcsdup
 #define fpexecv execv
 #define fpchmod chmod
 #define fpfdopen fdopen
 #define fpeof eof
 #define fpopen open
 #define fpread read
-#endif
+#endif*/

data/platform/shared/ruby/process.c

@@ -301,7 +301,7 @@ close_unless_reserved(int fd)
         rb_async_bug_errno("BUG timer thread still running", 0 /* EDOOFUS */);
         return 0;
     }
-    return fpclose(fd); /* async-signal-safe */
+    return close(fd); /* async-signal-safe */
 }
 
 /*#define DEBUG_REDIRECT*/
@@ -394,8 +394,8 @@ parent_redirect_close(int fd)
 }
 
 #else
-#define redirect_dup(oldfd) fpdup(oldfd)
-#define redirect_dup2(oldfd, newfd) fpdup2((oldfd), (newfd))
+#define redirect_dup(oldfd) dup(oldfd)
+#define redirect_dup2(oldfd, newfd) dup2((oldfd), (newfd))
 #define redirect_cloexec_dup(oldfd) rb_cloexec_dup(oldfd)
 #define redirect_cloexec_dup2(oldfd, newfd) rb_cloexec_dup2((oldfd), (newfd))
 #define redirect_close(fd) close_unless_reserved(fd)
@@ -416,7 +416,7 @@ parent_redirect_close(int fd)
 static VALUE
 get_pid(void)
 {
-    return PIDT2NUM(fpgetpid());
+    return PIDT2NUM(getpid());
 }
 
 
@@ -1259,9 +1259,9 @@ proc_exec_cmd(const char *prog, VALUE argv_str, VALUE envp_str)
 
     envp = envp_str ? (char **)RSTRING_PTR(envp_str) : NULL;
     if (envp_str)
-        fpexecve(prog, argv, envp); /* async-signal-safe */
+        execve(prog, argv, envp); /* async-signal-safe */
     else
-        fpexecv(prog, argv); /* async-signal-safe (since SUSv4) */
+        execv(prog, argv); /* async-signal-safe (since SUSv4) */
     preserving_errno(try_with_sh(prog, argv, envp)); /* try_with_sh() is async-signal-safe. */
     return -1;
 #endif
@@ -3045,7 +3045,7 @@ rb_execarg_run_options(const struct rb_execarg *eargp, struct rb_execarg *sargp,
 
     if (eargp->umask_given) {
         mode_t mask = eargp->umask_mask;
-        mode_t oldmask = fpumask(mask); /* never fail */ /* async-signal-safe */
+        mode_t oldmask = umask(mask); /* never fail */ /* async-signal-safe */
         if (sargp) {
             sargp->umask_given = 1;
             sargp->umask_mask = oldmask;

data/platform/shared/ruby/ruby.c

@@ -1009,7 +1009,7 @@ proc_options(long argc, char **argv, struct cmdline_options *opt, int envopt)
 	    if (envopt) goto noenvopt;
 	    opt->xflag = TRUE;
 	    s++;
-	    if (*s && fpchdir(s) < 0) {
+	    if (*s && chdir(s) < 0) {
 		rb_fatal("Can't chdir to %s", s);
 	    }
 	    break;
@@ -1020,7 +1020,7 @@ proc_options(long argc, char **argv, struct cmdline_options *opt, int envopt)
 	    if (!*++s && (!--argc || !(s = *++argv) || !*s)) {
 		rb_fatal("Can't chdir");
 	    }
-	    if (fpchdir(s) < 0) {
+	    if (chdir(s) < 0) {
 		rb_fatal("Can't chdir to %s", s);
 	    }
 	    break;
@@ -1901,7 +1901,7 @@ open_load_file(VALUE fname_v, int *xflag)
 #endif
 	if (!ruby_is_fd_loadable(fd)) {
 	    e = errno;
-	    (void)fpclose(fd);
+	    (void)close(fd);
 	    rb_load_fail(fname_v, strerror(e));
 	}
 
@@ -2184,22 +2184,22 @@ fill_standard_fds(void)
     f2 = fstat(2, &buf) == -1 && errno == EBADF;
     if (f0) {
         if (pipe(fds) == 0) {
-            fpclose(fds[1]);
+            close(fds[1]);
             if (fds[0] != 0) {
-                fpdup2(fds[0], 0);
-                fpclose(fds[0]);
+                dup2(fds[0], 0);
+                close(fds[0]);
             }
         }
     }
     if (f1 || f2) {
         if (pipe(fds) == 0) {
-            fpclose(fds[0]);
+            close(fds[0]);
             if (f1 && fds[1] != 1)
-                fpdup2(fds[1], 1);
+                dup2(fds[1], 1);
             if (f2 && fds[1] != 2)
-                fpdup2(fds[1], 2);
+                dup2(fds[1], 2);
             if (fds[1] != 1 && fds[1] != 2)
-                fpclose(fds[1]);
+                close(fds[1]);
         }
     }
 }

data/platform/shared/ruby/sailfish/ruby/config.h

@@ -236,7 +236,7 @@
 #define HAVE_IOCTL 1
 //#define HAVE_ISSETUGID 1
 #define HAVE_KILLPG 1
-#define HAVE_LCHMOD 1
+//#define HAVE_LCHMOD 1
 #define HAVE_LCHOWN 1
 #define HAVE_LINK 1
 #define HAVE_LLABS 1

data/platform/shared/ruby/thread_pthread.c

@@ -1244,7 +1244,7 @@ static int ubf_threads_empty(void) { return 1; }
 #endif /* USE_UBF_LIST */
 
 #define TT_DEBUG 0
-#define WRITE_CONST(fd, str) (void)(fpwrite((fd),(str),sizeof(str)-1)<0)
+#define WRITE_CONST(fd, str) (void)(write((fd),(str),sizeof(str)-1)<0)
 
 /* 100ms.  10ms is too small for user level thread scheduling
  * on recent Linux (tested on 2.6.35)

data/platform/shared/ruby/time.c

@@ -831,7 +831,7 @@ rb_localtime_r2(const time_t *t, struct tm *result)
 #endif
     return result;
 }
-#define LOCALTIME(tm, result) (fptzset(),rb_localtime_r2((tm), &(result)))
+#define LOCALTIME(tm, result) (tzset(),rb_localtime_r2((tm), &(result)))
 
 #if !defined(HAVE_STRUCT_TM_TM_GMTOFF)
 static struct tm *
@@ -956,7 +956,7 @@ zone_str_update(st_data_t *key, st_data_t *value, st_data_t arg, int existing)
 	*ret = (const char *)*value;
 	return ST_STOP;
     }
-    *ret = s = fpstrdup(s);
+    *ret = s = strdup(s);
     *key = *value = (st_data_t)s;
     return ST_CONTINUE;
 }

data/platform/shared/ruby/uwp/win32/win32.c

@@ -854,7 +854,7 @@ rb_w32_sysinit(int *argc, char ***argv)
     // Now set up the correct time stuff
     //
 
-    fptzset();
+    tzset();
 //RHO
 //#if !defined(_LIB)
 #ifndef OS_UWP
@@ -1563,7 +1563,7 @@ insert(const char *path, VALUE vinfo, void *enc)
     if (!tmpcurr) return -1;
     MEMZERO(tmpcurr, NtCmdLineElement, 1);
     tmpcurr->len = strlen(path);
-    tmpcurr->str = fpstrdup(path);
+    tmpcurr->str = strdup(path);
     if (!tmpcurr->str) return -1;
     tmpcurr->flags |= NTMALLOC;
     **tail = tmpcurr;
@@ -1684,7 +1684,7 @@ w32_cmdvector(const WCHAR *cmd, char ***vec, UINT cp, rb_encoding *enc)
 	return 0;
     }
 
-    ptr = cmdline = fpwcsdup(cmd);
+    ptr = cmdline = wcsdup(cmd);
 
     //
     // Ok, parse the command line, building a list of CmdLineElements.
@@ -2638,22 +2638,22 @@ init_stdhandle(void)
 #define open_null(fd)						\
     (((nullfd < 0) ?						\
       (nullfd = open(NULL_FILE, O_RDWR)) : 0),		\
-     ((nullfd == (fd)) ? (keep = 1) : fpdup2(nullfd, fd)),	\
+     ((nullfd == (fd)) ? (keep = 1) : dup2(nullfd, fd)),	\
      (fd))
 
-    if (fpfileno(stdin) == -1) {
+    if (fileno(stdin) == -1) {
 	FILE_FILENO(stdin) = open_null(0);
     }
     else {
-	fpsetmode(fpfileno(stdin), O_BINARY);
+	setmode(fileno(stdin), O_BINARY);
     }
-    if (fpfileno(stdout) == -1) {
+    if (fileno(stdout) == -1) {
 	FILE_FILENO(stdout) = open_null(1);
     }
-    if (fpfileno(stderr) == -1) {
+    if (fileno(stderr) == -1) {
 	FILE_FILENO(stderr) = open_null(2);
     }
-    if (nullfd >= 0 && !keep) fpclose(nullfd);
+    if (nullfd >= 0 && !keep) close(nullfd);
     setvbuf(stderr, NULL, _IONBF, 0);
 }
 
@@ -6268,7 +6268,7 @@ rb_w32_dup2(int oldfd, int newfd)
     int ret;
 
     if (oldfd == newfd) return newfd;
-    ret = fpdup2(oldfd, newfd);
+    ret = dup2(oldfd, newfd);
     if (ret < 0) return ret;
     set_new_std_fd(newfd);
     return newfd;
@@ -6525,7 +6525,7 @@ w32_wopen(const WCHAR *file, int oflag, int pmode)
 int
 rb_w32_fclose(FILE *fp)
 {
-    int fd = fpfileno(fp);
+    int fd = fileno(fp);
     SOCKET sock = TO_SOCKET(fd);
     int save_errno = errno;
 
@@ -7257,7 +7257,7 @@ rb_w32_write(int fd, const void *buf, size_t size)
     }
 
     if ((_osfile(fd) & FTEXT) &&
-        (!(_osfile(fd) & FPIPE) || fd == fpfileno(stdout) || fd == fpfileno(stderr))) {
+        (!(_osfile(fd) & FPIPE) || fd == fileno(stdout) || fd == fileno(stderr))) {
 	return _write(fd, buf, size);
     }
 

data/platform/shared/ruby/win32/ruby/config.h

@@ -6,7 +6,7 @@
 #ifndef INCLUDE_RUBY_CONFIG_H
 #define INCLUDE_RUBY_CONFIG_H 1
 
-#if _MSC_VER != 1900
+#if _MSC_VER < 1900
 #error MSC version unmatch: _MSC_VER: 1900 is expected.
 #endif
 

data/platform/shared/sqlite/CMakeLists.txt.erb

@@ -5,7 +5,7 @@ project(sqlite)
 add_definitions(-DOS_ANDROID)
 
 set(SOURCE_LIB
-<%= @rhoRoot %>/platform/shared/sqlite/sqlite3.c
+<%= @sourceList %>
 )
 
 include_directories(<%= @rhoRoot %>/platform/shared)

data/platform/shared/sqlite/sqlite3.c

@@ -26,6 +26,29 @@
 #define SQLITE_TEMP_STORE 2
 #define SQLITE_HAS_CODEC 1
 #include "tcmalloc/rhomem.h"
+
+/*
+#include "logging/RhoLog.h"
+
+#define SQLITE_LOCK_TRACE 1
+//#define SQLITE_PERFORMANCE_TRACE 1
+#define SQLITE_USE_FCNTL_TRACE 1
+#define SQLITE_ENABLE_IOTRACE 1
+#define SQLITE_ENABLE_SELECTTRACE 1
+#define SQLITE_ENABLE_VFSTRACE 1
+#define SQLITE_ENABLE_WHERETRACE 1
+#define SQLITE_DEBUG 1
+#define SQLITE_DEBUG_OS_TRACE 1
+#define SQLITE_FORCE_OS_TRACE 1
+#define SQLITE_IGNORE_FLOCK_LOCK_ERRORS 1
+
+#define SQLITE_OS_TRACE_PROC rhoSqlite3Trace
+
+void rhoSqlite3Trace(const char *zBuf, int nBuf) {
+  RAWTRACE_DATA( zBuf, nBuf );
+}
+*/
+
 // RHO
 #define SQLITE_CORE 1
 #define SQLITE_AMALGAMATION 1

data/platform/shared/sync/CMakeLists.txt.erb

@@ -5,7 +5,7 @@ project(rhosync)
 add_definitions(-DOS_ANDROID)
 
 set(SOURCE_LIB
-<%= @rhoRoot %>/platform/shared/sync/RhoconnectClientManager.cpp
+<%= @sourceList %>
 )
 
 include_directories(<%= @rhoRoot %>/platform/shared/sync)

data/platform/shared/unzip/gzlib.cpp

@@ -247,7 +247,7 @@ local gzFile gz_open(const void* path, int fd, const char* mode)
 #if defined(_WIN32) && !defined(_WIN32_WCE)
         fd == -2 ? _wopen((const wchar_t*)path, oflag, 0666) :
 #endif
-        fpopen((const char*)path, oflag, 0666));
+        open((const char*)path, oflag, 0666));
     if (state->fd == -1) {
         free(state->path);
         free(state);

data/platform/shared/unzip/gzwrite.cpp

@@ -97,7 +97,7 @@ local int gz_comp(gz_statep state, int flush)
 
     /* write directly if requested */
     if (state->direct) {
-        got = fpwrite(state->fd, strm->next_in, strm->avail_in);
+        got = write(state->fd, strm->next_in, strm->avail_in);
         if (got < 0 || (unsigned)got != strm->avail_in) {
             gz_error(state, Z_ERRNO, zstrerror());
             return -1;
@@ -114,7 +114,7 @@ local int gz_comp(gz_statep state, int flush)
         if (strm->avail_out == 0 || (flush != Z_NO_FLUSH &&
             (flush != Z_FINISH || ret == Z_STREAM_END))) {
             have = (unsigned)(strm->next_out - state->x.next);
-            if (have && ((got = fpwrite(state->fd, state->x.next, have)) < 0 ||
+            if (have && ((got = write(state->fd, state->x.next, have)) < 0 ||
                          (unsigned)got != have)) {
                 gz_error(state, Z_ERRNO, zstrerror());
                 return -1;
@@ -558,7 +558,7 @@ int ZEXPORT gzclose_w(gzFile file)
     }
     gz_error(state, Z_OK, NULL);
     free(state->path);
-    if (fpclose(state->fd) == -1)
+    if (close(state->fd) == -1)
         ret = Z_ERRNO;
     free(state);
     return ret;

data/platform/shared/unzip/unzip.cpp

@@ -14,13 +14,6 @@
 #endif
 
 #include "../ruby/posixnames.h"
-#if defined(POSIXNAME)
-#define fpfileno _fileno
-#define fpmkdir _mkdir
-#else
-#define fpfileno fileno
-#define fpmkdir mkdir
-#endif
 
 #ifdef ZIP_STD
 #include <stdio.h>
@@ -34,10 +27,10 @@
 #endif
 #if defined(_MSC_VER) || defined(__BORLANDC__) || defined(__MINGW32__)
 #include <direct.h>
-#define lumkdir(t) (fpmkdir(t))
+#define lumkdir(t) (mkdir(t))
 #else
 #include <unistd.h>
-#define lumkdir(t) (fpmkdir(t,0755))
+#define lumkdir(t) (mkdir(t,0755))
 #endif
 #include <sys/types.h>
 /* RHO BEGIN */
@@ -212,7 +205,7 @@ typedef struct tm_unz_s
 // some windows<->linux portability things
 #ifdef ZIP_STD
 DWORD GetFilePosU(HANDLE hfout)
-{ struct stat st; fstat(fpfileno(hfout),&st);
+{ struct stat st; fstat(fileno(hfout),&st);
   if ((st.st_mode&S_IFREG)==0) return 0xFFFFFFFF;
   return ftell(hfout);
 }

data/platform/shared/unzip/zip.cpp

@@ -3,11 +3,6 @@
 #include <memory>
 #include <stdio.h>
 
-#if defined(POSIXNAME)
-#define fpfileno _fileno
-#else
-#define fpfileno fileno
-#endif
 // THIS FILE is almost entirely based upon code by info-zip.
 // It has been modified by Lucian Wischik. The modifications
 // were a complete rewrite of the bit of code that generates the
@@ -621,7 +616,7 @@ void GetNow(lutime_t *ft, WORD *dosdate, WORD *dostime)
 }
 
 DWORD GetFilePosZ(HANDLE hfout)
-{ struct stat st; fstat(fpfileno(hfout),&st); 
+{ struct stat st; fstat(fileno(hfout),&st); 
   if ((st.st_mode&S_IFREG)==0) return 0xFFFFFFFF;
   return ftell(hfout);
 }
@@ -631,7 +626,7 @@ ZRESULT GetFileInfo(FILE *hf, ulg *attr, long *size, iztimes *times, ulg *timest
   // The date and time is returned in a long with the date most significant to allow
   // unsigned integer comparison of absolute times. The attributes have two
   // high bytes unix attr, and two low bytes a mapping of that to DOS attr.
-  struct stat bhi; int res=fstat(fpfileno(hf),&bhi); if (res==-1) return ZR_NOFILE;
+  struct stat bhi; int res=fstat(fileno(hf),&bhi); if (res==-1) return ZR_NOFILE;
   ulg fa=bhi.st_mode; ulg a=0;
   // Zip uses the lower word for its interpretation of windows stuff
   if ((fa&S_IWUSR)==0) a|=0x01;
@@ -2513,7 +2508,7 @@ ZRESULT TZip::open_handle(HANDLE hf,unsigned int len)
   if (hf==0 || hf==INVALID_HANDLE_VALUE) return ZR_ARGS;
   bool canseek;
 #ifdef ZIP_STD
-    struct stat st; fstat(fpfileno(hf),&st); canseek = S_ISREG(st.st_mode);
+    struct stat st; fstat(fileno(hf),&st); canseek = S_ISREG(st.st_mode);
 #else
   DWORD res = SetFilePointer(hfout,0,0,FILE_CURRENT);
   canseek = (res!=0xFFFFFFFF);

data/platform/uwp/rhodes/App.xaml.cs

@@ -1,18 +1,18 @@
 /*------------------------------------------------------------------------
 * (The MIT License)
-* 
+*
 * Copyright (c) 2008-2017 Tau Technologies, Inc.
-* 
+*
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to deal
 * in the Software without restriction, including without limitation the rights
 * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
 * copies of the Software, and to permit persons to whom the Software is
 * furnished to do so, subject to the following conditions:
-* 
+*
 * The above copyright notice and this permission notice shall be included in
 * all copies or substantial portions of the Software.
-* 
+*
 * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
 * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
 * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -20,8 +20,8 @@
 * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 * THE SOFTWARE.
-* 
-* http://tau-technologies.com
+*
+* http://tau-platform.com
 *------------------------------------------------------------------------*/
 
 using System;
@@ -71,7 +71,7 @@ namespace rhodes
             // Show graphics profiling information while debugging.
             if (System.Diagnostics.Debugger.IsAttached)
             {
-                
+
             }
 
         }
@@ -127,7 +127,7 @@ namespace rhodes
             rhoruntime.CRhoRuntime.getInstance().onActivate(1);
         }
 
-       
+
         // Code to execute if a navigation fails
         private void RootFrame_NavigationFailed(object sender, NavigationFailedEventArgs e)
         {
@@ -145,7 +145,7 @@ namespace rhodes
             // just ignore QuitException
             if (e.Exception is QuitException)
                 return;
-            
+
             if (System.Diagnostics.Debugger.IsAttached)
             {
                 // An unhandled exception has occurred; break into the debugger

data/platform/uwp/rhoruntime/common/RhoClassFactory.h

@@ -34,7 +34,7 @@
 namespace rho {
 namespace common {
 
-class CRhoClassFactory : public IRhoClassFactory
+class CRhoClassFactory : public CBaseRhoClassFactory
 {
 public:
     virtual ~CRhoClassFactory(void){}