Some fixes (UWP and Rhosim)

rhomobile · Jun 7, 2017 · c16f1d1 · c16f1d1
1 parent 2142c13
commit c16f1d1
Show file tree

Hide file tree

Showing 24 changed files with 1,200 additions and 209 deletions.
diff --git a/.gitignore b/.gitignore
@@ -100,6 +100,7 @@ platform/wp8/*/obj/*
 platform/wp8/bin/*
 platform/wp8/ipch/*
 platform/uwp/*/obj/*
+platform/uwp/platform
 platform/uwp/bin/*
 platform/uwp/ipch/*
 platform/uwp/RhoRuntimeInvoker/bin/*

diff --git a/Rakefile b/Rakefile
@@ -4237,18 +4237,19 @@ namespace "run" do
         end
 
         oldDir = File.join( $startdir, "platform/win32/RhoSimulator" )
-        newDir = File.join( $startdir, "platform/win32/RhoSimulatorRunnable" )
+        newDir = oldDir
+        #newDir = File.join( $startdir, "platform/win32/RhoSimulatorRunnable" )
 
-        rm_rf newDir if Dir.exist?(newDir)
-        FileUtils.mkpath newDir
+        #rm_rf newDir if Dir.exist?(newDir)
+        #FileUtils.mkpath newDir
 
-        cp_r File.join(oldDir, "."), newDir
+        #cp_r File.join(oldDir, "."), newDir
 
         qtdir = ENV['QTDIR']
         if !qtdir.nil?
           cp File.join(qtdir, "bin/Qt5Core.dll"), newDir
+          args << "-remote-debugging-port=9090"
         end
-        args << "-remote-debugging-port=9090"
 
         cmd = File.join(newDir, 'rhosimulator.exe')
       elsif RUBY_PLATFORM =~ /darwin/

diff --git a/lib/commonAPI/coreapi/ext/platform/uwp/Coreapi.vcxproj b/lib/commonAPI/coreapi/ext/platform/uwp/Coreapi.vcxproj
@@ -26,7 +26,7 @@
     <AppContainerApplication>true</AppContainerApplication>
     <ApplicationType>Windows Store</ApplicationType>
     <WindowsTargetPlatformVersion>10.0.14393.0</WindowsTargetPlatformVersion>
-    <WindowsTargetPlatformMinVersion>10.0.10586.0</WindowsTargetPlatformMinVersion>
+    <WindowsTargetPlatformMinVersion>10.0.14393.0</WindowsTargetPlatformMinVersion>
     <ApplicationTypeRevision>10.0</ApplicationTypeRevision>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />

diff --git a/lib/commonAPI/coreapi/ext/platform/uwp/NativeTabbarLib.vcxproj b/lib/commonAPI/coreapi/ext/platform/uwp/NativeTabbarLib.vcxproj
@@ -26,7 +26,7 @@
     <AppContainerApplication>true</AppContainerApplication>
     <ApplicationType>Windows Store</ApplicationType>
     <WindowsTargetPlatformVersion>10.0.14393.0</WindowsTargetPlatformVersion>
-    <WindowsTargetPlatformMinVersion>10.0.10586.0</WindowsTargetPlatformMinVersion>
+    <WindowsTargetPlatformMinVersion>10.0.14393.0</WindowsTargetPlatformMinVersion>
     <ApplicationTypeRevision>10.0</ApplicationTypeRevision>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />

diff --git a/lib/commonAPI/coreapi/ext/platform/uwp/NativeToolbarLib.vcxproj b/lib/commonAPI/coreapi/ext/platform/uwp/NativeToolbarLib.vcxproj
@@ -26,7 +26,7 @@
     <AppContainerApplication>true</AppContainerApplication>
     <ApplicationType>Windows Store</ApplicationType>
     <WindowsTargetPlatformVersion>10.0.14393.0</WindowsTargetPlatformVersion>
-    <WindowsTargetPlatformMinVersion>10.0.10586.0</WindowsTargetPlatformMinVersion>
+    <WindowsTargetPlatformMinVersion>10.0.14393.0</WindowsTargetPlatformMinVersion>
     <ApplicationTypeRevision>10.0</ApplicationTypeRevision>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />

diff --git a/lib/commonAPI/coreapi/ext/platform/uwp/WebViewLib.vcxproj b/lib/commonAPI/coreapi/ext/platform/uwp/WebViewLib.vcxproj
@@ -26,7 +26,7 @@
     <AppContainerApplication>true</AppContainerApplication>
     <ApplicationType>Windows Store</ApplicationType>
     <WindowsTargetPlatformVersion>10.0.14393.0</WindowsTargetPlatformVersion>
-    <WindowsTargetPlatformMinVersion>10.0.10586.0</WindowsTargetPlatformMinVersion>
+    <WindowsTargetPlatformMinVersion>10.0.14393.0</WindowsTargetPlatformMinVersion>
     <ApplicationTypeRevision>10.0</ApplicationTypeRevision>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
@@ -151,7 +151,6 @@
       <IgnoreSpecificDefaultLibraries>ole32.lib;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
       <GenerateWindowsMetadata>true</GenerateWindowsMetadata>
     </Link>
-
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">
     <ClCompile>

diff --git a/lib/extensions/digest-md5/ext/uwp/digest-md5.vcxproj b/lib/extensions/digest-md5/ext/uwp/digest-md5.vcxproj
@@ -26,7 +26,7 @@
     <AppContainerApplication>true</AppContainerApplication>
     <ApplicationType>Windows Store</ApplicationType>
     <WindowsTargetPlatformVersion>10.0.14393.0</WindowsTargetPlatformVersion>
-    <WindowsTargetPlatformMinVersion>10.0.10586.0</WindowsTargetPlatformMinVersion>
+    <WindowsTargetPlatformMinVersion>10.0.14393.0</WindowsTargetPlatformMinVersion>
     <ApplicationTypeRevision>10.0</ApplicationTypeRevision>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />

diff --git a/lib/extensions/digest-sha1/ext/uwp/digest-sha1.vcxproj b/lib/extensions/digest-sha1/ext/uwp/digest-sha1.vcxproj
@@ -26,7 +26,7 @@
     <AppContainerApplication>true</AppContainerApplication>
     <ApplicationType>Windows Store</ApplicationType>
     <WindowsTargetPlatformVersion>10.0.14393.0</WindowsTargetPlatformVersion>
-    <WindowsTargetPlatformMinVersion>10.0.10586.0</WindowsTargetPlatformMinVersion>
+    <WindowsTargetPlatformMinVersion>10.0.14393.0</WindowsTargetPlatformMinVersion>
     <ApplicationTypeRevision>10.0</ApplicationTypeRevision>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />

diff --git a/lib/extensions/digest/ext/uwp/digest.vcxproj b/lib/extensions/digest/ext/uwp/digest.vcxproj
@@ -26,7 +26,7 @@
     <AppContainerApplication>true</AppContainerApplication>
     <ApplicationType>Windows Store</ApplicationType>
     <WindowsTargetPlatformVersion>10.0.14393.0</WindowsTargetPlatformVersion>
-    <WindowsTargetPlatformMinVersion>10.0.10586.0</WindowsTargetPlatformMinVersion>
+    <WindowsTargetPlatformMinVersion>10.0.14393.0</WindowsTargetPlatformMinVersion>
     <ApplicationTypeRevision>10.0</ApplicationTypeRevision>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />

diff --git a/platform/shared/ruby/io.c b/platform/shared/ruby/io.c
@@ -284,7 +284,7 @@ rb_fix_detect_o_cloexec(int fd)
 int
 rb_cloexec_open(const char *pathname, int flags, mode_t mode)
 {
-    int ret;
+    int ret = 0;
     static int o_cloexec_state = -1; /* <0: unknown, 0: ignored, >0: working */
 
 #ifdef O_CLOEXEC
@@ -5482,7 +5482,7 @@ rb_sysopen_internal(struct sysopen_struct *data)
 static int
 rb_sysopen(VALUE fname, int oflags, mode_t perm)
 {
-    int fd;
+    int fd = 0;
     struct sysopen_struct data;
 
     data.fname = rb_str_encode_ospath(fname);

diff --git a/platform/shared/ruby/uwp/win32/win32.c b/platform/shared/ruby/uwp/win32/win32.c
@@ -49,15 +49,10 @@
 #include <processthreadsapi.h>
 #include <wtypesbase.h>
 #include "../../../../uwp/rhoruntime/common/RhodesHelperWP8.h"
-//#define rb_w32_wopen _wopen
-
 #if _MSC_VER >= 1400
 #include <crtdbg.h>
 #include <rtcapi.h>
 #endif
-#ifdef __MINGW32__
-#include <mswsock.h>
-#endif
 
 #include "uwp.h"
 #include "win32/dir.h"
@@ -73,7 +68,6 @@
 #include <ShlObj.h>
 #include <WinBase.h>
 
-
 #define isdirsep(x) ((x) == '/' || (x) == '\\')
 
 #include "logging/RhoLog.h"
@@ -135,7 +129,6 @@ int rb_w32_reparse_symlink_p(const WCHAR *path);
 
 #include "../posixnames.h"
 
-
 static struct ChildRecord *CreateChild(const WCHAR *, const WCHAR *, SECURITY_ATTRIBUTES *, HANDLE, HANDLE, HANDLE, DWORD);
 static int has_redirection(const char *, UINT);
 int rb_w32_wait_events(HANDLE *events, int num, DWORD timeout);
@@ -144,6 +137,7 @@ static int wstati64(const WCHAR *path, struct stati64 *st);
 static int wlstati64(const WCHAR *path, struct stati64 *st);
 VALUE rb_w32_conv_from_wchar(const WCHAR *wstr, rb_encoding *enc);
 int ruby_brace_glob_with_enc(const char *str, int flags, ruby_glob_func *func, VALUE arg, rb_encoding *enc);
+static FARPROC get_proc_address(const char *module, const char *func, HANDLE *mh);
 
 #define RUBY_CRITICAL(expr) do { expr; } while (0)
 
@@ -494,15 +488,15 @@ regulate_path(WCHAR *path)
 static FARPROC
 get_proc_address(const char *module, const char *func, HANDLE *mh)
 {
-    HANDLE h;
+    HMODULE h = 0;
     FARPROC ptr;
 
     if (mh)
-	h = LoadLibrary(module);
+		h = LoadLibraryA(module);
     else
-	h = GetModuleHandle(module);
-    if (!h)
-	return NULL;
+		h = GetModuleHandleA(module);
+
+    if (!h) return NULL;
 
     ptr = GetProcAddress(h, func);
     if (mh) {
@@ -805,14 +799,12 @@ static int w32_cmdvector(const WCHAR *, char ***, UINT, rb_encoding *);
 void
 rb_w32_sysinit(int *argc, char ***argv)
 {
-#if RT_VER >= 80// && !defined(OS_WP8) && !defined(OS_UWP)
     static void set_pioinfo_extra(void);
 
     _CrtSetReportMode(_CRT_ASSERT, 0);
     _set_invalid_parameter_handler(invalid_parameter);
-    _RTC_SetErrorFunc(rtc_error_handler);
+    _RTC_SetErrorFuncW(rtc_error_handler);
     set_pioinfo_extra();
-#endif
     SetErrorMode(SEM_FAILCRITICALERRORS|SEM_NOGPFAULTERRORBOX);
 
     get_version();
@@ -2084,7 +2076,7 @@ rb_w32_wstr_to_mbstr(UINT cp, const WCHAR *wstr, int clen, long *plen)
 WCHAR *
 rb_w32_mbstr_to_wstr(UINT cp, const char *str, int clen, long *plen)
 {
-    WCHAR *ptr;
+    WCHAR *ptr = 0;
     int len = MultiByteToWideChar(cp, 0, str, clen, NULL, 0);
     if (!(ptr = malloc(sizeof(WCHAR) * len))) return 0;
     MultiByteToWideChar(cp, 0, str, clen, ptr, len);
@@ -2422,7 +2414,7 @@ static inline ioinfo* _pioinfo(int);
 #define rb_acrt_lowio_lock_fh(i)   EnterCriticalSection(&_pioinfo(i)->lock)
 #define rb_acrt_lowio_unlock_fh(i) LeaveCriticalSection(&_pioinfo(i)->lock)
 
-#if RT_VER >= 80 //&& !defined(OS_WP8) && !defined(OS_UWP)
+#if defined(OS_UWP)
 static size_t pioinfo_extra = 0;	/* workaround for VC++8 SP1 */
 
 /* License: Ruby's */
@@ -5781,8 +5773,7 @@ w32_stati64(const char *path, struct stati64 *st, UINT cp)
     WCHAR *wpath;
     int ret;
 
-    if (!(wpath = mbstr_to_wstr(cp, path, -1, NULL)))
-	return -1;
+    if (!(wpath = mbstr_to_wstr(cp, path, -1, NULL))) return -1;
     ret = wstati64(wpath, st);
     free(wpath);
     return ret;
@@ -6169,8 +6160,7 @@ rb_w32_uopen(const char *file, int oflag, ...)
     pmode = va_arg(arg, int);
     va_end(arg);
 
-    if (!(wfile = utf8_to_wstr(file, NULL)))
-	return -1;
+    if (!(wfile = utf8_to_wstr(file, NULL))) return -1;
     ret = rb_w32_wopen(wfile, oflag, pmode);
     free(wfile);        
     return ret;

diff --git a/platform/uwp/RhoRuntimeInvoker/RhoRuntimeInvoker.csproj b/platform/uwp/RhoRuntimeInvoker/RhoRuntimeInvoker.csproj
@@ -14,7 +14,7 @@
     <DefaultLanguage>en-US</DefaultLanguage>
     <TargetPlatformIdentifier>UAP</TargetPlatformIdentifier>
     <TargetPlatformVersion>10.0.14393.0</TargetPlatformVersion>
-    <TargetPlatformMinVersion>10.0.10586.0</TargetPlatformMinVersion>
+    <TargetPlatformMinVersion>10.0.14393.0</TargetPlatformMinVersion>
     <MinimumVisualStudioVersion>14</MinimumVisualStudioVersion>
     <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{A5A43C5B-DE2A-4C0C-9213-0A381AF9435A};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>

diff --git a/platform/uwp/curl/libcurl.vcxproj b/platform/uwp/curl/libcurl.vcxproj
@@ -36,7 +36,7 @@
     <AppContainerApplication>true</AppContainerApplication>
     <ApplicationType>Windows Store</ApplicationType>
     <WindowsTargetPlatformVersion>10.0.14393.0</WindowsTargetPlatformVersion>
-    <WindowsTargetPlatformMinVersion>10.0.10586.0</WindowsTargetPlatformMinVersion>
+    <WindowsTargetPlatformMinVersion>10.0.14393.0</WindowsTargetPlatformMinVersion>
     <ApplicationTypeRevision>10.0</ApplicationTypeRevision>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />

diff --git a/platform/uwp/rhodes/MainPage.xaml.cs b/platform/uwp/rhodes/MainPage.xaml.cs
@@ -195,6 +195,7 @@ public bool ApplicationBarStatus()
             return getAppBar().IsOpen;
         }
 
+
         public MainPage()
         {
             deb("Running constructor");
@@ -230,6 +231,7 @@ public MainPage()
             try{
                 // initialize C# extensions factories
                 deb("InitializeExtensions()");
+
                 CSharpExtensions.InitializeExtensions();
 
                 // create rhodes runtime object
@@ -661,35 +663,42 @@ private CommandBar getAppBar()
 
         private void updateAppBarModeAndVisibility(bool autoToolbarVisibility = true)
         {
+            if (autoToolbarVisibility) { deb("Tool bar visible"); }
+            else { deb("Tool bar invisible"); }
+
             getAppBar().Visibility = autoToolbarVisibility ? Visibility.Visible : Visibility.Collapsed;
+            //getAppBar().IsSticky = autoToolbarVisibility ? 
             if (autoToolbarVisibility && (getAppBar().PrimaryCommands.Count > 0))
             {
                 getAppBar().ClosedDisplayMode = AppBarClosedDisplayMode.Compact;
                 getAppBar().IsOpen = true;
                 //ApplicationBar.IsMenuEnabled = true;
                 getAppBar().Opacity = 1.0;
+                deb("Tool bar type 1");
             }
             else if (getAppBar().PrimaryCommands.Count > 0)
             {
                 getAppBar().ClosedDisplayMode = AppBarClosedDisplayMode.Minimal;
                 getAppBar().IsOpen = true;
                 //ApplicationBar.IsMenuEnabled = true;
                 getAppBar().Opacity = 0.75;
+                deb("Tool bar type 2");
             }
             else
             {
                 getAppBar().ClosedDisplayMode = AppBarClosedDisplayMode.Compact;
                 getAppBar().IsOpen = false;
                 //ApplicationBar.IsMenuEnabled = false;
                 getAppBar().Opacity = 1.0;
+                deb("Tool bar type 3");
             }
         }
 
         // *** TOOLBAR ***
 
         public void toolbarRemoveAllButtons()
         {
-
+            deb("Removing buttons");
             if (!isUIThread) { InvokeInUIThread(delegate() { toolbarRemoveAllButtons(); }); return; }
 
             foreach(ICommandBarElement value in getAppBar().PrimaryCommands.ToList()){

diff --git a/platform/uwp/rhodes/common/RhoResourceMap.cs b/platform/uwp/rhodes/common/RhoResourceMap.cs
@@ -58,7 +58,7 @@ private static void copyMap(String strMap)
             {
                 String[] values = files[i].Split('|');
 
-                String strFile    = "rho/" + values[0];
+                String strFile    = "rho" + values[0];
                 String strDstFile = strFile;
 
                 if (values[1] == "dir")

diff --git a/platform/uwp/rhodes/rhodes.csproj b/platform/uwp/rhodes/rhodes.csproj
@@ -22,7 +22,7 @@
     <DefaultLanguage>en-US</DefaultLanguage>
     <TargetPlatformIdentifier>UAP</TargetPlatformIdentifier>
     <TargetPlatformVersion>10.0.14393.0</TargetPlatformVersion>
-    <TargetPlatformMinVersion>10.0.10586.0</TargetPlatformMinVersion>
+    <TargetPlatformMinVersion>10.0.14393.0</TargetPlatformMinVersion>
     <MinimumVisualStudioVersion>14</MinimumVisualStudioVersion>
     <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{A5A43C5B-DE2A-4C0C-9213-0A381AF9435A};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
@@ -71,6 +71,8 @@
     <UseVSHostingProcess>false</UseVSHostingProcess>
     <ErrorReport>prompt</ErrorReport>
     <Prefer32Bit>true</Prefer32Bit>
+    <UseDotNetNativeToolchain>true</UseDotNetNativeToolchain>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
     <DebugType>pdbonly</DebugType>
@@ -202,10 +204,10 @@
     <SDKReference Include="Microsoft.VCLibs, Version=14.0">
       <Name>Visual C++ 2015 Runtime for Universal Windows Platform Apps</Name>
     </SDKReference>
-    <SDKReference Include="WindowsDesktop, Version=10.0.10586.0">
+    <SDKReference Include="WindowsDesktop, Version=10.0.14393.0">
       <Name>Windows Desktop Extensions for the UWP</Name>
     </SDKReference>
-    <SDKReference Include="WindowsIoT, Version=10.0.10586.0">
+    <SDKReference Include="WindowsIoT, Version=10.0.14393.0">
       <Name>Windows IoT Extensions for the UWP</Name>
     </SDKReference>
   </ItemGroup>

diff --git a/platform/uwp/rholib/rholib.vcxproj b/platform/uwp/rholib/rholib.vcxproj
@@ -36,7 +36,7 @@
     <AppContainerApplication>true</AppContainerApplication>
     <ApplicationType>Windows Store</ApplicationType>
     <WindowsTargetPlatformVersion>10.0.14393.0</WindowsTargetPlatformVersion>
-    <WindowsTargetPlatformMinVersion>10.0.10586.0</WindowsTargetPlatformMinVersion>
+    <WindowsTargetPlatformMinVersion>10.0.14393.0</WindowsTargetPlatformMinVersion>
     <ApplicationTypeRevision>10.0</ApplicationTypeRevision>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />

diff --git a/platform/uwp/rhoruntime/common/RhodesHelperWP8.h b/platform/uwp/rhoruntime/common/RhodesHelperWP8.h
@@ -100,7 +100,7 @@ extern "C" {
 }
 #endif //__cplusplus
 
-#if (defined(_WP8_LIB) || defined(_UWP_LIB)) && !defined(_WINRT_DLL)
+#if defined(_UWP_LIB) && !defined(_WINRT_DLL)
 #define CreateFileW Rho_CreateFileW
 #define CreateFileA Rho_CreateFileW
 #define CreateFile Rho_CreateFileW

diff --git a/platform/uwp/rhoruntime/rhoruntime.cpp b/platform/uwp/rhoruntime/rhoruntime.cpp
@@ -378,7 +378,7 @@ extern "C" void rho_title_change(const int tabIndex, const char* strTitle)
 
 extern "C" const char* rho_native_rhopath()
 {
-    return "rho/"; //rho/apps?
+    return "rho"; //rho/apps?
 }