WebSVN – Kolibri OS – Diff – /kernel/trunk/fs/ntfs.inc

 ;; Copyright (C) KolibriOS team 2004-2016. All rights reserved. ;;
 ;;  Distributed under terms of the GNU General Public License.  ;;
 ;;                                                              ;;
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-$Revision: 6824 $
+$Revision: 6845 $
 ; NTFS external functions
 ;   in:
         pop     eax
         jmp     .doit2
 ;----------------------------------------------------------------
-ntfs_ReadFile:
-        cmp     byte [esi], 0
-        jnz     @f
-        or      ebx, -1
-        movi    eax, ERROR_ACCESS_DENIED
-        ret
-@@:
+ntfs_ReadFile:
         call    ntfs_lock
         call    ntfs_find_lfn
-        jnc     .found
-        call    ntfs_unlock
-        or      ebx, -1
-        movi    eax, ERROR_FILE_NOT_FOUND
-        ret
-.found:
+        jc      ntfsNotFound
         mov     [ebp+NTFS.cur_attr], 0x80   ; $DATA
         and     [ebp+NTFS.cur_offs], 0
         and     [ebp+NTFS.cur_size], 0
-        call    ntfs_read_attr
-        jnc     @f
+        call    ntfs_read_attr
-        call    ntfs_unlock
-        or      ebx, -1
-        movi    eax, ERROR_ACCESS_DENIED
-        ret
-@@:
-        pushad
-        and     dword [esp+10h], 0
+        jc      ntfsDenied
+        xor     eax, eax
-        xor     eax, eax
+        push    eax
         cmp     dword [ebx+8], 0x200
-        jb      @f
-.eof0:
-        popad
-        xor     ebx, ebx
-.eof:
-        call    ntfs_unlock
-        movi    eax, ERROR_END_OF_FILE
-        ret
-@@:
+        jnc     .eof
         mov     ecx, [ebx+12]
         mov     edx, [ebx+16]
         mov     eax, [ebx+4]
         test    eax, 0x1FF
         call    ntfs_read_attr.continue
         mov     eax, [ebx+4]
         and     eax, 0x1FF
         lea     esi, [ebp+NTFS.bitmap_buf+eax]
         sub     eax, [ebp+NTFS.cur_read]
-        jae     .eof0
+        jae     .eof
         neg     eax
         push    ecx
         cmp     ecx, eax
         jb      @f
         mov     ecx, eax
 @@:
-        mov     [esp+10h+4], ecx
+        mov     [esp+4], ecx
         mov     edi, edx
         rep movsb
         mov     edx, edi
         pop     ecx
-        sub     ecx, [esp+10h]
+        sub     ecx, [esp]
-        jnz     @f
+        jz      .retok
-.retok:
-        popad
-        call    ntfs_unlock
-        xor     eax, eax
-        ret
-@@:
         cmp     [ebp+NTFS.cur_read], 0x200
-        jz      .alignedstart
-.eof_ebx:
-        popad
-        jmp     .eof
+        jnz     .eof
 .alignedstart:
         mov     eax, [ebx+4]
         push    edx
         mov     edx, [ebx+8]
         add     eax, 511
         add     eax, [ebp+NTFS.cur_offs]
         push    eax
         call    ntfs_read_attr.continue
         pop     [ebp+NTFS.cur_offs]
         mov     eax, [ebp+NTFS.cur_read]
-        add     [esp+10h], eax
+        add     [esp], eax
         mov     eax, ecx
         and     eax, not 0x1FF
         cmp     [ebp+NTFS.cur_read], eax
-        jnz     .eof_ebx
+        jnz     .eof
         and     ecx, 0x1FF
         jz      .retok
         add     edx, [ebp+NTFS.cur_read]
         mov     [ebp+NTFS.cur_size], 1
         lea     eax, [ebp+NTFS.bitmap_buf]
 @@:
         xchg    ecx, [ebp+NTFS.cur_read]
         push    ecx
         mov     edi, edx
         lea     esi, [ebp+NTFS.bitmap_buf]
-        add     [esp+10h+4], ecx
+        add     [esp+4], ecx
         rep movsb
         pop     ecx
-        xor     eax, eax
         cmp     ecx, [ebp+NTFS.cur_read]
-        jz      @f
+        jnz     .eof
+.retok:
-        mov     al, ERROR_END_OF_FILE
+        pushd   0
-@@:
+.ret:
-        mov     [esp+1Ch], eax
         call    ntfs_unlock
-        popad
+        pop     eax ebx
         ret
+.eof:
+        push    ERROR_END_OF_FILE
+        jmp     .ret
 ;----------------------------------------------------------------
 ntfs_ReadFolder:
         call    ntfs_lock
         mov     [ebp+NTFS.cur_iRecord], 5   ; root directory
         mov     [ebp+NTFS.bFolder], 1
         jmp     @f
 ntfs_CreateFile:
-        mov     [ebp+NTFS.bFolder], 0
-@@:
-        cmp     byte [esi], 0
-        jnz     @f
-        xor     ebx, ebx
-        movi    eax, ERROR_ACCESS_DENIED
-        ret
         mov     [ebp+NTFS.bFolder], 0
 @@: ; 1. Search file
         call    ntfs_lock
         call    ntfs_find_lfn
         jc      .notFound
         stc
         ret
 ;----------------------------------------------------------------
-ntfs_WriteFile:
-        cmp     byte [esi], 0
-        jnz     @f
-        xor     ebx, ebx
-        movi    eax, ERROR_ACCESS_DENIED
-        ret
-@@:
+ntfs_WriteFile:
         call    ntfs_lock
         call    ntfs_find_lfn
         jc      ntfsNotFound
         cmp     [ebp+NTFS.cur_iRecord], 16
         mov     ebx, [ebx+12]
         jmp     ntfsDone
 ;----------------------------------------------------------------
-ntfs_Delete:
-        cmp     byte [esi], 0
-        jnz     @f
-        xor     ebx, ebx
-        movi    eax, ERROR_ACCESS_DENIED
-        ret
-@@:
+ntfs_Delete:
         call    ntfs_lock
         call    ntfs_find_lfn
         jc      ntfsNotFound
         cmp     [ebp+NTFS.cur_iRecord], 16
         xor     esi, esi
         ret
 ;----------------------------------------------------------------
-ntfs_SetFileEnd:
-        cmp     byte [esi], 0
-        jnz     @f
-        xor     ebx, ebx
-        movi    eax, ERROR_ACCESS_DENIED
-        ret
-@@:
+ntfs_SetFileEnd:
         call    ntfs_lock
         call    ntfs_find_lfn
         jc      ntfsNotFound
         cmp     [ebp+NTFS.cur_iRecord], 16
         adc     edx, 29389701
         ret
 ;----------------------------------------------------------------
-ntfs_SetFileInfo:
-        cmp     byte [esi], 0
-        jnz     @f
-        movi    eax, ERROR_UNSUPPORTED_FS
-        ret
-@@:
+ntfs_SetFileInfo:
         call    ntfs_lock
         call    ntfs_find_lfn
         jnc     @f
         test    eax, eax

Subversion Repositories Kolibri OS

(root)/kernel/trunk/fs/ntfs.inc – Rev 6824 → 6845