diff options
Diffstat (limited to 'src/Cedar/BridgeWin32.c')
| -rw-r--r-- | src/Cedar/BridgeWin32.c | 32 |
1 files changed, 17 insertions, 15 deletions
diff --git a/src/Cedar/BridgeWin32.c b/src/Cedar/BridgeWin32.c index 9672e4a9..74dd2abb 100644 --- a/src/Cedar/BridgeWin32.c +++ b/src/Cedar/BridgeWin32.c @@ -3,9 +3,9 @@ //
// SoftEther VPN Server, Client and Bridge are free software under GPLv2.
//
-// Copyright (c) 2012-2014 Daiyuu Nobori.
-// Copyright (c) 2012-2014 SoftEther VPN Project, University of Tsukuba, Japan.
-// Copyright (c) 2012-2014 SoftEther Corporation.
+// Copyright (c) 2012-2016 Daiyuu Nobori.
+// Copyright (c) 2012-2016 SoftEther VPN Project, University of Tsukuba, Japan.
+// Copyright (c) 2012-2016 SoftEther Corporation.
//
// All Rights Reserved.
//
@@ -1356,9 +1356,9 @@ TOKEN_LIST *GetEthList() {
UINT v;
- return GetEthListEx(&v);
+ return GetEthListEx(&v, true, false);
}
-TOKEN_LIST *GetEthListEx(UINT *total_num_including_hidden)
+TOKEN_LIST *GetEthListEx(UINT *total_num_including_hidden, bool enum_normal, bool enum_rawip)
{
TOKEN_LIST *ret;
UINT i;
@@ -1371,6 +1371,11 @@ TOKEN_LIST *GetEthListEx(UINT *total_num_including_hidden) return NULL;
}
+ if (enum_normal == false)
+ {
+ return NullToken();
+ }
+
if (total_num_including_hidden == NULL)
{
total_num_including_hidden = &dummy_int;
@@ -1894,6 +1899,12 @@ bool IsPcdSupported() UINT type;
OS_INFO *info = GetOsInfo();
+ if (MsIsWindows10())
+ {
+ // Windows 10 or later never supports PCD driver.
+ return false;
+ }
+
type = info->OsType;
if (OS_IS_WINDOWS_NT(type) == false)
@@ -1972,11 +1983,6 @@ HINSTANCE InstallPcdDriverInternal() src_filename = BRIDGE_WIN32_PCD_SYS_X64;
}
- if (MsIsIA64())
- {
- src_filename = BRIDGE_WIN32_PCD_SYS_IA64;
- }
-
// Copy see.sys
if (FileCopy(src_filename, tmp) == false)
{
@@ -1995,10 +2001,6 @@ HINSTANCE InstallPcdDriverInternal() {
dll_filename = BRIDGE_WIN32_PCD_DLL_X64;
}
- else if (MsIsIA64())
- {
- dll_filename = BRIDGE_WIN32_PCD_DLL_IA64;
- }
}
// Try to load see.dll and initialize
@@ -2142,7 +2144,7 @@ RELEASE: return false;
}
- o = GetEthListEx(&total_num);
+ o = GetEthListEx(&total_num, true, false);
if (o == NULL || total_num == 0)
{
FreeToken(o);
|