diff options
| author | Lakshmi Priya Sekar <lasekar@microsoft.com> | 2015-09-08 12:01:33 -0700 |
|---|---|---|
| committer | Lakshmi Priya Sekar <lasekar@microsoft.com> | 2015-09-08 14:31:43 -0700 |
| commit | 260f64716ae3bc8fb9ae4708cbb8d4a0a6c48a91 (patch) | |
| tree | eaf3d7a932739a8da89e64f0c9ac322e8c671dba /src/palrt | |
| parent | 2d2d0a5b512e2832565c448d9b4c6d6c1897f150 (diff) | |
| download | coreclr-260f64716ae3bc8fb9ae4708cbb8d4a0a6c48a91.tar.gz coreclr-260f64716ae3bc8fb9ae4708cbb8d4a0a6c48a91.tar.bz2 coreclr-260f64716ae3bc8fb9ae4708cbb8d4a0a6c48a91.zip | |
Replace MAX_PATH with new defines, rest of coreclr.
Diffstat (limited to 'src/palrt')
| -rw-r--r-- | src/palrt/path.cpp | 6 | ||||
| -rw-r--r-- | src/palrt/shstr.h | 2 | ||||
| -rw-r--r-- | src/palrt/urlpars.cpp | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/src/palrt/path.cpp b/src/palrt/path.cpp index 3aaae18a27..fa88eb4a84 100644 --- a/src/palrt/path.cpp +++ b/src/palrt/path.cpp @@ -280,7 +280,7 @@ STDAPI_(BOOL) PathCanonicalizeW(LPWSTR lpszDst, LPCWSTR lpszSrc) BOOL fUNC; int cchPC; - RIPMSG(lpszDst && IS_VALID_WRITE_BUFFER(lpszDst, WCHAR, MAX_PATH), "PathCanonicalize: caller passed bad lpszDst"); + RIPMSG(lpszDst && IS_VALID_WRITE_BUFFER(lpszDst, WCHAR, MAX_LONGPATH), "PathCanonicalize: caller passed bad lpszDst"); RIPMSG(lpszSrc && IS_VALID_STRING_PTR(lpszSrc, -1), "PathCanonicalize: caller passed bad lpszSrc"); RIPMSG(lpszDst != lpszSrc, "PathCanonicalize: caller passed the same buffer for lpszDst and lpszSrc"); @@ -466,7 +466,7 @@ STDAPI_(LPWSTR) PathCombineW(LPWSTR lpszDest, LPCWSTR lpszDir, LPCWSTR lpszFile) { // Skip the backslash when copying // Note: We don't support strings longer than 4GB, but that's - // okay because we already barf at MAX_PATH + // okay because we already barf at MAX_LONGPATH lstrcpynW(pszT, lpszFile+1, (int)(ARRAYSIZE(szTemp) - (pszT - szTemp))); } else @@ -541,7 +541,7 @@ STDAPI_(LPWSTR) PathAddBackslashW(LPWSTR lpszPath) // if we find these cases, return NULL. Note: We need to // check those places that call us to handle their GP fault // if they try to use the NULL! - if (ichPath >= (MAX_PATH - 2)) // -2 because ichPath doesn't include NULL, and we're adding a CH_WHACK. + if (ichPath >= (MAX_LONGPATH - 2)) // -2 because ichPath doesn't include NULL, and we're adding a CH_WHACK. { return(NULL); } diff --git a/src/palrt/shstr.h b/src/palrt/shstr.h index 41cc79dffc..0fb7bced28 100644 --- a/src/palrt/shstr.h +++ b/src/palrt/shstr.h @@ -16,7 +16,7 @@ // default shstr to something small, so we don't waste too much stack space // MAX_PATH is used frequently, so we'd like to a factor of that - so that // if we do grow to MAX_PATH size, we don't waste any extra. -#define DEFAULT_SHSTR_LENGTH (MAX_PATH/4) +#define DEFAULT_SHSTR_LENGTH (MAX_PATH_FNAME/4) #ifdef UNICODE diff --git a/src/palrt/urlpars.cpp b/src/palrt/urlpars.cpp index 5f71a88cd8..2570d8da57 100644 --- a/src/palrt/urlpars.cpp +++ b/src/palrt/urlpars.cpp @@ -289,8 +289,8 @@ ParseURLW( #ifdef DEBUG if (hr==S_OK) { - WCHAR rgchDebugProtocol[MAX_PATH]; - WCHAR rgchDebugSuffix[MAX_PATH]; + WCHAR rgchDebugProtocol[MAX_PATH_FNAME]; + WCHAR rgchDebugSuffix[MAX_PATH_FNAME]; // (+ 1) for null terminator. |