Rewrite portions of EbrFile handling to use UTF16

Frameworks/Foundation/NSPathUtilities.mm

@@ -39,15 +39,15 @@
 // Helper that gets the path for a folder dirName under the current app's AppData/Local... directory,
 // creating the folder if necessary
 NSString* _getCreateAppDataLocalDir(const char* dirName) {
-    auto ret = [NSString stringWithFormat:@"%hs/%hs", EbrGetWritableFolder(), dirName];
+    auto ret = [NSString stringWithFormat:@"%S/%hs", EbrGetWritableFolder(), dirName];
     _mkdir([ret cStringUsingEncoding:NSUTF8StringEncoding]);
     return ret;
 }
 
 // Override for when a higher-level directory needs to be created first (eg: Foo1/Foo2/)
 NSString* _getCreateAppDataLocalDir(const char* dirName1, const char* dirName2) {
     _getCreateAppDataLocalDir(dirName1);
-    auto ret = [NSString stringWithFormat:@"%hs/%hs/%hs", EbrGetWritableFolder(), dirName1, dirName2];
+    auto ret = [NSString stringWithFormat:@"%S/%hs/%hs", EbrGetWritableFolder(), dirName1, dirName2];
     _mkdir([ret cStringUsingEncoding:NSUTF8StringEncoding]);
     return ret;
 }

Frameworks/Starboard/AssetFile.cpp

@@ -79,8 +79,9 @@ bool EbrFSDirReader::readNext(EbrDir* curDir, EbrDirEnt* ent) {
 EbrDir* EbrOpenDir(const char* path) {
     CPathMapper map(path);
 
-    if (!map)
+    if (!map) {
         return NULL;
+    }
 
     EbrDirReader* fsReader = EbrFSDirReader::open(map.MappedPath());
     if (!fsReader) {

Frameworks/Starboard/EbrFile.cpp

@@ -161,13 +161,17 @@ bool EbrUnlink(const char* path) {
 }
 
 #define mkdir _mkdir
-char g_WritableFolder[2048] = ".";
+std::wstring g_WritableFolder(L".");
 
-void EbrSetWritableFolder(const char* folder) {
-    strcpy_s(g_WritableFolder, folder);
+void IwSetWritableFolder(const wchar_t* folder) {
+    g_WritableFolder = folder;
 }
 
-const char* EbrGetWritableFolder() {
+const wchar_t* IwGetWritableFolder() {
+    return g_WritableFolder.c_str();
+}
+
+const std::wstring& _IwGetWritableFolder() {
     return g_WritableFolder;
 }
 

Frameworks/Starboard/PathMapper.cpp

@@ -20,12 +20,11 @@
 
 #include <algorithm>
 #include <list>
-#include <regex>
 
 #include "Platform/EbrPlatform.h"
 #include "PathMapper.h"
 
-// utility function to tokenize string using delmiters
+// utility function to tokenize string using delimiters
 // d:\src/winobjc ==> d:, src, winobjc
 // /src/winobjc ==> "", src, winobjc
 // / ==> ""
@@ -59,9 +58,9 @@ static void _EscapeIllegalPathCharacters(std::wstring& str) {
 }
 
 // normalize relative path
-//  1 remove any "." or "" components
-//  2 from reverse, remove any ".." and preceeding component
-// if components becomes empty, return "."
+// 1 remove any "." or "" components
+// 2 remove any ".." and preceeding component
+// 3 if components becomes empty, return "."
 
 static void _NormalizeRelativePathComponents(std::list<std::wstring>& components) {
     for (auto it = components.begin(); it != components.end();) {
@@ -76,6 +75,8 @@ static void _NormalizeRelativePathComponents(std::list<std::wstring>& components
                 break;
             }
             // we have to do this in case the last component is ..
+            // erase the previous component first because erase returns the next item
+            // which would be "..".
             it = components.erase(--it);
             it = components.erase(it);
         } else {
@@ -98,15 +99,13 @@ std::wstring _MapPathRoot(const std::wstring& root) {
         return std::wstring(L".\\home");
     }
 
-    std::wregex drive(L"[a-zA-Z]:");
-
-    if (std::regex_match(root, drive)) {
+    if (root.length() == 2 && iswalpha(root[0]) && root[1] == L':') {
         return root;
     }
 
-    for (int i = 0; i < _countof(c_specialFolders); ++i) {
+    for (auto root : c_specialFolders) {
         if (_wcsicmp(root.c_str(), c_specialFolders[i].c_str()) == 0) {
-            return Strings::NarrowToWide<std::wstring>(EbrGetWritableFolder()) + std::wstring(L"\\") + c_specialFolders[i];
+            return IwGetWritableFolder() + std::wstring(L"\\") + c_specialFolders[i];
         }
     }
 

Frameworks/UIKit/StarboardXaml/ApplicationCompositor.cpp

@@ -39,12 +39,11 @@ void InitializeApp() {
     initialized = true;
 
     // Set our writable and temp folders
-    char writableFolder[2048];
-    size_t outLen;
     auto pathData = Windows::Storage::ApplicationData::Current->LocalFolder->Path;
-    wcstombs_s(&outLen, writableFolder, pathData->Data(), sizeof(writableFolder) - 1);
-    EbrSetWritableFolder(writableFolder);
+    IwSetWritableFolder(pathData->Data());
 
+    char writableFolder[2048];
+    size_t outLen;
     auto tempPathData = Windows::Storage::ApplicationData::Current->TemporaryFolder->Path;
     wcstombs_s(&outLen, writableFolder, tempPathData->Data(), sizeof(writableFolder) - 1);
     SetTemporaryFolder(writableFolder);

Frameworks/include/Platform/EbrPlatform.h

@@ -82,8 +82,8 @@ SB_EXPORT int EbrGetTimeOfDay(struct EbrTimeval* curtime);
 SB_EXPORT double EbrGetMediaTime();
 SB_EXPORT int EbrGetWantedOrientation();
 
-SB_EXPORT const char* EbrGetWritableFolder();
-SB_EXPORT void EbrSetWritableFolder(const char* folder);
+SB_EXPORT const wchar_t* IwGetWritableFolder();
+SB_EXPORT void IwSetWritableFolder(const wchar_t* folder);
 
 SB_EXPORT void EbrBlockIfBackground();
 

build/Starboard/dll/Starboard.def

@@ -164,8 +164,6 @@ LIBRARY Starboard
         EbrGetTimeOfDay
         EbrGetMediaTime
         EbrGetWantedOrientation
-        EbrGetWritableFolder
-        EbrSetWritableFolder
         EbrBlockIfBackground
         EbrEventInit
         EbrEventSignal
@@ -175,5 +173,8 @@ LIBRARY Starboard
         EbrEventTimedMultipleWait
         EbrEventDestroy
 
+        IwGetWritableFolder
+        IwSetWritableFolder
+
         ; REMOVE / CLEANUP C++ EXPORTS
         ?format@string@woc@@YA?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@PBDZZ

tests/unittests/Starboard/PathMapperTests.mm

@@ -17,10 +17,12 @@
 #include <TestFramework.h>
 #include "pathmapper.h"
 
-extern "C" void EbrSetWritableFolder(const char*);
+extern "C" void IwSetWritableFolder(const wchar_t*);
+extern "C" const wchar_t* IwGetWritableFolder();
 
 TEST(PathMapper, pathMapper) {
-    EbrSetWritableFolder("d:\\temp");
+    std::wstring writableFolder = EbrGetWritableFolder();
+    IwSetWritableFolder(L"d:\\temp");
 
     CPathMapper mapper1("c:/users/winobjc-bot");
     EXPECT_EQ_MSG(0, wcscmp(mapper1, L"c:\\users\\winobjc-bot"), "%S", (const wchar_t*)mapper1);
@@ -69,6 +71,8 @@
 
     CPathMapper mapper16("/AppSupport/.\\?/");
     EXPECT_EQ_MSG(0, wcscmp(mapper16, L"d:\\temp\\AppSupport\\+"), "%S", (const wchar_t*)mapper16);
+
+    IwSetWritableFolder(writableFolder.c_str());
 }
 
 TEST(PathMapper, RelativePathTests) {