WebSVN – Kolibri OS – Diff – /programs/develop/libraries/libs-dev/libini/libini.asm


;;================================================================================================;;
;;//// libini.asm //// (c) mike.dld, 2006-2008 ///////////////////////////////////////////////////;;
;;================================================================================================;;
;;                                                                                                ;;
;; This file is part of Common development libraries (Libs-Dev).                                  ;;
;;                                                                                                ;;
;; Libs-Dev is free software: you can redistribute it and/or modify it under the terms of the GNU ;;
;; Lesser General Public License as published by the Free Software Foundation, either version 2.1 ;;
;; of the License, or (at your option) any later version.                                         ;;
;;                                                                                                ;;
;; Libs-Dev is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without  ;;
;; even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU  ;;
;; Lesser General Public License for more details.                                                ;;
;;                                                                                                ;;
;; You should have received a copy of the GNU Lesser General Public License along with Libs-Dev.  ;;
;; If not, see .                                                    ;;
;;                                                                                                ;;
;;================================================================================================;;
;;                                                                                                ;;
;; 2009-03-08 (mike.dld)                                                                          ;;
;;   bug-fixes:                                                                                   ;;
;;     - moved buffer bound check in libini._.low.read_value up (reported by Insolor)             ;;
;;   new features:                                                                                ;;
;;     - comments support (char is ini.COMMENT_CHAR, defaults to ';')                             ;;
;;       inline comments are not supported                                                        ;;
;; 2008-12-29 (mike.dld)                                                                          ;;
;;   bug-fixes:                                                                                   ;;
;;     - unnecessary 'stosb' in ini.get_str was causing problems                                  ;;
;;   new features:                                                                                ;;
;;     - new functions: ini.get_color and ini.set_color                                           ;;
;; 2008-08-06 (mike.dld)                                                                          ;;
;;   changes:                                                                                     ;;
;;     - split private procs into libini_p.asm, added comments                                    ;;
;; 2008-02-07 (mike.dld)                                                                          ;;
;;   changes:                                                                                     ;;
;;     - renamed all *.aux.* to *._.* to match overall libraries design                           ;;
;; 2007-09-26 (mike.dld)                                                                          ;;
;;   bug-fixes:                                                                                   ;;
;;     - value was not correctly trimmed (reported by diamond)                                    ;;
;; 2007-08-01 (mike.dld)                                                                          ;;
;;   bug-fixes:                                                                                   ;;
;;     - serious defect in ini.set_str causing displaced write operations                         ;;
;;       (reported by diamond)                                                                    ;;
;;     - another serious defect in ini.enum_keys introduced with refactoring                      ;;
;;   changes:                                                                                     ;;
;;     - callback for enum_keys now takes additional parameter - key value                        ;;
;;     - handling trailing spaces in section/key/value                                            ;;
;; 2007-05-19 (mike.dld)                                                                          ;;
;;   bug-fixes:                                                                                   ;;
;;     - last char still wasn't read correctly                                                    ;;
;;     - digits of number were reversed when using ini.set_int                                    ;;
;;     - now using 'ini.aux.unget_char' instead of dangerous 'dec esi'                            ;;
;;   changes:                                                                                     ;;
;;     - all non-public functions now start with ini.aux.*                                        ;;
;;     - added ini.enum_sections and ini.enum_keys                                                ;;
;;     - removed ini.query_sec (use ini.enum_* instead)                                           ;;
;;                                                                                                ;;
;;================================================================================================;;
 
format MS COFF
 
public @EXPORT as 'EXPORTS'
 
include '../../../../proc32.inc'
include '../../../../macros.inc'
include '../libio/libio.inc'
purge section,mov,add,sub
 
include 'libini_p.inc'
 
section '.flat' code readable align 16
 
include 'libini_p.asm'
 
;;================================================================================================;;
proc ini.enum_sections _f_name, _callback ;///////////////////////////////////////////////////////;;
;;------------------------------------------------------------------------------------------------;;
 
;? Enumerate sections, calling c2------------------------------------------------------------------;;
;> _f_name = ini filename                                                                 ;;
;> _callback = callback function address: func(f_name, sec_name), where                           ;;
;>   f_name = ini filename (as passed to the function)                                    ;;
;>   sec_name = section name found                                                        ;;
;;------------------------------------------------------------------------------------------------;;
;< eax = -1 (error) / 0                                                                           ;;
;;================================================================================================;;
locals
  f	  IniFile
  f_addr  dd ?
  sec_buf dd ?
endl
 
	push	ebx esi edi
 
	cld
 
	invoke	mem.alloc, ini.MAX_NAME_LEN
	or	eax, eax
	jz	.exit_error.2
	mov	[sec_buf], eax
 
	xor	eax, eax
	mov	[f.fh], eax
	mov	[f.buf], eax
	invoke	file.open, [_f_name], O_READ
	cmp	eax, 32
	jb	.exit_file_error
	mov	[f.fh], eax
	invoke	mem.alloc, ini.MEM_SIZE
	or	eax, eax
	jz	.exit_error
	mov	[f.buf], eax
	lea	ebx, [f]
	mov	[f_addr], ebx
 
	invoke	file.seek, [f.fh], 0, SEEK_SET
	stdcall libini._.preload_block, [f_addr]
 
  .next_section:
	stdcall libini._.find_next_section, [f_addr]
	or	eax, eax
	jnz	.exit_error
 
	stdcall libini._.get_char, [f_addr]
	stdcall libini._.skip_spaces, [f_addr]
	mov	edi, [sec_buf]
    @@: stdcall libini._.get_char, [f_addr]
	cmp	al, ']'
	je	@f
	or	al, al
	jz	.exit_ok
	cmp	al, 13
	je	.next_section
	cmp	al, 10
	je	.next_section
	stosb
	jmp	@b
    @@: xor	al, al
	stosb
	add	edi, -2
    @@: cmp	byte[edi], 32
	ja	@f
	mov	byte[edi], 0
	dec	edi
	jmp	@b
    @@:
	pushad
	mov	eax, [f_addr]
	stdcall [_callback], [_f_name], [sec_buf]
	or	eax, eax
	popad
	jnz	.next_section
 
  .exit_ok:
	invoke	file.close, [f.fh]
	invoke	mem.free, [f.buf]
	invoke	mem.free, [sec_buf]
	xor	eax, eax
	pop	edi esi ebx
	ret
 
  .exit_error:
	invoke	file.close, [f.fh]
	invoke	mem.free, [f.buf]
  .exit_file_error:
	invoke	mem.free, [sec_buf]
  .exit_error.2:
	or	eax, -1
	pop	edi esi ebx
	ret
endp
 
;;================================================================================================;;
proc ini.enum_keys _f_name, _sec_name, _callback ;////////////////////////////////////////////////;;
;;------------------------------------------------------------------------------------------------;;
;? Enumerate keys within a section, calling callback function for each of them                    ;;
;;------------------------------------------------------------------------------------------------;;
;> _f_name = ini filename                                                                 ;;
;> _sec_name = section name                                                               ;;
;> _callback = callback function address: func(f_name, sec_name, key_name, key_value), where      ;;
;>   f_name = ini filename (as passed to the function)                                    ;;
;>   sec_name = section name (as passed to the function)                                  ;;
;>   key_name = key name found                                                            ;;
;>   key_value = value of key found                                                       ;;
;;------------------------------------------------------------------------------------------------;;
;< eax = -1 (error) / 0                                                                           ;;
;;================================================================================================;;
locals
  f	  IniFile
  f_addr  dd ?
  key_buf dd ?
  val_buf dd ?
endl
 
	push	ebx esi edi
 
	cld
 
	invoke	mem.alloc, ini.MAX_NAME_LEN
	or	eax, eax
	jz	.exit_error.3
	mov	[key_buf], eax
	invoke	mem.alloc, ini.MAX_VALUE_LEN
	or	eax, eax
	jz	.exit_error.2
	mov	[val_buf], eax
 
	xor	eax, eax
	mov	[f.fh], eax
	mov	[f.buf], eax
	invoke	file.open, [_f_name], O_READ
	cmp	eax, 32
	jb	.exit_file_error
	mov	[f.fh], eax
	invoke	mem.alloc, ini.MEM_SIZE
	or	eax, eax
	jz	.exit_error
	mov	[f.buf], eax
	lea	ebx, [f]
	mov	[f_addr], ebx
	stdcall libini._.find_section, ebx, [_sec_name]
	or	eax, eax
	jnz	.exit_error
 
  .next_key:
	stdcall libini._.skip_line, [f_addr]
	stdcall libini._.skip_nonblanks, [f_addr]
	or	al, al
	jz	.exit_error
	cmp	al, '['
	je	.exit_error
	mov	edi, [key_buf]
    @@: stdcall libini._.get_char, [f_addr]
	or	al, al
	jz	.exit_error
	cmp	al, '='
	je	@f
	stosb
	jmp	@b
    @@:
	xor	al, al
	stosb
	add	edi, -2
    @@: cmp	byte[edi], 32
	ja	@f
	mov	byte[edi], 0
	dec	edi
	jmp	@b
    @@: stdcall libini._.low.read_value, [f_addr], [val_buf], ini.MAX_VALUE_LEN
	pushad
	stdcall [_callback], [_f_name], [_sec_name], [key_buf], [val_buf]
	or	eax, eax
	popad
	jnz	.next_key
 
    @@: invoke	file.close, [f.fh]
	invoke	mem.free, [f.buf]
	xor	eax, eax
	stosb
	pop	edi esi ebx
	ret
 
  .exit_error:
	invoke	file.close, [f.fh]
	invoke	mem.free, [f.buf]
  .exit_file_error:
	invoke	mem.free, [val_buf]
  .exit_error.2:
	invoke	mem.free, [key_buf]
  .exit_error.3:
	or	eax, -1
	pop	edi esi ebx
	ret
endp
 
;;================================================================================================;;
proc ini.get_str _f_name, _sec_name, _key_name, _buffer, _buf_len, _def_val ;/////////////////////;;
;;------------------------------------------------------------------------------------------------;;
;? Read string                                                                                    ;;
;;------------------------------------------------------------------------------------------------;;
;> _f_name = ini filename                                                                 ;;
;> _sec_name = section name                                                               ;;
;> _key_name = key name                                                                   ;;
;> _buffer = destination buffer address                                                    ;;
;> _buf_len = buffer size (maximum bytes to read)                                          ;;
;> _def_val = default value to return if no key, section or file found                    ;;
;;------------------------------------------------------------------------------------------------;;
;< eax = -1 (error) / 0                                                                           ;;
;< [_buffer] = [_def_val] (error) / found key value                                       ;;
;;================================================================================================;;
locals
  f	 IniFile
  f_addr dd ?
endl
 
	push	ebx esi edi
 
	xor	eax, eax
	mov	[f.fh], eax
	mov	[f.buf], eax
	invoke	file.open, [_f_name], O_READ
	cmp	eax, 32
	jb	.exit_file_error
	mov	[f.fh], eax
	invoke	mem.alloc, ini.MEM_SIZE
	or	eax, eax
	jz	.exit_error
	mov	[f.buf], eax
	lea	ebx, [f]
	mov	[f_addr], ebx
	stdcall libini._.find_section, ebx, [_sec_name]
	or	eax, eax
	jnz	.exit_error
 
	stdcall libini._.find_key, ebx, [_key_name]
	or	eax, eax
	jnz	.exit_error
 
	stdcall libini._.low.read_value, [f_addr], [_buffer], [_buf_len]
    @@: invoke	file.close, [f.fh]
	invoke	mem.free, [f.buf]
	xor	eax, eax
	pop	edi esi ebx
	ret
 
  .exit_error:
	invoke	file.close, [f.fh]
	invoke	mem.free, [f.buf]
  .exit_file_error:
	mov	edi, [_buffer]
	mov	esi, [_def_val]
	xor	al, al
	or	esi, esi
	jz	.exit_error.2
    @@: lodsb
  .exit_error.2:
	stosb
	or	al, al
	jnz	@b
	or	eax, -1
	pop	edi esi ebx
	ret
endp
 
;;================================================================================================;;
proc ini.set_str _f_name, _sec_name, _key_name, _buffer, _buf_len ;///////////////////////////////;;
;;------------------------------------------------------------------------------------------------;;
;? Write string                                                                                   ;;
;;------------------------------------------------------------------------------------------------;;
;> _f_name = ini filename                                                                 ;;
;> _sec_name = section name                                                               ;;
;> _key_name = key name                                                                   ;;
;> _buffer = source buffer address                                                         ;;
;> _buf_len = buffer size (bytes to write)                                                 ;;
;;------------------------------------------------------------------------------------------------;;
;< eax = -1 (error) / 0                                                                           ;;
;;================================================================================================;;
locals
  f	 IniFile
  f_addr dd ?
endl
 
	push	ebx esi edi
 
	xor	eax, eax
	mov	[f.fh], eax
	mov	[f.buf], eax
	invoke	file.open, [_f_name], O_READ + O_WRITE + O_CREATE
	cmp	eax, 32
	jb	.exit_file_error
	mov	[f.fh], eax
	invoke	mem.alloc, ini.MEM_SIZE
	or	eax, eax
	jz	.exit_error
	mov	[f.buf], eax
	lea	ebx, [f]
	mov	[f_addr], ebx
 
						;/GerdtR - bugfix: at end of file required empty line
	invoke	file.seek, [f.fh],2,SEEK_END
	invoke	file.read, [f.fh],[f.buf],2
	mov	edx,[f.buf]
	cmp	word[edx],0A0Dh
	je	@f
	mov	word[edx],0A0Dh
	invoke	file.seek, [f.fh],0,SEEK_END
	invoke	file.write, [f.fh],[f.buf],2
    @@:
 
;        lea    ebx, [f]
						;\GerdtR
 
	stdcall libini._.find_section, ebx, [_sec_name]
	or	eax, eax
	jnz	.create_section
 
	stdcall libini._.find_key, ebx, [_key_name]
	or	eax, eax
	jnz	.create_key
 
  .modify_key:
	stdcall libini._.get_value_length, [f_addr]
	sub	eax, [_buf_len]
	stdcall libini._.shift_content, [f_addr], eax
 
  .modify_key.ex:
	invoke	file.tell, [f.fh]
	sub	eax, [f.cnt]
	invoke	file.seek, [f.fh], eax, SEEK_SET
	invoke	file.write, [f.fh], [_buffer], [_buf_len]
 
	invoke	file.close, [f.fh]
	pop	edi esi ebx
	mcall	68,13,[f.buf]
	xor	eax, eax
	ret
 
  .create_key:
	mov	edi, [f.buf]
	add	edi, ini.BLOCK_SIZE
	push	edi
 
  .create_key.ex:
	mov	esi, [_key_name]
	call	libini._.string_copy
	mov	byte[edi], '='
	inc	edi
	mov	esi, [_buffer]
	mov	ecx, [_buf_len]
	rep	movsb
	mov	word[edi], 0x0A0D
	add	edi, 2
	mov	eax, edi
 
	pop	edi
	sub	eax, edi
	mov	[_buffer], edi
	mov	[_buf_len], eax
	neg	eax
	stdcall libini._.shift_content, [f_addr], eax
 
	jmp	.modify_key.ex
 
  .create_section:
	mov	edi, [f.buf]
	add	edi, ini.BLOCK_SIZE
	push	edi
 
	mov	esi, [_sec_name]
 
	mov	byte[edi], '['
	inc	edi
	call	libini._.string_copy
	mov	dword[edi], ']' + (0x0A0D shl 8)
	add	edi, 3
 
	jmp	.create_key.ex
 
  .exit_error:
	invoke	file.close, [f.fh]
  .exit_file_error:
	pop	edi esi ebx
	or	eax, -1
	ret
endp
 
;;================================================================================================;;
proc ini.get_int _f_name, _sec_name, _key_name, _def_val ;////////////////////////////////////////;;
;;------------------------------------------------------------------------------------------------;;
;? Read integer                                                                                   ;;
;;------------------------------------------------------------------------------------------------;;
;> _f_name = ini filename                                                                 ;;
;> _sec_name = section name                                                               ;;
;> _key_name = key name                                                                   ;;
;> _def_val = default value to return if no key, section or file found                     ;;
;;------------------------------------------------------------------------------------------------;;
;< eax = [_def_val] (error) / found key value                                              ;;
;;================================================================================================;;
locals
  f	 IniFile
  f_addr dd ?
endl
 
	push	edx ebx esi edi
 
	xor	eax, eax
	mov	[f.fh], eax
	mov	[f.buf], eax
	invoke	file.open, [_f_name], O_READ
	cmp	eax, 32
	jb	.exit_file_error
	mov	[f.fh], eax
	invoke	mem.alloc, ini.MEM_SIZE
	or	eax, eax
	jz	.exit_error
	mov	[f.buf], eax
	lea	ebx, [f]
	mov	[f_addr], ebx
	stdcall libini._.find_section, ebx, [_sec_name]
	or	eax, eax
	jnz	.exit_error
 
	stdcall libini._.find_key, ebx, [_key_name]
	or	eax, eax
	jnz	.exit_error
 
	stdcall libini._.skip_spaces, [f_addr]
	xor	eax, eax
	xor	ebx, ebx
	xor	edx, edx
	stdcall libini._.get_char, [f_addr]
	cmp	al, '-'
	jne	.lp1
	inc	bh
    @@: stdcall libini._.get_char, [f_addr]
  .lp1: cmp	al, '0'
	jb	@f
	cmp	al, '9'
	ja	@f
	inc	bl
	add	eax, -'0'
	imul	edx, 10
	add	edx, eax
	jmp	@b
    @@:
	or	bl, bl
	jz	.exit_error
	or	bh, bh
	jz	@f
	neg	edx
    @@: invoke	file.close, [f.fh]
	invoke	mem.free, [f.buf]
	mov	eax, edx
	pop	edi esi ebx edx
	ret
 
  .exit_error:
	invoke	file.close, [f.fh]
  .exit_file_error:
	invoke	mem.free, [f.buf]
	mov	eax, [_def_val]
	pop	edi esi ebx edx
	ret
endp
 
;;================================================================================================;;
proc ini.set_int _f_name, _sec_name, _key_name, _val ;////////////////////////////////////////////;;
;;------------------------------------------------------------------------------------------------;;
;? Write integer                                                                                  ;;
;;------------------------------------------------------------------------------------------------;;
;> _f_name = ini filename                                                                 ;;
;> _sec_name = section name                                                               ;;
;> _key_name = key name                                                                   ;;
;> _val = value                                                                            ;;
;;------------------------------------------------------------------------------------------------;;
;< eax = -1 (error) / 0                                                                           ;;
;;================================================================================================;;
locals
  buf rb 16
  bNeg rd 1
endl
 
	push	ecx edx edi
 
	lea	edi, [buf]
	add	edi, 15
 
	mov	eax, [_val]
	mov	[bNeg],0
	or	eax, eax
	jns	@f
	mov	[bNeg],1
	neg	eax
 
    @@: mov	ecx, 10
    @@: xor	edx, edx
	idiv	ecx
	add	dl, '0'
	mov	[edi], dl
	dec	edi
	or	eax, eax
	jnz	@b
 
	cmp	[bNeg],0
	je	@f
	mov	byte[edi], '-'
	dec	edi
     @@:
	lea	eax, [buf]
	add	eax, 15
	sub	eax, edi
	inc	edi
 
 
 
	stdcall ini.set_str, [_f_name], [_sec_name], [_key_name], edi, eax
 
	pop	edi edx ecx
	ret
endp
 
;;================================================================================================;;
proc ini.get_color _f_name, _sec_name, _key_name, _def_val ;//////////////////////////////////////;;
;;------------------------------------------------------------------------------------------------;;
;? Read color                                                                                     ;;
;;------------------------------------------------------------------------------------------------;;
;> _f_name = ini filename                                                                 ;;
;> _sec_name = section name                                                               ;;
;> _key_name = key name                                                                   ;;
;> _def_val = default value to return if no key, section or file found                     ;;
;;------------------------------------------------------------------------------------------------;;
;< eax = [_def_val] (error) / found key value                                              ;;
;;================================================================================================;;
locals
  buf rb 14
endl
 
	push	ebx esi edi
 
	lea	esi, [buf]
	stdcall ini.get_str, [_f_name], [_sec_name], [_key_name], esi, 14, 0
	cmp	byte[esi],0
	je	.exit_error
 
	xor	ebx, ebx
	stdcall libini._.str_to_int
	movzx	ebx, al
	shl	ebx, 16
	lodsb
	cmp	al, ','
	jne	@f
	stdcall libini._.str_to_int
	mov	bh, al
	lodsb
	cmp	al, ','
	jne	@f
	stdcall libini._.str_to_int
	mov	bl, al
 
    @@: mov	eax, ebx
 
	pop	edi esi ebx
	ret
 
  .exit_error:
	mov	eax, [_def_val]
	pop	edi esi ebx
	ret
endp
 
;;================================================================================================;;
proc ini.set_color _f_name, _sec_name, _key_name, _val ;//////////////////////////////////////////;;
;;------------------------------------------------------------------------------------------------;;
;? Write color                                                                                    ;;
;;------------------------------------------------------------------------------------------------;;
;> _f_name = ini filename                                                                 ;;
;> _sec_name = section name                                                               ;;
;> _key_name = key name                                                                   ;;
;> _val = value                                                                            ;;
;;------------------------------------------------------------------------------------------------;;
;< eax = -1 (error) / 0                                                                           ;;
;;================================================================================================;;
locals
  buf rb 16
endl
 
	push	ecx edx edi
 
	lea	edi, [buf]
	mov	ecx, 10
	mov	ebx, [_val]
	mov	eax, ebx
	shr	eax, 16
	and	eax, 0x0ff
	stdcall libini._.int_to_str
	mov	byte[edi], ','
	inc	edi
	movzx	eax, bh
	stdcall libini._.int_to_str
	mov	byte[edi], ','
	inc	edi
	movzx	eax, bl
	stdcall libini._.int_to_str
 
	lea	eax, [buf]
	sub	edi, eax
 
	stdcall ini.set_str, [_f_name], [_sec_name], [_key_name], eax, edi
 
	pop	edi edx ecx
	ret
endp
 
 
;;================================================================================================;;
proc ini.del_section _f_name, _sec_name ;/////////////////////////////////////////////////////////;;
;;------------------------------------------------------------------------------------------------;;
;? Delete section and all key in this section                                                     ;;
;;------------------------------------------------------------------------------------------------;;
;> _f_name = ini filename                                                                 ;;
;> _sec_name = section name                                                               ;;
;;------------------------------------------------------------------------------------------------;;
;< eax = 0 - success                                                                              ;;
;<      -1 - file not found                                                                       ;;
;<       1 - section not found                                                                    ;;
;;================================================================================================;;
locals
   funcFile	rb 25
   fileInfo	rb 40
   begMem	rd 1
   endMem	rd 1
   begDel	rd 1
   endDel	rd 1
endl
	push	ebx ecx edi esi
	xor	eax,eax
	mov	dword[funcFile],5		;get file info
	mov	dword[funcFile+4],eax
	mov	dword[funcFile+8],eax
	mov	dword[funcFile+12],eax
	lea	eax,[fileInfo]
	mov	dword[funcFile+16],eax
	mov	byte[funcFile+20],0
	m2m	dword[funcFile+21],[_f_name]
	lea	ebx,[funcFile]
	mcall	70
	test	eax,eax
	jz	@f
 
	or	eax,-1
	pop	esi edi ecx ebx
	ret
      @@:
 
	mov	ecx,dword[fileInfo+32]		;allocation mem for all file
	mcall	68,12
 
	mov	[begMem],eax
	mov	[endMem],eax
	add	[endMem],ecx
 
	mov	dword[funcFile],0		;read file to buffer
	mov	dword[funcFile+12],ecx
	mov	dword[funcFile+16],eax
	lea	ebx,[funcFile]
	mcall	70
 
	mov	edi,[begMem]			;search begin section
	jmp	.searchSect
    .NoFindSect:
	mov	edi,[begDel]
    .searchSect:
	mov	al,'['
	repne	scasb
	test	ecx,ecx
	jnz	@f
 
	pop	esi edi ecx ebx
	mov	eax,1
	ret
      @@:
	mov	[begDel],edi
	mov	esi,[_sec_name]
      @@:
	lodsb
	test	al,al
	jz	@f
	scasb
	jne	.NoFindSect
	jmp	@b
      @@:
	cmp	byte[edi],']'
	jne	.NoFindSect
 
	mov	edi,[begDel]
	dec	[begDel]
				       ;search end section
    .searchEndSect:
	mov	al,'['
	repne	scasb
 
	dec	edi
	mov	[endDel],edi
 
	test	ecx,ecx
	jnz	@f
	jmp	.SaveToFile
      @@:
 
 
	mov	esi,[endDel]
	mov	edi,[begDel]
   @@:	lodsb
	stosb
	cmp	esi,[endMem]
	jb	@b
 
   .SaveToFile:
	mov	eax,dword[funcFile+12]
	sub	eax,[endDel]
	add	eax,[begDel]
	dec	eax
 
	mov	dword[funcFile],2		;write buffer to file
	mov	dword[funcFile+12],eax
	m2m	dword[funcFile+16],[begMem]
	lea	ebx,[funcFile]
	mcall	70
 
	mcall	68,13,[begMem]
 
	xor	eax,eax
	pop	esi edi ecx ebx
	ret
endp
 
 
 
 
;;================================================================================================;;
proc ini.get_shortcut _f_name, _sec_name, _key_name, _def_val, _modifiers ;///////////////////////;;
;;------------------------------------------------------------------------------------------------;;
;? Read shortcut key                                                                              ;;
;;------------------------------------------------------------------------------------------------;;
;> _f_name = ini filename                                                                 ;;
;> _sec_name = section name                                                               ;;
;> _key_name = key name                                                                   ;;
;> _def_val = default value to return if no key, section or file found                     ;;
;> _modifiers = pointer to dword variable which receives modifiers state as in 66.4       ;;
;;------------------------------------------------------------------------------------------------;;
;< eax = [_def_val] (error) / shortcut key value as scancode                                 ;;
;< [[_modifiers]] = unchanged (error) / modifiers state for this shortcut                    ;;
;;================================================================================================;;
locals
  buf rb 64
endl
 
	push	ebx esi edi
 
	lea	esi, [buf]
	stdcall ini.get_str, [_f_name], [_sec_name], [_key_name], esi, 64, 0
	cmp	byte[esi],0
	je	.exit_error
 
	xor	ebx, ebx	; ebx holds the value of modifiers
.loop:
; test for end
	xor	eax, eax
	cmp	byte [esi], al
	jz	.exit_ok	; exit with scancode zero
; skip all '+'s
	cmp	byte [esi], '+'
	jnz	@f
	inc	esi
	jmp	.loop
@@:
; test for names
	mov	edi, .names_table
	xor	edx, edx
.names_loop:
	movzx	ecx, byte [edi]
	inc	edi
	push	esi
@@:
	lodsb
	or	al, 20h
	scasb
	loopz	@b
	jz	.name_found
	pop	esi
	lea	edi, [edi+ecx+4]
	inc	edx
	cmp	byte [edi], 0
	jnz	.names_loop
; special test: functional keys F
	cmp	byte [esi], 'f'
	jz	@f
	cmp	byte [esi], 'F'
	jnz	.no_fx
@@:
	mov	edi, esi
	inc	esi
	call	libini._.str_to_int
	test	eax, eax
	jnz	.fx
	mov	esi, edi
.no_fx:
; name not found, that must be usual key
	movzx	eax, byte [esi]
	stdcall libini._.ascii_to_scan, eax
	test	eax, eax
	jz	.exit_error
; all is ok
.exit_ok:
	mov	ecx, [_modifiers]
	test	ecx, ecx
	jz	@f
	mov	[ecx], ebx
 
@@:
 
	pop	edi esi ebx
	ret
 
.exit_error:
	mov	eax, [_def_val]
	pop	edi esi ebx
	ret
; handler for Fx
; eax = number
.fx:
	cmp	eax, 10
	ja	@f
	add	eax, 3Bh-1
	jmp	.exit_ok
@@:
	add	eax, 57h-11
	jmp	.exit_ok
; handlers for names
.name_found:
	pop	eax	; ignore saved esi
	call	dword [edi]
	cmp	edx, .num_modifiers
	jae	.exit_ok
	jmp	.loop
; modifiers
; syntax of value for each modifier:
; 0 = none, 1 = exactly one of L+R, 2 = both L+R, 3 = L, 4 = R
; Logic for switching: LShift+RShift=LShift+Shift=Shift+Shift, LShift+LShift=LShift
; generic modifier: 0->1->2->2, 3->2, 4->2
; left modifier: 0->3->3, 1->2->2, 4->2
; right modifier: 0->4->4, 1->2->2, 3->2
; Shift corresponds to first hex digit, Ctrl - second, Alt - third
macro shortcut_handle_modifiers name,reg,shift
{
local .set2,.set3,.set4
.#name#_handler:	; generic modifier
	test	reg, 0xF
	jnz	.set2
if shift
	or	reg, 1 shl shift
else
	inc	reg
end if
	retn
.set2:
	and	reg, not (0xF shl shift)
	or	reg, 2 shl shift
	retn
.l#name#_handler:
	mov	al, reg
	and	al, 0xF shl shift
	jz	.set3
	cmp	al, 3 shl shift
	jnz	.set2
	retn
.set3:
	add	reg, 3 shl shift
	retn
.r#name#_handler:
	mov	al, reg
	and	al, 0xF shl shift
	jz	.set4
	cmp	al, 4 shl shift
	jnz	.set2
	retn
.set4:
	add	reg, 4 shl shift
	retn
}
shortcut_handle_modifiers shift,bl,0
shortcut_handle_modifiers ctrl,bl,4
shortcut_handle_modifiers alt,bh,0
; names of keys
.name_handler:
	movzx	eax, byte [.names_scancodes+edx-.num_modifiers]
	retn
endp
 
; note: comparison ignores case, so this table keeps lowercase names
; macro does this
macro shortcut_name_with_handler name,handler
{
local .start, .end
	db	.end - .start
.start:
	db	name
.end:
repeat .end - .start
	load .a byte from .start + % - 1
	store byte .a or 0x20 at .start + % - 1
end repeat
	dd	handler
}
macro shortcut_name [name]
{
	shortcut_name_with_handler name, .name_handler
}
 
; all names here must be in english
; ... or modify lowercasing in macro and in comparison
.names_table:
; generic modifiers
	shortcut_name_with_handler 'Ctrl', .ctrl_handler
	shortcut_name_with_handler 'Alt', .alt_handler
	shortcut_name_with_handler 'Shift', .shift_handler
; concrete modifiers
	shortcut_name_with_handler 'LCtrl', .lctrl_handler
	shortcut_name_with_handler 'RCtrl', .rctrl_handler
	shortcut_name_with_handler 'LAlt', .lalt_handler
	shortcut_name_with_handler 'RAlt', .ralt_handler
	shortcut_name_with_handler 'LShift', .lshift_handler
	shortcut_name_with_handler 'RShift', .rshift_handler
.num_modifiers = 9
; symbolic names of keys
	shortcut_name 'Home', 'End', 'PgUp', 'PgDn', 'Ins', 'Insert', 'Del', 'Delete'
	shortcut_name 'Tab', 'Plus', 'Esc', 'Enter', 'Backspace', 'Space', 'Left', 'Right'
	shortcut_name 'Up', 'Down'
; end of table
	db	0
ini.get_shortcut.names_scancodes:
; scancodes for 'Home' ... 'Down'
	db	47h, 4Fh, 49h, 51h, 52h, 52h, 53h, 53h
	db	0Fh, 4Eh, 01h, 1Ch, 0Eh, 39h, 4Bh, 4Dh
	db	48h, 50h
 
;;================================================================================================;;
;;////////////////////////////////////////////////////////////////////////////////////////////////;;
;;================================================================================================;;
;! Imported functions section                                                                     ;;
;;================================================================================================;;
;;////////////////////////////////////////////////////////////////////////////////////////////////;;
;;================================================================================================;;
 
 
align 16
@IMPORT:
 
library \
	libio , 'libio.obj'
 
import	libio			    , \
	file.size   , 'file_size'   , \
	file.open   , 'file_open'   , \
	file.read   , 'file_read'   , \
	file.write  , 'file_write'  , \
	file.seek   , 'file_seek'   , \
	file.eof?   , 'file_iseof'  , \
	file.seteof , 'file_seteof' , \
	file.tell   , 'file_tell'   , \
	file.close  , 'file_close'
 
 
;;================================================================================================;;
;;////////////////////////////////////////////////////////////////////////////////////////////////;;
;;================================================================================================;;
;! Exported functions section                                                                     ;;
;;================================================================================================;;
;;////////////////////////////////////////////////////////////////////////////////////////////////;;
;;================================================================================================;;
 
 
align 16
@EXPORT:
 
export						  \
	libini._.init	  , 'lib_init'		, \
	0x00080009	  , 'version'		, \
	ini.enum_sections , 'ini_enum_sections' , \
	ini.enum_keys	  , 'ini_enum_keys'	, \
	ini.get_str	  , 'ini_get_str'	, \
	ini.get_int	  , 'ini_get_int'	, \
	ini.get_color	  , 'ini_get_color'	, \
	ini.set_str	  , 'ini_set_str'	, \
	ini.set_int	  , 'ini_set_int'	, \
	ini.set_color	  , 'ini_set_color'	, \
	ini.get_shortcut  , 'ini_get_shortcut'	, \
	ini.del_section   , 'ini_del_section'

Rev 3920	Rev 4422
1	;;================================================================================================;;	1	;;================================================================================================;;
2	;;//// libini.asm //// (c) mike.dld, 2006-2008 ///////////////////////////////////////////////////;;	2	;;//// libini.asm //// (c) mike.dld, 2006-2008 ///////////////////////////////////////////////////;;
3	;;================================================================================================;;	3	;;================================================================================================;;
4	;; ;;	4	;; ;;
5	;; This file is part of Common development libraries (Libs-Dev). ;;	5	;; This file is part of Common development libraries (Libs-Dev). ;;
6	;; ;;	6	;; ;;
7	;; Libs-Dev is free software: you can redistribute it and/or modify it under the terms of the GNU ;;	7	;; Libs-Dev is free software: you can redistribute it and/or modify it under the terms of the GNU ;;
8	;; Lesser General Public License as published by the Free Software Foundation, either version 2.1 ;;	8	;; Lesser General Public License as published by the Free Software Foundation, either version 2.1 ;;
9	;; of the License, or (at your option) any later version. ;;	9	;; of the License, or (at your option) any later version. ;;
10	;; ;;	10	;; ;;
11	;; Libs-Dev is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without ;;	11	;; Libs-Dev is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without ;;
12	;; even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ;;	12	;; even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ;;
13	;; Lesser General Public License for more details. ;;	13	;; Lesser General Public License for more details. ;;
14	;; ;;	14	;; ;;
15	;; You should have received a copy of the GNU Lesser General Public License along with Libs-Dev. ;;	15	;; You should have received a copy of the GNU Lesser General Public License along with Libs-Dev. ;;
16	;; If not, see . ;;	16	;; If not, see . ;;
17	;; ;;	17	;; ;;
18	;;================================================================================================;;	18	;;================================================================================================;;
19	;; ;;	19	;; ;;
20	;; 2009-03-08 (mike.dld) ;;	20	;; 2009-03-08 (mike.dld) ;;
21	;; bug-fixes: ;;	21	;; bug-fixes: ;;
22	;; - moved buffer bound check in libini._.low.read_value up (reported by Insolor) ;;	22	;; - moved buffer bound check in libini._.low.read_value up (reported by Insolor) ;;
23	;; new features: ;;	23	;; new features: ;;
24	;; - comments support (char is ini.COMMENT_CHAR, defaults to ';') ;;	24	;; - comments support (char is ini.COMMENT_CHAR, defaults to ';') ;;
25	;; inline comments are not supported ;;	25	;; inline comments are not supported ;;
26	;; 2008-12-29 (mike.dld) ;;	26	;; 2008-12-29 (mike.dld) ;;
27	;; bug-fixes: ;;	27	;; bug-fixes: ;;
28	;; - unnecessary 'stosb' in ini.get_str was causing problems ;;	28	;; - unnecessary 'stosb' in ini.get_str was causing problems ;;
29	;; new features: ;;	29	;; new features: ;;
30	;; - new functions: ini.get_color and ini.set_color ;;	30	;; - new functions: ini.get_color and ini.set_color ;;
31	;; 2008-08-06 (mike.dld) ;;	31	;; 2008-08-06 (mike.dld) ;;
32	;; changes: ;;	32	;; changes: ;;
33	;; - split private procs into libini_p.asm, added comments ;;	33	;; - split private procs into libini_p.asm, added comments ;;
34	;; 2008-02-07 (mike.dld) ;;	34	;; 2008-02-07 (mike.dld) ;;
35	;; changes: ;;	35	;; changes: ;;
36	;; - renamed all .aux. to ._. to match overall libraries design ;;	36	;; - renamed all .aux. to ._. to match overall libraries design ;;
37	;; 2007-09-26 (mike.dld) ;;	37	;; 2007-09-26 (mike.dld) ;;
38	;; bug-fixes: ;;	38	;; bug-fixes: ;;
39	;; - value was not correctly trimmed (reported by diamond) ;;	39	;; - value was not correctly trimmed (reported by diamond) ;;
40	;; 2007-08-01 (mike.dld) ;;	40	;; 2007-08-01 (mike.dld) ;;
41	;; bug-fixes: ;;	41	;; bug-fixes: ;;
42	;; - serious defect in ini.set_str causing displaced write operations ;;	42	;; - serious defect in ini.set_str causing displaced write operations ;;
43	;; (reported by diamond) ;;	43	;; (reported by diamond) ;;
44	;; - another serious defect in ini.enum_keys introduced with refactoring ;;	44	;; - another serious defect in ini.enum_keys introduced with refactoring ;;
45	;; changes: ;;	45	;; changes: ;;
46	;; - callback for enum_keys now takes additional parameter - key value ;;	46	;; - callback for enum_keys now takes additional parameter - key value ;;
47	;; - handling trailing spaces in section/key/value ;;	47	;; - handling trailing spaces in section/key/value ;;
48	;; 2007-05-19 (mike.dld) ;;	48	;; 2007-05-19 (mike.dld) ;;
49	;; bug-fixes: ;;	49	;; bug-fixes: ;;
50	;; - last char still wasn't read correctly ;;	50	;; - last char still wasn't read correctly ;;
51	;; - digits of number were reversed when using ini.set_int ;;	51	;; - digits of number were reversed when using ini.set_int ;;
52	;; - now using 'ini.aux.unget_char' instead of dangerous 'dec esi' ;;	52	;; - now using 'ini.aux.unget_char' instead of dangerous 'dec esi' ;;
53	;; changes: ;;	53	;; changes: ;;
54	;; - all non-public functions now start with ini.aux.* ;;	54	;; - all non-public functions now start with ini.aux.* ;;
55	;; - added ini.enum_sections and ini.enum_keys ;;	55	;; - added ini.enum_sections and ini.enum_keys ;;
56	;; - removed ini.query_sec (use ini.enum_* instead) ;;	56	;; - removed ini.query_sec (use ini.enum_* instead) ;;
57	;; ;;	57	;; ;;
58	;;================================================================================================;;	58	;;================================================================================================;;
59		59
60	format MS COFF	60	format MS COFF
61		61
62	public @EXPORT as 'EXPORTS'	62	public @EXPORT as 'EXPORTS'
63		63
64	include '../../../../proc32.inc'	64	include '../../../../proc32.inc'
65	include '../../../../macros.inc'	65	include '../../../../macros.inc'
66	include '../libio/libio.inc'	66	include '../libio/libio.inc'
67	purge section,mov,add,sub	67	purge section,mov,add,sub
68		68
69	include 'libini_p.inc'	69	include 'libini_p.inc'
70		70
71	section '.flat' code readable align 16	71	section '.flat' code readable align 16
72		72
73	include 'libini_p.asm'	73	include 'libini_p.asm'
74		74
75	;;================================================================================================;;	75	;;================================================================================================;;
76	proc ini.enum_sections _f_name, _callback ;///////////////////////////////////////////////////////;;	76	proc ini.enum_sections _f_name, _callback ;///////////////////////////////////////////////////////;;
77	;;------------------------------------------------------------------------------------------------;;	77	;;------------------------------------------------------------------------------------------------;;
78	;? Enumerate sections, calling callback function for each of them ;;	-
79	;;------------------------------------------------------------------------------------------------;;	78	;? Enumerate sections, calling c2------------------------------------------------------------------;;
80	;> _f_name = ini filename ;;	79	;> _f_name = ini filename ;;
81	;> _callback = callback function address: func(f_name, sec_name), where ;;	80	;> _callback = callback function address: func(f_name, sec_name), where ;;
82	;> f_name = ini filename (as passed to the function) ;;	81	;> f_name = ini filename (as passed to the function) ;;
83	;> sec_name = section name found ;;	82	;> sec_name = section name found ;;
84	;;------------------------------------------------------------------------------------------------;;	83	;;------------------------------------------------------------------------------------------------;;
85	;< eax = -1 (error) / 0 ;;	84	;< eax = -1 (error) / 0 ;;
86	;;================================================================================================;;	85	;;================================================================================================;;
87	locals	86	locals
88	f IniFile	87	f IniFile
89	f_addr dd ?	88	f_addr dd ?
90	sec_buf dd ?	89	sec_buf dd ?
91	endl	90	endl
92		91
93	push ebx esi edi	92	push ebx esi edi
94		93
95	cld	94	cld
96		95
97	invoke mem.alloc, ini.MAX_NAME_LEN	96	invoke mem.alloc, ini.MAX_NAME_LEN
98	or eax, eax	97	or eax, eax
99	jz .exit_error.2	98	jz .exit_error.2
100	mov [sec_buf], eax	99	mov [sec_buf], eax
101		100
102	xor eax, eax	101	xor eax, eax
103	mov [f.fh], eax	102	mov [f.fh], eax
104	mov [f.buf], eax	103	mov [f.buf], eax
105	invoke file.open, [_f_name], O_READ	104	invoke file.open, [_f_name], O_READ
106	cmp eax, 32	105	cmp eax, 32
107	jb .exit_file_error	106	jb .exit_file_error
108	mov [f.fh], eax	107	mov [f.fh], eax
109	invoke mem.alloc, ini.MEM_SIZE	108	invoke mem.alloc, ini.MEM_SIZE
110	or eax, eax	109	or eax, eax
111	jz .exit_error	110	jz .exit_error
112	mov [f.buf], eax	111	mov [f.buf], eax
113	lea ebx, [f]	112	lea ebx, [f]
114	mov [f_addr], ebx	113	mov [f_addr], ebx
115		114
116	invoke file.seek, [f.fh], 0, SEEK_SET	115	invoke file.seek, [f.fh], 0, SEEK_SET
117	stdcall libini._.preload_block, [f_addr]	116	stdcall libini._.preload_block, [f_addr]
118		117
119	.next_section:	118	.next_section:
120	stdcall libini._.find_next_section, [f_addr]	119	stdcall libini._.find_next_section, [f_addr]
121	or eax, eax	120	or eax, eax
122	jnz .exit_error	121	jnz .exit_error
123		122
124	stdcall libini._.get_char, [f_addr]	123	stdcall libini._.get_char, [f_addr]
125	stdcall libini._.skip_spaces, [f_addr]	124	stdcall libini._.skip_spaces, [f_addr]
126	mov edi, [sec_buf]	125	mov edi, [sec_buf]
127	@@: stdcall libini._.get_char, [f_addr]	126	@@: stdcall libini._.get_char, [f_addr]
128	cmp al, ']'	127	cmp al, ']'
129	je @f	128	je @f
130	or al, al	129	or al, al
131	jz .exit_ok	130	jz .exit_ok
132	cmp al, 13	131	cmp al, 13
133	je .next_section	132	je .next_section
134	cmp al, 10	133	cmp al, 10
135	je .next_section	134	je .next_section
136	stosb	135	stosb
137	jmp @b	136	jmp @b
138	@@: xor al, al	137	@@: xor al, al
139	stosb	138	stosb
140	add edi, -2	139	add edi, -2
141	@@: cmp byte[edi], 32	140	@@: cmp byte[edi], 32
142	ja @f	141	ja @f
143	mov byte[edi], 0	142	mov byte[edi], 0
144	dec edi	143	dec edi
145	jmp @b	144	jmp @b
146	@@:	145	@@:
147	pushad	146	pushad
148	mov eax, [f_addr]	147	mov eax, [f_addr]
149	stdcall [_callback], [_f_name], [sec_buf]	148	stdcall [_callback], [_f_name], [sec_buf]
150	or eax, eax	149	or eax, eax
151	popad	150	popad
152	jnz .next_section	151	jnz .next_section
153		152
154	.exit_ok:	153	.exit_ok:
155	invoke file.close, [f.fh]	154	invoke file.close, [f.fh]
156	invoke mem.free, [f.buf]	155	invoke mem.free, [f.buf]
157	invoke mem.free, [sec_buf]	156	invoke mem.free, [sec_buf]
158	xor eax, eax	157	xor eax, eax
159	pop edi esi ebx	158	pop edi esi ebx
160	ret	159	ret
161		160
162	.exit_error:	161	.exit_error:
163	invoke file.close, [f.fh]	162	invoke file.close, [f.fh]
164	invoke mem.free, [f.buf]	163	invoke mem.free, [f.buf]
165	.exit_file_error:	164	.exit_file_error:
166	invoke mem.free, [sec_buf]	165	invoke mem.free, [sec_buf]
167	.exit_error.2:	166	.exit_error.2:
168	or eax, -1	167	or eax, -1
169	pop edi esi ebx	168	pop edi esi ebx
170	ret	169	ret
171	endp	170	endp
172		171
173	;;================================================================================================;;	172	;;================================================================================================;;
174	proc ini.enum_keys _f_name, _sec_name, _callback ;////////////////////////////////////////////////;;	173	proc ini.enum_keys _f_name, _sec_name, _callback ;////////////////////////////////////////////////;;
175	;;------------------------------------------------------------------------------------------------;;	174	;;------------------------------------------------------------------------------------------------;;
176	;? Enumerate keys within a section, calling callback function for each of them ;;	175	;? Enumerate keys within a section, calling callback function for each of them ;;
177	;;------------------------------------------------------------------------------------------------;;	176	;;------------------------------------------------------------------------------------------------;;
178	;> _f_name = ini filename ;;	177	;> _f_name = ini filename ;;
179	;> _sec_name = section name ;;	178	;> _sec_name = section name ;;
180	;> _callback = callback function address: func(f_name, sec_name, key_name, key_value), where ;;	179	;> _callback = callback function address: func(f_name, sec_name, key_name, key_value), where ;;
181	;> f_name = ini filename (as passed to the function) ;;	180	;> f_name = ini filename (as passed to the function) ;;
182	;> sec_name = section name (as passed to the function) ;;	181	;> sec_name = section name (as passed to the function) ;;
183	;> key_name = key name found ;;	182	;> key_name = key name found ;;
184	;> key_value = value of key found ;;	183	;> key_value = value of key found ;;
185	;;------------------------------------------------------------------------------------------------;;	184	;;------------------------------------------------------------------------------------------------;;
186	;< eax = -1 (error) / 0 ;;	185	;< eax = -1 (error) / 0 ;;
187	;;================================================================================================;;	186	;;================================================================================================;;
188	locals	187	locals
189	f IniFile	188	f IniFile
190	f_addr dd ?	189	f_addr dd ?
191	key_buf dd ?	190	key_buf dd ?
192	val_buf dd ?	191	val_buf dd ?
193	endl	192	endl
194		193
195	push ebx esi edi	194	push ebx esi edi
196		195
197	cld	196	cld
198		197
199	invoke mem.alloc, ini.MAX_NAME_LEN	198	invoke mem.alloc, ini.MAX_NAME_LEN
200	or eax, eax	199	or eax, eax
201	jz .exit_error.3	200	jz .exit_error.3
202	mov [key_buf], eax	201	mov [key_buf], eax
203	invoke mem.alloc, ini.MAX_VALUE_LEN	202	invoke mem.alloc, ini.MAX_VALUE_LEN
204	or eax, eax	203	or eax, eax
205	jz .exit_error.2	204	jz .exit_error.2
206	mov [val_buf], eax	205	mov [val_buf], eax
207		206
208	xor eax, eax	207	xor eax, eax
209	mov [f.fh], eax	208	mov [f.fh], eax
210	mov [f.buf], eax	209	mov [f.buf], eax
211	invoke file.open, [_f_name], O_READ	210	invoke file.open, [_f_name], O_READ
212	cmp eax, 32	211	cmp eax, 32
213	jb .exit_file_error	212	jb .exit_file_error
214	mov [f.fh], eax	213	mov [f.fh], eax
215	invoke mem.alloc, ini.MEM_SIZE	214	invoke mem.alloc, ini.MEM_SIZE
216	or eax, eax	215	or eax, eax
217	jz .exit_error	216	jz .exit_error
218	mov [f.buf], eax	217	mov [f.buf], eax
219	lea ebx, [f]	218	lea ebx, [f]
220	mov [f_addr], ebx	219	mov [f_addr], ebx
221	stdcall libini._.find_section, ebx, [_sec_name]	220	stdcall libini._.find_section, ebx, [_sec_name]
222	or eax, eax	221	or eax, eax
223	jnz .exit_error	222	jnz .exit_error
224		223
225	.next_key:	224	.next_key:
226	stdcall libini._.skip_line, [f_addr]	225	stdcall libini._.skip_line, [f_addr]
227	stdcall libini._.skip_nonblanks, [f_addr]	226	stdcall libini._.skip_nonblanks, [f_addr]
228	or al, al	227	or al, al
229	jz .exit_error	228	jz .exit_error
230	cmp al, '['	229	cmp al, '['
231	je .exit_error	230	je .exit_error
232	mov edi, [key_buf]	231	mov edi, [key_buf]
233	@@: stdcall libini._.get_char, [f_addr]	232	@@: stdcall libini._.get_char, [f_addr]
234	or al, al	233	or al, al
235	jz .exit_error	234	jz .exit_error
236	cmp al, '='	235	cmp al, '='
237	je @f	236	je @f
238	stosb	237	stosb
239	jmp @b	238	jmp @b
240	@@:	239	@@:
241	xor al, al	240	xor al, al
242	stosb	241	stosb
243	add edi, -2	242	add edi, -2
244	@@: cmp byte[edi], 32	243	@@: cmp byte[edi], 32
245	ja @f	244	ja @f
246	mov byte[edi], 0	245	mov byte[edi], 0
247	dec edi	246	dec edi
248	jmp @b	247	jmp @b
249	@@: stdcall libini._.low.read_value, [f_addr], [val_buf], ini.MAX_VALUE_LEN	248	@@: stdcall libini._.low.read_value, [f_addr], [val_buf], ini.MAX_VALUE_LEN
250	pushad	249	pushad
251	stdcall [_callback], [_f_name], [_sec_name], [key_buf], [val_buf]	250	stdcall [_callback], [_f_name], [_sec_name], [key_buf], [val_buf]
252	or eax, eax	251	or eax, eax
253	popad	252	popad
254	jnz .next_key	253	jnz .next_key
255		254
256	@@: invoke file.close, [f.fh]	255	@@: invoke file.close, [f.fh]
257	invoke mem.free, [f.buf]	256	invoke mem.free, [f.buf]
258	xor eax, eax	257	xor eax, eax
259	stosb	258	stosb
260	pop edi esi ebx	259	pop edi esi ebx
261	ret	260	ret
262		261
263	.exit_error:	262	.exit_error:
264	invoke file.close, [f.fh]	263	invoke file.close, [f.fh]
265	invoke mem.free, [f.buf]	264	invoke mem.free, [f.buf]
266	.exit_file_error:	265	.exit_file_error:
267	invoke mem.free, [val_buf]	266	invoke mem.free, [val_buf]
268	.exit_error.2:	267	.exit_error.2:
269	invoke mem.free, [key_buf]	268	invoke mem.free, [key_buf]
270	.exit_error.3:	269	.exit_error.3:
271	or eax, -1	270	or eax, -1
272	pop edi esi ebx	271	pop edi esi ebx
273	ret	272	ret
274	endp	273	endp
275		274
276	;;================================================================================================;;	275	;;================================================================================================;;
277	proc ini.get_str _f_name, _sec_name, _key_name, _buffer, _buf_len, _def_val ;/////////////////////;;	276	proc ini.get_str _f_name, _sec_name, _key_name, _buffer, _buf_len, _def_val ;/////////////////////;;
278	;;------------------------------------------------------------------------------------------------;;	277	;;------------------------------------------------------------------------------------------------;;
279	;? Read string ;;	278	;? Read string ;;
280	;;------------------------------------------------------------------------------------------------;;	279	;;------------------------------------------------------------------------------------------------;;
281	;> _f_name = ini filename ;;	280	;> _f_name = ini filename ;;
282	;> _sec_name = section name ;;	281	;> _sec_name = section name ;;
283	;> _key_name = key name ;;	282	;> _key_name = key name ;;
284	;> _buffer = destination buffer address ;;	283	;> _buffer = destination buffer address ;;
285	;> _buf_len = buffer size (maximum bytes to read) ;;	284	;> _buf_len = buffer size (maximum bytes to read) ;;
286	;> _def_val = default value to return if no key, section or file found ;;	285	;> _def_val = default value to return if no key, section or file found ;;
287	;;------------------------------------------------------------------------------------------------;;	286	;;------------------------------------------------------------------------------------------------;;
288	;< eax = -1 (error) / 0 ;;	287	;< eax = -1 (error) / 0 ;;
289	;< [_buffer] = [_def_val] (error) / found key value ;;	288	;< [_buffer] = [_def_val] (error) / found key value ;;
290	;;================================================================================================;;	289	;;================================================================================================;;
291	locals	290	locals
292	f IniFile	291	f IniFile
293	f_addr dd ?	292	f_addr dd ?
294	endl	293	endl
295		294
296	push ebx esi edi	295	push ebx esi edi
297		296
298	xor eax, eax	297	xor eax, eax
299	mov [f.fh], eax	298	mov [f.fh], eax
300	mov [f.buf], eax	299	mov [f.buf], eax
301	invoke file.open, [_f_name], O_READ	300	invoke file.open, [_f_name], O_READ
302	cmp eax, 32	301	cmp eax, 32
303	jb .exit_file_error	302	jb .exit_file_error
304	mov [f.fh], eax	303	mov [f.fh], eax
305	invoke mem.alloc, ini.MEM_SIZE	304	invoke mem.alloc, ini.MEM_SIZE
306	or eax, eax	305	or eax, eax
307	jz .exit_error	306	jz .exit_error
308	mov [f.buf], eax	307	mov [f.buf], eax
309	lea ebx, [f]	308	lea ebx, [f]
310	mov [f_addr], ebx	309	mov [f_addr], ebx
311	stdcall libini._.find_section, ebx, [_sec_name]	310	stdcall libini._.find_section, ebx, [_sec_name]
312	or eax, eax	311	or eax, eax
313	jnz .exit_error	312	jnz .exit_error
314		313
315	stdcall libini._.find_key, ebx, [_key_name]	314	stdcall libini._.find_key, ebx, [_key_name]
316	or eax, eax	315	or eax, eax
317	jnz .exit_error	316	jnz .exit_error
318		317
319	stdcall libini._.low.read_value, [f_addr], [_buffer], [_buf_len]	318	stdcall libini._.low.read_value, [f_addr], [_buffer], [_buf_len]
320	@@: invoke file.close, [f.fh]	319	@@: invoke file.close, [f.fh]
321	invoke mem.free, [f.buf]	320	invoke mem.free, [f.buf]
322	xor eax, eax	321	xor eax, eax
323	pop edi esi ebx	322	pop edi esi ebx
324	ret	323	ret
325		324
326	.exit_error:	325	.exit_error:
327	invoke file.close, [f.fh]	326	invoke file.close, [f.fh]
328	invoke mem.free, [f.buf]	327	invoke mem.free, [f.buf]
329	.exit_file_error:	328	.exit_file_error:
330	mov edi, [_buffer]	329	mov edi, [_buffer]
331	mov esi, [_def_val]	330	mov esi, [_def_val]
332	xor al, al	331	xor al, al
333	or esi, esi	332	or esi, esi
334	jz .exit_error.2	333	jz .exit_error.2
335	@@: lodsb	334	@@: lodsb
336	.exit_error.2:	335	.exit_error.2:
337	stosb	336	stosb
338	or al, al	337	or al, al
339	jnz @b	338	jnz @b
340	or eax, -1	339	or eax, -1
341	pop edi esi ebx	340	pop edi esi ebx
342	ret	341	ret
343	endp	342	endp
344		343
345	;;================================================================================================;;	344	;;================================================================================================;;
346	proc ini.set_str _f_name, _sec_name, _key_name, _buffer, _buf_len ;///////////////////////////////;;	345	proc ini.set_str _f_name, _sec_name, _key_name, _buffer, _buf_len ;///////////////////////////////;;
347	;;------------------------------------------------------------------------------------------------;;	346	;;------------------------------------------------------------------------------------------------;;
348	;? Write string ;;	347	;? Write string ;;
349	;;------------------------------------------------------------------------------------------------;;	348	;;------------------------------------------------------------------------------------------------;;
350	;> _f_name = ini filename ;;	349	;> _f_name = ini filename ;;
351	;> _sec_name = section name ;;	350	;> _sec_name = section name ;;
352	;> _key_name = key name ;;	351	;> _key_name = key name ;;
353	;> _buffer = source buffer address ;;	352	;> _buffer = source buffer address ;;
354	;> _buf_len = buffer size (bytes to write) ;;	353	;> _buf_len = buffer size (bytes to write) ;;
355	;;------------------------------------------------------------------------------------------------;;	354	;;------------------------------------------------------------------------------------------------;;
356	;< eax = -1 (error) / 0 ;;	355	;< eax = -1 (error) / 0 ;;
357	;;================================================================================================;;	356	;;================================================================================================;;
358	locals	357	locals
359	f IniFile	358	f IniFile
360	f_addr dd ?	359	f_addr dd ?
361	endl	360	endl
362		361
363	push ebx esi edi	362	push ebx esi edi
364		363
365	xor eax, eax	364	xor eax, eax
366	mov [f.fh], eax	365	mov [f.fh], eax
367	mov [f.buf], eax	366	mov [f.buf], eax
368	invoke file.open, [_f_name], O_READ + O_WRITE + O_CREATE	367	invoke file.open, [_f_name], O_READ + O_WRITE + O_CREATE
369	cmp eax, 32	368	cmp eax, 32
370	jb .exit_file_error	369	jb .exit_file_error
371	mov [f.fh], eax	370	mov [f.fh], eax
372	invoke mem.alloc, ini.MEM_SIZE	371	invoke mem.alloc, ini.MEM_SIZE
373	or eax, eax	372	or eax, eax
374	jz .exit_error	373	jz .exit_error
375	mov [f.buf], eax	374	mov [f.buf], eax
376	lea ebx, [f]	375	lea ebx, [f]
377	mov [f_addr], ebx	376	mov [f_addr], ebx
-		377
-		378	;/GerdtR - bugfix: at end of file required empty line
-		379	invoke file.seek, [f.fh],2,SEEK_END
-		380	invoke file.read, [f.fh],[f.buf],2
-		381	mov edx,[f.buf]
-		382	cmp word[edx],0A0Dh
-		383	je @f
-		384	mov word[edx],0A0Dh
-		385	invoke file.seek, [f.fh],0,SEEK_END
-		386	invoke file.write, [f.fh],[f.buf],2
-		387	@@:
-		388
-		389	; lea ebx, [f]
-		390	;\GerdtR
378		391
379	stdcall libini._.find_section, ebx, [_sec_name]	392	stdcall libini._.find_section, ebx, [_sec_name]
380	or eax, eax	393	or eax, eax
381	jnz .create_section	394	jnz .create_section
382		395
383	stdcall libini._.find_key, ebx, [_key_name]	396	stdcall libini._.find_key, ebx, [_key_name]
384	or eax, eax	397	or eax, eax
385	jnz .create_key	398	jnz .create_key
386		399
387	.modify_key:	400	.modify_key:
388	stdcall libini._.get_value_length, [f_addr]	401	stdcall libini._.get_value_length, [f_addr]
389	sub eax, [_buf_len]	402	sub eax, [_buf_len]
390	stdcall libini._.shift_content, [f_addr], eax	403	stdcall libini._.shift_content, [f_addr], eax
391		404
392	.modify_key.ex:	405	.modify_key.ex:
393	invoke file.tell, [f.fh]	406	invoke file.tell, [f.fh]
394	sub eax, [f.cnt]	407	sub eax, [f.cnt]
395	invoke file.seek, [f.fh], eax, SEEK_SET	408	invoke file.seek, [f.fh], eax, SEEK_SET
396	invoke file.write, [f.fh], [_buffer], [_buf_len]	409	invoke file.write, [f.fh], [_buffer], [_buf_len]
397		410
398	invoke file.close, [f.fh]	411	invoke file.close, [f.fh]
399	pop edi esi ebx	412	pop edi esi ebx
400	mcall 68,13,[f.buf]	413	mcall 68,13,[f.buf]
401	xor eax, eax	414	xor eax, eax
402	ret	415	ret
403		416
404	.create_key:	417	.create_key:
405	mov edi, [f.buf]	418	mov edi, [f.buf]
406	add edi, ini.BLOCK_SIZE	419	add edi, ini.BLOCK_SIZE
407	push edi	420	push edi
408		421
409	.create_key.ex:	422	.create_key.ex:
410	mov esi, [_key_name]	423	mov esi, [_key_name]
411	call libini._.string_copy	424	call libini._.string_copy
412	mov byte[edi], '='	425	mov byte[edi], '='
413	inc edi	426	inc edi
414	mov esi, [_buffer]	427	mov esi, [_buffer]
415	mov ecx, [_buf_len]	428	mov ecx, [_buf_len]
416	rep movsb	429	rep movsb
417	mov word[edi], 0x0A0D	430	mov word[edi], 0x0A0D
418	add edi, 2	431	add edi, 2
419	mov eax, edi	432	mov eax, edi
420		433
421	pop edi	434	pop edi
422	sub eax, edi	435	sub eax, edi
423	mov [_buffer], edi	436	mov [_buffer], edi
424	mov [_buf_len], eax	437	mov [_buf_len], eax
425	neg eax	438	neg eax
426	stdcall libini._.shift_content, [f_addr], eax	439	stdcall libini._.shift_content, [f_addr], eax
427		440
428	jmp .modify_key.ex	441	jmp .modify_key.ex
429		442
430	.create_section:	443	.create_section:
431	mov edi, [f.buf]	444	mov edi, [f.buf]
432	add edi, ini.BLOCK_SIZE	445	add edi, ini.BLOCK_SIZE
433	push edi	446	push edi
434		447
435	mov esi, [_sec_name]	448	mov esi, [_sec_name]
-		449
436	mov byte[edi], '['	450	mov byte[edi], '['
437	inc edi	451	inc edi
438	call libini._.string_copy	452	call libini._.string_copy
439	mov dword[edi], ']' + (0x0A0D shl 8)	453	mov dword[edi], ']' + (0x0A0D shl 8)
440	add edi, 3	454	add edi, 3
441		455
442	jmp .create_key.ex	456	jmp .create_key.ex
443		457
444	.exit_error:	458	.exit_error:
445	invoke file.close, [f.fh]	459	invoke file.close, [f.fh]
446	.exit_file_error:	460	.exit_file_error:
447	pop edi esi ebx	461	pop edi esi ebx
448	or eax, -1	462	or eax, -1
449	ret	463	ret
450	endp	464	endp
451		465
452	;;================================================================================================;;	466	;;================================================================================================;;
453	proc ini.get_int _f_name, _sec_name, _key_name, _def_val ;////////////////////////////////////////;;	467	proc ini.get_int _f_name, _sec_name, _key_name, _def_val ;////////////////////////////////////////;;
454	;;------------------------------------------------------------------------------------------------;;	468	;;------------------------------------------------------------------------------------------------;;
455	;? Read integer ;;	469	;? Read integer ;;
456	;;------------------------------------------------------------------------------------------------;;	470	;;------------------------------------------------------------------------------------------------;;
457	;> _f_name = ini filename ;;	471	;> _f_name = ini filename ;;
458	;> _sec_name = section name ;;	472	;> _sec_name = section name ;;
459	;> _key_name = key name ;;	473	;> _key_name = key name ;;
460	;> _def_val = default value to return if no key, section or file found ;;	474	;> _def_val = default value to return if no key, section or file found ;;
461	;;------------------------------------------------------------------------------------------------;;	475	;;------------------------------------------------------------------------------------------------;;
462	;< eax = [_def_val] (error) / found key value ;;	476	;< eax = [_def_val] (error) / found key value ;;
463	;;================================================================================================;;	477	;;================================================================================================;;
464	locals	478	locals
465	f IniFile	479	f IniFile
466	f_addr dd ?	480	f_addr dd ?
467	endl	481	endl
468		482
469	push edx ebx esi edi	483	push edx ebx esi edi
470		484
471	xor eax, eax	485	xor eax, eax
472	mov [f.fh], eax	486	mov [f.fh], eax
473	mov [f.buf], eax	487	mov [f.buf], eax
474	invoke file.open, [_f_name], O_READ	488	invoke file.open, [_f_name], O_READ
475	cmp eax, 32	489	cmp eax, 32
476	jb .exit_file_error	490	jb .exit_file_error
477	mov [f.fh], eax	491	mov [f.fh], eax
478	invoke mem.alloc, ini.MEM_SIZE	492	invoke mem.alloc, ini.MEM_SIZE
479	or eax, eax	493	or eax, eax
480	jz .exit_error	494	jz .exit_error
481	mov [f.buf], eax	495	mov [f.buf], eax
482	lea ebx, [f]	496	lea ebx, [f]
483	mov [f_addr], ebx	497	mov [f_addr], ebx
484	stdcall libini._.find_section, ebx, [_sec_name]	498	stdcall libini._.find_section, ebx, [_sec_name]
485	or eax, eax	499	or eax, eax

Subversion Repositories Kolibri OS

(root)/programs/develop/libraries/libs-dev/libini/libini.asm @ 7705 – Rev 3920 → 4422