===================================================================
RCS file: /home/cvs/OpenXM_contrib2/windows/asir32gui/io.c,v
retrieving revision 1.5
retrieving revision 1.11
diff -u -p -r1.5 -r1.11
--- OpenXM_contrib2/windows/asir32gui/io.c	2009/08/25 08:01:03	1.5
+++ OpenXM_contrib2/windows/asir32gui/io.c	2018/09/08 02:06:08	1.11
@@ -11,7 +11,7 @@
 #define ASIR_KEYNAME "SoftWare\\Fujitsu\\Asir\\1999.03.31"
 
 #define MAXHIST 256
-#define HISTORY "history"
+#define HISTORY "asirgui_history"
 
 static int use_current_dir;
 
@@ -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];
@@ -117,7 +154,9 @@ BOOL Init_IO(char *errmsg) {
 	char notify[100],notify_ack[100],intr[100],intr_ack[100],kill[100];
 	char name[BUFSIZ],qname[BUFSIZ],home[BUFSIZ];
 
+#if _MSC_VER < 1900
 	_setargv();
+#endif
 	if ( !strcmp(__argv[0],"debuggui") ) {
 		asirgui_kind = ASIRGUI_DEBUG;
 		hRead = atoi(__argv[1]);
@@ -165,7 +204,7 @@ BOOL Init_IO(char *errmsg) {
 			return FALSE;
 		}
 		sprintf(AsirExe,"%s\\bin\\engine.exe",name);
-//		sprintf(AsirExe,"c:\\home\\noro\\engine2000\\debug\\engine.exe");
+//		sprintf(AsirExe,"d:\\cygwin\\home\\noro\\new\\OpenXM_contrib2\\windows\\engine2000\\debug\\engine.exe");
 		if ( !getenv("HOME") ) {
 			sprintf(home,"HOME=%s",name);
 			_putenv(home);
@@ -265,8 +304,13 @@ 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);
+	char *env = getenv("TEMP");
+	if( env ) {
+		sprintf(history_path,"%s\\%s",env,HISTORY);
+	}else {
+		get_rootdir(rootdir,sizeof(rootdir),history_errmsg);
+		sprintf(history_path,"%s\\bin\\%s",rootdir,HISTORY);
+	}
 	init_hist(MAXHIST);
 }
 
@@ -281,7 +325,11 @@ void read_input_history()
 }
 
 void send_intr() {
+	HANDLE handle[1];
+
 	PulseEvent(hIntr);
+	handle[0] = hIntr_Ack;
+	WaitForMultipleObjects(1,(CONST HANDLE *)handle,FALSE,(DWORD)-1);
 }
 
 void terminate_asir() {