'exif.obj': fixes; add more tags

git-svn-id: svn://kolibrios.org@5010 a494cfbc-eb01-0410-851d-a64ba20cac60

programs/develop/libraries/exif/examples/viev_exif.asm

@@ -420,7 +420,7 @@ pushad
 		cmp byte[txt_buf],0
 		jne .cycle_0
 
-	;<3B><><EFBFBD><EFBFBD>뢠<EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD>୨<EFBFBD> ⥣<> <20><><EFBFBD> 0x8769
+	;<3B><>室<EFBFBD><EFBFBD> app2
 	stdcall [exif_get_app2], h_app1,h_child
 	cmp dword[h_child],0
 	je .no_found_child
@@ -488,7 +488,7 @@ but_2:
 
 align 4
 but_3:
-	call draw_file_3 ;<3B><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD>-<2D><> <20><><EFBFBD><EFBFBD>ଠ<EFBFBD><EFBFBD><EFBFBD> ...
+	call draw_file_3 ;<3B><><EFBFBD><EFBFBD>ଠ<EFBFBD><E0ACA0><EFBFBD> app2
 	ret
 
 ;<3B><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> 䠩<><E4A0A9><EFBFBD>
@@ -654,7 +654,6 @@ dd 0,0
 	sz_exif_get_app1_tag db 'exif_get_app1_tag',0
 	sz_exif_get_app1_child db 'exif_get_app1_child',0
 	sz_exif_get_app2 db 'exif_get_app2',0
-	;exif_get_image_160_120
 
 sc system_colors 
 
@@ -681,7 +680,9 @@ buf_1:
 	db 24 ;+20 bit in pixel
 
 h_app1  dd 0,0,0 ;<3B><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> ⥣<><E2A5A3>
+	dw 0
 h_child dd 0,0,0 ;<3B><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD>୨<EFBFBD> ⥣<><E2A5A3>
+	dw 0
 txt_openfile db '<27><><EFBFBD>ன<EFBFBD><E0AEA9> 䠩<> <20><><EFBFBD><EFBFBD>ࠦ<EFBFBD><E0A0A6><EFBFBD><EFBFBD> <20> <20><>ଠ<EFBFBD><E0ACA0> *.jpg.',0
 txt_nochild  db '<27><><EFBFBD><EFBFBD>ଠ<EFBFBD><E0ACA0><EFBFBD> <20><> <20>⮩ <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>.',0
 txt_buf rb 80

programs/develop/libraries/exif/trunk/about.htm

@@ -82,7 +82,7 @@ h_app1:
 <p><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> Exif <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>. <20><><EFBFBD><EFBFBD> <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> app1. <20><><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>, <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> 0. <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>:</p>
 <pre>stdcall [exif_get_app1], [open_file],h_app1
 ...
-h_app1 dd 0,0,0</pre>
+h_app1 rb 14</pre>
 <p><EFBFBD><EFBFBD><EFBFBD> open_file - <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (<28><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> *.jpg <20> *.jpeg).</p>
 <p>h_app1 - <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> Exif <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>.</p>
 
@@ -90,7 +90,7 @@ h_app1 dd 0,0,0</pre>
 <p><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> Exif <20> <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>. <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>:</p>
 <pre>stdcall [exif_get_app1_tag], h_app1,3,txt_buf,80
 ...
-h_app1 dd 0,0,0
+h_app1  rb 14
 txt_buf rb 80</pre>
 <p><EFBFBD><EFBFBD><EFBFBD> h_app1 - <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20> exif_get_app1 <20><><EFBFBD> <20> exif_get_app1_child.</p>
 <p>3 - <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>.</p>
@@ -101,8 +101,8 @@ txt_buf rb 80</pre>
 <p><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD> <20> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20> <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD>. <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD>. <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>:</p>
 <pre>stdcall [exif_get_app1_child], h_app1,h_child,0x8769
 ...
-h_app1  dd 0,0,0
+h_app1  rb 14
-h_child dd 0,0,0</pre>
+h_child rb 14</pre>
 <p><EFBFBD><EFBFBD><EFBFBD> h_app1 - <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20> exif_get_app1 <20><><EFBFBD> <20> exif_get_app1_child.</p>
 <p>h_child - <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD>.</p>
 <p>0x8769 - <20><><EFBFBD> <20><><EFBFBD><EFBFBD> (<28><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> h_app1), <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD>.</p>
@@ -112,8 +112,8 @@ h_child dd 0,0,0</pre>
 <p><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> Exif.app2. <20><><EFBFBD><EFBFBD> <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> app2. <20><><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>, <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> 0. <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>:</p>
 <pre>stdcall [exif_get_app2], h_app1,h_app2
 ...
-h_app1 dd 0,0,0
+h_app1 rb 14
-h_app2 dd 0,0,0</pre>
+h_app2 rb 14</pre>
 <p><EFBFBD><EFBFBD><EFBFBD> h_app1 - <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> c <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> Exif.app1, <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> exif_get_app1.</p>
 <p>h_app2 - <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> Exif.app2.</p>
 
@@ -125,7 +125,7 @@ h_app2 dd 0,0,0</pre>
 <p><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> GPS.</p>
 
 <h1><a name="tabl_e"><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD></a></h1>
-<p><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>, <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <b>@use_library_mem</b>:</p>
+<p><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>, <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <b>@use_library</b>:</p>
 <pre>align 4
 import_exif:
 	exif_get_app1 dd sz_exif_get_app1

programs/develop/libraries/exif/trunk/exif.asm

@@ -10,6 +10,7 @@ include '../../../../proc32.inc'
 ;---------
 offs_m_or_i    equ  8 ;ᬥ饭<E1ACA5><E9A5AD> <20><>ࠬ<EFBFBD><E0A0AC><EFBFBD><EFBFBD> 'MM' <20><><EFBFBD> 'II' (Motorola, Intel)
 offs_id_gr     equ 10 ;ᬥ饭<E1ACA5><E9A5AD> id group
+offs_id_gr_mak equ 12 ;ᬥ饭<E1ACA5><E9A5AD> id group <20>ந<EFBFBD><E0AEA8><EFBFBD><EFBFBD><EFBFBD>⥫<EFBFBD>
 offs_tag_0     equ  2 ;ᬥ饭<E1ACA5><E9A5AD> 0-<2D><> ⥣<>
 tag_size       equ 12 ;ࠧ<><E0A0A7><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> ⥣<>
 ;<3B><>ଠ<EFBFBD><E0ACA0> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
@@ -31,13 +32,26 @@ txt_dp db ': ',0
 txt_zap db ', ',0
 txt_div db '/',0
 
-;
+;<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> ⠡<><E2A0A1><EFBFBD> <20> <20><>㯯<EFBFBD><E3AFAF><EFBFBD> ⥣<><E2A5A3>
 align 4
 exif_tag_numbers:
-dd 0,      gr_0
+dd 0,      gr_0    ;<3B><>㯯<EFBFBD> app1
 dd 0x8769, gr_8769 ;Exif offset
 dd 0xa005, gr_a005 ;Interop offset
 dd 0x8825, gr_8825 ;GPS info
+
+;<3B><><EFBFBD><EFBFBD><EFBFBD> app2 (<28><><EFBFBD><EFBFBD><EFBFBD> <20> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20>ந<EFBFBD><E0AEA8><EFBFBD><EFBFBD><EFBFBD>⥫<EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> ᢮<> <20><>ଠ<EFBFBD> ⥣<><E2A5A3>)
+dw 0x927c ;app2 <20><><EFBFBD> Nikon
+db 'Ni'
+dd gr_927c_Ni
+
+dw 0x927c ;app2 <20><><EFBFBD> Panasonic
+db 'Pa'
+dd gr_927c_Pa
+
+dw 0x927c ;app2 <20><><EFBFBD> Canon
+db 'Ca'
+dd gr_927c_Ca
 .end:
 
 align 4
@@ -521,6 +535,290 @@ db 0x00,0x1f,'GPS h positioning error',0
 
 dd 0
 
+;<3B><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> app2 <20><><EFBFBD> Nikon
+align 4
+gr_927c_Ni:
+db 0x00,0x01,'MakerNoteVersion',0
+db 0x00,0x02,'ISO',0
+db 0x00,0x03,'ColorMode',0
+db 0x00,0x04,'Quality',0
+db 0x00,0x05,'WhiteBalance',0
+db 0x00,0x06,'Sharpness',0
+db 0x00,0x07,'FocusMode',0
+db 0x00,0x08,'FlashSetting',0
+db 0x00,0x09,'FlashType',0
+db 0x00,0x0b,'WhiteBalanceFineTune',0
+db 0x00,0x0c,'WB_RBLevels',0
+db 0x00,0x0d,'ProgramShift',0
+db 0x00,0x0e,'ExposureDifference',0
+db 0x00,0x0f,'ISOSelection',0
+db 0x00,0x10,'DataDump',0
+db 0x00,0x11,'PreviewIFD',0
+db 0x00,0x12,'FlashExposureComp',0
+db 0x00,0x13,'ISOSetting',0
+db 0x00,0x14,'ColorBalanceA ',0
+db 0x00,0x16,'ImageBoundary',0
+db 0x00,0x17,'ExternalFlashExposureComp',0
+db 0x00,0x18,'FlashExposureBracketValue',0
+db 0x00,0x19,'ExposureBracketValue',0
+db 0x00,0x1a,'ImageProcessing',0
+db 0x00,0x1b,'CropHiSpeed',0
+db 0x00,0x1c,'ExposureTuning',0
+db 0x00,0x1d,'SerialNumber',0
+db 0x00,0x1e,'ColorSpace',0
+db 0x00,0x1f,'VRInfo',0
+db 0x00,0x20,'ImageAuthentication',0
+db 0x00,0x21,'FaceDetect',0
+db 0x00,0x22,'ActiveD-Lighting',0
+db 0x00,0x23,'PictureControlData',0
+db 0x00,0x24,'WorldTime',0
+db 0x00,0x25,'ISOInfo',0
+db 0x00,0x2a,'VignetteControl',0
+db 0x00,0x2b,'DistortInfo',0
+db 0x00,0x2c,'UnknownInfo',0
+db 0x00,0x32,'UnknownInfo2',0
+db 0x00,0x35,'HDRInfo',0
+db 0x00,0x39,'LocationInfo',0
+db 0x00,0x3d,'BlackLevel',0
+db 0x00,0x80,'ImageAdjustment',0
+db 0x00,0x81,'ToneComp',0
+db 0x00,0x82,'AuxiliaryLens',0
+db 0x00,0x83,'LensType',0
+db 0x00,0x84,'Lens',0
+db 0x00,0x85,'ManualFocusDistance',0
+db 0x00,0x86,'DigitalZoom',0
+db 0x00,0x87,'FlashMode',0
+db 0x00,0x88,'AFInfo',0
+db 0x00,0x89,'ShootingMode',0
+db 0x00,0x8b,'LensFStops',0
+db 0x00,0x8c,'ContrastCurve',0
+db 0x00,0x8d,'ColorHue',0
+db 0x00,0x8f,'SceneMode',0
+db 0x00,0x90,'LightSource',0
+db 0x00,0x91,'ShotInfo',0
+db 0x00,0x92,'HueAdjustment',0
+db 0x00,0x93,'NEFCompression',0
+db 0x00,0x94,'Saturation',0
+db 0x00,0x95,'NoiseReduction',0
+db 0x00,0x96,'NEFLinearizationTable',0
+db 0x00,0x97,'ColorBalance',0
+db 0x00,0x98,'LensData',0
+db 0x00,0x99,'RawImageCenter',0
+db 0x00,0x9a,'SensorPixelSize',0
+db 0x00,0x9c,'SceneAssist',0
+db 0x00,0x9e,'RetouchHistory',0
+db 0x00,0xa0,'SerialNumber',0
+db 0x00,0xa2,'ImageDataSize',0
+db 0x00,0xa5,'ImageCount',0
+db 0x00,0xa6,'DeletedImageCount',0
+db 0x00,0xa7,'ShutterCount',0
+db 0x00,0xa8,'FlashInfo',0
+db 0x00,0xa9,'ImageOptimization',0
+db 0x00,0xaa,'Saturation',0
+db 0x00,0xab,'VariProgram',0
+db 0x00,0xac,'ImageStabilization',0
+db 0x00,0xad,'AFResponse',0
+db 0x00,0xb0,'MultiExposure',0
+db 0x00,0xb1,'HighISONoiseReduction',0
+db 0x00,0xb3,'ToningEffect',0
+db 0x00,0xb6,'PowerUpTime',0
+db 0x00,0xb7,'AFInfo2',0
+db 0x00,0xb8,'FileInfo',0
+db 0x00,0xb9,'AFTune',0
+db 0x00,0xbd,'PictureControlData',0
+db 0x00,0xc3,'BarometerInfo',0
+db 0x0e,0x00,'PrintIM',0
+db 0x0e,0x01,'NikonCaptureData',0
+db 0x0e,0x09,'NikonCaptureVersion',0
+db 0x0e,0x0e,'NikonCaptureOffsets',0
+db 0x0e,0x10,'NikonScanIFD',0
+db 0x0e,0x13,'NikonCaptureEditVersions ',0
+db 0x0e,0x1d,'NikonICCProfile',0
+db 0x0e,0x1e,'NikonCaptureOutput',0
+db 0x0e,0x22,'NEFBitDepth',0
+
+dd 0
+
+;<3B><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> app2 <20><><EFBFBD> Panasonic
+align 4
+gr_927c_Pa:
+db 0x00,0x01,'ImageQuality',0
+db 0x00,0x02,'FirmwareVersion',0
+db 0x00,0x03,'WhiteBalance',0
+db 0x00,0x07,'FocusMode',0
+db 0x00,0x0f,'AFAreaMode',0
+db 0x00,0x1a,'ImageStabilization',0
+db 0x00,0x1c,'MacroMode',0
+db 0x00,0x1f,'ShootingMode',0
+db 0x00,0x20,'Audio',0
+db 0x00,0x21,'DataDump',0
+db 0x00,0x23,'WhiteBalanceBias',0
+db 0x00,0x24,'FlashBias',0
+db 0x00,0x25,'InternalSerialNumber',0
+db 0x00,0x26,'PanasonicExifVersion',0
+db 0x00,0x28,'ColorEffect',0
+db 0x00,0x29,'TimeSincePowerOn',0
+db 0x00,0x2a,'BurstMode',0
+db 0x00,0x2b,'SequenceNumber',0
+db 0x00,0x2c,'ContrastMode',0
+db 0x00,0x2d,'NoiseReduction',0
+db 0x00,0x2e,'SelfTimer',0
+db 0x00,0x30,'Rotation',0
+db 0x00,0x31,'AFAssistLamp',0
+db 0x00,0x32,'ColorMode',0
+db 0x00,0x33,'BabyAge',0
+db 0x00,0x34,'OpticalZoomMode',0
+db 0x00,0x35,'ConversionLens',0
+db 0x00,0x36,'TravelDay',0
+db 0x00,0x39,'Contrast',0
+db 0x00,0x3a,'WorldTimeLocation',0
+db 0x00,0x3b,'TextStamp',0
+db 0x00,0x3c,'ProgramISO',0
+db 0x00,0x3d,'AdvancedSceneType',0
+db 0x00,0x3f,'FacesDetected',0
+db 0x00,0x40,'Saturation',0
+db 0x00,0x41,'Sharpness',0
+db 0x00,0x42,'FilmMode',0
+db 0x00,0x44,'ColorTempKelvin',0
+db 0x00,0x45,'BracketSettings',0
+db 0x00,0x46,'WBShiftAB',0
+db 0x00,0x47,'WBShiftGM',0
+db 0x00,0x48,'FlashCurtain',0
+db 0x00,0x49,'LongExposureNoiseReduction',0
+db 0x00,0x4b,'PanasonicImageWidth',0
+db 0x00,0x4c,'PanasonicImageHeight',0
+db 0x00,0x4d,'AFPointPosition',0
+db 0x00,0x51,'LensType',0
+db 0x00,0x52,'LensSerialNumber',0
+db 0x00,0x53,'AccessoryType',0
+db 0x00,0x54,'AccessorySerialNumber',0
+db 0x00,0x59,'Transform',0
+db 0x00,0x5d,'IntelligentExposure',0
+db 0x00,0x60,'LensFirmwareVersion',0
+db 0x00,0x61,'FaceRecInfo',0
+db 0x00,0x62,'FlashWarning',0
+db 0x00,0x63,'RecognizedFaceFlags',0
+db 0x00,0x65,'Title',0
+db 0x00,0x66,'BabyName',0
+db 0x00,0x67,'Location',0
+db 0x00,0x69,'Country',0
+db 0x00,0x6b,'State',0
+db 0x00,0x6d,'City',0
+db 0x00,0x6f,'Landmark',0
+db 0x00,0x70,'IntelligentResolution',0
+db 0x00,0x77,'BurstSpeed',0
+db 0x00,0x79,'IntelligentD-Range',0
+db 0x00,0x7c,'ClearRetouch',0
+db 0x00,0x86,'ManometerPressure',0
+db 0x00,0x89,'PhotoStyle',0
+db 0x00,0x8a,'ShadingCompensation',0
+db 0x00,0x8c,'AccelerometerZ',0
+db 0x00,0x8d,'AccelerometerX',0
+db 0x00,0x8e,'AccelerometerY',0
+db 0x00,0x8f,'CameraOrientation',0
+db 0x00,0x90,'RollAngle',0
+db 0x00,0x91,'PitchAngle',0
+db 0x00,0x93,'SweepPanoramaDirection',0
+db 0x00,0x94,'SweepPanoramaFieldOfView',0
+db 0x00,0x96,'TimerRecording',0
+db 0x00,0x9d,'InternalNDFilter',0
+db 0x00,0x9e,'HDR',0
+db 0x00,0x9f,'ShutterType',0
+db 0x00,0xa3,'ClearRetouchValue',0
+db 0x00,0xab,'TouchAE',0
+db 0x0e,0x00,'PrintIM',0
+db 0x80,0x00,'MakerNoteVersion',0
+db 0x80,0x01,'SceneMode',0
+db 0x80,0x04,'WBRedLevel',0
+db 0x80,0x05,'WBGreenLevel',0
+db 0x80,0x06,'WBBlueLevel',0
+db 0x80,0x07,'FlashFired',0
+db 0x80,0x08,'TextStamp',0
+db 0x80,0x09,'TextStamp',0
+db 0x80,0x10,'BabyAge',0
+db 0x80,0x12,'Transform',0
+
+dd 0
+
+;<3B><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> app2 <20><><EFBFBD> Canon
+align 4
+gr_927c_Ca:
+db 0x00,0x01,'CanonCameraSettings',0
+db 0x00,0x02,'CanonFocalLength',0
+db 0x00,0x03,'CanonFlashInfo?',0
+db 0x00,0x04,'CanonShotInfo',0
+db 0x00,0x05,'CanonPanorama',0
+db 0x00,0x06,'CanonImageType',0
+db 0x00,0x07,'CanonFirmwareVersion',0
+db 0x00,0x08,'FileNumber',0
+db 0x00,0x09,'OwnerName',0
+db 0x00,0x0a,'UnknownD30',0
+db 0x00,0x0c,'SerialNumber',0
+db 0x00,0x0d,'CanonCameraInfo',0
+db 0x00,0x0e,'CanonFileLength',0
+db 0x00,0x0f,'CustomFunctions',0
+db 0x00,0x10,'CanonModelID',0
+db 0x00,0x11,'MovieInfo',0
+db 0x00,0x12,'CanonAFInfo',0
+db 0x00,0x13,'ThumbnailImageValidArea',0
+db 0x00,0x15,'SerialNumberFormat',0
+db 0x00,0x1a,'SuperMacro',0
+db 0x00,0x1c,'DateStampMode',0
+db 0x00,0x1d,'MyColors',0
+db 0x00,0x1e,'FirmwareRevision',0
+db 0x00,0x23,'Categories',0
+db 0x00,0x24,'FaceDetect1',0
+db 0x00,0x25,'FaceDetect2',0
+db 0x00,0x26,'CanonAFInfo2',0
+db 0x00,0x27,'ContrastInfo',0
+db 0x00,0x28,'ImageUniqueID',0
+db 0x00,0x2f,'FaceDetect3',0
+db 0x00,0x35,'TimeInfo',0
+db 0x00,0x81,'RawDataOffset',0
+db 0x00,0x83,'OriginalDecisionDataOffset',0
+db 0x00,0x90,'CustomFunctions1D',0
+db 0x00,0x91,'PersonalFunctions',0
+db 0x00,0x92,'PersonalFunctionValues',0
+db 0x00,0x93,'CanonFileInfo',0
+db 0x00,0x94,'AFPointsInFocus1D',0
+db 0x00,0x95,'LensModel',0
+db 0x00,0x96,'SerialInfo ',0
+db 0x00,0x97,'DustRemovalData',0
+db 0x00,0x98,'CropInfo',0
+db 0x00,0x99,'CustomFunctions2',0
+db 0x00,0x9a,'AspectInfo',0
+db 0x00,0xa0,'ProcessingInfo',0
+db 0x00,0xa1,'ToneCurveTable',0
+db 0x00,0xa2,'SharpnessTable',0
+db 0x00,0xa3,'SharpnessFreqTable',0
+db 0x00,0xa4,'WhiteBalanceTable',0
+db 0x00,0xa9,'ColorBalance',0
+db 0x00,0xaa,'MeasuredColor',0
+db 0x00,0xae,'ColorTemperature',0
+db 0x00,0xb0,'CanonFlags',0
+db 0x00,0xb1,'ModifiedInfo',0
+db 0x00,0xb2,'ToneCurveMatching',0
+db 0x00,0xb3,'WhiteBalanceMatching',0
+db 0x00,0xb4,'ColorSpace',0
+db 0x00,0xb6,'PreviewImageInfo',0
+db 0x00,0xd0,'VRDOffset',0
+db 0x00,0xe0,'SensorInfo',0
+db 0x40,0x01,'ColorData',0
+db 0x40,0x02,'CRWParam?',0
+db 0x40,0x03,'ColorInfo',0
+db 0x40,0x05,'Flavor?',0
+db 0x40,0x08,'BlackLevel?',0
+db 0x40,0x10,'CustomPictureStyleFileName',0
+db 0x40,0x13,'AFMicroAdj',0
+db 0x40,0x15,'VignettingCorr ',0
+db 0x40,0x16,'VignettingCorr2',0
+db 0x40,0x18,'LightingOpt',0
+db 0x40,0x19,'LensInfo',0
+db 0x40,0x20,'AmbienceInfo',0
+db 0x40,0x24,'FilterInfo',0
+
+dd 0
+
 ;input:
 ; bof - 㪠<><E3AAA0>⥫<EFBFBD> <20><> <20><>砫<EFBFBD> 䠩<><E4A0A9>
 ; app1 - 㪠<><E3AAA0>⥫<EFBFBD> <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> exif.app1
@@ -554,10 +852,8 @@ proc exif_get_app1 uses eax ebx edi, bof:dword, app1:dword
 	je @f
 		inc ebx ;if 'MM' edx=1
 	@@:
-	mov [edi+offs_m_or_i],ebx
+	mov word[edi+offs_m_or_i],bx ;ᯮᮡ <20><>ࠢ<EFBFBD><E0A0A2><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><>ᥫ
-	;<3B><>襬 <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20> dword[edi+offs_m_or_i]
+	mov dword[edi+offs_id_gr],0 ;id <20><><EFBFBD><EFBFBD><EFBFBD> <20> <20>ந<EFBFBD><E0AEA8><EFBFBD><EFBFBD><EFBFBD>⥫<EFBFBD>, <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20>ᥣ<EFBFBD><E1A5A3> 0 <20><><EFBFBD> app1
-	;<3B> <20><><EFBFBD><EFBFBD>訥 2 <20><><EFBFBD><EFBFBD><EFBFBD> ᯮᮡ <20><>ࠢ<EFBFBD><E0A0A2><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><>ᥫ
-	;<3B> <20><><EFBFBD><EFBFBD>訥 2 <20><><EFBFBD><EFBFBD><EFBFBD> id <20><><EFBFBD><EFBFBD><EFBFBD>, <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20>ᥣ<EFBFBD><E1A5A3> 0 <20><><EFBFBD> app1
 	add eax,18
 	mov [edi],eax
 	sub eax,8
@@ -673,6 +969,7 @@ pushad
 		mov dx,word[c_tag]
 		ror edx,16
 		mov dword[edi+offs_m_or_i],edx
+		m2m word[edi+offs_id_gr_mak],word[eax+offs_id_gr_mak]
 
 	jmp .end_f
 	.no_found:
@@ -756,18 +1053,30 @@ pushad
 	stdcall exif_get_app1_child, eax,edi,0x8769
 	cmp dword[edi],0
 	je .no_suport
-	;<3B><>室<EFBFBD><E5AEA4> ⥣ 0xa005 (<28><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> Maker <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>)
+	;<3B><>室<EFBFBD><E5AEA4> ⥣ 0x927c (<28><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> Maker <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>)
 	stdcall exif_get_app1_child, edi,edi, 0x927c
 	cmp dword[edi],0
 	je .no_suport
 
 	cmp dword[ebx],'NIKO'
 	jne @f
-		add dword[edi],18 ;for Nikon
+		;for Nikon
+		add dword[edi],18
+		mov eax,dword[edi]
+		sub eax,8
+		mov dword[edi+4],eax
+		mov word[edi+offs_id_gr_mak],'Ni'
 	@@:
 	cmp dword[ebx],'Pana'
 	jne @f
-		add dword[edi],12 ;for Panasonic
+		;for Panasonic
+		add dword[edi],12
+		mov word[edi+offs_id_gr_mak],'Pa'
+	@@:
+	cmp dword[ebx],'Cano'
+	jne @f
+		;for Canon
+		mov word[edi+offs_id_gr_mak],'Ca'
 	@@:
 
 	jmp @f
@@ -790,9 +1099,9 @@ proc read_tag_value, app1:dword, t_max:dword
 
 	;<3B><><EFBFBD><EFBFBD><EFBFBD> ⠡<><E2A0A1><EFBFBD><EFBFBD> <20><><EFBFBD> <20><>㯯<EFBFBD> ⥣<><E2A5A3>
 	mov ebx,[app1]
-	mov bx,word[ebx+offs_id_gr] ;<3B><>६ <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>䨪<EFBFBD><E4A8AA><EFBFBD><EFBFBD> <20><>㯯<EFBFBD> ⥣<><E2A5A3>
+	mov ebx,dword[ebx+offs_id_gr] ;<3B><>६ <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>䨪<EFBFBD><E4A8AA><EFBFBD><EFBFBD> <20><>㯯<EFBFBD> ⥣<><E2A5A3>
 	@@:
-		cmp word[esi],bx
+		cmp dword[esi],ebx
 		je .set_table
 		add esi,8
 		cmp esi,exif_tag_numbers.end
@@ -864,7 +1173,7 @@ proc read_tag_value, app1:dword, t_max:dword
 			stdcall str_len,edi
 			add edi,eax
 			mov eax,ebx
-			call convert_int_to_str ;[t_max]
+			stdcall convert_int_to_str, [t_max]
 			bt edx,1
 			jnc .end_f
 			@@:
@@ -877,7 +1186,7 @@ proc read_tag_value, app1:dword, t_max:dword
 				stdcall str_len,edi
 				add edi,eax
 				movzx eax,cl
-				call convert_int_to_str ;[t_max]
+				stdcall convert_int_to_str, [t_max]
 				jmp @b
 		.over4b_01:
 			;...
@@ -944,7 +1253,7 @@ proc read_tag_value, app1:dword, t_max:dword
 			stdcall str_len,edi
 			add edi,eax
 			mov eax,ebx
-			call convert_int_to_str ;[t_max]
+			stdcall convert_int_to_str, [t_max]
 			bt edx,1 ;array ?
 			jnc .end_f
 			;<3B><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>塞 2-<2D> <20><>᫮
@@ -952,10 +1261,43 @@ proc read_tag_value, app1:dword, t_max:dword
 			stdcall str_len,edi
 			add edi,eax
 			mov eax,ecx
-			call convert_int_to_str ;[t_max]
+			stdcall convert_int_to_str, [t_max]
-		.over4b_03:
-			;...
 			jmp .end_f
+		.over4b_03:
+			mov ecx,[t_max]
+			mov esi,dword[eax+8]
+			bt edx,0
+			jnc @f
+				ror si,8
+				ror esi,16
+				ror si,8
+			@@:
+			mov eax,[app1]
+			mov eax,[eax+4]
+			add esi,eax
+			
+			;<3B><>६ <20><>᫮
+			.array_03:
+			stdcall str_len,edi
+			cmp ecx,eax
+			jle .end_f ;<3B>᫨ <20><> 墠⨫<E5A2A0> <20><>ப<EFBFBD>
+			add edi,eax
+			sub ecx,eax
+			movzx eax,word[esi]
+			bt edx,0
+			jnc @f
+				ror ax,8
+			@@:
+			stdcall convert_int_to_str,ecx
+
+			dec ebx
+			cmp ebx,0
+			je .end_f
+
+			;<3B><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>塞 <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
+			stdcall str_n_cat,edi,txt_zap,ecx
+			add esi,2
+			jmp .array_03
 	.tag_03:
 
 	mov bx,tag_format_ui4b
@@ -980,7 +1322,7 @@ proc read_tag_value, app1:dword, t_max:dword
 			stdcall str_len,edi
 			add edi,eax
 			mov eax,ebx
-			call convert_int_to_str ;[t_max]
+			stdcall convert_int_to_str, [t_max]
 		.over4b_04:
 			;...
 		jmp .end_f
@@ -1016,7 +1358,7 @@ proc read_tag_value, app1:dword, t_max:dword
 				ror eax,16
 				ror ax,8
 			@@:
-			call convert_int_to_str ;<3B>⠢<EFBFBD><E2A0A2> 1-<2D> <20><>᫮
+			stdcall convert_int_to_str, [t_max] ;<3B>⠢<EFBFBD><E2A0A2> 1-<2D> <20><>᫮
 			stdcall str_n_cat,edi,txt_div,[t_max] ;<3B>⠢<EFBFBD><E2A0A2> <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
 			stdcall str_len,edi
 			add edi,eax
@@ -1027,7 +1369,7 @@ proc read_tag_value, app1:dword, t_max:dword
 				ror eax,16
 				ror ax,8
 			@@:
-			call convert_int_to_str ;<3B>⠢<EFBFBD><E2A0A2> 2-<2D> <20><>᫮
+			stdcall convert_int_to_str, [t_max] ;<3B>⠢<EFBFBD><E2A0A2> 2-<2D> <20><>᫮
 		;.over4b_05:
 			;...
 		jmp .end_f
@@ -1042,8 +1384,16 @@ proc read_tag_value, app1:dword, t_max:dword
 	jne .tag_08
 		stdcall str_n_cat,edi,txt_dp,[t_max]
 		call get_tag_data_size
-		cmp ebx,1
+		cmp ebx,2
 		jg .over4b_08
+		jne @f
+			;<3B>᫨ <20><><EFBFBD> 2 <20><><EFBFBD>⮢<EFBFBD><E2AEA2> <20><>᫠
+			or edx,2 ;array data
+			movzx ecx,word[eax+10]
+			bt edx,0
+			jnc @f
+				ror cx,8
+			@@:		
 			;<3B>᫨ <20><><EFBFBD><EFBFBD> 2 <20><><EFBFBD>⮢<EFBFBD><E2AEA2> <20><>᫮
 			movzx ebx,word[eax+8]
 			bt edx,0
@@ -1060,10 +1410,66 @@ proc read_tag_value, app1:dword, t_max:dword
 				inc bx
 			@@:
 			mov eax,ebx
-			call convert_int_to_str ;[t_max]
+			stdcall convert_int_to_str, [t_max]
-		.over4b_08:
+			bt edx,1 ;array ?
-			;...
+			jnc .end_f
+			;<3B><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>塞 2-<2D> <20><>᫮
+			stdcall str_n_cat,edi,txt_zap,[t_max]
+			stdcall str_len,edi
+			add edi,eax
+			bt bx,15
+			jnc @f
+				mov byte[edi],'-'
+				inc edi
+				neg bx
+				inc bx
+			@@:
+			mov eax,ecx
+			stdcall convert_int_to_str, [t_max]
 			jmp .end_f
+		.over4b_08:
+			mov ecx,[t_max]
+			mov esi,dword[eax+8]
+			bt edx,0
+			jnc @f
+				ror si,8
+				ror esi,16
+				ror si,8
+			@@:
+			mov eax,[app1]
+			mov eax,[eax+4]
+			add esi,eax
+			
+			;<3B><>६ <20><>᫮
+			.array_08:
+			stdcall str_len,edi
+			cmp ecx,eax
+			jle .end_f ;<3B>᫨ <20><> 墠⨫<E5A2A0> <20><>ப<EFBFBD>
+			add edi,eax
+			sub ecx,eax
+			movzx eax,word[esi]
+			bt edx,0
+			jnc @f
+				ror ax,8
+			@@:
+			;ᬮ<>ਬ <20><> <20><><EFBFBD><EFBFBD> +|-
+			bt ax,15
+			jnc @f
+				mov byte[edi],'-'
+				inc edi
+				neg ax
+				inc ax
+			@@:
+			stdcall convert_int_to_str,ecx
+
+			dec ebx
+			cmp ebx,0
+			je .end_f
+
+			;<3B><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>塞 <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
+			stdcall str_n_cat,edi,txt_zap,ecx
+			add esi,2
+			jmp .array_08
 	.tag_08:
 
 	mov bx,tag_format_si4b
@@ -1095,7 +1501,7 @@ proc read_tag_value, app1:dword, t_max:dword
 				inc ebx
 			@@:
 			mov eax,ebx
-			call convert_int_to_str ;[t_max]
+			stdcall convert_int_to_str, [t_max]
 		.over4b_09:
 			;...
 		jmp .end_f
@@ -1176,17 +1582,20 @@ proc hex_in_str, buf:dword,val:dword,zif:dword
 endp
 
 ;input:
-; eax = value
+; eax - <20><>᫮
-; edi = string buffer
+; edi - <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD> <20><>ப<EFBFBD>
+; len - <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
 ;output:
 align 4
-convert_int_to_str:
+proc convert_int_to_str, len:dword
 pushad
-		mov dword[edi+1],0
+	mov esi,[len]
-		mov dword[edi+5],0
+	add esi,edi
+	dec esi
 	call .str
 popad
 	ret
+endp
 
 align 4
 .str:
@@ -1201,9 +1610,13 @@ align 4
 		call .str ;<3B><>३<EFBFBD><E0A5A9> <20><> ᠬ<> ᥡ<> <20>.<2E>. <20>맢<EFBFBD><EBA7A2><EFBFBD> ᠬ<> ᥡ<> <20> ⠪ <20><> ⮣<> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD> <20> eax <20><> <20>⠭<EFBFBD><E2A0AD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> 祬 <20> ecx
 		pop eax
 	@@: ;cmp al,10 ;<3B>஢<EFBFBD><E0AEA2><EFBFBD><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> <20><><EFBFBD>祭<EFBFBD><E7A5AD> <20> al 祬 10 (<28><><EFBFBD> <20><><EFBFBD>⥬<EFBFBD> <20><><EFBFBD>᫥<EFBFBD><E1ABA5> 10 <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> - <20><>譠<EFBFBD>))
+	cmp edi,esi
+	jge @f
 		or al,0x30 ;<3B><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>  祬 <20><><EFBFBD> <20><><EFBFBD><EFBFBD>
 		stosb      ;<3B><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> ॣ<><E0A5A3><EFBFBD><EFBFBD><EFBFBD> al <20> <20>祪<EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> es:edi
-	ret	      ;<3B><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> 祭<> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> 室 <20>.<2E>. <20><><EFBFBD><EFBFBD> <20> <20>⥪<EFBFBD> <20>࠭<EFBFBD><E0A0AD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD>-<2D><> <20>맮<EFBFBD><EBA7AE><EFBFBD> <20><> <20>⮫쪮 ࠧ <EFBFBD><EFBFBD> <EFBFBD> <20>㤥<EFBFBD> <20><><EFBFBD>뢠<EFBFBD><EFBFBD><EFBFBD><EFBFBD>
+		mov byte[edi],0 ;<3B> <20><><EFBFBD><EFBFBD><EFBFBD> <20><>ப<EFBFBD> <20>⠢<EFBFBD><E2A0A2> 0, <20><><EFBFBD>-<2D><> <20><> <20>뫠<EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD>
+	@@:
+	ret        ;<3B><><EFBFBD><EFBFBD> <20> <20>⥪<EFBFBD> <20>࠭<EFBFBD><E0A0AD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD>-<2D><> <20>맮<EFBFBD><EBA7AE><EFBFBD> <20><> <20>⮫쪮 ࠧ <20><> <20> <20>㤥<EFBFBD> <20><><EFBFBD>뢠<EFBFBD><EBA2A0><EFBFBD><EFBFBD>