rhodes 3.4.2 → 3.5.1.12

data/platform/shared/ruby/ext/webview/webview.i

@@ -1,11 +1,11 @@
 /* webview.i */
 %module WebView
 %{
-extern void rho_webview_refresh(int index);
+extern void rho_webview_refresh(int tab_index);
 #define refresh rho_webview_refresh 
 extern void rho_webview_navigate(const char* url, int tab_index);
 #define navigate rho_webview_navigate
-extern char* rho_webview_current_location(int index);
+extern char* rho_webview_current_location(int tab_index);
 #define current_location rho_webview_current_location
 extern char* rho_webview_execute_js(const char* js, int tab_index);
 #define execute_js rho_webview_execute_js
@@ -23,23 +23,28 @@ extern void rho_webview_set_cookie(const char* url, const char* cookie);
 extern void rho_webview_navigate_back();
 #define navigate_back rho_webview_navigate_back
 
-%}
+extern void rho_webview_save(const char* format, const char* path, int tab_index);
+#define save rho_webview_save
 
-%typemap(default) int index {
-  $1 = -1;
-}
+extern VALUE rho_webview_get_current_url(int tab_index);
+#define get_current_url rho_webview_get_current_url
+
+
+%}
 
 %typemap(default) int tab_index {
   $1 = -1;
 }
 
 
-extern void refresh(int index);
+extern void refresh(int tab_index);
 extern void navigate(const char* url, int tab_index);
-extern const char* current_location(int index);
+extern const char* current_location(int tab_index);
 extern const char* execute_js(const char* js, int tab_index);
 extern void set_menu_items(VALUE argv);
 extern int active_tab();
 extern void full_screen_mode(int enable);
 extern void set_cookie(const char* url, const char* cookie);
 extern void navigate_back();
+extern void save(const char* format, const char* path, int tab_index);
+extern VALUE get_current_url(int tab_index);

data/platform/shared/ruby/ext/webview/webview_wrap.c

@@ -1825,11 +1825,11 @@ static VALUE mWebView;
 #define SWIG_as_voidptrptr(a) ((void)SWIG_as_voidptr(*a),(void**)(a)) 
 
 
-extern void rho_webview_refresh(int index);
+extern void rho_webview_refresh(int tab_index);
 #define refresh rho_webview_refresh 
 extern void rho_webview_navigate(const char* url, int tab_index);
 #define navigate rho_webview_navigate
-extern char* rho_webview_current_location(int index);
+extern char* rho_webview_current_location(int tab_index);
 #define current_location rho_webview_current_location
 extern char* rho_webview_execute_js(const char* js, int tab_index);
 #define execute_js rho_webview_execute_js
@@ -1847,6 +1847,13 @@ extern void rho_webview_set_cookie(const char* url, const char* cookie);
 extern void rho_webview_navigate_back();
 #define navigate_back rho_webview_navigate_back
 
+extern void rho_webview_save(const char* format, const char* path, int tab_index);
+#define save rho_webview_save
+
+extern VALUE rho_webview_get_current_url(int tab_index);
+#define get_current_url rho_webview_get_current_url
+
+
 
 
 #include <limits.h>
@@ -2236,6 +2243,83 @@ fail:
 }
 
 
+SWIGINTERN VALUE
+_wrap_save(int argc, VALUE *argv, VALUE self) {
+  char *arg1 = (char *) 0 ;
+  char *arg2 = (char *) 0 ;
+  int arg3 ;
+  int res1 ;
+  char *buf1 = 0 ;
+  int alloc1 = 0 ;
+  int res2 ;
+  char *buf2 = 0 ;
+  int alloc2 = 0 ;
+  int val3 ;
+  int ecode3 = 0 ;
+  
+  {
+    arg3 = -1;
+  }
+  if ((argc < 2) || (argc > 3)) {
+    rb_raise(rb_eArgError, "wrong # of arguments(%d for 2)",argc); SWIG_fail;
+  }
+  res1 = SWIG_AsCharPtrAndSize(argv[0], &buf1, NULL, &alloc1);
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "char const *","save", 1, argv[0] ));
+  }
+  arg1 = (char *)(buf1);
+  res2 = SWIG_AsCharPtrAndSize(argv[1], &buf2, NULL, &alloc2);
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), Ruby_Format_TypeError( "", "char const *","save", 2, argv[1] ));
+  }
+  arg2 = (char *)(buf2);
+  if (argc > 2) {
+    ecode3 = SWIG_AsVal_int(argv[2], &val3);
+    if (!SWIG_IsOK(ecode3)) {
+      SWIG_exception_fail(SWIG_ArgError(ecode3), Ruby_Format_TypeError( "", "int","save", 3, argv[2] ));
+    } 
+    arg3 = (int)(val3);
+  }
+  save((char const *)arg1,(char const *)arg2,arg3);
+  if (alloc1 == SWIG_NEWOBJ) free((char*)buf1);
+  if (alloc2 == SWIG_NEWOBJ) free((char*)buf2);
+  return Qnil;
+fail:
+  if (alloc1 == SWIG_NEWOBJ) free((char*)buf1);
+  if (alloc2 == SWIG_NEWOBJ) free((char*)buf2);
+  return Qnil;
+}
+
+
+SWIGINTERN VALUE
+_wrap_get_current_url(int argc, VALUE *argv, VALUE self) {
+  int arg1 ;
+  int val1 ;
+  int ecode1 = 0 ;
+  VALUE result;
+  VALUE vresult = Qnil;
+  
+  {
+    arg1 = -1;
+  }
+  if ((argc < 0) || (argc > 1)) {
+    rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc); SWIG_fail;
+  }
+  if (argc > 0) {
+    ecode1 = SWIG_AsVal_int(argv[0], &val1);
+    if (!SWIG_IsOK(ecode1)) {
+      SWIG_exception_fail(SWIG_ArgError(ecode1), Ruby_Format_TypeError( "", "int","get_current_url", 1, argv[0] ));
+    } 
+    arg1 = (int)(val1);
+  }
+  result = (VALUE)get_current_url(arg1);
+  vresult = result;
+  return vresult;
+fail:
+  return Qnil;
+}
+
+
 
 /* -------- TYPE CONVERSION AND EQUIVALENCE RULES (BEGIN) -------- */
 
@@ -2551,5 +2635,7 @@ SWIGEXPORT void Init_WebView(void) {
   rb_define_module_function(mWebView, "full_screen_mode", _wrap_full_screen_mode, -1);
   rb_define_module_function(mWebView, "set_cookie", _wrap_set_cookie, -1);
   rb_define_module_function(mWebView, "navigate_back", _wrap_navigate_back, -1);
+  rb_define_module_function(mWebView, "save", _wrap_save, -1);
+  rb_define_module_function(mWebView, "get_current_url", _wrap_get_current_url, -1);
 }
 

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

@@ -719,7 +719,9 @@ uintptr_t rb_w32_asynchronize(asynchronous_func_t func, uintptr_t self, int argc
 #endif
 
 //RHO
-#ifdef _WIN32_WCE
+#if defined(_WP8_LIB)// || defined(_WINRT_DLL)
+#include "wp8/wp8.h"
+#elif _WIN32_WCE
 #include "wince.h"
 #endif
 //RHO

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

@@ -81,7 +81,7 @@
 #define HAVE_SYS_TIMES_H 1
 #define HAVE_SYS_PARAM_H 1
 
-#ifdef __APPLE__
+#if defined(__APPLE__) && !defined(RHODES_EMULATOR)
 #import <Availability.h>
 #ifndef __IPHONE_6_0
 #define HAVE_PWD_H 1
@@ -90,7 +90,7 @@
 #define HAVE_PWD_H 1
 #endif
 
-#ifdef __APPLE__
+#if defined(__APPLE__) && !defined(RHODES_EMULATOR)
 #import <Availability.h>
 #ifndef __IPHONE_6_0
 #define HAVE_GRP_H 1
@@ -211,7 +211,7 @@
 #define HAVE_GETPGID 1
 #define HAVE_SETPGID 1
 
-#ifdef __APPLE__
+#if defined(__APPLE__) && !defined(RHODES_EMULATOR)
 #import <Availability.h>
 #ifndef __IPHONE_6_0
 #define HAVE_INITGROUPS 1

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

@@ -2,6 +2,8 @@
 
 #include <math.h>
 
+#if !defined(_WP8_LIB)
+
 double hypot(double x, double y)
 {
     if (x < 0) x = -x;
@@ -14,3 +16,5 @@ double hypot(double x, double y)
     y /= x;
     return x * sqrt(1.0+y*y);
 }
+
+#endif

data/platform/shared/ruby/random.c

@@ -80,9 +80,13 @@ The original copyright notice follows.
 #  define _WIN32_WINNT 0x400
 #  undef __WINCRYPT_H__
 # endif
+
+#if !defined(_WP8_LIB)
 #include <wincrypt.h>
 #endif
 
+#endif
+
 typedef int int_must_be_32bit_at_least[sizeof(int) * CHAR_BIT < 32 ? -1 : 1];
 
 /* Period parameters */
@@ -477,7 +481,7 @@ fill_random_seed(unsigned int seed[DEFAULT_SEED_CNT])
 #if USE_DEV_URANDOM
     int fd;
     struct stat statbuf;
-#elif defined(_WIN32)
+#elif defined(_WIN32) && !defined(_WP8_LIB)
     HCRYPTPROV prov;
 #endif
 
@@ -497,7 +501,7 @@ fill_random_seed(unsigned int seed[DEFAULT_SEED_CNT])
         }
         close(fd);
     }
-#elif defined(_WIN32)
+#elif defined(_WIN32) && !defined(_WP8_LIB)
 //RHO
     if (CryptAcquireContextW(&prov, NULL, NULL, PROV_RSA_FULL, CRYPT_VERIFYCONTEXT)) {
 //RHO

data/platform/shared/ruby/thread_win32.c

@@ -71,9 +71,14 @@ w32_error(const char *func)
 {
     LPVOID lpMsgBuf = 0;
     int nError = GetLastError();
-    FormatMessage(FORMAT_MESSAGE_ALLOCATE_BUFFER |
-		  FORMAT_MESSAGE_FROM_SYSTEM |
-		  FORMAT_MESSAGE_IGNORE_INSERTS,
+
+#if defined(_WP8_LIB)
+	DWORD flFormat = FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_IGNORE_INSERTS;
+#else
+	DWORD flFormat = FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_IGNORE_INSERTS;
+#endif
+
+    FormatMessage(flFormat,
 		  NULL,
 		  nError,
 		  MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT),

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

@@ -6,9 +6,6 @@
 #ifndef CONFIG_RUBY_H
 #define CONFIG_RUBY_H 1
 
-#if !((_MSC_VER == 1400)||(_MSC_VER == 1500))
-#error MSC version unmatch: _MSC_VER: 1400 or 1500 is expected.
-#endif
 //#define WIN95 0
 #define RT_VER 80
 #define STDC_HEADERS 1

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

@@ -27,7 +27,11 @@
 #include <winbase.h>
 #include <wincon.h>
 #include <share.h>
+
+#ifndef _WP8_LIB
 #include <shlobj.h>
+#endif
+
 #ifndef _WIN32_WCE
 #include <mbstring.h>
 #if _MSC_VER >= 1400

data/platform/shared/ruby/wp8/assert.c

@@ -0,0 +1,12 @@
+/*#include <windows.h>
+#include <tchar.h>
+#include "assert.h"
+
+
+void assert( int expression )
+{
+	if( expression==0 )
+		exit(2);
+}
+
+*/

data/platform/shared/ruby/wp8/assert.h

@@ -0,0 +1,18 @@
+#ifndef _ASSERT_H_
+#define _ASSERT_H_
+
+#ifdef  NDEBUG
+
+#define assert(_Expression)     ((void)0)
+
+#else
+
+//void assert( int expression );
+#include "logging/RhoLog.h"
+
+#define assert(exp) RHO_ASSERT(exp)
+
+#endif //NDEBUG
+
+#endif //_ASSERT_H_
+

data/platform/shared/ruby/wp8/errno.c

@@ -0,0 +1,11 @@
+/***************************************************************
+  errno.c
+***************************************************************/
+
+#include <errno.h>
+
+
+int errno;
+int _doserrno;
+int _sys_nerr;
+

data/platform/shared/ruby/wp8/errno.h

@@ -0,0 +1,59 @@
+#ifndef ERRNO_H
+#define ERRNO_H 1
+
+
+#define EPERM           1
+#define ENOENT          2
+#define ESRCH           3
+#define EINTR           4
+#define EIO             5
+#define ENXIO           6
+#define E2BIG           7
+#define ENOEXEC         8
+#define EBADF           9
+#define ECHILD          10
+#define EAGAIN          11
+#define ENOMEM          12
+#define EACCES          13
+#define EFAULT          14
+#define EOSERR          15 // rk
+#define EBUSY           16
+#define EEXIST          17
+#define EXDEV           18
+#define ENODEV          19
+#define ENOTDIR         20
+#define EISDIR          21
+#define EINVAL          22
+#define ENFILE          23
+#define EMFILE          24
+#define ENOTTY          25
+#define EFBIG           27
+#define ENOSPC          28
+#define ESPIPE          29
+#define EROFS           30
+#define EMLINK          31
+#define EPIPE           32
+#define EDOM            33
+#define ERANGE          34
+#define EDEADLK         36
+//#define ENOSYS          37
+#define ENAMETOOLONG    38
+#define ENOLCK          39
+#define ENOSYS          40
+#define ENOTEMPTY       41
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+extern int errno;
+//extern int _doserrno;
+extern int _sys_nerr;
+
+#define sys_nerr _sys_nerr
+
+#ifdef __cplusplus
+};
+#endif
+
+#endif

data/platform/shared/ruby/wp8/missing_wp8.h

@@ -0,0 +1,74 @@
+#ifndef __MISSING_DEFS_WP8_H_ 
+#define __MISSING_DEFS_WP8_H_
+
+#include <windows.h>
+
+typedef struct _STARTUPINFOA {
+    DWORD   cb;
+    LPSTR   lpReserved;
+    LPSTR   lpDesktop;
+    LPSTR   lpTitle;
+    DWORD   dwX;
+    DWORD   dwY;
+    DWORD   dwXSize;
+    DWORD   dwYSize;
+    DWORD   dwXCountChars;
+    DWORD   dwYCountChars;
+    DWORD   dwFillAttribute;
+    DWORD   dwFlags;
+    WORD    wShowWindow;
+    WORD    cbReserved2;
+    LPBYTE  lpReserved2;
+    HANDLE  hStdInput;
+    HANDLE  hStdOutput;
+    HANDLE  hStdError;
+} STARTUPINFOA, *LPSTARTUPINFOA;
+typedef struct _STARTUPINFOW {
+    DWORD   cb;
+    LPWSTR  lpReserved;
+    LPWSTR  lpDesktop;
+    LPWSTR  lpTitle;
+    DWORD   dwX;
+    DWORD   dwY;
+    DWORD   dwXSize;
+    DWORD   dwYSize;
+    DWORD   dwXCountChars;
+    DWORD   dwYCountChars;
+    DWORD   dwFillAttribute;
+    DWORD   dwFlags;
+    WORD    wShowWindow;
+    WORD    cbReserved2;
+    LPBYTE  lpReserved2;
+    HANDLE  hStdInput;
+    HANDLE  hStdOutput;
+    HANDLE  hStdError;
+} STARTUPINFOW, *LPSTARTUPINFOW;
+#ifdef UNICODE
+typedef STARTUPINFOW STARTUPINFO;
+typedef LPSTARTUPINFOW LPSTARTUPINFO;
+#else
+typedef STARTUPINFOA STARTUPINFO;
+typedef LPSTARTUPINFOA LPSTARTUPINFO;
+#endif // UNICODE
+
+typedef struct _PROCESS_INFORMATION {
+    HANDLE hProcess;
+    HANDLE hThread;
+    DWORD dwProcessId;
+    DWORD dwThreadId;
+} PROCESS_INFORMATION, *PPROCESS_INFORMATION, *LPPROCESS_INFORMATION;
+
+typedef struct _BY_HANDLE_FILE_INFORMATION {
+    DWORD dwFileAttributes;
+    FILETIME ftCreationTime;
+    FILETIME ftLastAccessTime;
+    FILETIME ftLastWriteTime;
+    DWORD dwVolumeSerialNumber;
+    DWORD nFileSizeHigh;
+    DWORD nFileSizeLow;
+    DWORD nNumberOfLinks;
+    DWORD nFileIndexHigh;
+    DWORD nFileIndexLow;
+} BY_HANDLE_FILE_INFORMATION, *PBY_HANDLE_FILE_INFORMATION, *LPBY_HANDLE_FILE_INFORMATION;
+
+#endif