svnno****@sourc*****
svnno****@sourc*****
2016年 6月 5日 (日) 15:21:57 JST
Tera TermRevision: 6397
http://sourceforge.jp/projects/ttssh2/scm/svn/commits/6397
Author: maya
Date: 2016-06-05 15:21:57 +0900 (Sun, 05 Jun 2016)
Log Message:
-----------
Windows 95, 98, Me, NT4.0 で ttermpro.exe が起動しない問題を修正
kernel32.dll に VerSetConditionMask がないため
VerSetConditionMask は ULONGLONG の 1 ビット目に 1 を立てるが、理由がよくわからないので再現していない
Modified Paths:
--------------
trunk/teraterm/common/ttlib.c
-------------- next part --------------
Modified: trunk/teraterm/common/ttlib.c
===================================================================
--- trunk/teraterm/common/ttlib.c 2016-06-01 13:32:11 UTC (rev 6396)
+++ trunk/teraterm/common/ttlib.c 2016-06-05 06:21:57 UTC (rev 6397)
@@ -1123,6 +1123,80 @@
#endif
}
+ULONGLONG _myVerSetConditionMask(ULONGLONG dwlConditionMask, DWORD dwTypeBitMask, BYTE dwConditionMask)
+{
+ ULONGLONG result, mask;
+ BYTE op = dwConditionMask & 0x07;
+
+ switch (dwTypeBitMask) {
+ case VER_MINORVERSION:
+ mask = 0x07 << (0 * 3);
+ result = dwlConditionMask & ~mask;
+ result |= op << (0 * 3);
+ break;
+ case VER_MAJORVERSION:
+ mask = 0x07 << (1 * 3);
+ result = dwlConditionMask & ~mask;
+ result |= op << (1 * 3);
+ break;
+ case VER_BUILDNUMBER:
+ mask = 0x07 << (2 * 3);
+ result = dwlConditionMask & ~mask;
+ result |= op << (2 * 3);
+ break;
+ case VER_PLATFORMID:
+ mask = 0x07 << (3 * 3);
+ result = dwlConditionMask & ~mask;
+ result |= op << (3 * 3);
+ break;
+ case VER_SERVICEPACKMINOR:
+ mask = 0x07 << (4 * 3);
+ result = dwlConditionMask & ~mask;
+ result |= op << (4 * 3);
+ break;
+ case VER_SERVICEPACKMAJOR:
+ mask = 0x07 << (5 * 3);
+ result = dwlConditionMask & ~mask;
+ result |= op << (5 * 3);
+ break;
+ case VER_SUITENAME:
+ mask = 0x07 << (6 * 3);
+ result = dwlConditionMask & ~mask;
+ result |= op << (6 * 3);
+ break;
+ case VER_PRODUCT_TYPE:
+ mask = 0x07 << (7 * 3);
+ result = dwlConditionMask & ~mask;
+ result |= op << (7 * 3);
+ break;
+ }
+
+ return result;
+}
+
+ULONGLONG myVerSetConditionMask(ULONGLONG dwlConditionMask, DWORD dwTypeBitMask, BYTE dwConditionMask)
+{
+ typedef ULONGLONG(WINAPI *func)(ULONGLONG, DWORD, BYTE);
+ static HMODULE hmodKernel32 = NULL;
+ static func pVerSetConditionMask = NULL;
+ char kernel32_dll[MAX_PATH];
+
+ GetSystemDirectory(kernel32_dll, sizeof(kernel32_dll));
+ strncat_s(kernel32_dll, sizeof(kernel32_dll), "\\kernel32.dll", _TRUNCATE);
+ if (hmodKernel32 == NULL) {
+ hmodKernel32 = LoadLibrary(kernel32_dll);
+ if (hmodKernel32 != NULL) {
+ pVerSetConditionMask = (func)GetProcAddress(hmodKernel32, "VerSetConditionMask");
+ }
+ }
+
+ if (pVerSetConditionMask == NULL) {
+ return _myVerSetConditionMask(dwlConditionMask, dwTypeBitMask, dwConditionMask);
+ }
+
+ return pVerSetConditionMask(dwlConditionMask, dwTypeBitMask, dwConditionMask);
+}
+
// OS\x82\xAA Windows95 \x82\xA9\x82ǂ\xA4\x82\xA9\x82ʂ\xB7\x82\xE9\x81B
//
// return TRUE: 95
@@ -1139,9 +1213,9 @@
osvi.dwPlatformId = VER_PLATFORM_WIN32_WINDOWS;
osvi.dwMajorVersion = 4;
osvi.dwMinorVersion = 0;
- VER_SET_CONDITION(dwlConditionMask, VER_PLATFORMID, op);
- VER_SET_CONDITION(dwlConditionMask, VER_MAJORVERSION, op);
- VER_SET_CONDITION(dwlConditionMask, VER_MINORVERSION, op);
+ dwlConditionMask = myVerSetConditionMask(dwlConditionMask, VER_PLATFORMID, op);
+ dwlConditionMask = myVerSetConditionMask(dwlConditionMask, VER_MAJORVERSION, op);
+ dwlConditionMask = myVerSetConditionMask(dwlConditionMask, VER_MINORVERSION, op);
ret = myVerifyVersionInfo(&osvi, VER_PLATFORMID | VER_MAJORVERSION | VER_MINORVERSION, dwlConditionMask);
return (ret);
}
@@ -1160,7 +1234,7 @@
ZeroMemory(&osvi, sizeof(OSVERSIONINFOEX));
osvi.dwOSVersionInfoSize = sizeof(OSVERSIONINFOEX);
osvi.dwPlatformId = VER_PLATFORM_WIN32_NT;
- VER_SET_CONDITION(dwlConditionMask, VER_PLATFORMID, op);
+ dwlConditionMask = myVerSetConditionMask(dwlConditionMask, VER_PLATFORMID, op);
ret = myVerifyVersionInfo(&osvi, VER_PLATFORMID, dwlConditionMask);
return (ret);
}
@@ -1188,8 +1262,8 @@
osvi.dwOSVersionInfoSize = sizeof(OSVERSIONINFOEX);
osvi.dwPlatformId = VER_PLATFORM_WIN32_NT;
osvi.dwMajorVersion = 4;
- VER_SET_CONDITION(dwlConditionMask, VER_PLATFORMID, op);
- VER_SET_CONDITION(dwlConditionMask, VER_MAJORVERSION, op);
+ dwlConditionMask = myVerSetConditionMask(dwlConditionMask, VER_PLATFORMID, op);
+ dwlConditionMask = myVerSetConditionMask(dwlConditionMask, VER_MAJORVERSION, op);
ret = myVerifyVersionInfo(&osvi, VER_PLATFORMID | VER_MAJORVERSION, dwlConditionMask);
return (ret);
}
@@ -1207,8 +1281,8 @@
osvi.dwOSVersionInfoSize = sizeof(OSVERSIONINFOEX);
osvi.dwMajorVersion = dwMajorVersion;
osvi.dwMinorVersion = dwMinorVersion;
- VER_SET_CONDITION(dwlConditionMask, VER_MAJORVERSION, op);
- VER_SET_CONDITION(dwlConditionMask, VER_MINORVERSION, op);
+ dwlConditionMask = myVerSetConditionMask(dwlConditionMask, VER_MAJORVERSION, op);
+ dwlConditionMask = myVerSetConditionMask(dwlConditionMask, VER_MINORVERSION, op);
ret = myVerifyVersionInfo(&osvi, VER_MAJORVERSION | VER_MINORVERSION, dwlConditionMask);
return (ret);
}