|
@@ -95,12 +95,12 @@ begin
|
|
setlength(savebuf,len-1); // -1 because len is #0 inclusive
|
|
setlength(savebuf,len-1); // -1 because len is #0 inclusive
|
|
|
|
|
|
GetCurrentDirectoryW(len,punicodechar(SaveBuf)); // in TChar
|
|
GetCurrentDirectoryW(len,punicodechar(SaveBuf)); // in TChar
|
|
- if not SetCurrentDirectory(@Drive) then
|
|
|
|
|
|
+ if not SetCurrentDirectoryW(@Drive) then
|
|
begin
|
|
begin
|
|
errno := word (GetLastError);
|
|
errno := word (GetLastError);
|
|
Errno2InoutRes;
|
|
Errno2InoutRes;
|
|
Dir := widechar (DriveNr + 64) + ':\';
|
|
Dir := widechar (DriveNr + 64) + ':\';
|
|
- SetCurrentDirectory(@SaveBuf);
|
|
|
|
|
|
+ SetCurrentDirectoryW(@SaveBuf);
|
|
Exit;
|
|
Exit;
|
|
end;
|
|
end;
|
|
end;
|
|
end;
|
|
@@ -109,7 +109,7 @@ begin
|
|
setlength(dir,len-1); // -1 because len is #0 inclusive
|
|
setlength(dir,len-1); // -1 because len is #0 inclusive
|
|
GetCurrentDirectoryW(len,punicodechar(dir));
|
|
GetCurrentDirectoryW(len,punicodechar(dir));
|
|
if not defaultdrive then
|
|
if not defaultdrive then
|
|
- SetCurrentDirectory(@SaveBuf);
|
|
|
|
|
|
+ SetCurrentDirectoryW(@SaveBuf);
|
|
if not FileNameCasePreserving then
|
|
if not FileNameCasePreserving then
|
|
dir:=upcase(dir);
|
|
dir:=upcase(dir);
|
|
{$else WINCE}
|
|
{$else WINCE}
|