forked from KolibriOS/kolibrios
reverted wrong files from the prev revision
git-svn-id: svn://kolibrios.org@1517 a494cfbc-eb01-0410-851d-a64ba20cac60
This commit is contained in:
Evgeny Grechnikov (Diamond)
parent
0d2b81dd89
commit
04ca8139b5
@ -1423,9 +1423,9 @@ proc set_mtrr stdcall, base:dword,size:dword,mem_type:dword
|
||||
mov ebx, [size]
|
||||
dec ebx
|
||||
mov eax, 0xFFFFFFFF
|
||||
; mov edx, 0x0000000F
|
||||
mov edx, 0x0000000F
|
||||
sub eax, ebx
|
||||
; sbb edx, 0
|
||||
sbb edx, 0
|
||||
or eax, 0x800
|
||||
inc ecx
|
||||
wrmsr
|
||||
|
||||
@ -246,7 +246,6 @@ iglobal
|
||||
dd file_system_lfn ; 70-Common file system interface, version 2
|
||||
dd syscall_window_settings ; 71-Window settings
|
||||
dd sys_sendwindowmsg ; 72-Send window message
|
||||
dd ntfs_read_file_record_sysfn
|
||||
times 255 - ( ($-servetable2) /4 ) dd undefined_syscall
|
||||
dd sys_end ; -1-end application
|
||||
|
||||
|
||||
@ -740,7 +740,6 @@ ntfs_read_attr:
|
||||
and eax, 0x1FF
|
||||
mov [ntfs_cur_tail], eax
|
||||
@@:
|
||||
DEBUGF 1,'tail=%x, size=%x\n',[ntfs_cur_tail],[ntfs_cur_size]
|
||||
cmp [ntfs_cur_size], 0
|
||||
jz .okret
|
||||
mov eax, [ntfs_cur_offs]
|
||||
@ -775,7 +774,6 @@ ntfs_read_attr:
|
||||
mov ecx, [ntfs_cur_size]
|
||||
@@:
|
||||
mov ebx, [ntfs_cur_buf]
|
||||
DEBUGF 1,'eax=%x,ecx=%x,ebx=%x,offs=%x,size=%x\n',eax,ecx,ebx,[ntfs_cur_offs],[ntfs_cur_size]
|
||||
@@:
|
||||
call hd_read
|
||||
cmp [hd_error], 0
|
||||
@ -787,7 +785,6 @@ ntfs_read_attr:
|
||||
dec [ntfs_cur_size]
|
||||
inc [ntfs_cur_offs]
|
||||
loop @b
|
||||
DEBUGF 1,'cur_size=%x\n',[ntfs_cur_size]
|
||||
pop ecx
|
||||
xor eax, eax
|
||||
xor edx, edx
|
||||
@ -877,16 +874,6 @@ ntfs_read_file_record:
|
||||
xor eax, eax
|
||||
ret
|
||||
|
||||
ntfs_read_file_record_sysfn:
|
||||
mov eax, ebx
|
||||
call ntfs_read_file_record
|
||||
mov [esp+20h], eax
|
||||
mov edi, ecx
|
||||
mov esi, [ntfs_data.frs_buffer]
|
||||
mov ecx, 0x400/4
|
||||
rep movsd
|
||||
ret
|
||||
|
||||
ntfs_restore_usa_frs:
|
||||
mov eax, [ntfs_data.frs_size]
|
||||
ntfs_restore_usa:
|
||||
@ -981,15 +968,11 @@ ntfs_find_lfn:
|
||||
mov [ntfs_cur_buf], eax
|
||||
call ntfs_read_attr
|
||||
jnc @f
|
||||
DEBUGF 1,'ntfs_find_lfn: $INDEX_ROOT not found in %s\n',esi
|
||||
.ret:
|
||||
ret
|
||||
@@:
|
||||
cmp [ntfs_cur_read], 0x20
|
||||
jnc @f
|
||||
DEBUGF 1,'ntfs_find_lfn: $INDEX_ROOT too small in %s\n',esi
|
||||
jmp .ret
|
||||
@@:
|
||||
jc .ret
|
||||
pushad
|
||||
mov esi, [ntfs_data.cur_index_buf]
|
||||
mov eax, [esi+14h]
|
||||
@ -1000,7 +983,6 @@ ntfs_find_lfn:
|
||||
shr eax, 9
|
||||
cmp eax, [ntfs_data.cur_index_size]
|
||||
ja @f
|
||||
DEBUGF 1,'ntfs_find_lfn: err1 in %s\n',[esp+4]
|
||||
.stc_ret:
|
||||
popad
|
||||
stc
|
||||
@ -1016,7 +998,6 @@ ntfs_find_lfn:
|
||||
call kernel_alloc
|
||||
test eax, eax
|
||||
jnz @f
|
||||
DEBUGF 1,'ntfs_find_lfn: err2 in %s\n',[esp+4]
|
||||
and [ntfs_data.cur_index_size], 0
|
||||
and [ntfs_data.cur_index_buf], 0
|
||||
jmp .stc_ret
|
||||
@ -1034,10 +1015,7 @@ ntfs_find_lfn:
|
||||
call kernel_alloc
|
||||
pop ebp esi
|
||||
test eax, eax
|
||||
jnz @f
|
||||
DEBUGF 1,'ntfs_find_lfn: err3 in %s\n',[esp+4]
|
||||
jmp .stc_ret
|
||||
@@:
|
||||
jz .stc_ret
|
||||
mov edi, eax
|
||||
mov ecx, [ntfs_data.cur_index_size]
|
||||
shl ecx, 9-2
|
||||
@ -1089,10 +1067,7 @@ ntfs_find_lfn:
|
||||
pop esi
|
||||
.subnode:
|
||||
test byte [esi+0Ch], 1
|
||||
jnz @f
|
||||
DEBUGF 1,'ntfs_find_lfn: err4 in %s\n',[esp+4]
|
||||
jmp .notfound
|
||||
@@:
|
||||
jz .notfound
|
||||
movzx eax, word [esi+8]
|
||||
mov eax, [esi+eax-8]
|
||||
mul [ntfs_data.sectors_per_cluster]
|
||||
@ -1106,22 +1081,15 @@ ntfs_find_lfn:
|
||||
mov eax, ebp
|
||||
shl eax, 9
|
||||
cmp [ntfs_cur_read], eax
|
||||
jz @f
|
||||
DEBUGF 1,'ntfs_find_lfn: err5 in %s\n',[esp+4]
|
||||
jmp .notfound
|
||||
@@:
|
||||
jnz .notfound
|
||||
cmp dword [esi], 'INDX'
|
||||
jz @f
|
||||
DEBUGF 1,'ntfs_find_lfn: err6 in %s\n',[esp+4]
|
||||
jmp .notfound
|
||||
@@:
|
||||
jnz .notfound
|
||||
mov ebx, esi
|
||||
call ntfs_restore_usa
|
||||
jc .notfound
|
||||
add esi, 0x18
|
||||
jmp .scanloop
|
||||
.notfound:
|
||||
DEBUGF 1,'ntfs_find_lfn: .notfound in %s\n',[esp+4]
|
||||
popad
|
||||
stc
|
||||
ret
|
||||
@ -1139,7 +1107,6 @@ ntfs_find_lfn:
|
||||
pop esi
|
||||
mov eax, [esi]
|
||||
mov [ntfs_cur_iRecord], eax
|
||||
DEBUGF 1,'ntfs_find_lfn: 0x%x is irecord for %s\n',eax,[esp+4]
|
||||
mov [esp+1Ch], esi
|
||||
mov [esp+4], edi
|
||||
popad
|
||||
@ -1183,7 +1150,6 @@ ntfs_HdRead:
|
||||
pop eax
|
||||
ret
|
||||
.found:
|
||||
DEBUGF 1,'ntfs_HdRead: irecord is 0x%x\n',[ntfs_cur_iRecord]
|
||||
mov [ntfs_cur_attr], 0x80 ; $DATA
|
||||
and [ntfs_cur_offs], 0
|
||||
and [ntfs_cur_size], 0
|
||||
@ -1262,14 +1228,11 @@ ntfs_HdRead:
|
||||
mov eax, ecx
|
||||
shr eax, 9
|
||||
mov [ntfs_cur_size], eax
|
||||
; DEBUGF 1,'ntfs_HdRead: [ntfs_cur_offs]=%x\n',[ntfs_cur_offs]
|
||||
; DEBUGF 1,'ntfs_HdRead: [ntfs_cur_size]=%x\n',[ntfs_cur_size]
|
||||
add eax, [ntfs_cur_offs]
|
||||
push eax
|
||||
call ntfs_read_attr.continue
|
||||
pop [ntfs_cur_offs]
|
||||
mov eax, [ntfs_cur_read]
|
||||
; DEBUGF 1,'ntfs_HdRead: [ntfs_cur_read]=%x\n',[ntfs_cur_read]
|
||||
add [esp+10h], eax
|
||||
mov eax, ecx
|
||||
and eax, not 0x1FF
|
||||
@ -1322,7 +1285,6 @@ ntfs_HdReadFolder:
|
||||
jz .doit
|
||||
call ntfs_find_lfn
|
||||
jnc .doit2
|
||||
DEBUGF 1,'ntfs_HdReadFolder: ntfs_find_lfn failed\n'
|
||||
.notfound:
|
||||
or ebx, -1
|
||||
push ERROR_FILE_NOT_FOUND
|
||||
@ -1337,10 +1299,7 @@ ntfs_HdReadFolder:
|
||||
mov [ntfs_cur_size], 1
|
||||
mov [ntfs_cur_buf], ntfs_bitmap_buf
|
||||
call ntfs_read_attr
|
||||
jnc @f
|
||||
DEBUGF 1,'ntfs_HdReadFolder: no $STANDARD_INFORMATION\n'
|
||||
jmp .notfound
|
||||
@@:
|
||||
jc .notfound
|
||||
mov [ntfs_cur_attr], 0x90 ; $INDEX_ROOT
|
||||
and [ntfs_cur_offs], 0
|
||||
mov eax, [ntfs_data.cur_index_size]
|
||||
@ -1349,7 +1308,6 @@ ntfs_HdReadFolder:
|
||||
mov [ntfs_cur_buf], eax
|
||||
call ntfs_read_attr
|
||||
jnc .ok
|
||||
DEBUGF 1,'ntfs_HdReadFolder: no $INDEX_ROOT\n'
|
||||
cmp [hd_error], 0
|
||||
jz .notfound
|
||||
or ebx, -1
|
||||
|
||||
Loading…
Reference in New Issue
Block a user