From b239f46ecbb5813fdc431303fa5855d3e9281cd2 Mon Sep 17 00:00:00 2001 From: "Evgeny Grechnikov (Diamond)" Date: Fri, 22 Sep 2006 11:26:31 +0000 Subject: [PATCH] AC97WAV: corrected after rewriting to fn 70 SYSXTREE: version from K0600 (CD-ROM support) + URL line fixes git-svn-id: svn://kolibrios.org@156 a494cfbc-eb01-0410-851d-a64ba20cac60 --- programs/fs/sysxtree/trunk/systr12.GIF | Bin 2926 -> 2970 bytes programs/fs/sysxtree/trunk/sysxtree.asm | 65 ++++++++++++++++++---- programs/media/ac97wav/trunk/ac97wav.asm | 25 +++++---- programs/media/ac97wav/trunk/frontend.inc | 1 + 4 files changed, 68 insertions(+), 23 deletions(-) diff --git a/programs/fs/sysxtree/trunk/systr12.GIF b/programs/fs/sysxtree/trunk/systr12.GIF index fdd86c5e8cbdb7516d8f158aebb5a1bf2c62c9d9..3b19646455605745c21751cb6fd83b334ce2e232 100644 GIT binary patch delta 1251 zcmc)1i$Bu|008iLY}3PN!)~>ed3JHic4tVeCPpJt5^;-}xe2xE&NwSqO;TY@xgCXB zBDc{eRx0XaW^MDC=k&P38Y|}t$(Ubv|HXa3vkq0r^`T)QzJAA&%t)Xqtz`WrbI#ZQ zi6`hkNoHUY2xJBDuoi$hkjcYZu37*Ya2^(HvINAaB_0;C0tNz1SX&+z%HRyRApGiF z+`|y-ir*5J9nT8ehsB@X2!ALeTBC{?>EYwxo#y#?u7Hb z*jA4AhDWd&oD+O395O@YTKo3Klv5gT-V+J>9_;A$^zZq` zPyP0xcaU~BiKK1k+#N~0ex0wb$q`S6wwRIa(Sr?)MEZW#Mg<{qUZl;~in+WtI1_S; z<+PO;)AOZOb1Ph@}WX$k&ErS8=F&K zFNZ}Zvu@X&XIzMD9qN3b%7g8=o2$+Vcvij0FQ~YiEYS}eAHU1)O+bvp+Ic+~ zA=_0Pkw5Z-Ab$A0cxejf>;~QH;=GxlA^-`3Zllh>RY;`I1MfH zeX%5C<~d*aS()M;OSBAv;YzrkI+(3dz6UsQtx`!#bwl+<0g}=hPn}zWQIS$VSHcmY z-+6hUo>O6Mk@qO{?OTp08If%OS)rukn~bV#bz!;6MDt=v6(`gz0k|t|!$)aE;y1kBQ2{V{v*7C4Y?NfkJeee&8*OpZ;wtF1cF_|l`%wV5u5OcKMb!_dWkcC^Ch%D=N z<6luN?T_7y|M8p5eFHk2{lt)`Kf4LtmHHUp{VDI`#r-2MEk;|Paom$82@^{b+4UW= z%jF>xxTT&=Hbx596E#`X;VW`QN)icLYTXQAwbaPf`YvL9w^|RT}m)2Fz x5RS7Go>!lmuf?wF7-Y delta 1206 zcmV;n1WEgv7w#4eM@dFFH(_1@Ljd;xu?&db@>1QzrWk^2)yP2_;mok z0QR`#3Ge?PPX7P^e*h5J02$^CPjvtQ008V90J{_c`%?hF0H9Rt0p<16b#(#&0RI59 z0|6s^0QrOfzaKy(6y*Q_PXL?%00IC20001lFaR_F00Int00C9E07nS`03rDV00000 z4FD_v000190Yd-)2>+8A1O5VT|C1R6{R3tklNkqS zfAWlwjHDzJVu2A@@{*X$q#Hd_$xM231Qxg>9VeC8>ESrCGxqitlAWbqp?tI!l!p z6{#9k>n!KVPO)N*s(3xARj>NSV{Wye&aA0U8KTqZJTQFZGhbQ*H?VLbuc&xAYEm1S z&ZIg=AndGbR5zQ~&fasceB~rEe`Oj?X^Qfo6=Dfb$?7)qIbgBw0q61J%2->tw)L{@ ze4xfW%Uel;HnhqFs3?ak0csBAtMp;zQkOc&?(~j3Hi9k^5wpmJ0JFE)h2(F6>rYK) z_q*T?Z%MYxU6=Axyy#7@dMiTS@@5sL>y58`#oJ!@W~7r?ov(iPtJjtKfA_qi%`blk zOyEe?*S`YJXMzjN;07l#ju4LU8sF&P3R@V96%av&H>}|fbGQQ@4l#!_eBlzCIFch4 zv5GSc;uLfE#4wI=7G2!o7O(imB$ly`cmF&S8v7W>A?C4=hy0Nr8yUz%PO_3M!eSt& z*v2+~@sg)ZWC2)N1XjK>e~q)8s1COqT_C%MW8qSBAE z9OV~ZxyoPaa)C%3lrmqrR!^?*n&eCZtDuG9ak Ubf`aj-fDa!)~jxHVFv^NJCO%4hX4Qo diff --git a/programs/fs/sysxtree/trunk/sysxtree.asm b/programs/fs/sysxtree/trunk/sysxtree.asm index 11e413250c..140fd1f5e3 100644 --- a/programs/fs/sysxtree/trunk/sysxtree.asm +++ b/programs/fs/sysxtree/trunk/sysxtree.asm @@ -28,6 +28,8 @@ ;80Ver prompt edit fatal bug deleted, antiflick when move list up/down ;81Ver Save Dialog bug deleted ;82Ver Rewritten to function 70. Corrected work with scrollbar. +;83Ver CD-ROM support +;84Ver URL line editor corrected ;1560000 bytes memory! ;****************************************************************************** @@ -72,6 +74,30 @@ START: ; start of execution je no_hdpartition_on_hd3 mov [hdimg4], aHD3 no_hdpartition_on_hd3: + test byte [edx+1], 80h + jz @f + mov [hdimg1], aCD0 + mov [hdimg1+4], 'CD-R' + mov [hdimg1+8], 'OM ' +@@: + test byte [edx+1], 20h + jz @f + mov [hdimg2], aCD1 + mov [hdimg2+4], 'CD-R' + mov [hdimg2+8], 'OM ' +@@: + test byte [edx+1], 8 + jz @f + mov [hdimg3], aCD2 + mov [hdimg3+4], 'CD-R' + mov [hdimg3+8], 'OM ' +@@: + test byte [edx+1], 2 + jz @f + mov [hdimg4], aCD3 + mov [hdimg4+4], 'CD-R' + mov [hdimg4+8], 'OM ' +@@: mov eax,40 mov ebx,0100111b @@ -167,7 +193,7 @@ no_dlg: mov ecx,tempimg ;src mov edx,hdico ;dest - mov ebp,9 + mov ebp,10 loogetimg: call getimgproc add edx,9*12*3+8 @@ -316,12 +342,17 @@ con_edit: no_con_ent: cmp ah,key_Left jne no_con_left + cmp [cursor], 0 + jz still dec [cursor] mov [flick],2 jmp anti_flick ;red no_con_left: cmp ah,key_Right jne no_con_right + mov eax, [cursor] + cmp byte [path+eax], 0 + jz still inc [cursor] mov [flick],2 jmp anti_flick ;red @@ -344,7 +375,6 @@ lobsp: no_con_bspace: mov ecx,[cursor] - dec ecx mov ebp,1022 cmp byte [path+ebp], 0 jnz still @@ -450,6 +480,8 @@ no_kfad: rep stosb jmp still @@: + sub edi, path+1 + mov [cursor], edi pop edi ; name appended, now read new directory mov [filecursor],0 @@ -708,6 +740,8 @@ back: jmp still @@: sub ecx, edi + lea eax, [edi-path] + mov [cursor], eax xor eax, eax rep stosb mov [filecursor],0 @@ -1084,7 +1118,7 @@ help_text: info_text: db ' ~~~~~ SYSTEM X-TREE ~~~~~ ' - db ' INFO 82 Ver ' + db ' INFO 84 Ver ' db ' ' db ' Create by Pavlushin Evgeni ' db 'with ASCL library special for Kolibri OS' @@ -1801,6 +1835,11 @@ no_rdico: push rdico+8 jmp out_ico no_fdico: + cmp [edx+4],dword 'CD-R' + jne no_cdico + push cdico+8 + jmp out_ico +no_cdico: push folico+8 jmp out_ico no_folico: @@ -2052,16 +2091,14 @@ nstep: je nstep2 cmp [path+4],byte '/' je nstep2 - cmp [path+1],word 'RD' - jne nostep_RD mov ecx,1 - jmp loxpt -nostep_RD: - cmp [path+1],word 'FD' - jne nostep_FD + cmp [path+1],word 'RD' + jz loxpt + cmp [path+1],word 'CD' + jz loxpt mov ecx,2 - jmp loxpt -nostep_FD: + cmp [path+1],word 'FD' + jz loxpt cmp [path+1],dword 'HD0' jne nostep_HD0 movzx ecx,byte [table_area+2] @@ -2434,6 +2471,10 @@ aHD0 db 'HD0',0 aHD1 db 'HD1',0 aHD2 db 'HD2',0 aHD3 db 'HD3',0 +aCD0 db 'CD0',0 +aCD1 db 'CD1',0 +aCD2 db 'CD2',0 +aCD3 db 'CD3',0 a1 db '1',0,0 a2 db '2',0,0 a3 db '3',0,0 @@ -2585,6 +2626,8 @@ asmincico: rb 12*9*3+8 execico: rb 12*9*3+8 +cdico: +rb 12*9*3+8 tempimg: ;reserve ram for images rb 400*100*3+8 ;for picture diff --git a/programs/media/ac97wav/trunk/ac97wav.asm b/programs/media/ac97wav/trunk/ac97wav.asm index f346f0426c..b533bea3a7 100644 --- a/programs/media/ac97wav/trunk/ac97wav.asm +++ b/programs/media/ac97wav/trunk/ac97wav.asm @@ -32,14 +32,14 @@ ;--------------------------------------------------------------------- -include "macros.inc" ; standart macros & constants -include "meosfunc.inc" ; MenuetOS API functions names -include "debug.inc" ; printing to debug board -include "constant.inc" ; BIT?? constants -include "ac97.inc" ; AC'97 constants -include "pci.inc" ; PCI interface -include "codec.inc" ; functions for configuring codec -include "frontend.inc" ; main window +include "MACROS.INC" ; standart macros & constants +include "MEOSFUNC.INC" ; MenuetOS API functions names +include "DEBUG.INC" ; printing to debug board +include "CONSTANT.INC" ; BIT?? constants +include "AC97.INC" ; AC'97 constants +include "PCI.INC" ; PCI interface +include "CODEC.INC" ; functions for configuring codec +include "FRONTEND.INC" ; main window ;--------------------------------------------------------------------- @@ -652,13 +652,14 @@ update_next_buffer: ; jb temp_12_7 ; inc ecx ; temp_12_7: - cmp edx,0 - je temp_12_7 - inc ecx - temp_12_7: +; cmp edx,0 +; je temp_12_7 +; inc ecx +; temp_12_7: pop edx ebx mov eax,[esp+4] ;restore buffer index + and ecx, not 511 add [fileinfo.first_byte], ecx ; +60Kb call [convert + edx * 4] ;start fix for MM (4) diff --git a/programs/media/ac97wav/trunk/frontend.inc b/programs/media/ac97wav/trunk/frontend.inc index a09033ea24..8dbc17d607 100644 --- a/programs/media/ac97wav/trunk/frontend.inc +++ b/programs/media/ac97wav/trunk/frontend.inc @@ -188,6 +188,7 @@ main_loop: ;dps "block: " ;dpd eax ;newline + and eax, not 511 mov [fileinfo.first_byte], eax call draw_progress_bar jmp main_loop