File subsystem: fixed function 70.0 for CD

Window subsystem: now minimized windows are not activated when program terminates
@RB: now it ignores minimized windows
CMD: version from K0600 distro (modified to use fn 70.7 instead of 19) +
     redraw does not change window border


git-svn-id: svn://kolibrios.org@154 a494cfbc-eb01-0410-851d-a64ba20cac60

kernel/branches/gfx_kernel/fs/iso9660.inc

@@ -139,7 +139,7 @@ fs_CdRead:
     test    ecx, ecx
     jz    .done
     sub    ebx, 2048
-    jae    .new_sector
+    jae    .next
     add    ebx, 2048
     jnz    .incomplete_sector
     cmp    ecx, 2048
@@ -149,9 +149,10 @@ fs_CdRead:
     call ReadCDWRetr      ; ўшЄрхь ёхъЄюЁ Їрщыр
     cmp   [DevErrorCode],0
     jne   .noaccess_3
-    inc  dword [CDSectorAddress]
     add    edx, 2048
     sub    ecx, 2048
+.next:
+    inc  dword [CDSectorAddress]
     jmp    .new_sector
 .incomplete_sector:
 ; we must read and memmove incomplete sector
@@ -159,9 +160,6 @@ fs_CdRead:
     call ReadCDWRetr      ; ўшЄрхь ёхъЄюЁ Їрщыр
     cmp   [DevErrorCode],0
     jne   .noaccess_3 
-    inc  dword [CDSectorAddress]
-    mov    eax,CDDataBuf
-    add    eax, ebx
     push    ecx
     add    ecx, ebx
     cmp    ecx, 2048
@@ -171,7 +169,7 @@ fs_CdRead:
     sub    ecx, ebx
      push edi esi ecx
      mov edi,edx
-     mov esi,eax ;0x7000   ; CD data buffer
+        lea     esi, [CDDataBuf + ebx]
      cld
      rep movsb
      pop ecx esi edi
@@ -179,7 +177,7 @@ fs_CdRead:
     sub    [esp], ecx
     pop    ecx
     xor    ebx, ebx
-    jmp    .new_sector
+    jmp    .next
      
 .done:
         mov     ebx, edx

kernel/trunk/core/sys32.inc

@@ -861,6 +861,11 @@ terminate: ; terminate application
         cmp    [0x3000 + edi + TASKDATA.state], byte 9  ; skip dead slots
         je     .check_next_window
         add    edi, window_data
+; \begin{diamond}[19.09.2006]
+; skip minimized windows
+        test   [edi + WDATA.fl_wstate], WSTATE_MINIMIZED
+        jnz    .check_next_window
+; \end{diamond}
         call   waredraw
  .nothing_to_activate:
         popad

kernel/trunk/fs/iso9660.inc

@@ -139,7 +139,7 @@ fs_CdRead:
     test    ecx, ecx
     jz    .done
     sub    ebx, 2048
-    jae    .new_sector
+    jae    .next
     add    ebx, 2048
     jnz    .incomplete_sector
     cmp    ecx, 2048
@@ -149,9 +149,10 @@ fs_CdRead:
     call ReadCDWRetr      ; ўшЄрхь ёхъЄюЁ Їрщыр
     cmp   [DevErrorCode],0
     jne   .noaccess_3
-    inc  dword [CDSectorAddress]
     add    edx, 2048
     sub    ecx, 2048
+.next:
+    inc  dword [CDSectorAddress]
     jmp    .new_sector
 .incomplete_sector:
 ; we must read and memmove incomplete sector
@@ -159,9 +160,6 @@ fs_CdRead:
     call ReadCDWRetr      ; ўшЄрхь ёхъЄюЁ Їрщыр
     cmp   [DevErrorCode],0
     jne   .noaccess_3 
-    inc  dword [CDSectorAddress]
-    mov    eax,CDDataBuf
-    add    eax, ebx
     push    ecx
     add    ecx, ebx
     cmp    ecx, 2048
@@ -171,7 +169,7 @@ fs_CdRead:
     sub    ecx, ebx
      push edi esi ecx
      mov edi,edx
-     mov esi,eax ;0x7000   ; CD data buffer
+        lea     esi, [CDDataBuf + ebx]
      cld
      rep movsb
      pop ecx esi edi
@@ -179,7 +177,7 @@ fs_CdRead:
     sub    [esp], ecx
     pop    ecx
     xor    ebx, ebx
-    jmp    .new_sector
+    jmp    .next
      
 .done:
         mov     ebx, edx