Tera TermRevision: 9387
https://osdn.net/projects/ttssh2/scm/svn/commits/9387
Author: zmatsuo
Date: 2021-08-29 00:33:37 +0900 (Sun, 29 Aug 2021)
Log Message:
-----------
lngファイルをUnicode版に切り替え
- グローバル変数 ts を参照しないようにした
Modified Paths:
--------------
trunk/teraterm/teraterm/ttplug.c
-------------- next part --------------
Modified: trunk/teraterm/teraterm/ttplug.c
===================================================================
--- trunk/teraterm/teraterm/ttplug.c 2021-08-28 15:33:25 UTC (rev 9386)
+++ trunk/teraterm/teraterm/ttplug.c 2021-08-28 15:33:37 UTC (rev 9387)
@@ -37,7 +37,7 @@
#include <stdio.h>
#include <string.h>
#include <crtdbg.h>
-#include "ttwinman.h"
+
#include "ttplugin.h"
#include "codeconv.h"
#include "asprintf.h"
@@ -44,8 +44,6 @@
#include "ttplug.h"
-static int NumExtensions = 0;
-
typedef struct _ExtensionList {
TTXExports * exports;
HANDLE LibHandle;
@@ -52,15 +50,17 @@
} ExtensionList;
static ExtensionList *Extensions;
+static int NumExtensions = 0;
-static int compareOrder(const void * e1, const void * e2) {
- TTXExports * * exports1 = (TTXExports * *)e1;
- TTXExports * * exports2 = (TTXExports * *)e2;
+static int compareOrder(const void * e1, const void * e2)
+{
+ TTXExports * * exports1 = (TTXExports * *)e1;
+ TTXExports * * exports2 = (TTXExports * *)e2;
- return (*exports1)->loadOrder - (*exports2)->loadOrder;
+ return (*exports1)->loadOrder - (*exports2)->loadOrder;
}
-static void loadExtension(wchar_t const *fileName)
+static void loadExtension(wchar_t const *fileName, const wchar_t *UILanguageFile)
{
DWORD err;
const wchar_t *sub_message;
@@ -137,7 +137,7 @@
"MSG_LOAD_EXT_ERROR", L"Cannot load extension %s (%d, %s)",
MB_OK | MB_ICONEXCLAMATION
};
- TTMessageBoxA(NULL, &info, ts.UILanguageFile, fileName, err, sub_message);
+ TTMessageBoxW(NULL, &info, UILanguageFile, fileName, err, sub_message);
}
}
@@ -155,7 +155,7 @@
do {
wchar_t *filename;
aswprintf(&filename, L"%s\\%s", HomeDirW, fd.cFileName);
- loadExtension(filename);
+ loadExtension(filename, ts_->UILanguageFileW);
free(filename);
} while (FindNextFileW(hFind, &fd));
FindClose(hFind);