erabo/spiegel-keyman
1
0
Fork 0
mirror of https://github.com/keymanapp/keyman.git synced 2026-08-15 21:29:23 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

chore(windows): cleanup task deletion issues

Browse source
This commit is contained in:
Marc Durdin 2020-12-01 16:45:59 +11:00
parent ae8bb689af
commit 1897ff14d6
1 changed files with 20 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
windows/src/desktop/insthelp/Keyman.System.InstHelp.KeymanStartTaskUninstall.pas
View file

@ -14,6 +14,7 @@ implementation
uses
System.SysUtils,
System.Variants,
System.Win.ComObj,
Winapi.ActiveX,
Winapi.Windows,
@ -26,21 +27,23 @@ const
class procedure TKeymanStartTaskUninstall.ReportEvent(const Message: string);
var
hEventLog: THandle;
msgs: array[0..0] of PChar;
begin
kl.LogError(Message);
hEventLog := RegisterEventSource(nil, 'Keyman-Uninstall');
msgs[0] := PChar(Message);
Winapi.Windows.ReportEvent(
hEventLog,
EVENTLOG_ERROR_TYPE,
1,
1,
nil,
0,
Length(Message) * sizeof(Char),
99,
nil,
PChar(Message)
1,
0,
@msgs,
nil
);
CloseHandle(hEventLog);
DeregisterEventSource(hEventLog);
end;
class procedure TKeymanStartTaskUninstall.DeleteAllTasks;
@ -56,9 +59,16 @@ begin
try
pTaskFolder := pService.GetFolder('\'+CTaskFolderName);
except
on E:Exception do
on E:EOleException do
begin
// We can't find the folder, for some unknown reason, so give up
if E.ErrorCode <> HResultFromWin32(ERROR_FILE_NOT_FOUND) then
ReportEvent('Failed to find '+CTaskFolderName+' task folder: '+E.ClassName+', '+E.Message);
Exit;
end;
on E:Exception do
begin
ReportEvent('Failed to find '+CTaskFolderName+' task folder: '+E.ClassName+', '+E.Message);
Exit;
end;
@ -66,8 +76,10 @@ begin
pTasks := pTaskFolder.GetTasks(0);
for i := 0 to pTasks.Count - 1 do
for i := 1 to pTasks.Count do // 1-based collection
begin
pTaskFolder.DeleteTask(pTasks.Item[i].Name, 0);
end;
pTaskFolder := nil;
pService.GetFolder('\').DeleteFolder(CTaskFolderName, 0);