Changeset 51 in xtideuniversalbios

Timestamp:

Oct 11, 2010, 8:27:43 AM (14 years ago)

Author:

aitotat

google:author:

aitotat

Message:

Changes to Assembly Library:
File handle is now properly returned when opening file.
Added function for getting file size by using file handle.

Location:

trunk/Assembly_Library

Files:

• Inc/File.inc (modified) (2 diffs)
• Src/File/FileIO.asm (modified) (5 diffs)
• Src/Menu/Dialog/DialogFile.asm (modified) (2 diffs)
• Src/Menu/Dialog/LineSplitter.asm (modified) (3 diffs)
• Src/Menu/MenuCharOut.asm (modified) (2 diffs)

trunk/Assembly_Library/Inc/File.inc

@@ -2 +2 @@
 ; Project name  :   Assembly Library
 ; Created date  :   8.10.2010
-; Last update   :   8.10.2010
+; Last update   :   10.10.2010
 ; Author        :   Tomi Tilli
 ; Description   :   File library defines.
@@ -17 +17 @@
 ; Origin of file seek
 struc SEEK_FROM
-    .startOfFile            resb    1
-    .currentFilePosition    resb    1
-    .endOfFile              resb    1
+    .startOfFile            resb    1   ; 00h
+    .currentFilePosition    resb    1   ; 01h
+    .endOfFile              resb    1   ; 02h
 endstruc
 

trunk/Assembly_Library/Src/File/FileIO.asm

@@ -2 +2 @@
 ; Project name  :   Assembly Library
 ; Created date  :   1.9.2010
-; Last update   :   8.10.2010
+; Last update   :   10.10.2010
 ; Author        :   Tomi Tilli
 ; Description   :   Functions for file access.
@@ -28 +28 @@
     int     DOS_INTERRUPT_21h
     xchg    si, dx
+    mov     bx, ax      ; Copy file handle to BX
     ret
 
@@ -68 +69 @@
 ALIGN JUMP_ALIGN
 FileIO_ReadCXbytesToDSSIusingHandleFromBX:
-    xchg    dx, si              ; DS:DX now points to source buffer
+    xchg    dx, si              ; DS:DX now points to destination buffer
     mov     ah, READ_FROM_FILE_OR_DEVICE
     int     DOS_INTERRUPT_21h
@@ -102 +103 @@
 
 ;--------------------------------------------------------------------
+; FileIO_GetFileSizeToDXAXusingHandleFromBXandResetFilePosition:
+;   Parameters:
+;       BX:     File handle
+;   Returns:
+;       DX:AX:  Signed file size (if CF cleared)
+;       AX:     DOS error code (if CF set)
+;       CF:     Clear if successfull
+;               Set if error
+;   Corrupts registers:
+;       Nothing
+;--------------------------------------------------------------------
+ALIGN JUMP_ALIGN
+FileIO_GetFileSizeToDXAXusingHandleFromBXandResetFilePosition:
+    push    cx
+
+    ; Get file size to DX:AX
+    xor     cx, cx
+    xor     dx, dx
+    mov     al, SEEK_FROM.endOfFile
+    call    FileIO_SeekFromOriginInALtoOffsetInDXAXusingHandleFromBX
+    jc      SHORT .ReturnFileError
+    push    dx
+    push    ax
+
+    ; Reset file position
+    xor     dx, dx
+    mov     al, SEEK_FROM.startOfFile
+    call    FileIO_SeekFromOriginInALtoOffsetInDXAXusingHandleFromBX
+    pop     ax
+    pop     dx
+
+.ReturnFileError:
+    pop     cx
+    ret
+
+
+;--------------------------------------------------------------------
 ; FileIO_SeekFromOriginInALtoOffsetInDXAXusingHandleFromBX:
 ;   Parameters:
 ;       AL:     SEEK_FROM.(origin)
 ;       BX:     File handle
-;       DX:AX:  Seek offset (signed)
+;       CX:DX:  Signed offset to seek starting from AL
 ;   Returns:
-;       AX:     DOS error code if CF set
+;       DX:AX:  New file position in bytes from start of file (if CF cleared)
+;       AX:     DOS error code (if CF set)
 ;       CF:     Clear if successfull
 ;               Set if error
@@ -116 +155 @@
 ALIGN JUMP_ALIGN
 FileIO_SeekFromOriginInALtoOffsetInDXAXusingHandleFromBX:
-    push    dx
-    push    cx
-
-    mov     cx, dx              ; DOS wants high word in CX
-    xchg    dx, ax              ; DOS wants low word in DX
     mov     ah, SET_CURRENT_FILE_POSITION
     int     DOS_INTERRUPT_21h
-
-    pop     cx
-    pop     dx
     ret

trunk/Assembly_Library/Src/Menu/Dialog/DialogFile.asm

@@ -2 +2 @@
 ; Project name  :   Assembly Library
 ; Created date  :   6.9.2010
-; Last update   :   9.10.2010
+; Last update   :   10.10.2010
 ; Author        :   Tomi Tilli
 ; Description   :   Displays file dialog.
@@ -523 +523 @@
 ALIGN JUMP_ALIGN
 .ChangeToUpdir:
+    push    cs
+    pop     ds
     mov     si, g_szUpdir
     jmp     SHORT .ChangeDirectoryToDSSI

trunk/Assembly_Library/Src/Menu/Dialog/LineSplitter.asm

@@ -148 +148 @@
 ALIGN JUMP_ALIGN
 .RemoveEmptyLinesAtTheEndIfAnyExists:
-    mov     al, [si-2]          ; Load character before NULL
-    cmp     al, SOH
-    je      SHORT .RemoveEmptyLineAtTheEndOfString
-    cmp     al, LF
+    cmp     BYTE [si-2], SOH    ; Character before NULL
     je      SHORT .RemoveEmptyLineAtTheEndOfString
     ret
@@ -203 +200 @@
     mov     si, di              ; SI points to start of first line
     mov     al, STX             ; Last control character to scan for
-    inc     cx                  ; Increment CX to get length for first line
+    inc     cx                  ; Increment CX to line count
     cld
 ALIGN JUMP_ALIGN
 .LineScanLoop:
     scasb                       ; cmp al, [es:di]. Increment DI
-    jb      SHORT .LineScanLoop ; Non control character
-
-    ; Our end of line characters or NULL character
+    jb      SHORT .LineScanLoop ; Ignore all above STX
+
+    ; NULL, SOH or STX
     dec     cx                  ; Decrement lines to scan through
     jz      SHORT .WantedLineFound
@@ -223 +220 @@
 .EndOfString:
     lahf                        ; Load FLAGS low to AH
-    lea     cx, [di-1]          ; We don't want control character to be printed
-    sub     cx, si              ; String length to CX
+    lea     cx, [di-1]          ; CX = offset to NULL, SOH or STX
+    sub     cx, si              ; CX = string length
     sahf                        ; Store AH to FLAGS low
     ret

trunk/Assembly_Library/Src/Menu/MenuCharOut.asm

@@ -2 +2 @@
 ; Project name  :   Assembly Library
 ; Created date  :   15.7.2010
-; Last update   :   8.10.2010
+; Last update   :   10.10.2010
 ; Author        :   Tomi Tilli
 ; Description   :   Character out function for printing withing menu window.
@@ -80 +80 @@
 ALIGN JUMP_ALIGN
 MovePartialWordToNewTextLineAndPrintCharacterFromAX:
-    cmp     al, ' '
-    je      SHORT .MoveCursorInDItoBeginningOfNextLine
+    cmp     al, ' '     ; Space or any control character
+    jb      SHORT .MoveCursorInDItoBeginningOfNextLine
     push    si
     push    cx