Home
My Posts

Archive
Login
Signup

Recent Posts

Free subdomains

Want your own xyz.kpaste.net sub-domain for your community? Just type the address into your browser address bar (foo.xyz.kpaste.net is also supported).

Suggestions/Bugs?

Email us at . Try to include as much info as possible.

About

Pastebin is a tool for collaborative debugging or editing.

 

ms-nfsv41-client Visual Studio 19 patch
Posted by Anonymous on Mon 4th Sep 2023 02:32
raw | new post

Submit a correction or amendment below (click here to make a fresh posting)
After submitting an amendment, you'll be able to view the differences between the old and new posts easily.

Syntax highlighting: None Bash C C++ CSS Diff HTML mIRC Script Perl PHP Python Smarty XML ---------------------------- ABAP Actionscript ADA Apache Log AppleScript APT sources.list ASM ASP AutoIT Bash C C# C++ C++ (with QT) CSS Diff HTML INI (Config Files) Java Javascript Lua Make mIRC Script MySQL NSIS Perl PHP Python Q(uick)BASIC robots Ruby Ruby on Rails SDLBasic Smarty SQL TCL Text VB.NET Visual BASIC Visual Fox Pro Visual Prolog Windows Registry Files XML Xorg.conf

To highlight particular lines, prefix each line with {%HIGHLIGHT}
diff --git a/build.vc15/nfs41_driver/nfs41_driver.vcxproj b/build.vc15/nfs41_driver/nfs41_driver.vcxproj index 7680e49..de55c90 100644 --- a/build.vc15/nfs41_driver/nfs41_driver.vcxproj +++ b/build.vc15/nfs41_driver/nfs41_driver.vcxproj @@ -1,234 +1,234 @@ -<?xml version="1.0" encoding="utf-8"?> -<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <ItemGroup Label="ProjectConfigurations"> - <ProjectConfiguration Include="Debug|Win32"> - <Configuration>Debug</Configuration> - <Platform>Win32</Platform> - </ProjectConfiguration> - <ProjectConfiguration Include="Release|Win32"> - <Configuration>Release</Configuration> - <Platform>Win32</Platform> - </ProjectConfiguration> - <ProjectConfiguration Include="Debug|x64"> - <Configuration>Debug</Configuration> - <Platform>x64</Platform> - </ProjectConfiguration> - <ProjectConfiguration Include="Release|x64"> - <Configuration>Release</Configuration> - <Platform>x64</Platform> - </ProjectConfiguration> - <ProjectConfiguration Include="Debug|ARM"> - <Configuration>Debug</Configuration> - <Platform>ARM</Platform> - </ProjectConfiguration> - <ProjectConfiguration Include="Release|ARM"> - <Configuration>Release</Configuration> - <Platform>ARM</Platform> - </ProjectConfiguration> - <ProjectConfiguration Include="Debug|ARM64"> - <Configuration>Debug</Configuration> - <Platform>ARM64</Platform> - </ProjectConfiguration> - <ProjectConfiguration Include="Release|ARM64"> - <Configuration>Release</Configuration> - <Platform>ARM64</Platform> - </ProjectConfiguration> - </ItemGroup> - <PropertyGroup Label="Globals"> - <ProjectGuid>{78E2A6FE-05E7-40F8-AE1E-29BC3C307859}</ProjectGuid> - <TemplateGuid>{dd38f7fc-d7bd-488b-9242-7d8754cde80d}</TemplateGuid> - <TargetFrameworkVersion>v4.5</TargetFrameworkVersion> - <MinimumVisualStudioVersion>12.0</MinimumVisualStudioVersion> - <Configuration>Debug</Configuration> - <Platform Condition="'$(Platform)' == ''">Win32</Platform> - <RootNamespace>nfs41_driver</RootNamespace> - </PropertyGroup> - <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> - <TargetVersion>Windows10</TargetVersion> - <UseDebugLibraries>true</UseDebugLibraries> - <PlatformToolset>WindowsKernelModeDriver10.0</PlatformToolset> - <ConfigurationType>Driver</ConfigurationType> - <DriverType>WDM</DriverType> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> - <TargetVersion>Windows10</TargetVersion> - <UseDebugLibraries>false</UseDebugLibraries> - <PlatformToolset>WindowsKernelModeDriver10.0</PlatformToolset> - <ConfigurationType>Driver</ConfigurationType> - <DriverType>WDM</DriverType> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration"> - <TargetVersion>Windows10</TargetVersion> - <UseDebugLibraries>true</UseDebugLibraries> - <PlatformToolset>WindowsKernelModeDriver10.0</PlatformToolset> - <ConfigurationType>Driver</ConfigurationType> - <DriverType>WDM</DriverType> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration"> - <TargetVersion>Windows10</TargetVersion> - <UseDebugLibraries>false</UseDebugLibraries> - <PlatformToolset>WindowsKernelModeDriver10.0</PlatformToolset> - <ConfigurationType>Driver</ConfigurationType> - <DriverType>WDM</DriverType> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'" Label="Configuration"> - <TargetVersion>Windows10</TargetVersion> - <UseDebugLibraries>true</UseDebugLibraries> - <PlatformToolset>WindowsKernelModeDriver10.0</PlatformToolset> - <ConfigurationType>Driver</ConfigurationType> - <DriverType>WDM</DriverType> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'" Label="Configuration"> - <TargetVersion>Windows10</TargetVersion> - <UseDebugLibraries>false</UseDebugLibraries> - <PlatformToolset>WindowsKernelModeDriver10.0</PlatformToolset> - <ConfigurationType>Driver</ConfigurationType> - <DriverType>WDM</DriverType> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'" Label="Configuration"> - <TargetVersion>Windows10</TargetVersion> - <UseDebugLibraries>true</UseDebugLibraries> - <PlatformToolset>WindowsKernelModeDriver10.0</PlatformToolset> - <ConfigurationType>Driver</ConfigurationType> - <DriverType>WDM</DriverType> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'" Label="Configuration"> - <TargetVersion>Windows10</TargetVersion> - <UseDebugLibraries>false</UseDebugLibraries> - <PlatformToolset>WindowsKernelModeDriver10.0</PlatformToolset> - <ConfigurationType>Driver</ConfigurationType> - <DriverType>WDM</DriverType> - </PropertyGroup> - <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> - <ImportGroup Label="ExtensionSettings"> - </ImportGroup> - <ImportGroup Label="PropertySheets"> - <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - </ImportGroup> - <PropertyGroup Label="UserMacros" /> - <PropertyGroup /> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> - <DebuggerFlavor>DbgengKernelDebugger</DebuggerFlavor> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> - <DebuggerFlavor>DbgengKernelDebugger</DebuggerFlavor> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> - <DebuggerFlavor>DbgengKernelDebugger</DebuggerFlavor> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> - <DebuggerFlavor>DbgengKernelDebugger</DebuggerFlavor> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'"> - <DebuggerFlavor>DbgengKernelDebugger</DebuggerFlavor> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'"> - <DebuggerFlavor>DbgengKernelDebugger</DebuggerFlavor> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'"> - <DebuggerFlavor>DbgengKernelDebugger</DebuggerFlavor> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'"> - <DebuggerFlavor>DbgengKernelDebugger</DebuggerFlavor> - </PropertyGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'"> - <ClCompile> - <AdditionalIncludeDirectories>..\..\dll;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - <WarningLevel>Level3</WarningLevel> - <PreprocessorDefinitions>EXPLODE_POOLTAGS;MONOLITHIC_MINIRDR;%(PreprocessorDefinitions)</PreprocessorDefinitions> - </ClCompile> - <Link> - <AdditionalDependencies>$(WindowsSdkDir)lib\win7\km\$(DDKPlatform)\ntoskrnl.lib;$(WindowsSdkDir)lib\win7\km\$(DDKPlatform)\hal.lib;$(WindowsSdkDir)lib\win7\km\$(DDKPlatform)\bufferoverflowk.lib;$(WindowsSdkDir)lib\win7\km\$(DDKPlatform)\ksecdd.lib;$(WindowsSdkDir)lib\win7\km\$(DDKPlatform)\rxce.lib;$(WindowsSdkDir)lib\win7\km\$(DDKPlatform)\rdbsslib.lib;$(WindowsSdkDir)lib\win7\km\$(DDKPlatform)\copysup.lib</AdditionalDependencies> - </Link> - </ItemDefinitionGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'"> - <ClCompile> - <AdditionalIncludeDirectories>..\..\dll;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - <WarningLevel>Level3</WarningLevel> - <PreprocessorDefinitions>EXPLODE_POOLTAGS;MONOLITHIC_MINIRDR;%(PreprocessorDefinitions)</PreprocessorDefinitions> - </ClCompile> - <Link> - <AdditionalDependencies>$(WindowsSdkDir)lib\win7\km\$(DDKPlatform)\ntoskrnl.lib;$(WindowsSdkDir)lib\win7\km\$(DDKPlatform)\hal.lib;$(WindowsSdkDir)lib\win7\km\$(DDKPlatform)\bufferoverflowk.lib;$(WindowsSdkDir)lib\win7\km\$(DDKPlatform)\ksecdd.lib;$(WindowsSdkDir)lib\win7\km\$(DDKPlatform)\rxce.lib;$(WindowsSdkDir)lib\win7\km\$(DDKPlatform)\rdbsslib.lib;$(WindowsSdkDir)lib\win7\km\$(DDKPlatform)\copysup.lib</AdditionalDependencies> - </Link> - </ItemDefinitionGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> - <ClCompile> - <AdditionalIncludeDirectories>..\..\dll;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - <WarningLevel>Level3</WarningLevel> - <PreprocessorDefinitions>EXPLODE_POOLTAGS;MONOLITHIC_MINIRDR;%(PreprocessorDefinitions)</PreprocessorDefinitions> - </ClCompile> - <Link> - <AdditionalDependencies>$(WindowsSdkDir)lib\win7\km\$(DDKPlatform)\ntoskrnl.lib;$(WindowsSdkDir)lib\win7\km\$(DDKPlatform)\hal.lib;$(WindowsSdkDir)lib\win7\km\$(DDKPlatform)\bufferoverflowk.lib;$(WindowsSdkDir)lib\win7\km\$(DDKPlatform)\ksecdd.lib;$(WindowsSdkDir)lib\win7\km\$(DDKPlatform)\rxce.lib;$(WindowsSdkDir)lib\win7\km\$(DDKPlatform)\rdbsslib.lib;$(WindowsSdkDir)lib\win7\km\$(DDKPlatform)\copysup.lib</AdditionalDependencies> - </Link> - </ItemDefinitionGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> - <ClCompile> - <AdditionalIncludeDirectories>..\..\dll;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - <WarningLevel>Level3</WarningLevel> - <PreprocessorDefinitions>EXPLODE_POOLTAGS;MONOLITHIC_MINIRDR;%(PreprocessorDefinitions)</PreprocessorDefinitions> - </ClCompile> - <Link> - <AdditionalDependencies>$(WindowsSdkDir)lib\win7\km\$(DDKPlatform)\ntoskrnl.lib;$(WindowsSdkDir)lib\win7\km\$(DDKPlatform)\hal.lib;$(WindowsSdkDir)lib\win7\km\$(DDKPlatform)\bufferoverflowk.lib;$(WindowsSdkDir)lib\win7\km\$(DDKPlatform)\ksecdd.lib;$(WindowsSdkDir)lib\win7\km\$(DDKPlatform)\rxce.lib;$(WindowsSdkDir)lib\win7\km\$(DDKPlatform)\rdbsslib.lib;$(WindowsSdkDir)lib\win7\km\$(DDKPlatform)\copysup.lib</AdditionalDependencies> - </Link> - </ItemDefinitionGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'"> - <ClCompile> - <AdditionalIncludeDirectories>..\..\dll;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - <WarningLevel>Level3</WarningLevel> - <PreprocessorDefinitions>EXPLODE_POOLTAGS;MONOLITHIC_MINIRDR;%(PreprocessorDefinitions)</PreprocessorDefinitions> - </ClCompile> - <Link> - <AdditionalDependencies>$(WindowsSdkDir)lib\win7\km\$(DDKPlatform)\ntoskrnl.lib;$(WindowsSdkDir)lib\win7\km\$(DDKPlatform)\hal.lib;$(WindowsSdkDir)lib\win7\km\$(DDKPlatform)\bufferoverflowk.lib;$(WindowsSdkDir)lib\win7\km\$(DDKPlatform)\ksecdd.lib;$(WindowsSdkDir)lib\win7\km\$(DDKPlatform)\rxce.lib;$(WindowsSdkDir)lib\win7\km\$(DDKPlatform)\rdbsslib.lib;$(WindowsSdkDir)lib\win7\km\$(DDKPlatform)\copysup.lib</AdditionalDependencies> - </Link> - </ItemDefinitionGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'"> - <ClCompile> - <AdditionalIncludeDirectories>..\..\dll;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - <WarningLevel>Level3</WarningLevel> - <PreprocessorDefinitions>EXPLODE_POOLTAGS;MONOLITHIC_MINIRDR;%(PreprocessorDefinitions)</PreprocessorDefinitions> - </ClCompile> - <Link> - <AdditionalDependencies>$(WindowsSdkDir)lib\win7\km\$(DDKPlatform)\ntoskrnl.lib;$(WindowsSdkDir)lib\win7\km\$(DDKPlatform)\hal.lib;$(WindowsSdkDir)lib\win7\km\$(DDKPlatform)\bufferoverflowk.lib;$(WindowsSdkDir)lib\win7\km\$(DDKPlatform)\ksecdd.lib;$(WindowsSdkDir)lib\win7\km\$(DDKPlatform)\rxce.lib;$(WindowsSdkDir)lib\win7\km\$(DDKPlatform)\rdbsslib.lib;$(WindowsSdkDir)lib\win7\km\$(DDKPlatform)\copysup.lib</AdditionalDependencies> - </Link> - </ItemDefinitionGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> - <ClCompile> - <AdditionalIncludeDirectories>..\..\dll;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - <WarningLevel>Level3</WarningLevel> - <PreprocessorDefinitions>EXPLODE_POOLTAGS;MONOLITHIC_MINIRDR;%(PreprocessorDefinitions)</PreprocessorDefinitions> - </ClCompile> - <Link> - <AdditionalDependencies>$(WindowsSdkDir)lib\win7\km\$(DDKPlatform)\ntoskrnl.lib;$(WindowsSdkDir)lib\win7\km\$(DDKPlatform)\hal.lib;$(WindowsSdkDir)lib\win7\km\$(DDKPlatform)\bufferoverflowk.lib;$(WindowsSdkDir)lib\win7\km\$(DDKPlatform)\ksecdd.lib;$(WindowsSdkDir)lib\win7\km\$(DDKPlatform)\rxce.lib;$(WindowsSdkDir)lib\win7\km\$(DDKPlatform)\rdbsslib.lib;$(WindowsSdkDir)lib\win7\km\$(DDKPlatform)\copysup.lib</AdditionalDependencies> - </Link> - </ItemDefinitionGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> - <ClCompile> - <AdditionalIncludeDirectories>..\..\dll;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - <WarningLevel>Level3</WarningLevel> - <PreprocessorDefinitions>EXPLODE_POOLTAGS;MONOLITHIC_MINIRDR;%(PreprocessorDefinitions)</PreprocessorDefinitions> - </ClCompile> - <Link> - <AdditionalDependencies>$(WindowsSdkDir)lib\win7\km\$(DDKPlatform)\ntoskrnl.lib;$(WindowsSdkDir)lib\win7\km\$(DDKPlatform)\hal.lib;$(WindowsSdkDir)lib\win7\km\$(DDKPlatform)\bufferoverflowk.lib;$(WindowsSdkDir)lib\win7\km\$(DDKPlatform)\ksecdd.lib;$(WindowsSdkDir)lib\win7\km\$(DDKPlatform)\rxce.lib;$(WindowsSdkDir)lib\win7\km\$(DDKPlatform)\rdbsslib.lib;$(WindowsSdkDir)lib\win7\km\$(DDKPlatform)\copysup.lib</AdditionalDependencies> - </Link> - </ItemDefinitionGroup> - <ItemGroup> - <FilesToPackage Include="$(TargetPath)" /> - </ItemGroup> - <ItemGroup> - <ClCompile Include="..\..\sys\nfs41_debug.c" /> - <ClCompile Include="..\..\sys\nfs41_driver.c" /> - <ClCompile Include="..\..\sys\wmlkm.c" /> - </ItemGroup> - <ItemGroup> - <ClInclude Include="..\..\sys\nfs41_debug.h" /> - <ClInclude Include="..\..\sys\nfs41_driver.h" /> - <ClInclude Include="..\..\sys\wmlkm.h" /> - </ItemGroup> - <ItemGroup> - <ResourceCompile Include="..\..\sys\nfs41_driver.rc" /> - </ItemGroup> - <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> - <ImportGroup Label="ExtensionTargets"> - </ImportGroup> +<?xml version="1.0" encoding="utf-8"?> +<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <ItemGroup Label="ProjectConfigurations"> + <ProjectConfiguration Include="Debug|Win32"> + <Configuration>Debug</Configuration> + <Platform>Win32</Platform> + </ProjectConfiguration> + <ProjectConfiguration Include="Release|Win32"> + <Configuration>Release</Configuration> + <Platform>Win32</Platform> + </ProjectConfiguration> + <ProjectConfiguration Include="Debug|x64"> + <Configuration>Debug</Configuration> + <Platform>x64</Platform> + </ProjectConfiguration> + <ProjectConfiguration Include="Release|x64"> + <Configuration>Release</Configuration> + <Platform>x64</Platform> + </ProjectConfiguration> + <ProjectConfiguration Include="Debug|ARM"> + <Configuration>Debug</Configuration> + <Platform>ARM</Platform> + </ProjectConfiguration> + <ProjectConfiguration Include="Release|ARM"> + <Configuration>Release</Configuration> + <Platform>ARM</Platform> + </ProjectConfiguration> + <ProjectConfiguration Include="Debug|ARM64"> + <Configuration>Debug</Configuration> + <Platform>ARM64</Platform> + </ProjectConfiguration> + <ProjectConfiguration Include="Release|ARM64"> + <Configuration>Release</Configuration> + <Platform>ARM64</Platform> + </ProjectConfiguration> + </ItemGroup> + <PropertyGroup Label="Globals"> + <ProjectGuid>{78E2A6FE-05E7-40F8-AE1E-29BC3C307859}</ProjectGuid> + <TemplateGuid>{dd38f7fc-d7bd-488b-9242-7d8754cde80d}</TemplateGuid> + <TargetFrameworkVersion>v4.5</TargetFrameworkVersion> + <MinimumVisualStudioVersion>12.0</MinimumVisualStudioVersion> + <Configuration>Debug</Configuration> + <Platform Condition="'$(Platform)' == ''">Win32</Platform> + <RootNamespace>nfs41_driver</RootNamespace> + </PropertyGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> + <TargetVersion>Windows10</TargetVersion> + <UseDebugLibraries>true</UseDebugLibraries> + <PlatformToolset>WindowsKernelModeDriver10.0</PlatformToolset> + <ConfigurationType>Driver</ConfigurationType> + <DriverType>WDM</DriverType> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> + <TargetVersion>Windows10</TargetVersion> + <UseDebugLibraries>false</UseDebugLibraries> + <PlatformToolset>WindowsKernelModeDriver10.0</PlatformToolset> + <ConfigurationType>Driver</ConfigurationType> + <DriverType>WDM</DriverType> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration"> + <TargetVersion>Windows10</TargetVersion> + <UseDebugLibraries>true</UseDebugLibraries> + <PlatformToolset>WindowsKernelModeDriver10.0</PlatformToolset> + <ConfigurationType>Driver</ConfigurationType> + <DriverType>WDM</DriverType> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration"> + <TargetVersion>Windows10</TargetVersion> + <UseDebugLibraries>false</UseDebugLibraries> + <PlatformToolset>WindowsKernelModeDriver10.0</PlatformToolset> + <ConfigurationType>Driver</ConfigurationType> + <DriverType>WDM</DriverType> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'" Label="Configuration"> + <TargetVersion>Windows10</TargetVersion> + <UseDebugLibraries>true</UseDebugLibraries> + <PlatformToolset>WindowsKernelModeDriver10.0</PlatformToolset> + <ConfigurationType>Driver</ConfigurationType> + <DriverType>WDM</DriverType> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'" Label="Configuration"> + <TargetVersion>Windows10</TargetVersion> + <UseDebugLibraries>false</UseDebugLibraries> + <PlatformToolset>WindowsKernelModeDriver10.0</PlatformToolset> + <ConfigurationType>Driver</ConfigurationType> + <DriverType>WDM</DriverType> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'" Label="Configuration"> + <TargetVersion>Windows10</TargetVersion> + <UseDebugLibraries>true</UseDebugLibraries> + <PlatformToolset>WindowsKernelModeDriver10.0</PlatformToolset> + <ConfigurationType>Driver</ConfigurationType> + <DriverType>WDM</DriverType> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'" Label="Configuration"> + <TargetVersion>Windows10</TargetVersion> + <UseDebugLibraries>false</UseDebugLibraries> + <PlatformToolset>WindowsKernelModeDriver10.0</PlatformToolset> + <ConfigurationType>Driver</ConfigurationType> + <DriverType>WDM</DriverType> + </PropertyGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> + <ImportGroup Label="ExtensionSettings"> + </ImportGroup> + <ImportGroup Label="PropertySheets"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + </ImportGroup> + <PropertyGroup Label="UserMacros" /> + <PropertyGroup /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> + <DebuggerFlavor>DbgengKernelDebugger</DebuggerFlavor> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> + <DebuggerFlavor>DbgengKernelDebugger</DebuggerFlavor> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> + <DebuggerFlavor>DbgengKernelDebugger</DebuggerFlavor> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> + <DebuggerFlavor>DbgengKernelDebugger</DebuggerFlavor> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'"> + <DebuggerFlavor>DbgengKernelDebugger</DebuggerFlavor> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'"> + <DebuggerFlavor>DbgengKernelDebugger</DebuggerFlavor> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'"> + <DebuggerFlavor>DbgengKernelDebugger</DebuggerFlavor> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'"> + <DebuggerFlavor>DbgengKernelDebugger</DebuggerFlavor> + </PropertyGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'"> + <ClCompile> + <AdditionalIncludeDirectories>..\..\dll;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <WarningLevel>Level3</WarningLevel> + <PreprocessorDefinitions>EXPLODE_POOLTAGS;MONOLITHIC_MINIRDR;%(PreprocessorDefinitions)</PreprocessorDefinitions> + </ClCompile> + <Link> + <AdditionalDependencies>$(WindowsSdkDir)lib\win7\km\$(DDKPlatform)\ntoskrnl.lib;$(WindowsSdkDir)lib\win7\km\$(DDKPlatform)\hal.lib;$(WindowsSdkDir)lib\win7\km\$(DDKPlatform)\bufferoverflowk.lib;$(WindowsSdkDir)lib\win7\km\$(DDKPlatform)\ksecdd.lib;$(WindowsSdkDir)lib\win7\km\$(DDKPlatform)\rxce.lib;$(WindowsSdkDir)lib\win7\km\$(DDKPlatform)\rdbsslib.lib;$(WindowsSdkDir)lib\win7\km\$(DDKPlatform)\copysup.lib</AdditionalDependencies> + </Link> + </ItemDefinitionGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'"> + <ClCompile> + <AdditionalIncludeDirectories>..\..\dll;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <WarningLevel>Level3</WarningLevel> + <PreprocessorDefinitions>EXPLODE_POOLTAGS;MONOLITHIC_MINIRDR;%(PreprocessorDefinitions)</PreprocessorDefinitions> + </ClCompile> + <Link> + <AdditionalDependencies>$(WindowsSdkDir)lib\win7\km\$(DDKPlatform)\ntoskrnl.lib;$(WindowsSdkDir)lib\win7\km\$(DDKPlatform)\hal.lib;$(WindowsSdkDir)lib\win7\km\$(DDKPlatform)\bufferoverflowk.lib;$(WindowsSdkDir)lib\win7\km\$(DDKPlatform)\ksecdd.lib;$(WindowsSdkDir)lib\win7\km\$(DDKPlatform)\rxce.lib;$(WindowsSdkDir)lib\win7\km\$(DDKPlatform)\rdbsslib.lib;$(WindowsSdkDir)lib\win7\km\$(DDKPlatform)\copysup.lib</AdditionalDependencies> + </Link> + </ItemDefinitionGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> + <ClCompile> + <AdditionalIncludeDirectories>..\..\dll;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <WarningLevel>Level3</WarningLevel> + <PreprocessorDefinitions>EXPLODE_POOLTAGS;MONOLITHIC_MINIRDR;%(PreprocessorDefinitions)</PreprocessorDefinitions> + </ClCompile> + <Link> + <AdditionalDependencies>$(WindowsSdkDir)lib\win7\km\$(DDKPlatform)\ntoskrnl.lib;$(WindowsSdkDir)lib\win7\km\$(DDKPlatform)\hal.lib;$(WindowsSdkDir)lib\win7\km\$(DDKPlatform)\bufferoverflowk.lib;$(WindowsSdkDir)lib\win7\km\$(DDKPlatform)\ksecdd.lib;$(WindowsSdkDir)lib\win7\km\$(DDKPlatform)\rxce.lib;$(WindowsSdkDir)lib\win7\km\$(DDKPlatform)\rdbsslib.lib;$(WindowsSdkDir)lib\win7\km\$(DDKPlatform)\copysup.lib</AdditionalDependencies> + </Link> + </ItemDefinitionGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> + <ClCompile> + <AdditionalIncludeDirectories>..\..\dll;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <WarningLevel>Level3</WarningLevel> + <PreprocessorDefinitions>EXPLODE_POOLTAGS;MONOLITHIC_MINIRDR;%(PreprocessorDefinitions)</PreprocessorDefinitions> + </ClCompile> + <Link> + <AdditionalDependencies>$(WindowsSdkDir)lib\win7\km\$(DDKPlatform)\ntoskrnl.lib;$(WindowsSdkDir)lib\win7\km\$(DDKPlatform)\hal.lib;$(WindowsSdkDir)lib\win7\km\$(DDKPlatform)\bufferoverflowk.lib;$(WindowsSdkDir)lib\win7\km\$(DDKPlatform)\ksecdd.lib;$(WindowsSdkDir)lib\win7\km\$(DDKPlatform)\rxce.lib;$(WindowsSdkDir)lib\win7\km\$(DDKPlatform)\rdbsslib.lib;$(WindowsSdkDir)lib\win7\km\$(DDKPlatform)\copysup.lib</AdditionalDependencies> + </Link> + </ItemDefinitionGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'"> + <ClCompile> + <AdditionalIncludeDirectories>..\..\dll;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <WarningLevel>Level3</WarningLevel> + <PreprocessorDefinitions>EXPLODE_POOLTAGS;MONOLITHIC_MINIRDR;%(PreprocessorDefinitions)</PreprocessorDefinitions> + </ClCompile> + <Link> + <AdditionalDependencies>$(WindowsSdkDir)lib\win7\km\$(DDKPlatform)\ntoskrnl.lib;$(WindowsSdkDir)lib\win7\km\$(DDKPlatform)\hal.lib;$(WindowsSdkDir)lib\win7\km\$(DDKPlatform)\bufferoverflowk.lib;$(WindowsSdkDir)lib\win7\km\$(DDKPlatform)\ksecdd.lib;$(WindowsSdkDir)lib\win7\km\$(DDKPlatform)\rxce.lib;$(WindowsSdkDir)lib\win7\km\$(DDKPlatform)\rdbsslib.lib;$(WindowsSdkDir)lib\win7\km\$(DDKPlatform)\copysup.lib</AdditionalDependencies> + </Link> + </ItemDefinitionGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'"> + <ClCompile> + <AdditionalIncludeDirectories>..\..\dll;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <WarningLevel>Level3</WarningLevel> + <PreprocessorDefinitions>EXPLODE_POOLTAGS;MONOLITHIC_MINIRDR;%(PreprocessorDefinitions)</PreprocessorDefinitions> + </ClCompile> + <Link> + <AdditionalDependencies>$(WindowsSdkDir)lib\win7\km\$(DDKPlatform)\ntoskrnl.lib;$(WindowsSdkDir)lib\win7\km\$(DDKPlatform)\hal.lib;$(WindowsSdkDir)lib\win7\km\$(DDKPlatform)\bufferoverflowk.lib;$(WindowsSdkDir)lib\win7\km\$(DDKPlatform)\ksecdd.lib;$(WindowsSdkDir)lib\win7\km\$(DDKPlatform)\rxce.lib;$(WindowsSdkDir)lib\win7\km\$(DDKPlatform)\rdbsslib.lib;$(WindowsSdkDir)lib\win7\km\$(DDKPlatform)\copysup.lib</AdditionalDependencies> + </Link> + </ItemDefinitionGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> + <ClCompile> + <AdditionalIncludeDirectories>..\..\dll;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <WarningLevel>Level3</WarningLevel> + <PreprocessorDefinitions>EXPLODE_POOLTAGS;MONOLITHIC_MINIRDR;%(PreprocessorDefinitions)</PreprocessorDefinitions> + </ClCompile> + <Link> + <AdditionalDependencies>$(WindowsSdkDir)lib\win7\km\$(DDKPlatform)\ntoskrnl.lib;$(WindowsSdkDir)lib\win7\km\$(DDKPlatform)\hal.lib;$(WindowsSdkDir)lib\win7\km\$(DDKPlatform)\bufferoverflowk.lib;$(WindowsSdkDir)lib\win7\km\$(DDKPlatform)\ksecdd.lib;$(WindowsSdkDir)lib\win7\km\$(DDKPlatform)\rxce.lib;$(WindowsSdkDir)lib\win7\km\$(DDKPlatform)\rdbsslib.lib;$(WindowsSdkDir)lib\win7\km\$(DDKPlatform)\copysup.lib</AdditionalDependencies> + </Link> + </ItemDefinitionGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> + <ClCompile> + <AdditionalIncludeDirectories>..\..\dll;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <WarningLevel>Level3</WarningLevel> + <PreprocessorDefinitions>EXPLODE_POOLTAGS;MONOLITHIC_MINIRDR;%(PreprocessorDefinitions)</PreprocessorDefinitions> + </ClCompile> + <Link> + <AdditionalDependencies>$(WindowsSdkDir)lib\win7\km\$(DDKPlatform)\ntoskrnl.lib;$(WindowsSdkDir)lib\win7\km\$(DDKPlatform)\hal.lib;$(WindowsSdkDir)lib\win7\km\$(DDKPlatform)\bufferoverflowk.lib;$(WindowsSdkDir)lib\win7\km\$(DDKPlatform)\ksecdd.lib;$(WindowsSdkDir)lib\win7\km\$(DDKPlatform)\rxce.lib;$(WindowsSdkDir)lib\win7\km\$(DDKPlatform)\rdbsslib.lib;$(WindowsSdkDir)lib\win7\km\$(DDKPlatform)\copysup.lib</AdditionalDependencies> + </Link> + </ItemDefinitionGroup> + <ItemGroup> + <FilesToPackage Include="$(TargetPath)" /> + </ItemGroup> + <ItemGroup> + <ClCompile Include="..\..\sys\nfs41_debug.c" /> + <ClCompile Include="..\..\sys\nfs41_driver.c" /> + <ClCompile Include="..\..\sys\wmlkm.c" /> + </ItemGroup> + <ItemGroup> + <ClInclude Include="..\..\sys\nfs41_debug.h" /> + <ClInclude Include="..\..\sys\nfs41_driver.h" /> + <ClInclude Include="..\..\sys\wmlkm.h" /> + </ItemGroup> + <ItemGroup> + <ResourceCompile Include="..\..\sys\nfs41_driver.rc" /> + </ItemGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> + <ImportGroup Label="ExtensionTargets"> + </ImportGroup> </Project> \ No newline at end of file diff --git a/build.vc15/nfs41_driver/nfs41_driver.vcxproj.filters b/build.vc15/nfs41_driver/nfs41_driver.vcxproj.filters index 0c2ccad..4b93149 100644 --- a/build.vc15/nfs41_driver/nfs41_driver.vcxproj.filters +++ b/build.vc15/nfs41_driver/nfs41_driver.vcxproj.filters @@ -1,48 +1,48 @@ -<?xml version="1.0" encoding="utf-8"?> -<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <ItemGroup> - <Filter Include="Source Files"> - <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier> - <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions> - </Filter> - <Filter Include="Header Files"> - <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier> - <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions> - </Filter> - <Filter Include="Resource Files"> - <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier> - <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions> - </Filter> - <Filter Include="Driver Files"> - <UniqueIdentifier>{8E41214B-6785-4CFE-B992-037D68949A14}</UniqueIdentifier> - <Extensions>inf;inv;inx;mof;mc;</Extensions> - </Filter> - </ItemGroup> - <ItemGroup> - <ClCompile Include="..\..\sys\nfs41_debug.c"> - <Filter>Source Files</Filter> - </ClCompile> - <ClCompile Include="..\..\sys\nfs41_driver.c"> - <Filter>Source Files</Filter> - </ClCompile> - <ClCompile Include="..\..\sys\wmlkm.c"> - <Filter>Source Files</Filter> - </ClCompile> - </ItemGroup> - <ItemGroup> - <ClInclude Include="..\..\sys\nfs41_debug.h"> - <Filter>Header Files</Filter> - </ClInclude> - <ClInclude Include="..\..\sys\nfs41_driver.h"> - <Filter>Header Files</Filter> - </ClInclude> - <ClInclude Include="..\..\sys\wmlkm.h"> - <Filter>Header Files</Filter> - </ClInclude> - </ItemGroup> - <ItemGroup> - <ResourceCompile Include="..\..\sys\nfs41_driver.rc"> - <Filter>Resource Files</Filter> - </ResourceCompile> - </ItemGroup> +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <ItemGroup> + <Filter Include="Source Files"> + <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier> + <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions> + </Filter> + <Filter Include="Header Files"> + <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier> + <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions> + </Filter> + <Filter Include="Resource Files"> + <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier> + <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions> + </Filter> + <Filter Include="Driver Files"> + <UniqueIdentifier>{8E41214B-6785-4CFE-B992-037D68949A14}</UniqueIdentifier> + <Extensions>inf;inv;inx;mof;mc;</Extensions> + </Filter> + </ItemGroup> + <ItemGroup> + <ClCompile Include="..\..\sys\nfs41_debug.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\sys\nfs41_driver.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\sys\wmlkm.c"> + <Filter>Source Files</Filter> + </ClCompile> + </ItemGroup> + <ItemGroup> + <ClInclude Include="..\..\sys\nfs41_debug.h"> + <Filter>Header Files</Filter> + </ClInclude> + <ClInclude Include="..\..\sys\nfs41_driver.h"> + <Filter>Header Files</Filter> + </ClInclude> + <ClInclude Include="..\..\sys\wmlkm.h"> + <Filter>Header Files</Filter> + </ClInclude> + </ItemGroup> + <ItemGroup> + <ResourceCompile Include="..\..\sys\nfs41_driver.rc"> + <Filter>Resource Files</Filter> + </ResourceCompile> + </ItemGroup> </Project> \ No newline at end of file diff --git a/daemon/from_kernel.h b/daemon/from_kernel.h index c14c398..7f74ca2 100644 --- a/daemon/from_kernel.h +++ b/daemon/from_kernel.h @@ -152,6 +152,8 @@ typedef struct _FILE_BOTH_DIR_INFORMATION { WCHAR FileName[1]; } FILE_BOTH_DIR_INFORMATION, *PFILE_BOTH_DIR_INFORMATION; +#if (NTDDI_VERSION <= NTDDI_WIN7) + typedef struct _FILE_FULL_DIR_INFO { ULONG NextEntryOffset; ULONG FileIndex; @@ -167,6 +169,8 @@ typedef struct _FILE_FULL_DIR_INFO { WCHAR FileName[1]; } FILE_FULL_DIR_INFO, *PFILE_FULL_DIR_INFO; +#endif // NTDDI_VERSION <= NTDDI_WIN7 + typedef struct _FILE_ID_FULL_DIR_INFO { ULONG NextEntryOffset; ULONG FileIndex; diff --git a/daemon/idmap.c b/daemon/idmap.c index f38ec71..0dfa8ef 100644 --- a/daemon/idmap.c +++ b/daemon/idmap.c @@ -275,7 +275,7 @@ static int config_find_option( /* find the config_option by key */ for (i = 0; i < count; i++) { - if (stricmp(pair->key, g_options[i].key) == 0) { + if (_stricmp(pair->key, g_options[i].key) == 0) { *option = &g_options[i]; status = NO_ERROR; break; diff --git a/daemon/makefile b/daemon/makefile deleted file mode 100644 index 66f1c8e..0000000 --- a/daemon/makefile +++ /dev/null @@ -1,8 +0,0 @@ -# -# DO NOT EDIT THIS FILE!!! Edit .\sources. if you want to add a new source -# file to this component. This file merely indirects to the real make file -# that is shared by all the driver components of the Windows NT DDK -# - -!INCLUDE $(NTMAKEENV)\makefile.def - diff --git a/daemon/nfs41_compound.c b/daemon/nfs41_compound.c index f7e3d65..498d588 100644 --- a/daemon/nfs41_compound.c +++ b/daemon/nfs41_compound.c @@ -362,7 +362,7 @@ retry: saved_sec_flavor = session->client->rpc->sec_flavor; saved_auth = session->client->rpc->rpc->cl_auth; if (op == OP_LOOKUP || op == OP_OPEN) { - const nfs41_component *name; + const nfs41_component *name = 0; nfs41_path_fh tmp = { 0 }; nfs41_getfh_res *getfh; nfs41_lookup_args *largs; diff --git a/daemon/sources b/daemon/sources deleted file mode 100644 index d39e36a..0000000 --- a/daemon/sources +++ /dev/null @@ -1,32 +0,0 @@ -TARGETTYPE=PROGRAM -TARGETNAME=nfsd -SOURCES=nfs41_daemon.c daemon_debug.c nfs41_ops.c nfs41_compound.c nfs41_xdr.c \ - nfs41_server.c nfs41_client.c nfs41_superblock.c nfs41_session.c lookup.c \ - mount.c open.c readwrite.c lock.c readdir.c getattr.c setattr.c upcall.c \ - nfs41_rpc.c util.c pnfs_layout.c pnfs_device.c pnfs_debug.c pnfs_io.c \ - name_cache.c namespace.c rbtree.c volume.c callback_server.c callback_xdr.c \ - service.c symlink.c idmap.c -UMTYPE=console -USE_LIBCMT=1 -#USE_MSVCRT=1 -C_DEFINES=-DSTANDALONE_NFSD #-- use this for non-service nfsd -INCLUDES=..\sys;..\dll;..\libtirpc\tirpc -# Use the following for "service" version of nfsd -#TARGETLIBS=$(SDK_LIB_PATH)\ws2_32.lib $(SDK_LIB_PATH)\iphlpapi.lib \ -# ..\libtirpc\src\obj$(BUILD_ALT_DIR)\*\libtirpc.lib \ -# $(SDK_LIB_PATH)\kernel32.lib \ -# $(SDK_LIB_PATH)\advapi32.lib \ -# $(SDK_LIB_PATH)\shell32.lib -TARGETLIBS=$(SDK_LIB_PATH)\ws2_32.lib $(SDK_LIB_PATH)\iphlpapi.lib \ - ..\libtirpc\src\obj$(BUILD_ALT_DIR)\*\libtirpc.lib - -!IF 0 -/W3 is default level -bump to /Wall, but suppress warnings generated by system includes, -as well as the following warnings: -4100 - unused function call arguments (we have lots of stubs) -4127 - constant conditional (I like to use if(0) or if(1)) -4220 - varargs matching remaining parameters -4204 - nonstandard extension -!ENDIF -MSC_WARNING_LEVEL=/Wall /wd4668 /wd4619 /wd4820 /wd4255 /wd4100 /wd4127 /wd4711 /wd4220 /wd4204 diff --git a/dirs b/dirs index ae5014a..b50059f 100644 --- a/dirs +++ b/dirs @@ -1 +1 @@ -DIRS = dll sys mount install +DIRS = dll sys mount install libtirpc daemon diff --git a/etc_netconfig b/etc_netconfig deleted file mode 100644 index effc67e..0000000 --- a/etc_netconfig +++ /dev/null @@ -1,19 +0,0 @@ -# -# The network configuration file. This file is currently only used in -# conjunction with the TI-RPC code in the libtirpc library. -# -# Entries consist of: -# -# <network_id> <semantics> <flags> <protofamily> <protoname> \ -# <device> <nametoaddr_libs> -# -# The <device> and <nametoaddr_libs> fields are always empty in this -# implementation. -# -udp tpi_clts v inet udp - - -tcp tpi_cots_ord v inet tcp - - -udp6 tpi_clts v inet6 udp - - -tcp6 tpi_cots_ord v inet6 tcp - - -rawip tpi_raw - inet - - - -local tpi_cots_ord - loopback - - - -unix tpi_cots_ord - loopback - - - diff --git a/install.bat b/install.bat deleted file mode 100644 index cd79372..0000000 --- a/install.bat +++ /dev/null @@ -1,2 +0,0 @@ -nfs_install.exe -rundll32.exe setupapi.dll,InstallHinfSection DefaultInstall 132 ./nfs41rdr.inf diff --git a/install/sources b/install/sources index d5bc6c2..71c5e6b 100644 --- a/install/sources +++ b/install/sources @@ -1,15 +1,15 @@ -TARGETTYPE=PROGRAM -TARGETNAME=nfs_install -SOURCES=nfs_install.c nfsreginst.c -UMTYPE=console -USE_MSVCRT=1 -INCLUDES=..\sys - -!IF 0 -/W3 is default level -bump to /Wall, but suppress warnings generated by system includes, -as well as the following warnings: -4100 - unused function call arguments (we have lots of stubs) -4127 - constant conditional (I like to use if(0) or if(1)) -!ENDIF -MSC_WARNING_LEVEL=/Wall /wd4668 /wd4619 /wd4820 /wd4255 /wd4100 /wd4127 /wd4201 /wd4214 /wd4711 +TARGETTYPE=PROGRAM +TARGETNAME=nfs_install +SOURCES=nfs_install.c nfsreginst.c +UMTYPE=console +USE_MSVCRT=1 +INCLUDES=..\sys + +!IF 0 +/W3 is default level +bump to /Wall, but suppress warnings generated by system includes, +as well as the following warnings: +4100 - unused function call arguments (we have lots of stubs) +4127 - constant conditional (I like to use if(0) or if(1)) +!ENDIF +MSC_WARNING_LEVEL=/Wall /wd4668 /wd4619 /wd4820 /wd4255 /wd4100 /wd4127 /wd4201 /wd4214 /wd4711 diff --git a/libtirpc/src/auth_unix.c b/libtirpc/src/auth_unix.c index 4757aaa..ca8c908 100644 --- a/libtirpc/src/auth_unix.c +++ b/libtirpc/src/auth_unix.c @@ -375,8 +375,14 @@ marshal_new_auth(auth) XDR_DESTROY(xdrs); } -static bool_t -authunix_wrap(AUTH *auth, XDR *xdrs, xdrproc_t func, caddr_t args, u_int seq) +static int +authunix_wrap(struct __auth *auth, XDR *xdrs, xdrproc_t func, caddr_t args) +{ + return ((*func)(xdrs, args)); +} + +static int +authunix_unwrap(struct __auth *auth, XDR *xdrs, xdrproc_t func, caddr_t args, u_int seq) { return ((*func)(xdrs, args)); } @@ -397,7 +403,7 @@ authunix_ops() ops.ah_refresh = authunix_refresh; ops.ah_destroy = authunix_destroy; ops.ah_wrap = authunix_wrap; - ops.ah_unwrap = authunix_wrap; + ops.ah_unwrap = authunix_unwrap; } mutex_unlock(&ops_lock); return (&ops); diff --git a/libtirpc/src/clnt_dg.c b/libtirpc/src/clnt_dg.c index a567b22..6ec6169 100644 --- a/libtirpc/src/clnt_dg.c +++ b/libtirpc/src/clnt_dg.c @@ -55,6 +55,7 @@ //#include <err.h> #include "rpc_com.h" +#undef IP_RECVERR #ifdef IP_RECVERR #include <asm/types.h> #include <linux/errqueue.h> diff --git a/libtirpc/src/sources b/libtirpc/src/sources index 80a6ae2..87249b5 100644 --- a/libtirpc/src/sources +++ b/libtirpc/src/sources @@ -81,7 +81,7 @@ DLLBASE=0x1010000 #USE_NTDLL=1 #USE_MSVCRT=1 USE_LIBCMT=1 -NET_C_DEFINES=-DUNICODE -DINET6 -D_WIN32 -DPORTMAP +NET_C_DEFINES=-DUNICODE -DFD_SETSIZE=128 -DINET6 -DNO_CB_4_KRB5P -DPORTMAP INCLUDES=..\sys; \ ..\tirpc; \ @@ -90,6 +90,7 @@ INCLUDES=..\sys; \ TARGETLIBS=$(SDK_LIB_PATH)\user32.lib \ $(SDK_LIB_PATH)\kernel32.lib \ $(SDK_LIB_PATH)\ws2_32.lib \ + $(SDK_LIB_PATH)\secur32.lib \ $(SDK_LIB_PATH)\Advapi32.lib diff --git a/libtirpc/src/xdr_rec.c b/libtirpc/src/xdr_rec.c index cd8e987..fa779b6 100644 --- a/libtirpc/src/xdr_rec.c +++ b/libtirpc/src/xdr_rec.c @@ -421,7 +421,7 @@ xdrrec_getoutbase(xdrs) switch (xdrs->x_op) { case XDR_ENCODE: - buf = rstrm->out_base; + buf = (int32_t *) rstrm->out_base; break; case XDR_DECODE: diff --git a/libtirpc/tirpc/wintirpc.h b/libtirpc/tirpc/wintirpc.h index a2ed188..ba277b4 100644 --- a/libtirpc/tirpc/wintirpc.h +++ b/libtirpc/tirpc/wintirpc.h @@ -45,10 +45,14 @@ #include <process.h> #include <basetsd.h> +#if (NTDDI_VERSION <= NTDDI_WIN7) #define snprintf _snprintf +#endif // NTDDI_VERSION <= NTDDI_WIN7 //#define vsnprintf _vsnprintf #define strcasecmp _stricmp -//#define strdup _strdup +#if (NTDDI_VERSION <= NTDDI_WIN7) +#define strdup _strdup +#endif // NTDDI_VERSION <= NTDDI_WIN7 #define getpid _getpid #define bcmp memcmp diff --git a/ms-nfs41-idmap.conf b/ms-nfs41-idmap.conf deleted file mode 100644 index 2fe1ff3..0000000 --- a/ms-nfs41-idmap.conf +++ /dev/null @@ -1,20 +0,0 @@ -# ldap server information -#ldap_hostname="localhost" -#ldap_port="389" -#ldap_version="3" -#ldap_timeout="5" - -# ldap schema information -#ldap_base="cn=localhost" - -#ldap_class_users="user" -#ldap_class_groups="group" - -#ldap_attr_username="cn" -#ldap_attr_groupname="cn" -#ldap_attr_gssAuthName="gssAuthName" -#ldap_attr_uidNumber="uidNumber" -#ldap_attr_gidNumber="gidNumber" - -# caching configuration -#cache_ttl="60" diff --git a/nfs41rdr.inf b/nfs41rdr.inf deleted file mode 100644 index 02ee912..0000000 --- a/nfs41rdr.inf +++ /dev/null @@ -1,63 +0,0 @@ -[Version] -Signature="$CHICAGO$" -DriverVer=05/27/2009,1.0 -ClassGUID={00000000-0000-0000-0000-000000000000} -;Its possible that we should be using: -;Class=NetService -;ClassGUID={4d36e974-e325-11ce-bfc1-08002be10318} -CatalogFile=catalogfile.cat -Provider=%ProviderName% - -[SourceDisksNames] -1=%Disk% - -[SourceDisksFiles] -nfs41_driver.sys=1, -nfs41_np.dll=1, - -[DestinationDirs] -DefaultDestDir=10 ;%windir% -nfs41_driver.sysfile=12 ;%windir%\system32\drivers -nfs41_driver.dllfile=11 ;%windir%\system32 - -[DefaultInstall] -CopyFiles=nfs41_driver.sysfile,nfs41_driver.dllfile -AddReg=nfs41_np.AddReg - -[DefaultInstall.Services] -AddService=%Nfs41RdrServiceName%,,nfs41rdr.Service - -[DefaultUninstall] -DelFiles=nfs41_driver.sysfile,nfs41_driver.dllfile -DelReg=nfs41_driver.DelReg - -[DefaultUninstall.Services] -DelService=%Nfs41RdrServiceName% - -[nfs41_driver.sysfile] -nfs41_driver.sys - -[nfs41_driver.dllfile] -nfs41_np.dll - -[nfs41rdr.Service] -DisplayName=%Nfs41RdrServiceName% -Description=%Nfs41RdrServiceName% -ServiceType=0x00000002 ;SERVICE_FILE_SYSTEM_DRIVER -StartType=0x00000001 ;SERVICE_SYSTEM_START -ErrorControl=0x00000001 ;SERVICE_ERROR_NORMAL -ServiceBinary=%12%\nfs41_driver.sys -LoadOrderGroup=Network - -[nfs41_np.AddReg] -HKLM,SYSTEM\CurrentControlSet\Services\nfs41_driver\NetworkProvider,DeviceName,,\Device\nfs41_driver -HKLM,SYSTEM\CurrentControlSet\Services\nfs41_driver\NetworkProvider,Name,,"NFS41 Network" -HKLM,SYSTEM\CurrentControlSet\Services\nfs41_driver\NetworkProvider,ProviderPath,,System32\nfs41_np.dll - -[nfs41_driver.DelReg] -HKLM,SYSTEM\CurrentControlSet\Services\nfs41_driver - -[Strings] -Nfs41RdrServiceName="nfs41_driver" -Disk="Source files" -ProviderName="NFS41 Provider" diff --git a/sys/nfs41_driver.c b/sys/nfs41_driver.c index 187894d..72b045f 100644 --- a/sys/nfs41_driver.c +++ b/sys/nfs41_driver.c @@ -486,6 +486,118 @@ void print_debug_header( print_irp_flags(0, RxContext->CurrentIrp); } +#if (NTDDI_VERSION < NTDDI_WIN7) + +NTSTATUS WINAPI RtlUnicodeToUTF8N(CHAR *utf8_dest, ULONG utf8_bytes_max, + ULONG *utf8_bytes_written, + const WCHAR *uni_src, ULONG uni_bytes) +{ + NTSTATUS status; + ULONG i; + ULONG written; + ULONG ch; + BYTE utf8_ch[4]; + ULONG utf8_ch_len = 0; + + if (!uni_src) + return STATUS_INVALID_PARAMETER_4; + if (!utf8_bytes_written) + return STATUS_INVALID_PARAMETER; + if (utf8_dest && uni_bytes % sizeof(WCHAR)) + return STATUS_INVALID_PARAMETER_5; + + written = 0; + status = STATUS_SUCCESS; + + for (i = 0; i < uni_bytes / sizeof(WCHAR); i++) + { + /* decode UTF-16 into ch */ + ch = uni_src[i]; + if (ch >= 0xdc00 && ch <= 0xdfff) + { + ch = 0xfffd; + status = STATUS_SOME_NOT_MAPPED; + } + else if (ch >= 0xd800 && ch <= 0xdbff) + { + if (i + 1 < uni_bytes / sizeof(WCHAR)) + { + ch -= 0xd800; + ch <<= 10; + if (uni_src[i + 1] >= 0xdc00 && uni_src[i + 1] <= 0xdfff) + { + ch |= uni_src[i + 1] - 0xdc00; + ch += 0x010000; + i++; + } + else + { + ch = 0xfffd; + status = STATUS_SOME_NOT_MAPPED; + } + } + else + { + ch = 0xfffd; + status = STATUS_SOME_NOT_MAPPED; + } + } + + /* encode ch as UTF-8 */ + ASSERT(ch <= 0x10ffff); + if (ch < 0x80) + { + utf8_ch[0] = ch & 0x7f; + utf8_ch_len = 1; + } + else if (ch < 0x800) + { + utf8_ch[0] = 0xc0 | (ch >> 6 & 0x1f); + utf8_ch[1] = 0x80 | (ch >> 0 & 0x3f); + utf8_ch_len = 2; + } + else if (ch < 0x10000) + { + utf8_ch[0] = 0xe0 | (ch >> 12 & 0x0f); + utf8_ch[1] = 0x80 | (ch >> 6 & 0x3f); + utf8_ch[2] = 0x80 | (ch >> 0 & 0x3f); + utf8_ch_len = 3; + } + else if (ch < 0x200000) + { + utf8_ch[0] = 0xf0 | (ch >> 18 & 0x07); + utf8_ch[1] = 0x80 | (ch >> 12 & 0x3f); + utf8_ch[2] = 0x80 | (ch >> 6 & 0x3f); + utf8_ch[3] = 0x80 | (ch >> 0 & 0x3f); + utf8_ch_len = 4; + } + + if (!utf8_dest) + { + written += utf8_ch_len; + continue; + } + + if (utf8_bytes_max >= utf8_ch_len) + { + memcpy(utf8_dest, utf8_ch, utf8_ch_len); + utf8_dest += utf8_ch_len; + utf8_bytes_max -= utf8_ch_len; + written += utf8_ch_len; + } + else + { + utf8_bytes_max = 0; + status = STATUS_BUFFER_TOO_SMALL; + } + } + + *utf8_bytes_written = written; + return status; +} + +#endif // NTDDI_VERSION < NTDDI_WIN7 + /* convert strings from unicode -> ansi during marshalling to * save space in the upcall buffers and avoid extra copies */ INLINE ULONG length_as_utf8(

Title:

Privacy: Public Private

How long should your post be retained?

15 mins an hour a day a week a month forever

All content is user-submitted.
The administrators of this site (kpaste.net) are not responsible for their content.
Abuse reports should be emailed to us at