svnno****@sourc*****
svnno****@sourc*****
2017年 6月 9日 (金) 23:32:34 JST
Tera TermRevision: 6792
http://sourceforge.jp/projects/ttssh2/scm/svn/commits/6792
Author: doda
Date: 2017-06-09 23:32:34 +0900 (Fri, 09 Jun 2017)
Log Message:
-----------
Tera Term 本体関連 DLL をフルパスで LoadLibrary() するようにした。
Modified Paths:
--------------
trunk/teraterm/teraterm/filesys.cpp
trunk/teraterm/teraterm/teklib.c
trunk/teraterm/teraterm/ttdialog.c
trunk/teraterm/teraterm/ttsetup.c
trunk/teraterm/teraterm/ttwinman.c
trunk/teraterm/teraterm/ttwinman.h
-------------- next part --------------
Modified: trunk/teraterm/teraterm/filesys.cpp
===================================================================
--- trunk/teraterm/teraterm/filesys.cpp 2017-06-09 14:32:31 UTC (rev 6791)
+++ trunk/teraterm/teraterm/filesys.cpp 2017-06-09 14:32:34 UTC (rev 6792)
@@ -119,7 +119,7 @@
else
TTFILECount = 0;
- HTTFILE = LoadLibrary("TTPFILE.DLL");
+ HTTFILE = LoadHomeDLL("TTPFILE.DLL");
if (HTTFILE == NULL)
return FALSE;
Modified: trunk/teraterm/teraterm/teklib.c
===================================================================
--- trunk/teraterm/teraterm/teklib.c 2017-06-09 14:32:31 UTC (rev 6791)
+++ trunk/teraterm/teraterm/teklib.c 2017-06-09 14:32:34 UTC (rev 6792)
@@ -7,6 +7,7 @@
#include "teraterm.h"
#include "tttypes.h"
#include "tektypes.h"
+#include "ttwinman.h"
#include "teklib.h"
@@ -58,7 +59,7 @@
BOOL Err;
if (HTTTEK != NULL) return TRUE;
- HTTTEK = LoadLibrary("TTPTEK.DLL");
+ HTTTEK = LoadHomeDLL("TTPTEK.DLL");
if (HTTTEK == NULL) return FALSE;
Err = FALSE;
Modified: trunk/teraterm/teraterm/ttdialog.c
===================================================================
--- trunk/teraterm/teraterm/ttdialog.c 2017-06-09 14:32:31 UTC (rev 6791)
+++ trunk/teraterm/teraterm/ttdialog.c 2017-06-09 14:32:34 UTC (rev 6792)
@@ -44,7 +44,7 @@
if (HTTDLG == NULL) {
TTDLGUseCount = 0;
- HTTDLG = LoadLibrary("TTPDLG.DLL");
+ HTTDLG = LoadHomeDLL("TTPDLG.DLL");
if (HTTDLG==NULL) return FALSE;
TTDLGSetUILanguageFile(ts.UILanguageFile);
Modified: trunk/teraterm/teraterm/ttsetup.c
===================================================================
--- trunk/teraterm/teraterm/ttsetup.c 2017-06-09 14:32:31 UTC (rev 6791)
+++ trunk/teraterm/teraterm/ttsetup.c 2017-06-09 14:32:34 UTC (rev 6792)
@@ -9,6 +9,8 @@
#include "ttsetup.h"
#include "ttplug.h" /* TTPLUG */
+#include "ttwinman.h"
+
PReadIniFile ReadIniFile;
PWriteIniFile WriteIniFile;
PReadKeyboardCnf ReadKeyboardCnf;
@@ -34,7 +36,7 @@
BOOL Err;
if (HTTSET != NULL) return TRUE;
- HTTSET = LoadLibrary("TTPSET.DLL");
+ HTTSET = LoadHomeDLL("TTPSET.DLL");
if (HTTSET == NULL) return FALSE;
Err = FALSE;
Modified: trunk/teraterm/teraterm/ttwinman.c
===================================================================
--- trunk/teraterm/teraterm/ttwinman.c 2017-06-09 14:32:31 UTC (rev 6791)
+++ trunk/teraterm/teraterm/ttwinman.c 2017-06-09 14:32:34 UTC (rev 6792)
@@ -275,3 +275,10 @@
if (H2!=0)
PostMessage(H2,WM_USER_CHANGETBAR,0,0);
}
+
+HMODULE LoadHomeDLL(const char *DLLname)
+{
+ char DLLpath[MAX_PATH];
+ _snprintf_s(DLLpath, sizeof(DLLpath), _TRUNCATE, "%s\\%s", ts.HomeDir, DLLname);
+ return LoadLibrary(DLLpath);
+}
Modified: trunk/teraterm/teraterm/ttwinman.h
===================================================================
--- trunk/teraterm/teraterm/ttwinman.h 2017-06-09 14:32:31 UTC (rev 6791)
+++ trunk/teraterm/teraterm/ttwinman.h 2017-06-09 14:32:34 UTC (rev 6792)
@@ -13,6 +13,7 @@
void ChangeTitle();
void SwitchMenu();
void SwitchTitleBar();
+HMODULE LoadHomeDLL(const char *DLLname);
extern HWND HVTWin;
extern HWND HTEKWin;