Procházet zdrojové kódy

--- Merging r47528 into '.':
U rtl/os2/sysutils.pp
--- Recording mergeinfo for merge of r47528 into '.':
U .
--- Merging r47529 into '.':
U rtl/emx/sysutils.pp
U rtl/go32v2/sysutils.pp
U rtl/msdos/sysutils.pp
U rtl/watcom/sysutils.pp
--- Recording mergeinfo for merge of r47529 into '.':
G .

# revisions: 47528,47529
r47528 | hajny | 2020-11-22 16:53:50 +0100 (Sun, 22 Nov 2020) | 1 line
Changed paths:
M /trunk/rtl/os2/sysutils.pp

* Corrections of omissions in GetLocalTime
r47529 | hajny | 2020-11-22 17:19:34 +0100 (Sun, 22 Nov 2020) | 1 line
Changed paths:
M /trunk/rtl/emx/sysutils.pp
M /trunk/rtl/go32v2/sysutils.pp
M /trunk/rtl/msdos/sysutils.pp
M /trunk/rtl/watcom/sysutils.pp

* Correction of omissions in GetLocalTime

git-svn-id: branches/fixes_3_2@47539 -

marco před 4 roky
rodič
revize
f9aa77ace5

+ 12 - 9
rtl/emx/sysutils.pp

@@ -1099,30 +1099,33 @@ asm
  mov ah, 2Ah
  call syscall
 {$IFDEF REGCALL}
- pop eax
+ pop edi
 {$ELSE REGCALL}
  mov edi, SystemTime
 {$ENDIF REGCALL}
- mov ax, cx
- stosw
- xor eax, eax
- mov al, 10
- mul dl
+ xchg ax, cx
  shl eax, 16
  mov al, dh
  stosd
+ mov al, dl
+ shl eax, 16
+ mov al, cl
+ stosd
  push edi
  mov ah, 2Ch
  call syscall
  pop edi
  xor eax, eax
- mov al, cl
- shl eax, 16
  mov al, ch
+ shl eax, 16
+ mov al, cl
  stosd
- mov al, dl
+ xor eax, eax
+ mov al, 10
+ mul dl
  shl eax, 16
  mov al, dh
+ rol eax, 16
  stosd
  pop edi
 end {['eax', 'ecx', 'edx', 'edi']};

+ 1 - 0
rtl/go32v2/sysutils.pp

@@ -662,6 +662,7 @@ begin
   SystemTime.Year := Regs.Cx;
   SystemTime.Month := Regs.Dh;
   SystemTime.Day := Regs.Dl;
+  SystemTime.DayOfWeek := Regs.Al;
 end ;
 
 

+ 1 - 0
rtl/msdos/sysutils.pp

@@ -646,6 +646,7 @@ begin
   SystemTime.Year := Regs.Cx;
   SystemTime.Month := Regs.Dh;
   SystemTime.Day := Regs.Dl;
+  SystemTime.DayOfWeek := Regs.Al;
 end ;
 
 

+ 2 - 1
rtl/os2/sysutils.pp

@@ -564,10 +564,11 @@ begin
     Year:=DT.Year;
     Month:=DT.Month;
     Day:=DT.Day;
+    DayOfWeek:=DT.WeekDay;
     Hour:=DT.Hour;
     Minute:=DT.Minute;
     Second:=DT.Second;
-    MilliSecond:=DT.Sec100;
+    MilliSecond:=DT.Sec100 * 10;
   end;
 end;
 

+ 1 - 0
rtl/watcom/sysutils.pp

@@ -646,6 +646,7 @@ begin
   SystemTime.Year := Regs.Cx;
   SystemTime.Month := Regs.Dh;
   SystemTime.Day := Regs.Dl;
+  SystemTime.DayOfWeek := Regs.Al;
 end ;