ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Better fix for removing trailing spaces in RtlGetFullPathName_U. 

Need to remove trailing dots too (reported by Ken Belleau).
This commit is contained in:
Alexandre Julliard 2004-05-14 22:10:24 +00:00
parent ad546918b4
commit 63a5d81cfa
2 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
dlls/ntdll/path.c
View File

@ -506,6 +506,10 @@ static inline void collapse_path( WCHAR *path, UINT mark )
while (*p && *p != '\\') p++;
if (*p == '\\') p++;
}
/* remove trailing spaces and dots (yes, Windows really does that, don't ask) */
while (p > path + mark && (p[-1] == ' ' || p[-1] == '.')) p--;
*p = 0;
}
@ -533,17 +537,16 @@ static const WCHAR *skip_unc_prefix( const WCHAR *ptr )
*/
static ULONG get_full_path_helper(LPCWSTR name, LPWSTR buffer, ULONG size)
{
ULONG reqsize = 0, mark = 0, dep = 0, deplen, name_len;
ULONG reqsize = 0, mark = 0, dep = 0, deplen;
DOS_PATHNAME_TYPE type;
LPWSTR ins_str = NULL;
LPCWSTR ptr;
const UNICODE_STRING* cd;
WCHAR tmp[4];
/* remove trailing spaces (yes, Windows really does that, don't ask) */
name_len = strlenW( name );
while (name_len && name[name_len-1] == ' ') name_len--;
if (!name_len) return 0;
/* return error if name only consists of spaces */
for (ptr = name; *ptr; ptr++) if (*ptr != ' ') break;
if (!*ptr) return 0;
RtlAcquirePebLock();
@ -679,7 +682,7 @@ static ULONG get_full_path_helper(LPCWSTR name, LPWSTR buffer, ULONG size)
}
/* enough space ? */
deplen = (name_len - dep) * sizeof(WCHAR);
deplen = strlenW(name + dep) * sizeof(WCHAR);
if (reqsize + deplen + sizeof(WCHAR) > size)
{
/* not enough space, return need size (including terminating '\0') */
@ -687,8 +690,7 @@ static ULONG get_full_path_helper(LPCWSTR name, LPWSTR buffer, ULONG size)
goto done;
}
memmove(buffer + reqsize / sizeof(WCHAR), name + dep, deplen);
buffer[(reqsize + deplen) / sizeof(WCHAR)] = 0;
memmove(buffer + reqsize / sizeof(WCHAR), name + dep, deplen + sizeof(WCHAR));
if (reqsize) memcpy(buffer, ins_str, reqsize);
reqsize += deplen;

7
dlls/ntdll/tests/path.c
View File

@ -240,6 +240,11 @@ static void test_RtlGetFullPathName_U()
{
{ "c:/test", "c:\\test", "test"},
{ "c:/test ", "c:\\test", "test"},
{ "c:/test.", "c:\\test", "test"},
{ "c:/test .... .. ", "c:\\test", "test"},
{ "c:/test/ .... .. ", "c:\\test\\", NULL},
{ "c:/test/..", "c:\\", NULL},
{ "c:/test/.. ", "c:\\test\\", NULL},
{ "c:/TEST", "c:\\test", "test"},
{ "c:/test/file", "c:\\test\\file", "file"},
{ "c:/test/././file", "c:\\test\\file", "file"},
@ -265,7 +270,7 @@ static void test_RtlGetFullPathName_U()
len= strlen(test->rname) * sizeof(WCHAR);
pRtlMultiByteToUnicodeN(pathbufW , sizeof(pathbufW), NULL, test->path, strlen(test->path)+1 );
ret = pRtlGetFullPathName_U( pathbufW,MAX_PATH, rbufferW, &file_part);
ok( ret == len, "Wrong result %ld/%d for %s\n", ret, len, test->path );
ok( ret == len, "Wrong result %ld/%d for \"%s\"\n", ret, len, test->path );
ok(pRtlUnicodeToMultiByteN(rbufferA,MAX_PATH,&reslen,rbufferW,MAX_PATH) == STATUS_SUCCESS,
"RtlUnicodeToMultiByteN failed\n");
ok(strcasecmp(rbufferA,test->rname) == 0, "Got \"%s\" expected \"%s\"\n",rbufferA,test->rname);