=================================================================== RCS file: /home/cvs/OpenXM_contrib2/windows/asir32gui/io.c,v retrieving revision 1.4 retrieving revision 1.7 diff -u -p -r1.4 -r1.7 --- OpenXM_contrib2/windows/asir32gui/io.c 2005/10/19 06:22:59 1.4 +++ OpenXM_contrib2/windows/asir32gui/io.c 2013/08/30 18:18:11 1.7 @@ -38,9 +38,9 @@ char *errmsg; LONG ret; HKEY hOpenKey; DWORD Type,dw; - char dir[BUFSIZ],message[BUFSIZ]; + char dir[BUFSIZ],message[BUFSIZ],engine[BUFSIZ]; char *slash; - int ldir; + size_t ldir; static char rootdir[BUFSIZ]; static int rootdir_is_initialized; @@ -49,6 +49,22 @@ char *errmsg; return TRUE; } + if(GetModuleFileName(NULL,dir,BUFSIZ)) { + slash = strrchr(dir,'\\'); + *slash = 0; + sprintf(engine,"%s\\engine.exe", dir); + if ( access(engine,0) >= 0 ) { + slash = strrchr(dir,'\\'); + if ( slash ) { + *slash = 0; + } + use_current_dir = 1; + strcpy(rootdir,dir); + strcpy(name,dir); + rootdir_is_initialized = 1; + return TRUE; + } + } GetCurrentDirectory(BUFSIZ,dir); slash = strrchr(dir,'\\'); if ( slash ) @@ -86,7 +102,7 @@ char *errmsg; NULL); return FALSE; } - if ( ret = RegSetValueEx(hOpenKey,"Directory",NULL,REG_SZ,dir,ldir) ) { + if ( ret = RegSetValueEx(hOpenKey,"Directory",0,REG_SZ,dir,ldir) ) { FormatMessage( FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_IGNORE_INSERTS, @@ -106,6 +122,27 @@ char *errmsg; return TRUE; } +const char *get_helpdir() { + static char helpdir[BUFSIZ]; + static int helpdir_is_initialized; + char lang[BUFSIZ]; + char file[BUFSIZ]; + char root[BUFSIZ]; + char errmsg[BUFSIZ]; + + if( !helpdir_is_initialized ) { + get_rootdir(root,sizeof(root),errmsg); + GetLocaleInfo(GetUserDefaultLCID(), LOCALE_SISO639LANGNAME, lang, BUFSIZ); + sprintf(helpdir, "%s\\help\\%s", root, lang); + sprintf(file, "%s\\asirhelp.chm", helpdir); + if ( access(file,0) < 0 ) { + sprintf(helpdir, "%s\\help", root); + } + helpdir_is_initialized = 1; + } + return helpdir; +} + BOOL Init_IO(char *errmsg) { int i; char *av[BUFSIZ]; @@ -259,19 +296,25 @@ void read_and_insert() } } +static char history_path[BUFSIZ]; +static char history_errmsg[BUFSIZ]; + void init_input_history() { + char rootdir[BUFSIZ]; + get_rootdir(rootdir,sizeof(rootdir),history_errmsg); + sprintf(history_path,"%s\\bin\\%s",rootdir,HISTORY); init_hist(MAXHIST); } void write_input_history() { - write_hist(HISTORY); + write_hist(history_path); } void read_input_history() { - read_hist(HISTORY); + read_hist(history_path); } void send_intr() {