Replace missed MAX_PATH defines with new defines in vm.
authorLakshmi Priya Sekar <lasekar@microsoft.com>
Thu, 27 Aug 2015 18:24:07 +0000 (11:24 -0700)
committerLakshmi Priya Sekar <lasekar@microsoft.com>
Thu, 27 Aug 2015 18:24:07 +0000 (11:24 -0700)
src/vm/eventtrace.cpp
src/vm/fusioninit.cpp
src/vm/rtlfunctions.cpp
src/vm/util.cpp

index 055fb2f..13c704f 100644 (file)
@@ -4933,10 +4933,10 @@ VOID ETW::InfoLog::RuntimeInformation(INT32 type)
 
             _ASSERTE (NumItems(dllPath) > MAX_LONGPATH);
             // if WszGetModuleFileName fails, we return an empty string
-            if (!WszGetModuleFileName(GetCLRModule(), dllPath, MAX_PATH)) {
+            if (!WszGetModuleFileName(GetCLRModule(), dllPath, MAX_LONGPATH)) {
                 dllPath[0] = 0;
             }
-            dllPath[MAX_PATH] = 0;
+            dllPath[MAX_LONGPATH] = 0;
 
             if(type == ETW::InfoLog::InfoStructs::Callback)
             {
index b246308..bdfd791 100644 (file)
@@ -192,7 +192,7 @@ HRESULT STDMETHODCALLTYPE InitializeFusion()
     DWORD               dwSize = 0;
     BOOL                fExecutableIsKnown = FALSE;
     LPWSTR              pwzFileName = NULL;
-    WCHAR               wzBindingConfigPath[MAX_PATH + 1];
+    WCHAR               wzBindingConfigPath[MAX_LONGPATH + 1];
 
     BEGIN_SO_INTOLERANT_CODE_NO_THROW_CHECK_THREAD(return COR_E_STACKOVERFLOW);
     
@@ -207,7 +207,7 @@ HRESULT STDMETHODCALLTYPE InitializeFusion()
 
     g_lcid = MAKELCID(LOCALE_INVARIANT, SORT_DEFAULT);
 
-    WszGetModuleFileName(g_hInst, g_FusionDllPath, MAX_PATH);
+    WszGetModuleFileName(g_hInst, g_FusionDllPath, MAX_LONGPATH);
 
     if (!InitFusionCriticalSections()) {
         hr = E_OUTOFMEMORY;
index 60d001c..8db5555 100644 (file)
@@ -81,7 +81,7 @@ VOID InstallEEFunctionTable (
 
     if (wszModuleName == NULL)        
     {
-        WCHAR rgwTempName[MAX_PATH] = {0};
+        WCHAR rgwTempName[MAX_LONGPATH] = {0};
         DWORD dwTempNameSize = MAX_LONGPATH;
 
         // Leaves trailing backslash on path, producing something like "c:\windows\microsoft.net\framework\v4.0.x86dbg\"
index 5abf8c8..9c13540 100644 (file)
@@ -1311,7 +1311,7 @@ HRESULT WszSHGetFolderPath(
     _ASSERTE(cchPathMax >= MAX_LONGPATH);
 
     HRESULT hr;
-    ULONG maxLength = MAX_PATH;
+    ULONG maxLength = MAX_LONGPATH;
     HMODULE _hmodShell32 = 0;
     HMODULE _hmodSHFolder = 0;