reactos/wine
1
0
Fork 0
mirror of https://github.com/reactos/wine.git synced 2024-11-25 04:39:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

kernel32: GetShortPathName for a non-existent short file name should fail.

Browse Source
This commit is contained in:
Dmitry Timoshkov 2013-07-19 14:02:38 +09:00 committed by Alexandre Julliard
parent deff27e23e
commit 4cc482bc0d
2 changed files with 8 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
dlls/kernel32/path.c
View File

@ -441,8 +441,6 @@ DWORD WINAPI GetShortPathNameW( LPCWSTR longpath, LPWSTR shortpath, DWORD shortl
DWORD tmplen; DWORD tmplen;
WIN32_FIND_DATAW wfd; WIN32_FIND_DATAW wfd;
HANDLE goit; HANDLE goit;
UNICODE_STRING ustr;
WCHAR ustr_buf[8+1+3+1];
TRACE("%s\n", debugstr_w(longpath)); TRACE("%s\n", debugstr_w(longpath));
@ -465,10 +463,6 @@ DWORD WINAPI GetShortPathNameW( LPCWSTR longpath, LPWSTR shortpath, DWORD shortl
sp = lp = 2; sp = lp = 2;
} }
ustr.Buffer = ustr_buf;
ustr.Length = 0;
ustr.MaximumLength = sizeof(ustr_buf);
while (longpath[lp]) while (longpath[lp])
{ {
/* check for path delimiters and reproduce them */ /* check for path delimiters and reproduce them */
@ -485,29 +479,21 @@ DWORD WINAPI GetShortPathNameW( LPCWSTR longpath, LPWSTR shortpath, DWORD shortl
continue; continue;
} }
for (p = longpath + lp; *p && *p != '/' && *p != '\\'; p++); p = longpath + lp;
if (lp == 0 && p[0] == '.' && (p[1] == '/' || p[1] == '\\'))
{
tmpshortpath[sp++] = *p++;
tmpshortpath[sp++] = *p++;
}
for (; *p && *p != '/' && *p != '\\'; p++);
tmplen = p - (longpath + lp); tmplen = p - (longpath + lp);
lstrcpynW(tmpshortpath + sp, longpath + lp, tmplen + 1); lstrcpynW(tmpshortpath + sp, longpath + lp, tmplen + 1);
/* Check, if the current element is a valid dos name */
if (tmplen <= 8+1+3)
{
BOOLEAN spaces;
memcpy(ustr_buf, longpath + lp, tmplen * sizeof(WCHAR));
ustr_buf[tmplen] = '\0';
ustr.Length = tmplen * sizeof(WCHAR);
if (RtlIsNameLegalDOS8Dot3(&ustr, NULL, &spaces) && !spaces)
{
sp += tmplen;
lp += tmplen;
continue;
}
}
/* Check if the file exists and use the existing short file name */ /* Check if the file exists and use the existing short file name */
goit = FindFirstFileW(tmpshortpath, &wfd); goit = FindFirstFileW(tmpshortpath, &wfd);
if (goit == INVALID_HANDLE_VALUE) goto notfound; if (goit == INVALID_HANDLE_VALUE) goto notfound;
FindClose(goit); FindClose(goit);
strcpyW(tmpshortpath + sp, wfd.cAlternateFileName); strcpyW(tmpshortpath + sp, wfd.cAlternateFileName[0] ? wfd.cAlternateFileName : wfd.cFileName);
sp += strlenW(tmpshortpath + sp); sp += strlenW(tmpshortpath + sp);
lp += tmplen; lp += tmplen;
} }

2
dlls/kernel32/tests/path.c
View File

@ -1281,9 +1281,7 @@ static void test_GetShortPathNameW(void)
/* GetShortPathName for a non-existent short file name should fail */ /* GetShortPathName for a non-existent short file name should fail */
SetLastError(0xdeadbeef); SetLastError(0xdeadbeef);
length = GetShortPathNameW( short_path, path, 0 ); length = GetShortPathNameW( short_path, path, 0 );
todo_wine
ok(!length, "GetShortPathNameW should fail\n"); ok(!length, "GetShortPathNameW should fail\n");
todo_wine
ok(GetLastError() == ERROR_FILE_NOT_FOUND, "expected ERROR_FILE_NOT_FOUND, got %d\n", GetLastError()); ok(GetLastError() == ERROR_FILE_NOT_FOUND, "expected ERROR_FILE_NOT_FOUND, got %d\n", GetLastError());
file = CreateFileW( short_path, GENERIC_READ|GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL ); file = CreateFileW( short_path, GENERIC_READ|GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL );