Skip to content

Commit adafa23

Browse files
nanoscopicnanoscopic
committed
fork: rename embedded driver package flow to drywintun
Switch INF/CAT/SYS installer resource names, driver package metadata, and runtime driver filename checks to drywintun naming across the fork's driver install path.
1 parent daef3b2 commit adafa23

7 files changed

Lines changed: 43 additions & 43 deletions

File tree

‎api/api.vcxproj‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,9 @@
2727
</ClCompile>
2828
<ResourceCompile>
2929
<AdditionalIncludeDirectories>..\$(Configuration)\$(WintunPlatform);..\$(Configuration);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
30-
<PreprocessorDefinitions Condition="Exists('..\$(Configuration)\$(WintunPlatform)\driver\wintun.sys') And Exists('..\$(Configuration)\$(WintunPlatform)\driver\wintun.inf') And Exists('..\$(Configuration)\$(WintunPlatform)\driver\wintun.cat')">WINTUN_EMBED_DRIVER;%(PreprocessorDefinitions)</PreprocessorDefinitions>
31-
<PreprocessorDefinitions Condition="Exists('..\$(Configuration)\arm64\driver\wintun.sys') And Exists('..\$(Configuration)\arm64\setupapihost.dll')">BUILT_ARM64_WOW64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
32-
<PreprocessorDefinitions Condition="Exists('..\$(Configuration)\amd64\driver\wintun.sys') And Exists('..\$(Configuration)\amd64\setupapihost.dll')">BUILT_AMD64_WOW64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
30+
<PreprocessorDefinitions Condition="Exists('..\$(Configuration)\$(WintunPlatform)\driver\drywintun.sys') And Exists('..\$(Configuration)\$(WintunPlatform)\driver\wintun.inf') And Exists('..\$(Configuration)\$(WintunPlatform)\driver\drywintun.cat')">WINTUN_EMBED_DRIVER;%(PreprocessorDefinitions)</PreprocessorDefinitions>
31+
<PreprocessorDefinitions Condition="Exists('..\$(Configuration)\arm64\driver\drywintun.sys') And Exists('..\$(Configuration)\arm64\setupapihost.dll')">BUILT_ARM64_WOW64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
32+
<PreprocessorDefinitions Condition="Exists('..\$(Configuration)\amd64\driver\drywintun.sys') And Exists('..\$(Configuration)\amd64\setupapihost.dll')">BUILT_AMD64_WOW64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
3333
<PreprocessorDefinitions Condition="'$(Platform)'=='Win32'">WANT_ARM64_WOW64;WANT_AMD64_WOW64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
3434
<PreprocessorDefinitions Condition="'$(Platform)'=='x64'">WANT_ARM64_WOW64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
3535
<PreprocessorDefinitions Condition="'$(Platform)'=='ARM'">WANT_ARM64_WOW64;%(PreprocessorDefinitions)</PreprocessorDefinitions>

‎api/driver.c‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -203,7 +203,7 @@ MaybeGetRunningDriverVersion(BOOL ReturnOneIfRunningInsteadOfVersion)
203203
for (ULONG i = Modules->NumberOfModules; i-- > 0;)
204204
{
205205
LPCSTR NtPath = (LPCSTR)Modules->Modules[i].FullPathName;
206-
if (!_stricmp(&NtPath[Modules->Modules[i].OffsetToFileName], "wintun.sys"))
206+
if (!_stricmp(&NtPath[Modules->Modules[i].OffsetToFileName], "drywintun.sys"))
207207
{
208208
if (ReturnOneIfRunningInsteadOfVersion)
209209
{
@@ -380,9 +380,9 @@ DriverInstall(HDEVINFO *DevInfoExistingAdaptersForCleanup, SP_DEVINFO_DATA_LIST
380380
WCHAR CatPath[MAX_PATH] = { 0 };
381381
WCHAR SysPath[MAX_PATH] = { 0 };
382382
WCHAR InfPath[MAX_PATH] = { 0 };
383-
if (!PathCombineW(CatPath, RandomTempSubDirectory, L"wintun.cat") ||
384-
!PathCombineW(SysPath, RandomTempSubDirectory, L"wintun.sys") ||
385-
!PathCombineW(InfPath, RandomTempSubDirectory, L"wintun.inf"))
383+
if (!PathCombineW(CatPath, RandomTempSubDirectory, L"drywintun.cat") ||
384+
!PathCombineW(SysPath, RandomTempSubDirectory, L"drywintun.sys") ||
385+
!PathCombineW(InfPath, RandomTempSubDirectory, L"drywintun.inf"))
386386
{
387387
LastError = ERROR_BUFFER_OVERFLOW;
388388
goto cleanupDirectory;
@@ -391,21 +391,21 @@ DriverInstall(HDEVINFO *DevInfoExistingAdaptersForCleanup, SP_DEVINFO_DATA_LIST
391391
WCHAR *CatSource, *SysSource, *InfSource;
392392
if (NativeMachine == IMAGE_FILE_PROCESS)
393393
{
394-
CatSource = L"wintun.cat";
395-
SysSource = L"wintun.sys";
396-
InfSource = L"wintun.inf";
394+
CatSource = L"drywintun.cat";
395+
SysSource = L"drywintun.sys";
396+
InfSource = L"drywintun.inf";
397397
}
398398
else if (NativeMachine == IMAGE_FILE_MACHINE_AMD64)
399399
{
400-
CatSource = L"wintun-amd64.cat";
401-
SysSource = L"wintun-amd64.sys";
402-
InfSource = L"wintun-amd64.inf";
400+
CatSource = L"drywintun-amd64.cat";
401+
SysSource = L"drywintun-amd64.sys";
402+
InfSource = L"drywintun-amd64.inf";
403403
}
404404
else if (NativeMachine == IMAGE_FILE_MACHINE_ARM64)
405405
{
406-
CatSource = L"wintun-arm64.cat";
407-
SysSource = L"wintun-arm64.sys";
408-
InfSource = L"wintun-arm64.inf";
406+
CatSource = L"drywintun-arm64.cat";
407+
SysSource = L"drywintun-arm64.sys";
408+
InfSource = L"drywintun-arm64.inf";
409409
}
410410
else
411411
{

‎api/resources.rc‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -9,28 +9,28 @@
99
#pragma code_page(1252)
1010

1111
#if defined(WINTUN_EMBED_DRIVER)
12-
wintun.cat RCDATA "driver\\wintun.cat"
13-
wintun.inf RCDATA "driver\\wintun.inf"
14-
wintun.sys RCDATA "driver\\wintun.sys"
12+
drywintun.cat RCDATA "driver\\drywintun.cat"
13+
drywintun.inf RCDATA "driver\\wintun.inf"
14+
drywintun.sys RCDATA "driver\\drywintun.sys"
1515
#else
1616
# pragma message("Current-arch driver package not embedded in this build")
1717
#endif
1818

1919
#if defined(WANT_AMD64_WOW64)
2020
# if defined(BUILT_AMD64_WOW64)
21-
wintun-amd64.cat RCDATA "amd64\\driver\\wintun.cat"
22-
wintun-amd64.inf RCDATA "amd64\\driver\\wintun.inf"
23-
wintun-amd64.sys RCDATA "amd64\\driver\\wintun.sys"
21+
drywintun-amd64.cat RCDATA "amd64\\driver\\drywintun.cat"
22+
drywintun-amd64.inf RCDATA "amd64\\driver\\wintun.inf"
23+
drywintun-amd64.sys RCDATA "amd64\\driver\\drywintun.sys"
2424
setupapihost-amd64.dll RCDATA "amd64\\setupapihost.dll"
2525
# else
2626
# pragma message("AMD64 wintun.sys was not built, so this will not work from WOW64")
2727
# endif
2828
#endif
2929
#if defined(WANT_ARM64_WOW64)
3030
# if defined(BUILT_ARM64_WOW64)
31-
wintun-arm64.cat RCDATA "arm64\\driver\\wintun.cat"
32-
wintun-arm64.inf RCDATA "arm64\\driver\\wintun.inf"
33-
wintun-arm64.sys RCDATA "arm64\\driver\\wintun.sys"
31+
drywintun-arm64.cat RCDATA "arm64\\driver\\drywintun.cat"
32+
drywintun-arm64.inf RCDATA "arm64\\driver\\wintun.inf"
33+
drywintun-arm64.sys RCDATA "arm64\\driver\\drywintun.sys"
3434
setupapihost-arm64.dll RCDATA "arm64\\setupapihost.dll"
3535
# else
3636
# pragma message("ARM64 wintun.sys was not built, so this will not work from WOW64")

‎driver/driver.vcxproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
</PropertyGroup>
1313
<Import Project="..\wintun.props" />
1414
<PropertyGroup>
15-
<TargetName>wintun</TargetName>
15+
<TargetName>drywintun</TargetName>
1616
</PropertyGroup>
1717
<ItemDefinitionGroup>
1818
<ClCompile>

‎driver/wintun.inf‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ Signature = "$Windows NT$"
77
Class = Net
88
ClassGUID = {4D36E972-E325-11CE-BFC1-08002BE10318}
99
Provider = %Wintun.CompanyName%
10-
CatalogFile.NT = wintun.cat
10+
CatalogFile.NT = drywintun.cat
1111
PnpLockdown = 1
1212

1313
[Manufacturer]
@@ -17,14 +17,14 @@ PnpLockdown = 1
1717
1 = %Wintun.DiskDesc%, "", ,
1818

1919
[SourceDisksFiles]
20-
wintun.sys = 1
20+
drywintun.sys = 1
2121

2222
[DestinationDirs]
2323
DefaultDestDir = 12
2424
Wintun.CopyFiles.Sys = 12
2525

2626
[Wintun.CopyFiles.Sys]
27-
wintun.sys, , , 0x00004002 ; COPYFLG_IN_USE_RENAME | COPYFLG_NOSKIP
27+
drywintun.sys, , , 0x00004002 ; COPYFLG_IN_USE_RENAME | COPYFLG_NOSKIP
2828

2929
[Wintun.NT$ARCH$]
3030
%Wintun.DeviceDesc% = Wintun.Install, Wintun
@@ -43,10 +43,10 @@ EnableDhcp = 0 ; Disable DHCP
4343
DeviceVendorWebsite,,,,"https://www.wintun.net/"
4444

4545
[Wintun.Install.Services]
46-
AddService = wintun, 2, Wintun.Service, Wintun.EventLog ; 2=SPSVCINST_ASSOCSERVICE
46+
AddService = drywintun, 2, Wintun.Service, Wintun.EventLog ; 2=SPSVCINST_ASSOCSERVICE
4747

4848
[Wintun.Ndi]
49-
HKR, Ndi, Service, 0, wintun
49+
HKR, Ndi, Service, 0, drywintun
5050
HKR, Ndi\Interfaces, UpperRange, , "ndis5"
5151
HKR, Ndi\Interfaces, LowerRange, , "nolower"
5252

@@ -56,14 +56,14 @@ Description = %Wintun.DeviceDesc%
5656
ServiceType = 1 ; SERVICE_KERNEL_DRIVER
5757
StartType = 3 ; SERVICE_DEMAND_START
5858
ErrorControl = 1 ; SERVICE_ERROR_NORMAL
59-
ServiceBinary = %12%\wintun.sys
59+
ServiceBinary = %12%\drywintun.sys
6060

6161
[Wintun.EventLog]
62-
HKR, , EventMessageFile, 0x00020000, "%11%\IoLogMsg.dll;%12%\wintun.sys"
62+
HKR, , EventMessageFile, 0x00020000, "%11%\IoLogMsg.dll;%12%\drywintun.sys"
6363
HKR, , TypesSupported, 0x00010001, 7
6464

6565
[Strings]
66-
Wintun.Name = "Wintun"
67-
Wintun.DiskDesc = "Wintun Driver Install Disk"
68-
Wintun.DeviceDesc = "Wintun Userspace Tunnel"
66+
Wintun.Name = "DryWintun"
67+
Wintun.DiskDesc = "DryWintun Driver Install Disk"
68+
Wintun.DeviceDesc = "DryWintun Userspace Tunnel"
6969
Wintun.CompanyName = "WireGuard LLC"

‎driver/wintun.rc‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,9 @@ BEGIN
2525
VALUE "CompanyName", "WireGuard LLC"
2626
VALUE "FileDescription", "Wintun Driver"
2727
VALUE "FileVersion", EXPAND(WINTUN_VERSION)
28-
VALUE "InternalName", "wintun.sys"
28+
VALUE "InternalName", "drywintun.sys"
2929
VALUE "LegalCopyright", "Copyright \xa9 2018-2021 WireGuard LLC. All Rights Reserved."
30-
VALUE "OriginalFilename", "wintun.sys"
30+
VALUE "OriginalFilename", "drywintun.sys"
3131
VALUE "ProductName", "Wintun Driver"
3232
VALUE "ProductVersion", EXPAND(WINTUN_VERSION)
3333
VALUE "Comments", "https://www.wintun.net/"

‎wintun.proj‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<?xml version="1.0" encoding="utf-8"?>
1+
<?xml version="1.0" encoding="utf-8"?>
22
<!--
33
SPDX-License-Identifier: GPL-2.0
44
@@ -33,22 +33,22 @@
3333
<DriverInputs>driver\undocumented.h;driver\wintun.c;driver\wintun.inf;wintun.props;driver\wintun.rc;driver\driver.vcxproj;$(DriverInputs)</DriverInputs>
3434
</PropertyGroup>
3535
<Target Name="Driver-x86"
36-
Outputs="$(Configuration)\x86\driver\wintun.sys;$(Configuration)\x86\driver\wintun.inf;$(Configuration)\x86\driver\wintun.cat"
36+
Outputs="$(Configuration)\x86\driver\drywintun.sys;$(Configuration)\x86\driver\wintun.inf;$(Configuration)\x86\driver\drywintun.cat"
3737
Inputs="$(DriverInputs)">
3838
<MSBuild Projects="driver\driver.vcxproj" Targets="Build" Properties="Configuration=$(Configuration);Platform=Win32" />
3939
</Target>
4040
<Target Name="Driver-amd64"
41-
Outputs="$(Configuration)\amd64\driver\wintun.sys;$(Configuration)\amd64\driver\wintun.inf;$(Configuration)\amd64\driver\wintun.cat"
41+
Outputs="$(Configuration)\amd64\driver\drywintun.sys;$(Configuration)\amd64\driver\wintun.inf;$(Configuration)\amd64\driver\drywintun.cat"
4242
Inputs="$(DriverInputs)">
4343
<MSBuild Projects="driver\driver.vcxproj" Targets="Build" Properties="Configuration=$(Configuration);Platform=x64" />
4444
</Target>
4545
<Target Name="Driver-arm"
46-
Outputs="$(Configuration)\arm\driver\wintun.sys;$(Configuration)\arm\driver\wintun.inf;$(Configuration)\arm\driver\wintun.cat"
46+
Outputs="$(Configuration)\arm\driver\drywintun.sys;$(Configuration)\arm\driver\wintun.inf;$(Configuration)\arm\driver\drywintun.cat"
4747
Inputs="$(DriverInputs)">
4848
<MSBuild Projects="driver\driver.vcxproj" Targets="Build" Properties="Configuration=$(Configuration);Platform=ARM" />
4949
</Target>
5050
<Target Name="Driver-arm64"
51-
Outputs="$(Configuration)\arm64\driver\wintun.sys;$(Configuration)\arm64\driver\wintun.inf;$(Configuration)\arm64\driver\wintun.cat"
51+
Outputs="$(Configuration)\arm64\driver\drywintun.sys;$(Configuration)\arm64\driver\wintun.inf;$(Configuration)\arm64\driver\drywintun.cat"
5252
Inputs="$(DriverInputs)">
5353
<MSBuild Projects="driver\driver.vcxproj" Targets="Build" Properties="Configuration=$(Configuration);Platform=ARM64" />
5454
</Target>

0 commit comments

Comments
 (0)