paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-04-12 20:33:13 +02:00
Code Issues Packages Projects Releases Wiki Activity

* fix for bug - added definition of REMOTE_NAME_INFOW (and REMOTE_NAME_INFOA), the W version used in ExpandUNCFileName now

Browse Source 
git-svn-id: trunk@32692 -
This commit is contained in:
Tomas Hajny 2015-12-21 02:05:13 +00:00
parent 62efd8c156
commit b48b758a23
2 changed files with 26 additions and 5 deletions

2
rtl/win/sysutils.pp
View File

@ -221,7 +221,7 @@ begin
rc := WNetGetUniversalNameW (pwidechar(s), UNIVERSAL_NAME_INFO_LEVEL, buf, @size);
end;
if rc = NO_ERROR then
Result := PRemoteNameInfo(buf)^.lpUniversalName
Result := PRemoteNameInfoW(buf)^.lpUniversalName
else if rc = ERROR_NOT_CONNECTED then
Result := filename
else

29
rtl/win/wininc/struct.inc
View File

@ -6458,14 +6458,35 @@ Const
TREASSIGNBLOCKS = REASSIGN_BLOCKS;
PREASSIGNBLOCKS = ^REASSIGN_BLOCKS;
REMOTE_NAME_INFO = record
REMOTE_NAME_INFOA = record
lpUniversalName : LPTSTR;
lpConnectionName : LPTSTR;
lpRemainingPath : LPTSTR;
end;
_REMOTE_NAME_INFO = REMOTE_NAME_INFO;
TREMOTENAMEINFO = REMOTE_NAME_INFO;
PREMOTENAMEINFO = ^REMOTE_NAME_INFO;
_REMOTE_NAME_INFOA = REMOTE_NAME_INFOA;
TREMOTENAMEINFOA = REMOTE_NAME_INFOA;
PREMOTENAMEINFOA = ^REMOTE_NAME_INFOA;
REMOTE_NAME_INFOW = record
lpUniversalName : LPWSTR;
lpConnectionName : LPWSTR;
lpRemainingPath : LPWSTR;
end;
_REMOTE_NAME_INFOW = REMOTE_NAME_INFOW;
TREMOTENAMEINFOW = REMOTE_NAME_INFOW;
PREMOTENAMEINFOW = ^REMOTE_NAME_INFOW;
{$IFNDEF UNICODE}
REMOTE_NAME_INFO = REMOTE_NAME_INFOA;
_REMOTE_NAME_INFO = REMOTE_NAME_INFOA;
TREMOTENAMEINFO = REMOTE_NAME_INFOA;
PREMOTENAMEINFO = ^REMOTE_NAME_INFOA;
{$ELSE UNICODE}
REMOTE_NAME_INFO = REMOTE_NAME_INFOW;
_REMOTE_NAME_INFO = REMOTE_NAME_INFOW;
TREMOTENAMEINFO = REMOTE_NAME_INFOW;
PREMOTENAMEINFO = ^REMOTE_NAME_INFOW;
{$ENDIF UNICODE}
(*
TODO: OLE