Tera TermRevision: 9832
https://osdn.net/projects/ttssh2/scm/svn/commits/9832
Author: zmatsuo
Date: 2022-03-24 01:22:57 +0900 (Thu, 24 Mar 2022)
Log Message:
-----------
インストーラでインストールしたcygtermが起動しない
- cygtool.dllからの文字列が正しく返っていなかった
- iss内の文字列型 String は Unicode(UTF-16)
- dllの関数は char * を期待している
- iss内の文字列型を AnsiString に変更
- TODO
- cygtool.dll で Unicode を扱えるようにする
- iss内の AnsiString を String に変更する
Modified Paths:
--------------
trunk/cygwin/cygtool/cygtool.c
trunk/installer/teraterm.iss
-------------- next part --------------
Modified: trunk/cygwin/cygtool/cygtool.c
===================================================================
--- trunk/cygwin/cygtool/cygtool.c 2022-03-23 13:58:46 UTC (rev 9831)
+++ trunk/cygwin/cygtool/cygtool.c 2022-03-23 16:22:57 UTC (rev 9832)
@@ -26,8 +26,8 @@
if (SearchPath(NULL, "cygwin1", ".dll", sizeof(file), file, &filename) > 0) {
#ifdef EXE
printf(" %s from PATH\n", file);
+#endif
goto found_dll;
-#endif
}
for (c = 'C' ; c <= 'Z' ; c++) {
Modified: trunk/installer/teraterm.iss
===================================================================
--- trunk/installer/teraterm.iss 2022-03-23 13:58:46 UTC (rev 9831)
+++ trunk/installer/teraterm.iss 2022-03-23 16:22:57 UTC (rev 9832)
@@ -336,7 +336,7 @@
procedure SHChangeNotify(wEventId, uFlags, dwItem1, dwItem2: Integer);
external 'SHCha****@shell***** stdcall';
-function FindCygwinPath(CygwinDirectory, CygwinDir: AnsiString; Dirlen: Cardinal): Integer;
+function FindCygwinPath(CygwinDirectory: AnsiString; CygwinDir: AnsiString; Dirlen: Cardinal): Integer;
external 'FindCygwinPath ＠ files:cygtool.dll stdcall setuponly';
function PortableExecutableMachine(CygwinDir: AnsiString): Integer;
@@ -751,8 +751,8 @@
procedure CurStepChanged(CurStep: TSetupStep);
var
iniFile : String;
- CygDir : String;
- CygPath : String;
+ CygDir : AnsiString;
+ CygPath : AnsiString;
CygDll : String;
Cygterm : String;
Res : Integer;