diff options
author | dnobori <da.git@softether.co.jp> | 2015-05-31 13:02:35 +0300 |
---|---|---|
committer | dnobori <da.git@softether.co.jp> | 2015-05-31 13:02:35 +0300 |
commit | ff497063732fdc08300c8bc166f4d4f62317e98a (patch) | |
tree | cfadea91c0b83255d9f137e75903031bcb572744 /src/Neo | |
parent | 7785c41f3881f4527705c808c0e2a8d8a6e6d822 (diff) |
v4.17-9562-beta
Diffstat (limited to 'src/Neo')
-rw-r--r-- | src/Neo/NDIS5.c | 2 | ||||
-rw-r--r-- | src/Neo/NDIS5.h | 2 | ||||
-rw-r--r-- | src/Neo/Neo.h | 2 | ||||
-rw-r--r-- | src/Neo/Neo.vcproj | 12 |
4 files changed, 9 insertions, 9 deletions
diff --git a/src/Neo/NDIS5.c b/src/Neo/NDIS5.c index 8e411948..08bd0795 100644 --- a/src/Neo/NDIS5.c +++ b/src/Neo/NDIS5.c @@ -1705,7 +1705,7 @@ void *NeoMalloc(UINT size) }
// Allocate the non-paged memory
- r = NdisAllocateMemoryWithTag(&p, size, 0);
+ r = NdisAllocateMemoryWithTag(&p, size, 'SETH');
if (NG(r))
{
diff --git a/src/Neo/NDIS5.h b/src/Neo/NDIS5.h index 531e580c..a9437265 100644 --- a/src/Neo/NDIS5.h +++ b/src/Neo/NDIS5.h @@ -227,7 +227,7 @@ static UINT SupportedOids[] = WCHAR *_P;\
_D->Length = (USHORT)((strlen(_S)) * sizeof(WCHAR));\
_D->MaximumLength = _D->Length + sizeof(WCHAR);\
- NdisAllocateMemoryWithTag((PVOID *)&(_D->Buffer), _D->MaximumLength, 0);\
+ NdisAllocateMemoryWithTag((PVOID *)&(_D->Buffer), _D->MaximumLength, 'SETH');\
_P = _D->Buffer;\
while(*_S != '\0'){\
*_P = (WCHAR)(*_S);\
diff --git a/src/Neo/Neo.h b/src/Neo/Neo.h index 63a0620d..3e16b41c 100644 --- a/src/Neo/Neo.h +++ b/src/Neo/Neo.h @@ -124,7 +124,7 @@ #define NDIS_NEO_EVENT_NAME_WIN32 "Global\\NEO_EVENT_NEOADAPTER_%s"
// Constant
-#define NEO_MAX_PACKET_SIZE 1560
+#define NEO_MAX_PACKET_SIZE 1600
#define NEO_MAX_PACKET_SIZE_ANNOUNCE 1514
#define NEO_MIN_PACKET_SIZE 14
#define NEO_PACKET_HEADER_SIZE 14
diff --git a/src/Neo/Neo.vcproj b/src/Neo/Neo.vcproj index d44fa47f..eea59b3b 100644 --- a/src/Neo/Neo.vcproj +++ b/src/Neo/Neo.vcproj @@ -21,7 +21,7 @@ <Configurations>
<Configuration
Name="Release|Win32"
- OutputDirectory="$(SolutionDir)bin"
+ OutputDirectory="$(SolutionDir)BuiltDriverPackages\Neo\x86"
IntermediateDirectory="$(PlatformName)_$(ConfigurationName)"
ConfigurationType="2"
CharacterSet="2"
@@ -72,14 +72,14 @@ />
<Tool
Name="VCPreLinkEventTool"
- CommandLine="$(SolutionDir)bin\BuildUtil.exe /CMD:GenerateVersionResource "$(TargetPath)" /OUT:"$(SolutionDir)tmp\VersionResources\$(ProjectName)_$(PlatformName).res""
+ CommandLine="$(SolutionDir)bin\BuildUtil.exe /CMD:GenerateVersionResource "$(TargetPath)" /OUT:"$(SolutionDir)tmp\VersionResources\$(ProjectName)_$(PlatformName).res" /PRODUCT:"SoftEther VPN""
/>
<Tool
Name="VCLinkerTool"
IgnoreImportLibrary="true"
AdditionalOptions="/driver /subsystem:native,5.00 /FULLBUILD /align:0x80 /osversion:5.00 /STACK:0x40000,0x1000 /MERGE:_PAGE=PAGE /MERGE:_TEXT=.text /NODEFAULTLIB /stub:C:\WINDDK\7600.16385.0\lib\wnet\stub512.com"
AdditionalDependencies="wdm.lib ndis.lib wdmsec.lib "$(SolutionDir)tmp\VersionResources\$(ProjectName)_$(PlatformName).res""
- OutputFile="$(OutDir)\hamcore\not_signed\vpn_driver.sys"
+ OutputFile="$(OutDir)\Neo_x86.sys"
LinkIncremental="1"
AdditionalLibraryDirectories="C:\WINDDK\7600.16385.0\lib\wnet\i386"
GenerateManifest="false"
@@ -125,7 +125,7 @@ </Configuration>
<Configuration
Name="Release|x64"
- OutputDirectory="$(SolutionDir)bin"
+ OutputDirectory="$(SolutionDir)BuiltDriverPackages\Neo\x64"
IntermediateDirectory="$(PlatformName)_$(ConfigurationName)"
ConfigurationType="2"
CharacterSet="2"
@@ -177,14 +177,14 @@ />
<Tool
Name="VCPreLinkEventTool"
- CommandLine="$(SolutionDir)bin\BuildUtil.exe /CMD:GenerateVersionResource "$(TargetPath)" /OUT:"$(SolutionDir)tmp\VersionResources\$(ProjectName)_$(PlatformName).res""
+ CommandLine="$(SolutionDir)bin\BuildUtil.exe /CMD:GenerateVersionResource "$(TargetPath)" /OUT:"$(SolutionDir)tmp\VersionResources\$(ProjectName)_$(PlatformName).res" /PRODUCT:"SoftEther VPN""
/>
<Tool
Name="VCLinkerTool"
IgnoreImportLibrary="true"
AdditionalOptions="/driver /subsystem:native /FULLBUILD /align:0x80 /osversion:5.00 /STACK:0x40000,0x1000 /MERGE:_PAGE=PAGE /MERGE:_TEXT=.text /NODEFAULTLIB /stub:C:\WINDDK\7600.16385.0\lib\wnet\stub512.com"
AdditionalDependencies="wdm.lib ndis.lib wdmsec.lib "$(SolutionDir)tmp\VersionResources\$(ProjectName)_$(PlatformName).res""
- OutputFile="$(OutDir)\hamcore\not_signed\vpn_driver_x64.sys"
+ OutputFile="$(OutDir)\Neo_x64.sys"
LinkIncremental="1"
AdditionalLibraryDirectories="C:\WINDDK\7600.16385.0\lib\wnet\amd64"
GenerateManifest="false"
|