GitHub-Mirror/x2utils
1
0
Fork 0
mirror of synced 2024-09-19 17:56:09 +00:00
Code Issues Projects Releases Wiki Activity

Memory issue when using SHGetSpecialFolderLocation (deprecated)

Browse Source
This commit is contained in:
Jan Middelburg 2021-12-03 13:23:05 +01:00 committed by GitHub
parent b779a0e6af
commit c0ca278638
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 32 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
X2UtApp.pas
View File

@ -418,33 +418,43 @@ procedure TX2App.GetPath();
(APath); (APath);
end; end;
var {$IFNDEF DXE2PLUS}
ifMalloc: IMalloc; procedure GetPaths;
pIDL: PItemIDList; var
cPath: array[0..MAX_PATH] of Char; ifMalloc: IMalloc;
pIDL: PItemIDList;
cPath: array[0..MAX_PATH] of Char;
begin
SHGetMalloc(ifMalloc);
try
FillChar(cPath, SizeOf(cPath), #0);
SHGetSpecialFolderLocation(0, CSIDL_APPDATA, pIDL);
SHGetPathFromIDList(pIDL, @cPath);
FUserPath := FixPath(cPath);
cPath := '';
FillChar(cPath, SizeOf(cPath), #0);
SHGetSpecialFolderLocation(0, CSIDL_COMMON_APPDATA, pIDL);
SHGetPathFromIDList(pIDL, @cPath);
FProgramDataPath := FixPath(cPath);
finally
ifMalloc := nil;
end;
end;
{$ENDIF}
begin begin
FFileName := GetModule(SysInit.HInstance); FFileName := GetModule(SysInit.HInstance);
FPath := FixPath(ExtractFilePath(FFileName)); FPath := FixPath(ExtractFilePath(FFileName));
FMainPath := FixPath(ExtractFilePath(GetModule(0))); FMainPath := FixPath(ExtractFilePath(GetModule(0)));
{$IFDEF DXE2PLUS}
SHGetMalloc(ifMalloc); FUserPath := FixPath(System.IOUtils.TPath.GetHomePath);
try FProgramDataPath := FixPath(System.IOUtils.TPath.GetPublicPath);
FillChar(cPath, SizeOf(cPath), #0); {$ELSE}
SHGetSpecialFolderLocation(0, CSIDL_APPDATA, pIDL); GetPaths;
SHGetPathFromIDList(pIDL, @cPath); {$ENDIF}
FUserPath := FixPath(cPath);
FillChar(cPath, SizeOf(cPath), #0);
SHGetSpecialFolderLocation(0, CSIDL_COMMON_APPDATA, pIDL);
SHGetPathFromIDList(pIDL, @cPath);
FProgramDataPath := FixPath(cPath);
finally
ifMalloc := nil;
end;
end; end;