From 04dd6d0c8c846a3fd9c2d9a0dda74868d2271858 Mon Sep 17 00:00:00 2001
From: "Marat Zakiyanov (Mario79)" <mario79@bk.ru>
Date: Fri, 19 Mar 2010 08:21:29 +0000
Subject: [PATCH] Rtfread updated for opendial.mac

git-svn-id: svn://kolibrios.org@1436 a494cfbc-eb01-0410-851d-a64ba20cac60
---
 programs/other/rtfread/trunk/rtfread.asm | 19 +++++--------------
 1 file changed, 5 insertions(+), 14 deletions(-)

diff --git a/programs/other/rtfread/trunk/rtfread.asm b/programs/other/rtfread/trunk/rtfread.asm
index 33128562f2..2163fa97a1 100644
--- a/programs/other/rtfread/trunk/rtfread.asm
+++ b/programs/other/rtfread/trunk/rtfread.asm
@@ -261,7 +261,6 @@ still:
   .file_open:
 ;---------------------------------------------------------------------
 ;OpenDialog_start:
-	call	get_filter_data
 ;	copy_path	open_dialog_name,path,library_path,0
 	
 	start_OpenDialog	OpenDialog_data
@@ -269,19 +268,8 @@ still:
 	cmp	[OpenDialog_data.status],2 ; OpenDialog does not start
 	je	.sysxtree  ; 	some kind of alternative, instead OpenDialog
 	cmp	[OpenDialog_data.status],1
-;	jne	still ; OpenDialog user say cancel
-;	copy path
-;	call	draw_window
 	je	prep_load
-	
-;.copy_dir_path:
-;    mov   esi,fname_buf
-;    mov   edi,temp_dir_pach
-;	call  copy_dir_path
-	
-	jmp	still ; OpenDialog user selected the target file
-	; [OpenDialog_data.openfile_pach] pointer of area the target file  
-  
+	jmp	still
 ;---------------------------------------------------------------------  
 .sysxtree:
     or   [mode],RTF_OPENING
@@ -569,6 +557,8 @@ OpenDialog_data:
 .draw_window		dd draw_window ;+28
 .status			dd 0 ;+32
 .openfile_pach		dd fname_buf ;+36
+.filename_area		dd 0	;+40
+.filter_area		dd Filter
 
 communication_area_name:
 	db 'FFFFFFFF_open_dialog',0
@@ -578,7 +568,8 @@ communication_area_default_pach:
 	db '/rd/1',0
 
 Filter:
-dd  Filter.end - Filter
+dd Filter.end - Filter
+.1:
 db 'RTF',0
 .end:
 db 0