KIV - use OpenDialog calls of Proc_Lib now

git-svn-id: svn://kolibrios.org@1511 a494cfbc-eb01-0410-851d-a64ba20cac60
This commit is contained in:
Marat Zakiyanov (Mario79) 2010-07-03 14:27:35 +00:00
parent bc6fbbb6e8
commit 753474ef6b

View File

@ -16,22 +16,23 @@ include 'dll.inc'
include '../../../develop/libraries/libs-dev/libio/libio.inc' include '../../../develop/libraries/libs-dev/libio/libio.inc'
include '../../../develop/libraries/libs-dev/libimg/libimg.inc' include '../../../develop/libraries/libs-dev/libimg/libimg.inc'
include '../../../develop/libraries/box_lib/asm/trunk/opendial.mac' ;include '../../../develop/libraries/box_lib/asm/trunk/opendial.mac'
use_OpenDialog ;use_OpenDialog
;----------------------------------------------------------------------------- ;-----------------------------------------------------------------------------
START: START:
mcall 68, 11 mcall 68, 11
; OpenDialog initialisation
init_OpenDialog OpenDialog_data
stdcall dll.Load, @IMPORT stdcall dll.Load, @IMPORT
or eax, eax or eax, eax
jnz exit jnz exit
invoke sort.START, 1 invoke sort.START, 1
; OpenDialog initialisation
push dword OpenDialog_data
call [OpenDialog_Init]
mov ecx, 1 ; for 15.4: 1 = tile mov ecx, 1 ; for 15.4: 1 = tile
cmp word [@PARAMS], '\T' cmp word [@PARAMS], '\T'
jz set_bgr jz set_bgr
@ -51,7 +52,9 @@ init_OpenDialog OpenDialog_data
mov [OpenDialog_data.draw_window],draw_window_fake 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 cmp [OpenDialog_data.status],1
jne exit jne exit
@ -205,7 +208,9 @@ button:
@@: cmp eax, 'opn' @@: cmp eax, 'opn'
jne @f jne @f
start_OpenDialog OpenDialog_data ; OpenDialog Open
push dword OpenDialog_data
call [OpenDialog_Start]
cmp [OpenDialog_data.status],1 cmp [OpenDialog_data.status],1
jne still jne still
@ -927,7 +932,9 @@ library \
libgfx , 'libgfx.obj' , \ libgfx , 'libgfx.obj' , \
libimg , 'libimg.obj' , \ libimg , 'libimg.obj' , \
libini , 'libini.obj' , \ libini , 'libini.obj' , \
sort , 'sort.obj' sort , 'sort.obj' , \
proc_lib ,'proc_lib.obj'
import libio , \ import libio , \
libio.init , 'lib_init' , \ libio.init , 'lib_init' , \
@ -958,6 +965,10 @@ import libini, \
import sort, sort.START, 'START', SortDir, 'SortDir', strcmpi, 'strcmpi' import sort, sort.START, 'START', SortDir, 'SortDir', strcmpi, 'strcmpi'
import proc_lib, \
OpenDialog_Init, 'OpenDialog_init', \
OpenDialog_Start,'OpenDialog_start'
bFirstDraw db 0 bFirstDraw db 0
;----------------------------------------------------------------------------- ;-----------------------------------------------------------------------------