forked from KolibriOS/kolibrios
CtrlDemo - used OpenDialog calls of Proc_Lib now
git-svn-id: svn://kolibrios.org@1585 a494cfbc-eb01-0410-851d-a64ba20cac60
This commit is contained in:
parent
dff858a94c
commit
6712ae3c0d
@ -45,8 +45,7 @@ include '../../load_lib.mac'
|
||||
;include 'macros.inc'
|
||||
;include 'load_lib.mac'
|
||||
@use_library
|
||||
include 'opendial.mac'
|
||||
use_OpenDialog
|
||||
|
||||
;---------------------------------------------------------------------
|
||||
;--- Start of program ----------------------------------------------
|
||||
;---------------------------------------------------------------------
|
||||
@ -66,7 +65,8 @@ load_libraries l_libs_start,end_l_libs
|
||||
mov [deflate_unpack],eax
|
||||
|
||||
; OpenDialog initialisation
|
||||
init_OpenDialog OpenDialog_data
|
||||
push dword OpenDialog_data
|
||||
call [OpenDialog_Init]
|
||||
|
||||
mov edi,filename_area
|
||||
mov esi,start_temp_file_name
|
||||
@ -303,7 +303,8 @@ OpenDialog_start:
|
||||
copy_path open_dialog_name,path,library_path,0
|
||||
|
||||
|
||||
start_OpenDialog OpenDialog_data
|
||||
push dword OpenDialog_data
|
||||
call [OpenDialog_Start]
|
||||
|
||||
cmp [OpenDialog_data.status],2 ; OpenDialog does not start
|
||||
je still ; some kind of alternative, instead OpenDialog
|
||||
|
@ -20,6 +20,7 @@ plugins_directory db 0
|
||||
system_dir_Boxlib db '/sys/lib/box_lib.obj',0
|
||||
system_dir_CnvPNG db '/sys/lib/cnv_png.obj',0
|
||||
system_dir_UNPACK db '/sys/lib/archiver.obj',0
|
||||
system_dir_ProcLib db '/sys/lib/proc_lib.obj',0
|
||||
; …᫨ ¥áâì ¦¥« ¨¥ à §ê¥¤¨¨âì, ⮠㦮 ¨á¯®«ì§®¢ âì á«¥¤ãîé¨î ª®áâàãªæ¨î
|
||||
;system_path db '/sys/lib/box_lib.obj',0
|
||||
;... «î¡ ï ¯®á«¥¤®¢ ⥫ì®áâì ¤àã£¨å ª®¬ ¤ ¨ ®¯à¥¤¥«¥¨©.
|
||||
@ -35,9 +36,12 @@ er_message_import db 'Error on load import library box_lib.obj',0
|
||||
er_message_found_lib2 db 'cnv_png.obj - Not found!',0
|
||||
er_message_import2 db 'cnv_png.obj - Wrong import!',0
|
||||
|
||||
err_message_found_lib3 db 'archiver.obj - Not found!',0
|
||||
err_message_import3 db 'archiver.obj - Wrong import!',0
|
||||
er_message_found_lib3 db 'archiver.obj - Not found!',0
|
||||
er_message_import3 db 'archiver.obj - Wrong import!',0
|
||||
|
||||
er_message_found_lib4 db 'proc_lib.obj - Not found!',0
|
||||
er_message_import4 db 'proc_lib.obj - Wrong import!',0
|
||||
;---------------------------------------------------------------------
|
||||
align 4
|
||||
l_libs_start:
|
||||
library01 l_libs system_dir_Boxlib+9, path, file_name, system_dir_Boxlib,\
|
||||
@ -47,11 +51,25 @@ library02 l_libs system_dir_CnvPNG+9, path, file_name, system_dir_CnvPNG,\
|
||||
er_message_found_lib2, ihead_f_l, cnv_png_import, er_message_import2, ihead_f_i, plugins_directory
|
||||
|
||||
library03 l_libs system_dir_UNPACK+9, path, file_name, system_dir_UNPACK,\
|
||||
err_message_found_lib3, ihead_f_l, UNPACK_import, err_message_import3, ihead_f_i, plugins_directory
|
||||
er_message_found_lib3, ihead_f_l, UNPACK_import, er_message_import3, ihead_f_i, plugins_directory
|
||||
|
||||
library04 l_libs system_dir_ProcLib+9, path, file_name, system_dir_ProcLib, \
|
||||
er_message_found_lib4, ihead_f_l, ProcLib_import, er_message_import4, ihead_f_i, plugins_directory
|
||||
|
||||
end_l_libs:
|
||||
;---------------------------------------------------------------------
|
||||
align 4
|
||||
ProcLib_import:
|
||||
OpenDialog_Init dd aOpenDialog_Init
|
||||
OpenDialog_Start dd aOpenDialog_Start
|
||||
;OpenDialog__Version dd aOpenDialog_Version
|
||||
dd 0
|
||||
dd 0
|
||||
aOpenDialog_Init db 'OpenDialog_init',0
|
||||
aOpenDialog_Start db 'OpenDialog_start',0
|
||||
;aOpenDialog_Version db 'Version_OpenDialog',0
|
||||
;---------------------------------------------------------------------
|
||||
align 4
|
||||
cnv_png_import:
|
||||
.Start dd aCP_Start
|
||||
.Version dd aCP_Version
|
||||
@ -438,6 +456,12 @@ OpenDialog_data:
|
||||
.openfile_pach dd openfile_pach ;+36
|
||||
.filename_area dd filename_area ;+40
|
||||
.filter_area dd Filter
|
||||
.x:
|
||||
.x_size dw 420 ;+48 ; Window X size
|
||||
.x_start dw 10 ;+50 ; Window X position
|
||||
.y:
|
||||
.y_size dw 320 ;+52 ; Window y size
|
||||
.y_start dw 10 ;+54 ; Window Y position
|
||||
|
||||
communication_area_name:
|
||||
db 'FFFFFFFF_open_dialog',0
|
||||
|
Loading…
Reference in New Issue
Block a user