From 753474ef6b30009e6fc22c7c6cfe0a45529790cb Mon Sep 17 00:00:00 2001 From: "Marat Zakiyanov (Mario79)" Date: Sat, 3 Jul 2010 14:27:35 +0000 Subject: [PATCH] KIV - use OpenDialog calls of Proc_Lib now git-svn-id: svn://kolibrios.org@1511 a494cfbc-eb01-0410-851d-a64ba20cac60 --- programs/media/kiv/trunk/kiv.asm | 27 +++++++++++++++++++-------- 1 file changed, 19 insertions(+), 8 deletions(-) diff --git a/programs/media/kiv/trunk/kiv.asm b/programs/media/kiv/trunk/kiv.asm index a646c405d2..91baf2aad4 100644 --- a/programs/media/kiv/trunk/kiv.asm +++ b/programs/media/kiv/trunk/kiv.asm @@ -16,22 +16,23 @@ include 'dll.inc' include '../../../develop/libraries/libs-dev/libio/libio.inc' include '../../../develop/libraries/libs-dev/libimg/libimg.inc' -include '../../../develop/libraries/box_lib/asm/trunk/opendial.mac' -use_OpenDialog +;include '../../../develop/libraries/box_lib/asm/trunk/opendial.mac' +;use_OpenDialog ;----------------------------------------------------------------------------- START: mcall 68, 11 -; OpenDialog initialisation -init_OpenDialog OpenDialog_data - stdcall dll.Load, @IMPORT or eax, eax jnz exit invoke sort.START, 1 +; OpenDialog initialisation + push dword OpenDialog_data + call [OpenDialog_Init] + mov ecx, 1 ; for 15.4: 1 = tile cmp word [@PARAMS], '\T' jz set_bgr @@ -51,7 +52,9 @@ init_OpenDialog OpenDialog_data mov [OpenDialog_data.draw_window],draw_window_fake - start_OpenDialog OpenDialog_data +; OpenDialog Open + push dword OpenDialog_data + call [OpenDialog_Start] cmp [OpenDialog_data.status],1 jne exit @@ -205,7 +208,9 @@ button: @@: cmp eax, 'opn' jne @f - start_OpenDialog OpenDialog_data +; OpenDialog Open + push dword OpenDialog_data + call [OpenDialog_Start] cmp [OpenDialog_data.status],1 jne still @@ -927,7 +932,9 @@ library \ libgfx , 'libgfx.obj' , \ libimg , 'libimg.obj' , \ libini , 'libini.obj' , \ - sort , 'sort.obj' + sort , 'sort.obj' , \ + proc_lib ,'proc_lib.obj' + import libio , \ libio.init , 'lib_init' , \ @@ -958,6 +965,10 @@ import libini, \ import sort, sort.START, 'START', SortDir, 'SortDir', strcmpi, 'strcmpi' +import proc_lib, \ + OpenDialog_Init, 'OpenDialog_init', \ + OpenDialog_Start,'OpenDialog_start' + bFirstDraw db 0 ;-----------------------------------------------------------------------------