Changeset 51 in xtideuniversalbios for trunk/Assembly_Library/Src/Menu

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/Src/Menu

Files:

• Dialog/DialogFile.asm (modified) (2 diffs)
• Dialog/LineSplitter.asm (modified) (3 diffs)
• MenuCharOut.asm (modified) (2 diffs)

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