浏览代码

Merge remote-tracking branch 'turric4n/develop' into develop

Turrican 6 年之前
父节点
当前提交
418b422465
共有 2 个文件被更改,包括 4 次插入3 次删除
  1. 2 2
      Quick.Commons.pas
  2. 2 1
      Quick.Threads.pas

+ 2 - 2
Quick.Commons.pas

@@ -466,10 +466,10 @@ begin
   path.ALLUSERSPROFILE := SysUtils.GetEnvironmentVariable('AllUsersProfile');
   path.ALLUSERSPROFILE := SysUtils.GetEnvironmentVariable('AllUsersProfile');
   path.INSTDRIVE := path.HOMEDRIVE;
   path.INSTDRIVE := path.HOMEDRIVE;
   path.TEMP := SysUtils.GetEnvironmentVariable('TEMP');
   path.TEMP := SysUtils.GetEnvironmentVariable('TEMP');
-  path.SYSTEM := GetSpecialFolderPath(CSIDL_SYSTEM);
-  path.APPDATA:=GetSpecialFolderPath(CSIDL_APPDATA);
   //these paths fail if user is SYSTEM
   //these paths fail if user is SYSTEM
   try
   try
+    path.SYSTEM := GetSpecialFolderPath(CSIDL_SYSTEM);
+    path.APPDATA := GetSpecialFolderPath(CSIDL_APPDATA);
     path.DESKTOP := GetSpecialFolderPath(CSIDL_DESKTOP);
     path.DESKTOP := GetSpecialFolderPath(CSIDL_DESKTOP);
     path.DESKTOP_ALLUSERS := GetSpecialFolderPath(CSIDL_COMMON_DESKTOPDIRECTORY);
     path.DESKTOP_ALLUSERS := GetSpecialFolderPath(CSIDL_COMMON_DESKTOPDIRECTORY);
     path.STARTMENU:=GetSpecialFolderPath(CSIDL_PROGRAMS);
     path.STARTMENU:=GetSpecialFolderPath(CSIDL_PROGRAMS);

+ 2 - 1
Quick.Threads.pas

@@ -183,7 +183,7 @@ type
 
 
   TScheduleMode = (smRunOnce, smRepeatMode);
   TScheduleMode = (smRunOnce, smRepeatMode);
 
 
-  TTimeMeasure = (tmDays, tmHours, tmMinutes, tmSeconds);
+  TTimeMeasure = (tmDays, tmHours, tmMinutes, tmSeconds, tmMilliseconds);
 
 
   ITask = interface
   ITask = interface
   ['{0182FD36-5A7C-4C00-BBF8-7CFB1E3F9BB1}']
   ['{0182FD36-5A7C-4C00-BBF8-7CFB1E3F9BB1}']
@@ -1401,6 +1401,7 @@ begin
         tmHours : fNextExecution := IncHour(fNextExecution,fTimeInterval);
         tmHours : fNextExecution := IncHour(fNextExecution,fTimeInterval);
         tmMinutes : fNextExecution := IncMinute(fNextExecution,fTimeInterval);
         tmMinutes : fNextExecution := IncMinute(fNextExecution,fTimeInterval);
         tmSeconds : fNextExecution := IncSecond(fNextExecution,fTimeInterval);
         tmSeconds : fNextExecution := IncSecond(fNextExecution,fTimeInterval);
+        tmMilliseconds : fNextExecution := IncMilliSecond(fNextExecution, fTimeInterval);
       end;
       end;
 
 
       if Now() > fNextExecution then Result := False //avoid execution if system time was altered
       if Now() > fNextExecution then Result := False //avoid execution if system time was altered