Merge pull request #1589 from Priya91/pathstring

Use SString type - PathString for path allocations in binder.

Author: Priya91

src/binder/assemblybinder.cpp

@@ -164,7 +164,7 @@ namespace BINDER_SPACE
             }
             else
             {
-                PathString fullAssemblyPath;
+                SString fullAssemblyPath;
                 WCHAR *pwzFullAssemblyPath = fullAssemblyPath.OpenUnicodeBuffer(MAX_LONGPATH);
                 DWORD dwCCFullAssemblyPath = MAX_LONGPATH + 1; // SString allocates extra byte for null.
 
@@ -184,9 +184,6 @@ namespace BINDER_SPACE
                 {
                     assemblyPath.Set(fullAssemblyPath);
                 }
-
-                // Now turn this path into our canonical representation
-                CanonicalizePath(assemblyPath);
             }
 
             return hr;

src/binder/cdebuglog.cpp

@@ -56,7 +56,7 @@ namespace BINDER_SPACE
         {
             HRESULT hr=S_OK;
             LPTSTR  pszFileName;
-            TCHAR   szPath[MAX_LONGPATH];
+            PathString szPathString;
             DWORD   dw = 0;
 
             // _ASSERTE (pszPath ) ;
@@ -65,8 +65,12 @@ namespace BINDER_SPACE
                 IF_FAIL_GO(HRESULT_FROM_WIN32(ERROR_BUFFER_OVERFLOW));
             }
 
-            IF_FAIL_GO(StringCbCopy(szPath, sizeof(szPath), pszName));
-
+            size_t pszNameLen = wcslen(pszName);
+            WCHAR * szPath = szPathString.OpenUnicodeBuffer(static_cast<COUNT_T>(pszNameLen));
+            size_t cbSzPath = (sizeof(WCHAR)) * (pszNameLen + 1); // SString allocates extra byte for null
+            IF_FAIL_GO(StringCbCopy(szPath, cbSzPath, pszName));
+            szPathString.CloseBuffer(static_cast<COUNT_T>(pszNameLen));
+            
             pszFileName = PathFindFileName(szPath);
 
             if (pszFileName <= szPath)
@@ -330,7 +334,6 @@ namespace BINDER_SPACE
         CombinePath(g_BinderVariables->logPath, sCategory, logFilePath);
         CombinePath(logFilePath, m_applicationName, logFilePath);
         CombinePath(logFilePath, m_logFileName, logFilePath);
-        CanonicalizePath(logFilePath);
 
         BINDER_LOG_STRING(L"logFilePath", logFilePath);
 

src/binder/debuglog.cpp

@@ -90,7 +90,6 @@ namespace BINDER_SPACE
                                        kCount2.u.HighPart);
 
                     PlatformPath(logFilePath);
-                    CanonicalizePath(logFilePath);
                 }
 
                 fFileExists = (FileOrDirectoryExists(logFilePath) == S_OK);

src/binder/inc/bindertypes.hpp

@@ -32,8 +32,6 @@ class PEAssembly;
 
 namespace BINDER_SPACE
 {
-    typedef InlineSString<MAX_LONGPATH + 1> PathString;
-
     class AssemblyVersion;
     class AssemblyName;
     class Assembly;

src/binder/utils.cpp

@@ -260,37 +260,6 @@ namespace BINDER_SPACE
         BINDER_LOG_LEAVE(W("Utils::PlatformPath"));
     }
 
-    void CanonicalizePath(SString &path, BOOL fAppendPathSeparator)
-    {
-        BINDER_LOG_ENTER(W("Utils::CanonicalizePath"));
-        BINDER_LOG_STRING(W("input path"), path);
-
-        if (!path.IsEmpty())
-        {
-            WCHAR wszCanonicalPath[MAX_LONGPATH];
-            PlatformPath(path);
-
-            // This is also defined in rotor pal
-            if (PathCanonicalizeW(wszCanonicalPath, path))
-            {
-                path.Set(wszCanonicalPath);
-            }
-
-            if (fAppendPathSeparator)
-            {
-                SString platformPathSeparator(SString::Literal, GetPlatformPathSeparator());
-
-                if (!path.EndsWith(platformPathSeparator))
-                {
-                    path.Append(platformPathSeparator);
-                }
-            }
-        }
-
-        BINDER_LOG_STRING(W("canonicalized path"), path);
-        BINDER_LOG_LEAVE(W("Utils::CanonicalizePath"));
-    }
-
     void CombinePath(SString &pathA,
                      SString &pathB,
                      SString &combinedPath)
@@ -300,17 +269,16 @@ namespace BINDER_SPACE
         BINDER_LOG_STRING(W("path A"), pathA);
         BINDER_LOG_STRING(W("path B"), pathB);
 
-        WCHAR tempResultPath[MAX_LONGPATH];
-        if (PathCombineW(tempResultPath, pathA, pathB))
-        {
-            combinedPath.Set(tempResultPath);
-            BINDER_LOG_STRING(W("combined path"), tempResultPath);
-        }
-        else
+        SString platformPathSeparator(SString::Literal, GetPlatformPathSeparator());
+        combinedPath.Set(pathA);
+        
+        if (!combinedPath.EndsWith(platformPathSeparator))
         {
-            combinedPath.Clear();
+            combinedPath.Append(platformPathSeparator);
         }
 
+        combinedPath.Append(pathB);
+        
         BINDER_LOG_LEAVE(W("Utils::CombinePath"));
     }
 

src/classlibnative/bcltype/system.cpp

@@ -24,6 +24,7 @@
 #include "classnames.h"
 #include "system.h"
 #include "string.h"
+#include "sstring.h"
 #include "eeconfig.h"
 #include "assemblynative.hpp"
 #include "generics.h"
@@ -288,34 +289,29 @@ FCIMPL0(StringObject*, SystemNative::_GetModuleFileName)
 {
     FCALL_CONTRACT;
 
-    WCHAR wszFile[MAX_LONGPATH];
-    STRINGREF   refRetVal   = NULL;
-    LPCWSTR pFileName = NULL;
-    DWORD lgth = 0;
+    STRINGREF   refRetVal = NULL;
 
+    HELPER_METHOD_FRAME_BEGIN_RET_1(refRetVal);
     if (g_pCachedModuleFileName)
     {
-        pFileName = g_pCachedModuleFileName;
-        lgth = (DWORD)wcslen(pFileName);
+        refRetVal = StringObject::NewString(g_pCachedModuleFileName);
     }
     else
     {
-        HELPER_METHOD_FRAME_BEGIN_RET_1(refRetVal);
-        lgth = WszGetModuleFileName(NULL, wszFile, MAX_LONGPATH);
+        SString wszFilePathString;
+
+        WCHAR * wszFile = wszFilePathString.OpenUnicodeBuffer(MAX_LONGPATH);
+        DWORD lgth = WszGetModuleFileName(NULL, wszFile, MAX_LONGPATH);
         if (!lgth)
         {
             COMPlusThrowWin32();
         }
-        HELPER_METHOD_FRAME_END();
-        pFileName = wszFile;
-    }
+        wszFilePathString.CloseBuffer(lgth);
 
-    if(lgth)
-    {
-        HELPER_METHOD_FRAME_BEGIN_RET_1(refRetVal);
-        refRetVal = StringObject::NewString(pFileName, lgth);
-        HELPER_METHOD_FRAME_END();
+        refRetVal = StringObject::NewString(wszFilePathString.GetUnicode());
     }
+    HELPER_METHOD_FRAME_END();
+
     return (StringObject*)OBJECTREFToObject(refRetVal);
 }
 FCIMPLEND
@@ -347,14 +343,16 @@ FCIMPL0(StringObject*, SystemNative::GetRuntimeDirectory)
 {
     FCALL_CONTRACT;
 
-    wchar_t wszFile[MAX_LONGPATH+1];
     STRINGREF   refRetVal   = NULL;
     DWORD dwFile = MAX_LONGPATH+1;
 
     HELPER_METHOD_FRAME_BEGIN_RET_1(refRetVal);
+    SString wszFilePathString;
 
+    WCHAR * wszFile = wszFilePathString.OpenUnicodeBuffer(dwFile);
     HRESULT hr = GetInternalSystemDirectory(wszFile, &dwFile);
-
+    wszFilePathString.CloseBuffer(dwFile);
+    
     if(FAILED(hr))
         COMPlusThrowHR(hr);
 

src/debug/ee/debugger.cpp

@@ -15136,7 +15136,8 @@ HRESULT Debugger::InitAppDomainIPC(void)
     } hEnsureCleanup(this);
 
     DWORD dwStrLen = 0;
-    WCHAR szExeName[MAX_LONGPATH];
+    SString szExeNamePathString;
+    WCHAR * szExeName = szExeNamePathString.OpenUnicodeBuffer(MAX_LONGPATH);
     int i;
 
     // all fields in the object can be zero initialized.
@@ -15188,6 +15189,7 @@ HRESULT Debugger::InitAppDomainIPC(void)
                                     szExeName,
                                     MAX_LONGPATH);
 
+    szExeNamePathString.CloseBuffer(dwStrLen);
     // If we couldn't get the name, then use a nice default.
     if (dwStrLen == 0)
     {