tst: passthrough: reorg project

This commit is contained in:
Bill Zissimopoulos 2017-01-28 12:34:10 -08:00
parent f97ef5704f
commit 960c627924
6 changed files with 13 additions and 20 deletions

View File

@ -262,17 +262,15 @@
<Component Id="C.passthrough.c"> <Component Id="C.passthrough.c">
<File Name="passthrough.c" KeyPath="yes" /> <File Name="passthrough.c" KeyPath="yes" />
</Component> </Component>
<Directory Id="SMPDIR.passthrough.passthrough" Name="passthrough"> <Component Id="C.passthrough.sln">
<Component Id="C.passthrough.sln"> <File Name="passthrough.sln" KeyPath="yes" />
<File Name="passthrough.sln" KeyPath="yes" /> </Component>
</Component> <Component Id="C.passthrough.vcxproj">
<Component Id="C.passthrough.vcxproj"> <File Name="passthrough.vcxproj" KeyPath="yes" />
<File Name="passthrough.vcxproj" KeyPath="yes" /> </Component>
</Component> <Component Id="C.passthrough.vcxproj.filters">
<Component Id="C.passthrough.vcxproj.filters"> <File Name="passthrough.vcxproj.filters" KeyPath="yes" />
<File Name="passthrough.vcxproj.filters" KeyPath="yes" /> </Component>
</Component>
</Directory>
</Directory> </Directory>
</DirectoryRef> </DirectoryRef>
<DirectoryRef Id="SYMDIR"> <DirectoryRef Id="SYMDIR">

View File

@ -895,7 +895,6 @@ static NTSTATUS WinFspLoad(VOID)
#endif #endif
#define FSP_DLLPATH "bin\\" FSP_DLLNAME #define FSP_DLLPATH "bin\\" FSP_DLLNAME
LONG WINAPI __HrLoadAllImportsForDll(CONST CHAR *);
WCHAR PathBuf[MAX_PATH - (sizeof L"" FSP_DLLPATH / sizeof(WCHAR) - 1)]; WCHAR PathBuf[MAX_PATH - (sizeof L"" FSP_DLLPATH / sizeof(WCHAR) - 1)];
DWORD Size; DWORD Size;
LONG Result; LONG Result;
@ -916,10 +915,6 @@ static NTSTATUS WinFspLoad(VOID)
Module = LoadLibraryW(PathBuf); Module = LoadLibraryW(PathBuf);
if (0 == Module) if (0 == Module)
return STATUS_DLL_NOT_FOUND; return STATUS_DLL_NOT_FOUND;
Result = __HrLoadAllImportsForDll(FSP_DLLNAME);
if (0 > Result)
return STATUS_DELAY_LOAD_FAILED;
} }
return STATUS_SUCCESS; return STATUS_SUCCESS;

View File

@ -18,6 +18,9 @@
<Platform>x64</Platform> <Platform>x64</Platform>
</ProjectConfiguration> </ProjectConfiguration>
</ItemGroup> </ItemGroup>
<ItemGroup>
<ClCompile Include="passthrough.c" />
</ItemGroup>
<PropertyGroup Label="Globals"> <PropertyGroup Label="Globals">
<ProjectGuid>{9E0E5997-7316-4818-A130-00B3AF1AD354}</ProjectGuid> <ProjectGuid>{9E0E5997-7316-4818-A130-00B3AF1AD354}</ProjectGuid>
<Keyword>Win32Proj</Keyword> <Keyword>Win32Proj</Keyword>
@ -173,9 +176,6 @@
<DelayLoadDLLs>winfsp-$(PlatformTarget).dll</DelayLoadDLLs> <DelayLoadDLLs>winfsp-$(PlatformTarget).dll</DelayLoadDLLs>
</Link> </Link>
</ItemDefinitionGroup> </ItemDefinitionGroup>
<ItemGroup>
<ClCompile Include="..\passthrough.c" />
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets"> <ImportGroup Label="ExtensionTargets">
</ImportGroup> </ImportGroup>

View File

@ -7,7 +7,7 @@
</Filter> </Filter>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ClCompile Include="..\passthrough.c"> <ClCompile Include="passthrough.c">
<Filter>Source</Filter> <Filter>Source</Filter>
</ClCompile> </ClCompile>
</ItemGroup> </ItemGroup>