Attachment 132121 Details for Bug 98705 – Patch for resolving the Bug

[patch] Patch for resolving the Bug

GetCaseCorrectPathName.diff (text/plain), 5.06 KB, created by aasthaagrrawal on 2017-03-24 10:36:14 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: aasthaagrrawal

Created: 2017-03-24 10:36:14 UTC

Size: 5.06 KB

patch

obsolete

>diff --git a/sal/osl/w32/file_dirvol.cxx b/sal/osl/w32/file_dirvol.cxx
>index 4351ba0..345e473 100644
>--- a/sal/osl/w32/file_dirvol.cxx
>+++ b/sal/osl/w32/file_dirvol.cxx
>@@ -1669,10 +1669,10 @@ oslFileError SAL_CALL osl_getFileStatus(
>         if ( !pItemImpl->bFullPathNormalized )
>         {
>             ::osl::LongPathBuffer< sal_Unicode > aBuffer( MAX_LONG_PATH );
>-            sal_uInt32 nNewLen = GetCaseCorrectPathName( rtl_uString_getStr( pItemImpl->m_pFullPath ),
>+            sal_uInt32 nNewLen = GetLongPathName( rtl_uString_getStr( pItemImpl->m_pFullPath ),
>                                                       ::osl::mingw_reinterpret_cast<LPWSTR>( aBuffer ),
>-                                                      aBuffer.getBufSizeInSymbols(),
>-                                                      true );
>+                                                      aBuffer.getBufSizeInSymbols()
>+                                                      );
> 
>             if ( nNewLen )
>             {
>diff --git a/sal/osl/w32/file_url.cxx b/sal/osl/w32/file_url.cxx
>index ce61eb1..52f7f65 100644
>--- a/sal/osl/w32/file_url.cxx
>+++ b/sal/osl/w32/file_url.cxx
>@@ -450,37 +450,39 @@ static DWORD GetCaseCorrectPathNameEx(
>         return _tcslen( lpszPath );
> }
> 
>-DWORD GetCaseCorrectPathName(
>-    LPCWSTR lpszShortPath,  // file name
>-    LPWSTR  lpszLongPath,   // path buffer
>-    DWORD   cchBuffer,      // size of path buffer
>-    BOOL bCheckExistence
>-)
>-{
>-    /* Special handling for "\\.\" as system root */
>-    if ( lpszShortPath && 0 == wcscmp( lpszShortPath, WSTR_SYSTEM_ROOT_PATH ) )
>-    {
>-        if ( cchBuffer >= SAL_N_ELEMENTS(WSTR_SYSTEM_ROOT_PATH) )
>-        {
>-            wcscpy( lpszLongPath, WSTR_SYSTEM_ROOT_PATH );
>-            return SAL_N_ELEMENTS(WSTR_SYSTEM_ROOT_PATH) - 1;
>-        }
>-        else
>-        {
>-            return SAL_N_ELEMENTS(WSTR_SYSTEM_ROOT_PATH) - 1;
>-        }
>-    }
>-    else if ( lpszShortPath )
>-    {
>-        if ( _tcslen( lpszShortPath ) <= cchBuffer )
>-        {
>-            _tcscpy( lpszLongPath, lpszShortPath );
>-            return GetCaseCorrectPathNameEx( lpszLongPath, cchBuffer, 0, bCheckExistence );
>-        }
>-    }
>-
>-    return 0;
>-}
>+/*
>+ * DWORD GetCaseCorrectPathName(
>+ *    LPCWSTR lpszShortPath,  // file name
>+ *    LPWSTR  lpszLongPath,   // path buffer
>+ *    DWORD   cchBuffer,      // size of path buffer
>+ *    BOOL bCheckExistence
>+ * )
>+ * {
>+ *    /* Special handling for "\\.\" as system root */
>+ *    if ( lpszShortPath && 0 == wcscmp( lpszShortPath, WSTR_SYSTEM_ROOT_PATH ) )
>+ *    {
>+ *        if ( cchBuffer >= SAL_N_ELEMENTS(WSTR_SYSTEM_ROOT_PATH) )
>+ *        {
>+ *            wcscpy( lpszLongPath, WSTR_SYSTEM_ROOT_PATH );
>+ *            return SAL_N_ELEMENTS(WSTR_SYSTEM_ROOT_PATH) - 1;
>+ *        }
>+ *        else
>+ *        {
>+ *            return SAL_N_ELEMENTS(WSTR_SYSTEM_ROOT_PATH) - 1;
>+ *        }
>+ *    }
>+ *    else if ( lpszShortPath )
>+ *    {
>+ *        if ( _tcslen( lpszShortPath ) <= cchBuffer )
>+ *        {
>+ *            _tcscpy( lpszLongPath, lpszShortPath );
>+ *            return GetCaseCorrectPathNameEx( lpszLongPath, cchBuffer, 0, bCheckExistence );
>+ *        }
>+ *    }
>+ *
>+ *    return 0;
>+ * }
>+ */
> 
> static bool osl_decodeURL_( rtl_String* strUTF8, rtl_uString** pstrDecodedURL )
> {
>@@ -683,10 +685,10 @@ oslFileError osl_getSystemPathFromFileURL_( rtl_uString *strURL, rtl_uString **p
>                 else
>                 {
>                     ::osl::LongPathBuffer< sal_Unicode > aBuf( MAX_LONG_PATH );
>-                    sal_uInt32 nNewLen = GetCaseCorrectPathName( pDecodedURL + nSkip,
>+                    sal_uInt32 nNewLen = GetLongPathName( pDecodedURL + nSkip,
>                                                                  ::osl::mingw_reinterpret_cast<LPWSTR>(aBuf),
>-                                                                 aBuf.getBufSizeInSymbols(),
>-                                                                 false );
>+                                                                 aBuf.getBufSizeInSymbols()
>+                                                                 );
> 
>                     if ( nNewLen <= MAX_PATH - 12
>                       || 0 == rtl_ustr_shortenedCompareIgnoreAsciiCase_WithLength( pDecodedURL + nSkip, nDecodedLen - nSkip, WSTR_SYSTEM_ROOT_PATH, SAL_N_ELEMENTS(WSTR_SYSTEM_ROOT_PATH) - 1, SAL_N_ELEMENTS(WSTR_SYSTEM_ROOT_PATH) - 1 )
>diff --git a/sal/osl/w32/file_url.hxx b/sal/osl/w32/file_url.hxx
>index 6ccbc61..fff33ba 100644
>--- a/sal/osl/w32/file_url.hxx
>+++ b/sal/osl/w32/file_url.hxx
>@@ -60,12 +60,13 @@ DWORD IsValidFilePath (
>     rtl_uString ** corrected
> );
> 
>-DWORD GetCaseCorrectPathName (
>-    LPCWSTR lpszShortPath,  // file name
>-    LPWSTR  lpszLongPath,   // path buffer
>-    DWORD   cchBuffer,      // size of path buffer
>-    BOOL bCheckExistence
>-);
>+/* DWORD GetCaseCorrectPathName (
>+ *    LPCWSTR lpszShortPath,  // file name
>+ *    LPWSTR  lpszLongPath,   // path buffer
>+ *    DWORD   cchBuffer,      // size of path buffer
>+ *    BOOL bCheckExistence
>+ * );
>+ */
> 
> oslFileError osl_getSystemPathFromFileURL_ (
>     rtl_uString *  strURL,

Actions: View

Attachments on bug 98705: 132121 | 132143