diff options
| author |   Simon Rozman <simon@rozman.si> | 2020-11-04 08:11:44 +0100 |
|---|---|---|
| committer | Simon Rozman <simon@rozman.si> | 2020-11-04 13:21:42 +0100 |
| commit | 0a51e26730993e1f4a2faee33f7b6cd27f871e5a (patch) | |
| tree | 510a951cdf8fddeaccef2aa0b3fc07604e6bacbe | |
| parent | api: translate NTSTATUS to Win32 error codes (diff) | |
| download | wintun-0a51e26730993e1f4a2faee33f7b6cd27f871e5a.tar.xz wintun-0a51e26730993e1f4a2faee33f7b6cd27f871e5a.zip | |
api: include the rundll32 helpers the MSVC-typical way
Signed-off-by: Simon Rozman <simon@rozman.si>
| -rw-r--r-- | api/adapter.c | 2 | ||||
| -rw-r--r-- | api/api.vcxproj | 6 | ||||
| -rw-r--r-- | api/api.vcxproj.filters | 6 | ||||
| -rw-r--r-- | api/rundll32_i.c (renamed from api/rundll32.h) | 0 |
4 files changed, 8 insertions, 6 deletions
diff --git a/api/adapter.c b/api/adapter.c index 62ef05c..6a0af9d 100644 --- a/api/adapter.c +++ b/api/adapter.c @@ -1653,7 +1653,7 @@ cleanupMutex: return RET_ERROR(Adapter, LastError); } -#include "rundll32.h" +#include "rundll32_i.c" _Return_type_success_(return != NULL) WINTUN_ADAPTER *WINAPI WintunCreateAdapter( _In_z_ const WCHAR *Pool, diff --git a/api/api.vcxproj b/api/api.vcxproj index fcd3047..f93551d 100644 --- a/api/api.vcxproj +++ b/api/api.vcxproj @@ -106,7 +106,7 @@ <PreprocessorDefinitions>_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions> <PreprocessorDefinitions Condition="Exists('$(OutDir)whql\')">HAVE_WHQL;%(PreprocessorDefinitions)</PreprocessorDefinitions> <AdditionalOptions>/volatile:iso %(AdditionalOptions)</AdditionalOptions> - <AdditionalIncludeDirectories>..\$(Configuration)\$(WintunPlatform);..\$(Configuration);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <AdditionalIncludeDirectories>..\$(Configuration)\$(WintunPlatform);..\$(Configuration);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> </ClCompile> <ResourceCompile> <AdditionalIncludeDirectories>..\$(Configuration)\$(WintunPlatform);..\$(Configuration);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> @@ -163,7 +163,9 @@ lib.exe /def:"$(ProjectDir)nci.def" /out:"$(IntDir)nci.lib" /machine:$(PlatformT <ClInclude Include="entry.h" /> <ClInclude Include="adapter.h" /> <ClInclude Include="elevate.h" /> - <ClInclude Include="rundll32.h" /> + <ClInclude Include="rundll32_i.c"> + <ExcludedFromBuild>true</ExcludedFromBuild> + </ClInclude> <ClInclude Include="logger.h" /> <ClInclude Include="namespace.h" /> <ClInclude Include="nci.h" /> diff --git a/api/api.vcxproj.filters b/api/api.vcxproj.filters index 7b3493f..682681e 100644 --- a/api/api.vcxproj.filters +++ b/api/api.vcxproj.filters @@ -55,12 +55,12 @@ <ClInclude Include="entry.h"> <Filter>Header Files</Filter> </ClInclude> - <ClInclude Include="rundll32.h"> - <Filter>Header Files</Filter> - </ClInclude> <ClInclude Include="ntdll.h"> <Filter>Header Files</Filter> </ClInclude> + <ClInclude Include="rundll32_i.c"> + <Filter>Source Files</Filter> + </ClInclude> </ItemGroup> <ItemGroup> <ClCompile Include="namespace.c"> diff --git a/api/rundll32.h b/api/rundll32_i.c index ca4a504..ca4a504 100644 --- a/api/rundll32.h +++ b/api/rundll32_i.c |