Fixed regression caused by previous change.
This commit is contained in:
parent
b7937afab9
commit
4c5c7e7a04
|
@ -1027,6 +1027,7 @@ DWORD WINAPI GetShortPathNameA( LPCSTR longpath, LPSTR shortpath,
|
||||||
DWORD sp = 0, lp = 0;
|
DWORD sp = 0, lp = 0;
|
||||||
int tmplen, drive;
|
int tmplen, drive;
|
||||||
UINT flags;
|
UINT flags;
|
||||||
|
BOOL unixabsolute = *longpath == '/';
|
||||||
|
|
||||||
TRACE("%s\n", debugstr_a(longpath));
|
TRACE("%s\n", debugstr_a(longpath));
|
||||||
|
|
||||||
|
@ -1044,12 +1045,21 @@ DWORD WINAPI GetShortPathNameA( LPCSTR longpath, LPSTR shortpath,
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/* check for drive letter */
|
||||||
|
if (!unixabsolute && longpath[1] == ':' ) {
|
||||||
|
tmpshortpath[0] = longpath[0];
|
||||||
|
tmpshortpath[1] = ':';
|
||||||
|
sp = 2;
|
||||||
|
}
|
||||||
|
|
||||||
if ( ( drive = DOSFS_GetPathDrive ( &longpath )) == -1 ) return 0;
|
if ( ( drive = DOSFS_GetPathDrive ( &longpath )) == -1 ) return 0;
|
||||||
flags = DRIVE_GetFlags ( drive );
|
flags = DRIVE_GetFlags ( drive );
|
||||||
|
|
||||||
tmpshortpath[0] = drive + 'A';
|
if (unixabsolute && drive != DRIVE_GetCurrentDrive()) {
|
||||||
tmpshortpath[1] = ':';
|
tmpshortpath[0] = drive + 'A';
|
||||||
sp = 2;
|
tmpshortpath[1] = ':';
|
||||||
|
sp = 2;
|
||||||
|
}
|
||||||
|
|
||||||
while ( longpath[lp] ) {
|
while ( longpath[lp] ) {
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue