diff --git a/.build/CBT/CBT.Core.dll b/.build/CBT/CBT.Core.dll deleted file mode 100644 index 8098a29..0000000 Binary files a/.build/CBT/CBT.Core.dll and /dev/null differ diff --git a/.build/CBT/build.props b/.build/CBT/build.props deleted file mode 100644 index c809c84..0000000 --- a/.build/CBT/build.props +++ /dev/null @@ -1,158 +0,0 @@ - - - - - - $(MSBuildAllProjects);$(MSBuildThisFileFullPath) - - $(EnlistmentRoot.TrimEnd('\\')) - - - $(MSBuildThisFileDirectory) - $(CBTGlobalPath.TrimEnd('\\')) - - - $([System.IO.Path]::GetDirectoryName($(CBTGlobalPath)))\Local - $(CBTLocalPath.TrimEnd('\\')) - - $(CBTLocalPath)\Extensions - - Debug - $(DefaultProjectConfiguration) - $(DefaultProjectPlatform) - - - - - - $([System.IO.Path]::Combine($(CBTLocalPath), 'CBTModules', 'CBTModules.proj')) - $([System.IO.Path]::Combine($(CBTLocalPath), 'CBTModules.proj')) - $([System.IO.Path]::Combine($(CBTLocalPath), 'CBTModules', 'packages.config')) - $([System.IO.Path]::Combine($(CBTLocalPath), 'packages.config')) - $([System.IO.Path]::GetFullPath($(CBTModulePackageConfigPath))) - - - - $(MSBuildThisFileDirectory)CBT.Core.dll - $(MSBuildThisFileFullPath);$(CBTCoreAssemblyPath);$(CBTModulePackageConfigPath) - - - - - - $(MSBuildThisFileDirectory)obj - - $(CBTIntermediateOutputPath)\Modules - $(CBTModulePath)\$(MSBuildThisFile) - $(CBTModulePath)\Extensions - %24(CBTLocalBuildExtensionsPath)\%24(MSBuildThisFile) - - - $(CBTIntermediateOutputPath)\NuGet - $(CBTCoreAssemblyPath) - CBT.Core.Internal.DefaultNuGetDownloader - CBT.Core.Tasks.RestoreModules - $(CBTNuGetBinDir)\NuGet.exe - restore "$(CBTModulePackageConfigPath)" -NonInteractive - $(CBTModuleRestoreCommandArguments) $(CBTModuleRestoreCommandAdditionalArguments) - - - false - - $(CBTCoreAssemblyPath.GetType().Assembly.GetType('System.AppDomain').GetProperty('CurrentDomain').GetValue(null).SetData('CBT_CORE_ASSEMBLY', $(CBTCoreAssemblyPath.GetType().Assembly.GetType('System.AppDomain').GetProperty('CurrentDomain').GetValue(null).Load($(CBTCoreAssemblyPath.GetType().Assembly.GetType('System.IO.File').GetMethod('ReadAllBytes').Invoke(null, $([System.IO.Directory]::GetFiles($([System.IO.Path]::GetDirectoryName($(CBTCoreAssemblyPath))), $([System.IO.Path]::GetFileName($(CBTCoreAssemblyPath))))))))))) - $(CBTCoreAssemblyPath.GetType().Assembly.GetType('System.AppDomain').GetProperty('CurrentDomain').GetValue(null).GetData('CBT_CORE_ASSEMBLY')) - $(CBTCoreAssemblyPath.GetType().Assembly.GetType('System.AppDomain').GetProperty('CurrentDomain').GetValue(null).GetData('CBT_CORE_ASSEMBLY').CreateInstance($(CBTModuleRestoreTaskName)).Execute($(CBTModuleImportsAfter.Split(';')), $(CBTModuleImportsBefore.Split(';')), $(CBTModuleExtensionsPath), $(CBTModulePropertiesFile), $(CBTNuGetDownloaderAssemblyPath), $(CBTNuGetDownloaderClassName), '$(CBTNuGetDownloaderArguments)', $(CBTModuleRestoreInputs.Split(';')), $(CBTModulePackageConfigPath), $(CBTModuleRestoreCommand), $(CBTModuleRestoreCommandArguments), $(MSBuildProjectFullPath), $(MSBuildBinPath))) - - - - - - CBT1000 - - - CBT1001 - - - CBT1002 - - - - - - - - - - - - - - - - - - true - - - - - - - - - - - - $(_CurrentProjectJsonPath) - - - $(RestoreProjectStyle) - $(NuGetProjectStyle) - - - $(RestoreOutputAbsolutePath) - - - %(PackageReference.Identity) - %(PackageReference.Version) - - - - - - - - - - diff --git a/.build/Local/CBTModules/CBTModules.proj b/.build/Local/CBTModules/CBTModules.proj deleted file mode 100644 index 8a8d130..0000000 --- a/.build/Local/CBTModules/CBTModules.proj +++ /dev/null @@ -1,60 +0,0 @@ - - - - net46 - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/Directory.Build.props b/Directory.Build.props deleted file mode 100644 index a5e937a..0000000 --- a/Directory.Build.props +++ /dev/null @@ -1,165 +0,0 @@ - - - - - - $(MSBuildAllProjects);$(MSBuildThisFileFullPath) - - - $(MSBuildThisFileDirectory.TrimEnd('\\')) - $(EnlistmentRoot)\packages - - - - - - - - - - - CustomDictionary.xml - - - - False - true - 300 - false - false - - - - - true - - - - - - - - $(MSBuildExtensionsPath)\NuProj - $(CBTModule_NuProj)\tools - - false - - - - - $(EnlistmentRoot)\out\$(Configuration)-$(Platform)\ - - - - $(StagingOutputRootPath)$(MSBuildProjectName)\ - $(StagingOutputRootPath)include - 14.15.26726 - 10.0.16299.0 - v141 - Unicode - $(OutputPath) - false - - - - true - true - - - - false - false - true - - - - - Level3 - true - true - ProgramDatabase - 26439 - - - ;%(AdditionalDependencies) - Windows - - - - - - Disabled - _DEBUG;%(PreprocessorDefinitions) - MultiThreadedDebug - true - - - - - - - - MaxSpeed - NDEBUG;%(PreprocessorDefinitions) - MultiThreaded - true - - - - - - - - WIN32;%(PreprocessorDefinitions) - - - - - - - - - - - - - - - - - - - - - diff --git a/NuGet.Config b/NuGet.Config deleted file mode 100644 index 6525673..0000000 --- a/NuGet.Config +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/README.md b/README.md index bb3694b..a441aae 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,7 @@ # NetworkDirect SPI +This fork contains updates that allow building everything with Visual Studio 2022. There is no dependency on CBT (common build tools). + The NetworkDirect architecture provides application developers with a networking interface that enables zero-copy data transfers between applications, kernel-bypass I/O generation and completion processing, and one-sided data transfer operations. The NetworkDirect service provider interface (SPI) defines the interface that NetworkDirect providers implement to expose their hardware capabilities to applications. Please find additional documentation in [docs/](./docs) folder. @@ -10,22 +12,13 @@ NetworkDirect SDK is available in [Nuget](https://www.nuget.org/packages/network ## Prerequisites - - [Visial Studio 2017](https://docs.microsoft.com/visualstudio/install/install-visual-studio) + - [Visial Studio 2022](https://visualstudio.microsoft.com/vs/) Please make sure to select the following workloads during installation: - - .NET desktop development (required for CBT/Nuget packages) - Desktop development with C++ - - [Windows SDK](https://developer.microsoft.com/windows/downloads/windows-10-sdk) - - [Windows WDK](https://docs.microsoft.com/windows-hardware/drivers/download-the-wdk) - - Based on the installed VS/SDK/WDK versions, update _VCToolsVersion_ and _WindowsTargetPlatformVersion_ in Directory.Build.props - - Note that the build system uses [CommonBuildToolSet(CBT)](https://commonbuildtoolset.github.io/). You may need to unblock __CBT.core.dll__ (under .build/CBT) depending on your security configurations. Please refer to [CBT documentation](https://commonbuildtoolset.github.io/#/getting-started) for additional details. - - ## Build - To build, open a __Native Tools Command Prompt for Visual Studio__ and run ``msbuild`` from root folder. + To build, open a __Developer Command Prompt for VS 2022__ and run ``msbuild`` from src folder. # Contributing diff --git a/dirs.proj b/dirs.proj deleted file mode 100644 index 5a19bbf..0000000 --- a/dirs.proj +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/src/dirs.proj b/src/dirs.proj deleted file mode 100644 index ef6ef8e..0000000 --- a/src/dirs.proj +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - diff --git a/src/examples/dirs.proj b/src/examples/dirs.proj deleted file mode 100644 index c52dcd0..0000000 --- a/src/examples/dirs.proj +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/examples/examples.props b/src/examples/examples.props deleted file mode 100644 index ffd7cb7..0000000 --- a/src/examples/examples.props +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - ..\;..\ndtestutil\;$(OutIncludePath);%(AdditionalIncludeDirectories) - - - kernel32.lib;ws2_32.lib;uuid.lib;Iphlpapi.lib;%(AdditionalDependencies) - $(OutDir)\..\ndutil\;..\ndtestutil\;%(AdditionalLibraryDirectories) - - - ..;%(AdditionalIncludeDirectories) - - - - - examples - *.exe - - - - - {6955ed94-3b21-4835-838a-a797aff63183} - - - - - - - \ No newline at end of file diff --git a/src/examples/ndadapterinfo/NuGetAssetsLock.props b/src/examples/ndadapterinfo/NuGetAssetsLock.props deleted file mode 100644 index d69953b..0000000 --- a/src/examples/ndadapterinfo/NuGetAssetsLock.props +++ /dev/null @@ -1,22 +0,0 @@ - - - - true - - - - - [1.0.0] - imbNHw4hg7nnbLjFuagxR1oc7TJv058rCclt+DmqJrvYYKJ10R/tGuKjne1nq94y0FTM1zd4j9v9v9n5A9Va6w== - vc150/1.0.0 - vc150.1.0.0.nupkg.sha512 - - - [1.0.3] - SeyxBzNqK/4Mh0yqD7LrJKxKu7b8Bja+iJFivyUu09B45brU4gOwTYFO7hSgk6Ll+OCjl9pA5RZYmtyy2aU0DA== - wk10/1.0.3 - wk10.1.0.3.nupkg.sha512 - - - - \ No newline at end of file diff --git a/src/examples/ndadapterinfo/ndadapterinfo.cpp b/src/examples/ndadapterinfo/ndadapterinfo.cpp index a36a26f..6131d10 100644 --- a/src/examples/ndadapterinfo/ndadapterinfo.cpp +++ b/src/examples/ndadapterinfo/ndadapterinfo.cpp @@ -8,6 +8,9 @@ // valid NetworkDirect addresses. If there are no addresses the test // generates an error. +#define WIN32_LEAN_AND_MEAN +#include +#include #include "ndcommon.h" #include #include diff --git a/src/examples/ndadapterinfo/ndadapterinfo.vcxproj b/src/examples/ndadapterinfo/ndadapterinfo.vcxproj index 21b47a0..5215d45 100644 --- a/src/examples/ndadapterinfo/ndadapterinfo.vcxproj +++ b/src/examples/ndadapterinfo/ndadapterinfo.vcxproj @@ -1,27 +1,154 @@ - - + + + + Debug + Win32 + + + Release + Win32 + + + Debug + x64 + + + Release + x64 + + - 15.0 - {8D8C0B5F-A47C-46BE-A3D4-54E39F0F88B8} + 16.0 Win32Proj + {f8bb9b41-cd6b-4c1c-84c1-68d200b19952} ndadapterinfo + 10.0 - + + Application + true + v143 + Unicode + + + Application + false + v143 + true + Unicode + + Application + true + v143 + Unicode + Static + + + Application + false + v143 + true + Unicode + Static - + + + + + - + + + + + + + + + + + + + Level3 + true + WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + MultiThreadedDebug + ..\;..\ndtestutil;..\..\ndutil;%(AdditionalIncludeDirectories) + + + Console + true + ..\..\$(Platform)\$(Configuration)\ndutil.lib;..\..\$(Platform)\$(Configuration)\ndtestutil.lib;uuid.lib;Ws2_32.lib;$(CoreLibraryDependencies);%(AdditionalDependencies) + + + ..\ + + + - _CONSOLE;%(PreprocessorDefinitions) + Level3 + true + true + true + WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + MultiThreaded + ..\;..\ndtestutil;..\..\ndutil;%(AdditionalIncludeDirectories) Console + true + true + true + ..\..\$(Platform)\$(Configuration)\ndutil.lib;..\..\$(Platform)\$(Configuration)\ndtestutil.lib;uuid.lib;Ws2_32.lib;$(CoreLibraryDependencies);%(AdditionalDependencies) + + ..\ + + + + + Level3 + true + _DEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + ..\;..\ndtestutil;..\..\ndutil;%(AdditionalIncludeDirectories) + + + Console + true + ..\..\$(Platform)\$(Configuration)\ndutil.lib;..\..\$(Platform)\$(Configuration)\ndtestutil.lib;uuid.lib;Ws2_32.lib;$(CoreLibraryDependencies);%(AdditionalDependencies) + + + ..\ + + + + + Level3 + true + true + true + NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + ..\;..\ndtestutil;..\..\ndutil;%(AdditionalIncludeDirectories) + + + Console + true + true + true + ..\..\$(Platform)\$(Configuration)\ndutil.lib;..\..\$(Platform)\$(Configuration)\ndtestutil.lib;uuid.lib;Ws2_32.lib;$(CoreLibraryDependencies);%(AdditionalDependencies) + + + ..\ + @@ -30,4 +157,6 @@ + + \ No newline at end of file diff --git a/src/examples/ndadapterinfo/ndadapterinfo.vcxproj.filters b/src/examples/ndadapterinfo/ndadapterinfo.vcxproj.filters new file mode 100644 index 0000000..18e827e --- /dev/null +++ b/src/examples/ndadapterinfo/ndadapterinfo.vcxproj.filters @@ -0,0 +1,27 @@ + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cc;cxx;c++;cppm;ixx;def;odl;idl;hpj;bat;asm;asmx + + + {93995380-89BD-4b04-88EB-625FBE52EBFB} + h;hh;hpp;hxx;h++;hm;inl;inc;ipp;xsd + + + {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} + rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms + + + + + Source Files + + + + + Resource Files + + + \ No newline at end of file diff --git a/src/examples/ndcat/NuGetAssetsLock.props b/src/examples/ndcat/NuGetAssetsLock.props deleted file mode 100644 index d69953b..0000000 --- a/src/examples/ndcat/NuGetAssetsLock.props +++ /dev/null @@ -1,22 +0,0 @@ - - - - true - - - - - [1.0.0] - imbNHw4hg7nnbLjFuagxR1oc7TJv058rCclt+DmqJrvYYKJ10R/tGuKjne1nq94y0FTM1zd4j9v9v9n5A9Va6w== - vc150/1.0.0 - vc150.1.0.0.nupkg.sha512 - - - [1.0.3] - SeyxBzNqK/4Mh0yqD7LrJKxKu7b8Bja+iJFivyUu09B45brU4gOwTYFO7hSgk6Ll+OCjl9pA5RZYmtyy2aU0DA== - wk10/1.0.3 - wk10.1.0.3.nupkg.sha512 - - - - \ No newline at end of file diff --git a/src/examples/ndcat/ndcat.cpp b/src/examples/ndcat/ndcat.cpp index fdb5898..a5a1231 100644 --- a/src/examples/ndcat/ndcat.cpp +++ b/src/examples/ndcat/ndcat.cpp @@ -8,6 +8,9 @@ // valid NetworkDirect addresses. If there are no addresses the test // generates an error. +#define WIN32_LEAN_AND_MEAN +#include +#include #include "ndcommon.h" #include diff --git a/src/examples/ndcat/ndcat.vcxproj b/src/examples/ndcat/ndcat.vcxproj index 83233cc..99450b6 100644 --- a/src/examples/ndcat/ndcat.vcxproj +++ b/src/examples/ndcat/ndcat.vcxproj @@ -1,26 +1,154 @@ - - + + + + Debug + Win32 + + + Release + Win32 + + + Debug + x64 + + + Release + x64 + + - 15.0 - {8DC2234B-0FFD-492B-817E-C81DC04EFF86} + 16.0 Win32Proj + {cb0e86c1-d48a-4a21-b88b-a6ee9734fc67} ndcat + 10.0 - + + Application + true + v143 + Unicode + + + Application + false + v143 + true + Unicode + + Application + true + v143 + Unicode + Static + + + Application + false + v143 + true + Unicode + Static - + + + + + - + + + + + + + + + + + + + Level3 + true + WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + MultiThreadedDebug + ..\;..\ndtestutil;..\..\ndutil;%(AdditionalIncludeDirectories) + + + Console + true + ..\..\$(Platform)\$(Configuration)\ndutil.lib;..\..\$(Platform)\$(Configuration)\ndtestutil.lib;uuid.lib;Ws2_32.lib;$(CoreLibraryDependencies);%(AdditionalDependencies) + + + ..\ + + + + Level3 + true + true + true + WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + MultiThreaded + ..\;..\ndtestutil;..\..\ndutil;%(AdditionalIncludeDirectories) Console + true + true + true + ..\..\$(Platform)\$(Configuration)\ndutil.lib;..\..\$(Platform)\$(Configuration)\ndtestutil.lib;uuid.lib;Ws2_32.lib;$(CoreLibraryDependencies);%(AdditionalDependencies) + + ..\ + + + + + Level3 + true + _DEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + ..\;..\ndtestutil;..\..\ndutil;%(AdditionalIncludeDirectories) + + + Console + true + ..\..\$(Platform)\$(Configuration)\ndutil.lib;..\..\$(Platform)\$(Configuration)\ndtestutil.lib;uuid.lib;Ws2_32.lib;$(CoreLibraryDependencies);%(AdditionalDependencies) + + + ..\ + + + + + Level3 + true + true + true + NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + ..\;..\ndtestutil;..\..\ndutil;%(AdditionalIncludeDirectories) + + + Console + true + true + true + ..\..\$(Platform)\$(Configuration)\ndutil.lib;..\..\$(Platform)\$(Configuration)\ndtestutil.lib;uuid.lib;Ws2_32.lib;$(CoreLibraryDependencies);%(AdditionalDependencies) + + + ..\ + @@ -29,4 +157,6 @@ - + + + \ No newline at end of file diff --git a/src/examples/ndcat/ndcat.vcxproj.filters b/src/examples/ndcat/ndcat.vcxproj.filters new file mode 100644 index 0000000..e920479 --- /dev/null +++ b/src/examples/ndcat/ndcat.vcxproj.filters @@ -0,0 +1,27 @@ + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cc;cxx;c++;cppm;ixx;def;odl;idl;hpj;bat;asm;asmx + + + {93995380-89BD-4b04-88EB-625FBE52EBFB} + h;hh;hpp;hxx;h++;hm;inl;inc;ipp;xsd + + + {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} + rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms + + + + + Source Files + + + + + Resource Files + + + \ No newline at end of file diff --git a/src/examples/ndmrlat/NuGetAssetsLock.props b/src/examples/ndmrlat/NuGetAssetsLock.props deleted file mode 100644 index d69953b..0000000 --- a/src/examples/ndmrlat/NuGetAssetsLock.props +++ /dev/null @@ -1,22 +0,0 @@ - - - - true - - - - - [1.0.0] - imbNHw4hg7nnbLjFuagxR1oc7TJv058rCclt+DmqJrvYYKJ10R/tGuKjne1nq94y0FTM1zd4j9v9v9n5A9Va6w== - vc150/1.0.0 - vc150.1.0.0.nupkg.sha512 - - - [1.0.3] - SeyxBzNqK/4Mh0yqD7LrJKxKu7b8Bja+iJFivyUu09B45brU4gOwTYFO7hSgk6Ll+OCjl9pA5RZYmtyy2aU0DA== - wk10/1.0.3 - wk10.1.0.3.nupkg.sha512 - - - - \ No newline at end of file diff --git a/src/examples/ndmrlat/ndmrlat.cpp b/src/examples/ndmrlat/ndmrlat.cpp index 191dcda..20aaebc 100644 --- a/src/examples/ndmrlat/ndmrlat.cpp +++ b/src/examples/ndmrlat/ndmrlat.cpp @@ -3,7 +3,9 @@ // // ndmrlat.cpp - NetworkDirect memory registration latency test // - +#define WIN32_LEAN_AND_MEAN +#include +#include #include "ndcommon.h" #include #include "ndtestutil.h" diff --git a/src/examples/ndmrlat/ndmrlat.vcxproj b/src/examples/ndmrlat/ndmrlat.vcxproj index 0b8e2ab..9c00eb6 100644 --- a/src/examples/ndmrlat/ndmrlat.vcxproj +++ b/src/examples/ndmrlat/ndmrlat.vcxproj @@ -1,24 +1,156 @@ - - + + + + Debug + Win32 + + + Release + Win32 + + + Debug + x64 + + + Release + x64 + + - 15.0 - {432cd967-42fa-437a-80a4-61c890e72418} + 16.0 Win32Proj + {7e8a3354-1eeb-4580-8b07-b9cedf81f727} ndmrlat + 10.0 + + Application + true + v143 + Unicode + + + Application + false + v143 + true + Unicode + + + Application + true + v143 + Unicode + false + + + Application + false + v143 + true + Unicode + false + - + + + + + + + + - + + + + + + + + - _CONSOLE;%(PreprocessorDefinitions) + Level3 + true + WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + MultiThreadedDebug + ..\;..\ndtestutil;..\..\ndutil;%(AdditionalIncludeDirectories) Console + true + ..\..\$(Platform)\$(Configuration)\ndutil.lib;..\..\$(Platform)\$(Configuration)\ndtestutil.lib;uuid.lib;Ws2_32.lib;$(CoreLibraryDependencies);%(AdditionalDependencies) + + ..\ + + + + + Level3 + true + true + true + WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + MultiThreaded + ..\;..\ndtestutil;..\..\ndutil;%(AdditionalIncludeDirectories) + + + Console + true + true + true + ..\..\$(Platform)\$(Configuration)\ndutil.lib;..\..\$(Platform)\$(Configuration)\ndtestutil.lib;uuid.lib;Ws2_32.lib;$(CoreLibraryDependencies);%(AdditionalDependencies) + + + ..\ + + + + + Level3 + true + _DEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + ..\;..\ndtestutil;..\..\ndutil;%(AdditionalIncludeDirectories) + MultiThreadedDebug + + + Console + true + ..\..\$(Platform)\$(Configuration)\ndutil.lib;..\..\$(Platform)\$(Configuration)\ndtestutil.lib;uuid.lib;Ws2_32.lib;$(CoreLibraryDependencies);%(AdditionalDependencies) + + + ..\ + + + + + Level3 + true + true + true + NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + ..\;..\ndtestutil;..\..\ndutil;%(AdditionalIncludeDirectories) + MultiThreaded + + + Console + true + true + true + ..\..\$(Platform)\$(Configuration)\ndutil.lib;..\..\$(Platform)\$(Configuration)\ndtestutil.lib;uuid.lib;Ws2_32.lib;$(CoreLibraryDependencies);%(AdditionalDependencies) + + + ..\ + @@ -26,9 +158,7 @@ - - Application - Unicode - + + \ No newline at end of file diff --git a/src/examples/ndmrlat/ndmrlat.vcxproj.filters b/src/examples/ndmrlat/ndmrlat.vcxproj.filters new file mode 100644 index 0000000..bdeb079 --- /dev/null +++ b/src/examples/ndmrlat/ndmrlat.vcxproj.filters @@ -0,0 +1,27 @@ + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cc;cxx;c++;cppm;ixx;def;odl;idl;hpj;bat;asm;asmx + + + {93995380-89BD-4b04-88EB-625FBE52EBFB} + h;hh;hpp;hxx;h++;hm;inl;inc;ipp;xsd + + + {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} + rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms + + + + + Source Files + + + + + Resource Files + + + \ No newline at end of file diff --git a/src/examples/ndmrrate/NuGetAssetsLock.props b/src/examples/ndmrrate/NuGetAssetsLock.props deleted file mode 100644 index d69953b..0000000 --- a/src/examples/ndmrrate/NuGetAssetsLock.props +++ /dev/null @@ -1,22 +0,0 @@ - - - - true - - - - - [1.0.0] - imbNHw4hg7nnbLjFuagxR1oc7TJv058rCclt+DmqJrvYYKJ10R/tGuKjne1nq94y0FTM1zd4j9v9v9n5A9Va6w== - vc150/1.0.0 - vc150.1.0.0.nupkg.sha512 - - - [1.0.3] - SeyxBzNqK/4Mh0yqD7LrJKxKu7b8Bja+iJFivyUu09B45brU4gOwTYFO7hSgk6Ll+OCjl9pA5RZYmtyy2aU0DA== - wk10/1.0.3 - wk10.1.0.3.nupkg.sha512 - - - - \ No newline at end of file diff --git a/src/examples/ndmrrate/ndmrrate.cpp b/src/examples/ndmrrate/ndmrrate.cpp index e71a1fb..ee574e5 100644 --- a/src/examples/ndmrrate/ndmrrate.cpp +++ b/src/examples/ndmrrate/ndmrrate.cpp @@ -3,7 +3,9 @@ // // ndmrlat.cpp - NetworkDirect memory registration bandwidth test // - +#define WIN32_LEAN_AND_MEAN +#include +#include #include "ndcommon.h" #include #include "ndtestutil.h" diff --git a/src/examples/ndmrrate/ndmrrate.vcxproj b/src/examples/ndmrrate/ndmrrate.vcxproj index 0230c83..8c54875 100644 --- a/src/examples/ndmrrate/ndmrrate.vcxproj +++ b/src/examples/ndmrrate/ndmrrate.vcxproj @@ -1,24 +1,156 @@ - - + + + + Debug + Win32 + + + Release + Win32 + + + Debug + x64 + + + Release + x64 + + - 15.0 - {8d8e0152-c783-490b-b2a0-50aa4b909934} + 16.0 Win32Proj + {3906a75a-0c0e-440d-a4fe-f91888425f4c} ndmrrate + 10.0 + + Application + true + v143 + Unicode + + + Application + false + v143 + true + Unicode + + + Application + true + v143 + Unicode + false + + + Application + false + v143 + true + Unicode + false + - + + + + + + + + - + + + + + + + + - _CONSOLE;%(PreprocessorDefinitions) + Level3 + true + WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + MultiThreadedDebug + ..\;..\ndtestutil;..\..\ndutil;%(AdditionalIncludeDirectories) Console + true + ..\..\$(Platform)\$(Configuration)\ndutil.lib;..\..\$(Platform)\$(Configuration)\ndtestutil.lib;uuid.lib;Ws2_32.lib;$(CoreLibraryDependencies);%(AdditionalDependencies) + + ..\ + + + + + Level3 + true + true + true + WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + MultiThreaded + ..\;..\ndtestutil;..\..\ndutil;%(AdditionalIncludeDirectories) + + + Console + true + true + true + ..\..\$(Platform)\$(Configuration)\ndutil.lib;..\..\$(Platform)\$(Configuration)\ndtestutil.lib;uuid.lib;Ws2_32.lib;$(CoreLibraryDependencies);%(AdditionalDependencies) + + + ..\ + + + + + Level3 + true + _DEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + ..\;..\ndtestutil;..\..\ndutil;%(AdditionalIncludeDirectories) + MultiThreadedDebug + + + Console + true + ..\..\$(Platform)\$(Configuration)\ndutil.lib;..\..\$(Platform)\$(Configuration)\ndtestutil.lib;uuid.lib;Ws2_32.lib;$(CoreLibraryDependencies);%(AdditionalDependencies) + + + ..\ + + + + + Level3 + true + true + true + NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + ..\;..\ndtestutil;..\..\ndutil;%(AdditionalIncludeDirectories) + MultiThreaded + + + Console + true + true + true + ..\..\$(Platform)\$(Configuration)\ndutil.lib;..\..\$(Platform)\$(Configuration)\ndtestutil.lib;uuid.lib;Ws2_32.lib;$(CoreLibraryDependencies);%(AdditionalDependencies) + + + ..\ + @@ -26,9 +158,7 @@ - - Application - Unicode - + + \ No newline at end of file diff --git a/src/examples/ndmrrate/ndmrrate.vcxproj.filters b/src/examples/ndmrrate/ndmrrate.vcxproj.filters new file mode 100644 index 0000000..07a1951 --- /dev/null +++ b/src/examples/ndmrrate/ndmrrate.vcxproj.filters @@ -0,0 +1,27 @@ + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cc;cxx;c++;cppm;ixx;def;odl;idl;hpj;bat;asm;asmx + + + {93995380-89BD-4b04-88EB-625FBE52EBFB} + h;hh;hpp;hxx;h++;hm;inl;inc;ipp;xsd + + + {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} + rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms + + + + + Source Files + + + + + Resource Files + + + \ No newline at end of file diff --git a/src/examples/ndping/NuGetAssetsLock.props b/src/examples/ndping/NuGetAssetsLock.props deleted file mode 100644 index d69953b..0000000 --- a/src/examples/ndping/NuGetAssetsLock.props +++ /dev/null @@ -1,22 +0,0 @@ - - - - true - - - - - [1.0.0] - imbNHw4hg7nnbLjFuagxR1oc7TJv058rCclt+DmqJrvYYKJ10R/tGuKjne1nq94y0FTM1zd4j9v9v9n5A9Va6w== - vc150/1.0.0 - vc150.1.0.0.nupkg.sha512 - - - [1.0.3] - SeyxBzNqK/4Mh0yqD7LrJKxKu7b8Bja+iJFivyUu09B45brU4gOwTYFO7hSgk6Ll+OCjl9pA5RZYmtyy2aU0DA== - wk10/1.0.3 - wk10.1.0.3.nupkg.sha512 - - - - \ No newline at end of file diff --git a/src/examples/ndping/ndping.cpp b/src/examples/ndping/ndping.cpp index 8a08a12..f094059 100644 --- a/src/examples/ndping/ndping.cpp +++ b/src/examples/ndping/ndping.cpp @@ -4,10 +4,13 @@ // // ndping.cpp - NetworkDirect unidirectional send/recv ping test // - +#define WIN32_LEAN_AND_MEAN +#include +#include #include "ndcommon.h" #include "ndtestutil.h" #include +#include "ndspi.h" const USHORT x_DefaultPort = 54324; const SIZE_T x_MaxXfer = (4 * 1024 * 1024); @@ -63,6 +66,7 @@ class NdPingServer : public NdTestServerBase ND2_ADAPTER_INFO adapterInfo = { 0 }; NdTestBase::GetAdapterInfo(&adapterInfo); m_queueDepth = min(adapterInfo.MaxCompletionQueueDepth, adapterInfo.MaxReceiveQueueDepth); + m_queueDepth = min(m_queueDepth, adapterInfo.MaxInitiatorQueueDepth); m_queueDepth = (queueDepth != 0) ? min(queueDepth, m_queueDepth) : m_queueDepth; m_inlineSizeThreshold = adapterInfo.InlineRequestThreshold; @@ -196,6 +200,7 @@ class NdPingClient : public NdTestClientBase ND2_ADAPTER_INFO adapterInfo; NdTestBase::GetAdapterInfo(&adapterInfo); m_queueDepth = min(adapterInfo.MaxCompletionQueueDepth, adapterInfo.MaxInitiatorQueueDepth); + m_queueDepth = min(m_queueDepth, adapterInfo.MaxReceiveQueueDepth); m_queueDepth = (queueDepth != 0) ? min(queueDepth, m_queueDepth) : m_queueDepth; m_inlineSizeThreshold = adapterInfo.InlineRequestThreshold; diff --git a/src/examples/ndping/ndping.vcxproj b/src/examples/ndping/ndping.vcxproj index af1b087..cc1c266 100644 --- a/src/examples/ndping/ndping.vcxproj +++ b/src/examples/ndping/ndping.vcxproj @@ -1,37 +1,149 @@ - - + + + + Debug + Win32 + + + Release + Win32 + + + Debug + x64 + + + Release + x64 + + - 15.0 - {7523D17D-72E7-4AFE-B176-6A37A3170416} + 16.0 Win32Proj + {fd8218c4-7d3a-4ee9-9262-02e9631e7cb6} ndping + 10.0 + + Application + true + v143 + Unicode + + + Application + false + v143 + true + Unicode + + + Application + true + v143 + Unicode + false + + + Application + false + v143 + true + Unicode + false + - + + + + + - + + + + + + + + + + + - _CONSOLE;%(PreprocessorDefinitions) + Level3 + true + WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + MultiThreadedDebug + ..\;..\ndtestutil;..\..\ndutil;%(AdditionalIncludeDirectories) Console + true + ..\..\$(Platform)\$(Configuration)\ndutil.lib;..\..\$(Platform)\$(Configuration)\ndtestutil.lib;uuid.lib;Ws2_32.lib;$(CoreLibraryDependencies);%(AdditionalDependencies) + + + + + Level3 + true + true + true + WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + MultiThreaded + ..\;..\ndtestutil;..\..\ndutil;%(AdditionalIncludeDirectories) + + + Console + true + true + true + ..\..\$(Platform)\$(Configuration)\ndutil.lib;..\..\$(Platform)\$(Configuration)\ndtestutil.lib;uuid.lib;Ws2_32.lib;$(CoreLibraryDependencies);%(AdditionalDependencies) + + + + + Level3 + true + _DEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + ..\;..\ndtestutil;..\..\ndutil;%(AdditionalIncludeDirectories) + MultiThreadedDebug + + + Console + true + ..\..\$(Platform)\$(Configuration)\ndutil.lib;..\..\$(Platform)\$(Configuration)\ndtestutil.lib;uuid.lib;Ws2_32.lib;$(CoreLibraryDependencies);%(AdditionalDependencies) + + + + + Level3 + true + true + true + NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + ..\;..\ndtestutil;..\..\ndutil;%(AdditionalIncludeDirectories) + MultiThreaded + + + Console + true + true + true + ..\..\$(Platform)\$(Configuration)\ndutil.lib;..\..\$(Platform)\$(Configuration)\ndtestutil.lib;uuid.lib;Ws2_32.lib;$(CoreLibraryDependencies);%(AdditionalDependencies) - - ..;%(AdditionalIncludeDirectories) - - - - - - Application - Unicode - + + \ No newline at end of file diff --git a/src/examples/ndping/ndping.vcxproj.filters b/src/examples/ndping/ndping.vcxproj.filters new file mode 100644 index 0000000..8275e2d --- /dev/null +++ b/src/examples/ndping/ndping.vcxproj.filters @@ -0,0 +1,22 @@ + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cc;cxx;c++;cppm;ixx;def;odl;idl;hpj;bat;asm;asmx + + + {93995380-89BD-4b04-88EB-625FBE52EBFB} + h;hh;hpp;hxx;h++;hm;inl;inc;ipp;xsd + + + {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} + rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms + + + + + Source Files + + + \ No newline at end of file diff --git a/src/examples/ndpingpong/NuGetAssetsLock.props b/src/examples/ndpingpong/NuGetAssetsLock.props deleted file mode 100644 index d69953b..0000000 --- a/src/examples/ndpingpong/NuGetAssetsLock.props +++ /dev/null @@ -1,22 +0,0 @@ - - - - true - - - - - [1.0.0] - imbNHw4hg7nnbLjFuagxR1oc7TJv058rCclt+DmqJrvYYKJ10R/tGuKjne1nq94y0FTM1zd4j9v9v9n5A9Va6w== - vc150/1.0.0 - vc150.1.0.0.nupkg.sha512 - - - [1.0.3] - SeyxBzNqK/4Mh0yqD7LrJKxKu7b8Bja+iJFivyUu09B45brU4gOwTYFO7hSgk6Ll+OCjl9pA5RZYmtyy2aU0DA== - wk10/1.0.3 - wk10.1.0.3.nupkg.sha512 - - - - \ No newline at end of file diff --git a/src/examples/ndpingpong/ndpingpong.cpp b/src/examples/ndpingpong/ndpingpong.cpp index 4bae9cb..0c7b522 100644 --- a/src/examples/ndpingpong/ndpingpong.cpp +++ b/src/examples/ndpingpong/ndpingpong.cpp @@ -3,7 +3,9 @@ // // ndpingpong.cpp - NetworkDirect send/recv pingpong test // - +#define WIN32_LEAN_AND_MEAN +#include +#include #include "ndcommon.h" #include "ndtestutil.h" #include "logging.h" @@ -68,6 +70,7 @@ class NdPingPongServer : public NdTestServerBase NdTestBase::GetAdapterInfo(&adapterInfo); m_queueDepth = min(adapterInfo.MaxCompletionQueueDepth, adapterInfo.MaxReceiveQueueDepth); + m_queueDepth = min(m_queueDepth, adapterInfo.MaxInitiatorQueueDepth); m_queueDepth = (queueDepth != 0) ? min(queueDepth, m_queueDepth) : m_queueDepth; m_inlineThreshold = adapterInfo.InlineRequestThreshold; @@ -209,6 +212,7 @@ class NdPingPongClient : public NdTestClientBase NdTestBase::GetAdapterInfo(&adapterInfo); m_queueDepth = min(adapterInfo.MaxCompletionQueueDepth, adapterInfo.MaxInitiatorQueueDepth); + m_queueDepth = min(m_queueDepth, adapterInfo.MaxReceiveQueueDepth); m_queueDepth = (queueDepth != 0) ? min(queueDepth, m_queueDepth) : m_queueDepth; m_inlineThreshold = adapterInfo.InlineRequestThreshold; diff --git a/src/examples/ndpingpong/ndpingpong.vcxproj b/src/examples/ndpingpong/ndpingpong.vcxproj index 25bf24f..b8daf8b 100644 --- a/src/examples/ndpingpong/ndpingpong.vcxproj +++ b/src/examples/ndpingpong/ndpingpong.vcxproj @@ -1,28 +1,156 @@ - - + + + + Debug + Win32 + + + Release + Win32 + + + Debug + x64 + + + Release + x64 + + - 15.0 - {32A2B4B2-58B0-4878-BFD5-D6FDB8B35AAA} + 16.0 Win32Proj + {df2c2c46-f5c9-4e74-a903-67d93d4157a5} ndpingpong + 10.0 - + + Application + true + v143 + Unicode + + + Application + false + v143 + true + Unicode + + Application + true + v143 + Unicode + false + + + Application + false + v143 + true + Unicode + false - + + + + + - + + + + + + + + + + + + + Level3 + true + WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + MultiThreadedDebug + ..\;..\ndtestutil;..\..\ndutil;%(AdditionalIncludeDirectories) + + + Console + true + ..\..\$(Platform)\$(Configuration)\ndutil.lib;..\..\$(Platform)\$(Configuration)\ndtestutil.lib;uuid.lib;Ws2_32.lib;$(CoreLibraryDependencies);%(AdditionalDependencies) + + + ..\ + + + - _CONSOLE;%(PreprocessorDefinitions) - StdCall + Level3 + true + true + true + WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + MultiThreaded + ..\;..\ndtestutil;..\..\ndutil;%(AdditionalIncludeDirectories) Console + true + true + true + ..\..\$(Platform)\$(Configuration)\ndutil.lib;..\..\$(Platform)\$(Configuration)\ndtestutil.lib;uuid.lib;Ws2_32.lib;$(CoreLibraryDependencies);%(AdditionalDependencies) + + ..\ + + + + + Level3 + true + _DEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + ..\;..\ndtestutil;..\..\ndutil;%(AdditionalIncludeDirectories) + MultiThreadedDebug + + + Console + true + ..\..\$(Platform)\$(Configuration)\ndutil.lib;..\..\$(Platform)\$(Configuration)\ndtestutil.lib;uuid.lib;Ws2_32.lib;$(CoreLibraryDependencies);%(AdditionalDependencies) + + + ..\ + + + + + Level3 + true + true + true + NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + ..\;..\ndtestutil;..\..\ndutil;%(AdditionalIncludeDirectories) + MultiThreaded + + + Console + true + true + true + ..\..\$(Platform)\$(Configuration)\ndutil.lib;..\..\$(Platform)\$(Configuration)\ndtestutil.lib;uuid.lib;Ws2_32.lib;$(CoreLibraryDependencies);%(AdditionalDependencies) + + + ..\ + @@ -31,4 +159,6 @@ + + \ No newline at end of file diff --git a/src/examples/ndpingpong/ndpingpong.vcxproj.filters b/src/examples/ndpingpong/ndpingpong.vcxproj.filters new file mode 100644 index 0000000..dfd154f --- /dev/null +++ b/src/examples/ndpingpong/ndpingpong.vcxproj.filters @@ -0,0 +1,27 @@ + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cc;cxx;c++;cppm;ixx;def;odl;idl;hpj;bat;asm;asmx + + + {93995380-89BD-4b04-88EB-625FBE52EBFB} + h;hh;hpp;hxx;h++;hm;inl;inc;ipp;xsd + + + {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} + rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms + + + + + Source Files + + + + + Resource Files + + + \ No newline at end of file diff --git a/src/examples/ndrping/NuGetAssetsLock.props b/src/examples/ndrping/NuGetAssetsLock.props deleted file mode 100644 index d69953b..0000000 --- a/src/examples/ndrping/NuGetAssetsLock.props +++ /dev/null @@ -1,22 +0,0 @@ - - - - true - - - - - [1.0.0] - imbNHw4hg7nnbLjFuagxR1oc7TJv058rCclt+DmqJrvYYKJ10R/tGuKjne1nq94y0FTM1zd4j9v9v9n5A9Va6w== - vc150/1.0.0 - vc150.1.0.0.nupkg.sha512 - - - [1.0.3] - SeyxBzNqK/4Mh0yqD7LrJKxKu7b8Bja+iJFivyUu09B45brU4gOwTYFO7hSgk6Ll+OCjl9pA5RZYmtyy2aU0DA== - wk10/1.0.3 - wk10.1.0.3.nupkg.sha512 - - - - \ No newline at end of file diff --git a/src/examples/ndrping/ndrping.cpp b/src/examples/ndrping/ndrping.cpp index ba13b29..0f0cd69 100644 --- a/src/examples/ndrping/ndrping.cpp +++ b/src/examples/ndrping/ndrping.cpp @@ -9,7 +9,9 @@ // operations to its heart's content with no further involvement // of the server. // - +#define WIN32_LEAN_AND_MEAN +#include +#include #include "ndcommon.h" #include "ndtestutil.h" #include @@ -222,6 +224,7 @@ class NdrPingClient : public NdTestClientBase m_queueDepth = (queueDepth > 0) ? min(queueDepth, adapterInfo.MaxCompletionQueueDepth) : adapterInfo.MaxCompletionQueueDepth; m_queueDepth = min(m_queueDepth, adapterInfo.MaxInitiatorQueueDepth); + m_queueDepth = min(m_queueDepth, adapterInfo.MaxReceiveQueueDepth); m_nMaxSge = min(nSge, adapterInfo.MaxInitiatorSge); m_inlineThreshold = adapterInfo.InlineRequestThreshold; if (m_opRead) @@ -248,7 +251,9 @@ class NdrPingClient : public NdTestClientBase NdTestBase::CreateCQ(m_queueDepth); NdTestBase::CreateConnector(); - NdTestBase::CreateQueuePair(min(m_queueDepth, adapterInfo.MaxReceiveQueueDepth), nSge, m_inlineThreshold); + DWORD q_depth = min(m_queueDepth, adapterInfo.MaxReceiveQueueDepth); + q_depth = min(q_depth, adapterInfo.MaxInitiatorQueueDepth); + NdTestBase::CreateQueuePair(q_depth, nSge, m_inlineThreshold); ND2_SGE sge; sge.Buffer = m_pBuf; diff --git a/src/examples/ndrping/ndrping.vcxproj b/src/examples/ndrping/ndrping.vcxproj index 264b175..a100b99 100644 --- a/src/examples/ndrping/ndrping.vcxproj +++ b/src/examples/ndrping/ndrping.vcxproj @@ -1,28 +1,156 @@ - - + + + + Debug + Win32 + + + Release + Win32 + + + Debug + x64 + + + Release + x64 + + - 15.0 - {e4965852-d42d-4c02-8bf3-f26d521487c5} + 16.0 Win32Proj + {48e4e74b-9f0c-4b5c-a2bc-ebc4397086f7} ndrping + 10.0 - + + Application + true + v143 + Unicode + + + Application + false + v143 + true + Unicode + + Application + true + v143 + Unicode + false + + + Application + false + v143 + true + Unicode + false - + + + + + - + + + + + + + + + + + + + Level3 + true + WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + MultiThreadedDebug + ..\;..\ndtestutil;..\..\ndutil;%(AdditionalIncludeDirectories) + + + Console + true + ..\..\$(Platform)\$(Configuration)\ndutil.lib;..\..\$(Platform)\$(Configuration)\ndtestutil.lib;uuid.lib;Ws2_32.lib;$(CoreLibraryDependencies);%(AdditionalDependencies) + + + ..\ + + + - _CONSOLE;%(PreprocessorDefinitions) - StdCall + Level3 + true + true + true + WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + MultiThreaded + ..\;..\ndtestutil;..\..\ndutil;%(AdditionalIncludeDirectories) Console + true + true + true + ..\..\$(Platform)\$(Configuration)\ndutil.lib;..\..\$(Platform)\$(Configuration)\ndtestutil.lib;uuid.lib;Ws2_32.lib;$(CoreLibraryDependencies);%(AdditionalDependencies) + + ..\ + + + + + Level3 + true + _DEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + ..\;..\ndtestutil;..\..\ndutil;%(AdditionalIncludeDirectories) + MultiThreadedDebug + + + Console + true + ..\..\$(Platform)\$(Configuration)\ndutil.lib;..\..\$(Platform)\$(Configuration)\ndtestutil.lib;uuid.lib;Ws2_32.lib;$(CoreLibraryDependencies);%(AdditionalDependencies) + + + ..\ + + + + + Level3 + true + true + true + NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + ..\;..\ndtestutil;..\..\ndutil;%(AdditionalIncludeDirectories) + MultiThreaded + + + Console + true + true + true + ..\..\$(Platform)\$(Configuration)\ndutil.lib;..\..\$(Platform)\$(Configuration)\ndtestutil.lib;uuid.lib;Ws2_32.lib;$(CoreLibraryDependencies);%(AdditionalDependencies) + + + ..\ + @@ -31,4 +159,6 @@ + + \ No newline at end of file diff --git a/src/examples/ndrping/ndrping.vcxproj.filters b/src/examples/ndrping/ndrping.vcxproj.filters new file mode 100644 index 0000000..b6a1e80 --- /dev/null +++ b/src/examples/ndrping/ndrping.vcxproj.filters @@ -0,0 +1,27 @@ + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cc;cxx;c++;cppm;ixx;def;odl;idl;hpj;bat;asm;asmx + + + {93995380-89BD-4b04-88EB-625FBE52EBFB} + h;hh;hpp;hxx;h++;hm;inl;inc;ipp;xsd + + + {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} + rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms + + + + + Source Files + + + + + Resource Files + + + \ No newline at end of file diff --git a/src/examples/ndrpingpong/NuGetAssetsLock.props b/src/examples/ndrpingpong/NuGetAssetsLock.props deleted file mode 100644 index d69953b..0000000 --- a/src/examples/ndrpingpong/NuGetAssetsLock.props +++ /dev/null @@ -1,22 +0,0 @@ - - - - true - - - - - [1.0.0] - imbNHw4hg7nnbLjFuagxR1oc7TJv058rCclt+DmqJrvYYKJ10R/tGuKjne1nq94y0FTM1zd4j9v9v9n5A9Va6w== - vc150/1.0.0 - vc150.1.0.0.nupkg.sha512 - - - [1.0.3] - SeyxBzNqK/4Mh0yqD7LrJKxKu7b8Bja+iJFivyUu09B45brU4gOwTYFO7hSgk6Ll+OCjl9pA5RZYmtyy2aU0DA== - wk10/1.0.3 - wk10.1.0.3.nupkg.sha512 - - - - \ No newline at end of file diff --git a/src/examples/ndrpingpong/ndrpingpong.cpp b/src/examples/ndrpingpong/ndrpingpong.cpp index 6cf7ad0..ef92de2 100644 --- a/src/examples/ndrpingpong/ndrpingpong.cpp +++ b/src/examples/ndrpingpong/ndrpingpong.cpp @@ -4,7 +4,9 @@ // // ndrpingpong.cpp - NetworkDirect bidirectional RDMA write ping-pong test // - +#define WIN32_LEAN_AND_MEAN +#include +#include #include "ndcommon.h" #include "ndtestutil.h" #include diff --git a/src/examples/ndrpingpong/ndrpingpong.vcxproj b/src/examples/ndrpingpong/ndrpingpong.vcxproj index 00a94de..94a8fba 100644 --- a/src/examples/ndrpingpong/ndrpingpong.vcxproj +++ b/src/examples/ndrpingpong/ndrpingpong.vcxproj @@ -1,28 +1,156 @@ - - + + + + Debug + Win32 + + + Release + Win32 + + + Debug + x64 + + + Release + x64 + + - 15.0 - {104A3A1F-5C55-4FF0-A040-18B8725B3A0A} + 16.0 Win32Proj + {0a036d35-fee2-426d-9fc1-3694b8c15418} ndrpingpong + 10.0 - + + Application + true + v143 + Unicode + + + Application + false + v143 + true + Unicode + + Application + true + v143 + Unicode + false + + + Application + false + v143 + true + Unicode + false - + + + + + - + + + + + + + + + + + + + Level3 + true + WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + MultiThreadedDebug + ..\;..\ndtestutil;..\..\ndutil;%(AdditionalIncludeDirectories) + + + Console + true + ..\..\$(Platform)\$(Configuration)\ndutil.lib;..\..\$(Platform)\$(Configuration)\ndtestutil.lib;uuid.lib;Ws2_32.lib;$(CoreLibraryDependencies);%(AdditionalDependencies) + + + ..\ + + + - _CONSOLE;%(PreprocessorDefinitions) - StdCall + Level3 + true + true + true + WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + MultiThreaded + ..\;..\ndtestutil;..\..\ndutil;%(AdditionalIncludeDirectories) Console + true + true + true + ..\..\$(Platform)\$(Configuration)\ndutil.lib;..\..\$(Platform)\$(Configuration)\ndtestutil.lib;uuid.lib;Ws2_32.lib;$(CoreLibraryDependencies);%(AdditionalDependencies) + + ..\ + + + + + Level3 + true + _DEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + ..\;..\ndtestutil;..\..\ndutil;%(AdditionalIncludeDirectories) + MultiThreadedDebug + + + Console + true + ..\..\$(Platform)\$(Configuration)\ndutil.lib;..\..\$(Platform)\$(Configuration)\ndtestutil.lib;uuid.lib;Ws2_32.lib;$(CoreLibraryDependencies);%(AdditionalDependencies) + + + ..\ + + + + + Level3 + true + true + true + NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + ..\;..\ndtestutil;..\..\ndutil;%(AdditionalIncludeDirectories) + MultiThreaded + + + Console + true + true + true + ..\..\$(Platform)\$(Configuration)\ndutil.lib;..\..\$(Platform)\$(Configuration)\ndtestutil.lib;uuid.lib;Ws2_32.lib;$(CoreLibraryDependencies);%(AdditionalDependencies) + + + ..\ + @@ -31,4 +159,6 @@ + + \ No newline at end of file diff --git a/src/examples/ndrpingpong/ndrpingpong.vcxproj.filters b/src/examples/ndrpingpong/ndrpingpong.vcxproj.filters new file mode 100644 index 0000000..269311a --- /dev/null +++ b/src/examples/ndrpingpong/ndrpingpong.vcxproj.filters @@ -0,0 +1,27 @@ + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cc;cxx;c++;cppm;ixx;def;odl;idl;hpj;bat;asm;asmx + + + {93995380-89BD-4b04-88EB-625FBE52EBFB} + h;hh;hpp;hxx;h++;hm;inl;inc;ipp;xsd + + + {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} + rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms + + + + + Source Files + + + + + Resource Files + + + \ No newline at end of file diff --git a/src/examples/ndsupport.h b/src/examples/ndsupport.h deleted file mode 100644 index 4072557..0000000 --- a/src/examples/ndsupport.h +++ /dev/null @@ -1,94 +0,0 @@ -// -// Copyright(c) Microsoft Corporation.All rights reserved. -// Licensed under the MIT License. -// -// Net Direct Helper Interface -// - -#pragma once - -#ifndef _NETDIRECT_H_ -#define _NETDIRECT_H_ - -#include - - -#ifdef __cplusplus -extern "C" -{ -#endif // __cplusplus - -#define ND_HELPER_API __stdcall - - -// -// Initialization -// -HRESULT ND_HELPER_API -NdStartup( - VOID - ); - -HRESULT ND_HELPER_API -NdCleanup( - VOID - ); - -VOID ND_HELPER_API -NdFlushProviders( - VOID - ); - -// -// Network capabilities -// -#define ND_QUERY_EXCLUDE_EMULATOR_ADDRESSES 0x00000001 -#define ND_QUERY_EXCLUDE_NDv1_ADDRESSES 0x00000002 -#define ND_QUERY_EXCLUDE_NDv2_ADDRESSES 0x00000004 - -HRESULT ND_HELPER_API -NdQueryAddressList( - _In_ DWORD flags, - _Out_opt_bytecap_post_bytecount_(*pcbAddressList, *pcbAddressList) SOCKET_ADDRESS_LIST* pAddressList, - _Inout_ SIZE_T* pcbAddressList - ); - - -HRESULT ND_HELPER_API -NdResolveAddress( - _In_bytecount_(cbRemoteAddress) const struct sockaddr* pRemoteAddress, - _In_ SIZE_T cbRemoteAddress, - _Out_bytecap_(*pcbLocalAddress) struct sockaddr* pLocalAddress, - _Inout_ SIZE_T* pcbLocalAddress - ); - - -HRESULT ND_HELPER_API -NdCheckAddress( - _In_bytecount_(cbAddress) const struct sockaddr* pAddress, - _In_ SIZE_T cbAddress - ); - - -HRESULT ND_HELPER_API -NdOpenAdapter( - _In_ REFIID iid, - _In_bytecount_(cbAddress) const struct sockaddr* pAddress, - _In_ SIZE_T cbAddress, - _Deref_out_ VOID** ppIAdapter - ); - - -HRESULT ND_HELPER_API -NdOpenV1Adapter( - _In_bytecount_(cbAddress) const struct sockaddr* pAddress, - _In_ SIZE_T cbAddress, - _Deref_out_ INDAdapter** ppIAdapter - ); - -#ifdef __cplusplus -} -#endif // __cplusplus - - -#endif // _NETDIRECT_H_ diff --git a/src/examples/ndtestutil/NuGetAssetsLock.props b/src/examples/ndtestutil/NuGetAssetsLock.props deleted file mode 100644 index d69953b..0000000 --- a/src/examples/ndtestutil/NuGetAssetsLock.props +++ /dev/null @@ -1,22 +0,0 @@ - - - - true - - - - - [1.0.0] - imbNHw4hg7nnbLjFuagxR1oc7TJv058rCclt+DmqJrvYYKJ10R/tGuKjne1nq94y0FTM1zd4j9v9v9n5A9Va6w== - vc150/1.0.0 - vc150.1.0.0.nupkg.sha512 - - - [1.0.3] - SeyxBzNqK/4Mh0yqD7LrJKxKu7b8Bja+iJFivyUu09B45brU4gOwTYFO7hSgk6Ll+OCjl9pA5RZYmtyy2aU0DA== - wk10/1.0.3 - wk10.1.0.3.nupkg.sha512 - - - - \ No newline at end of file diff --git a/src/examples/ndtestutil/ndtestutil.cpp b/src/examples/ndtestutil/ndtestutil.cpp index 8288874..84295e9 100644 --- a/src/examples/ndtestutil/ndtestutil.cpp +++ b/src/examples/ndtestutil/ndtestutil.cpp @@ -3,6 +3,10 @@ // Licensed under the MIT License. // +#define WIN32_LEAN_AND_MEAN +#include +#include "ndspi.h" +#include "ndsupport.h" #include "ndtestutil.h" //initializer diff --git a/src/examples/ndtestutil/ndtestutil.h b/src/examples/ndtestutil/ndtestutil.h index 8446bcd..c3e2590 100644 --- a/src/examples/ndtestutil/ndtestutil.h +++ b/src/examples/ndtestutil/ndtestutil.h @@ -87,7 +87,7 @@ class NdTestBase protected: NdTestBase(); - ~NdTestBase(); + virtual ~NdTestBase(); //Initialize the adaptor, overlapped handler void Init( @@ -293,7 +293,7 @@ class NdTestServerBase : public NdTestBase public: NdTestServerBase(); - ~NdTestServerBase(); + virtual ~NdTestServerBase(); //virtual method that each test case must implement virtual void RunTest( diff --git a/src/examples/ndtestutil/ndtestutil.vcxproj b/src/examples/ndtestutil/ndtestutil.vcxproj index 161796e..188557a 100644 --- a/src/examples/ndtestutil/ndtestutil.vcxproj +++ b/src/examples/ndtestutil/ndtestutil.vcxproj @@ -1,51 +1,171 @@ - - + + + + Debug + Win32 + + + Release + Win32 + + + Debug + x64 + + + Release + x64 + + - 15.0 - ndtestutil - {c71f993f-d743-41dd-b1bc-b00f500e2602} + 16.0 Win32Proj + {18cf640f-17b3-48af-a936-84042ff7ac58} + ndtestutil + 10.0 - + + StaticLibrary + true + v143 + Unicode + + + StaticLibrary + false + v143 + true + Unicode + + + StaticLibrary + true + v143 + Unicode + false + + StaticLibrary - WindowsUserModeDriver10.0 + false + v143 + true + Unicode + false - + + + + + + + + + + + - + + + + + + $(SolutionDir)$(Platform)\$(Configuration)\ + $(Platform)\$(Configuration)\ + + + $(SolutionDir)$(Platform)\$(Configuration)\ + $(Platform)\$(Configuration)\ + + - _LIB;%(PreprocessorDefinitions) - $(OutIncludePath);.\;..\;%(AdditionalIncludeDirectories); + Level3 + true + WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) + true + + + MultiThreadedDebug + ..\..\ndutil;..\..\examples;%(AdditionalIncludeDirectories) + + + + true + - - - - - - - - - - - + + Level3 + true + true + true + WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) + true + + + MultiThreaded + ..\..\ndutil;..\..\examples;%(AdditionalIncludeDirectories) + + + + + true + true + true + + + + + Level3 + true + _DEBUG;_LIB;%(PreprocessorDefinitions) + true + NotUsing + + + ..\..\ndutil;..\..\examples;%(AdditionalIncludeDirectories) + + MultiThreadedDebug + + + + true + - + + Level3 + true + true + true + NDEBUG;_LIB;%(PreprocessorDefinitions) + true + NotUsing + + + ..\..\ndutil;..\..\examples;%(AdditionalIncludeDirectories) + + MultiThreaded + + + + true + true + true + - - - + + + \ No newline at end of file diff --git a/src/examples/ndtestutil/ndtestutil.vcxproj.filters b/src/examples/ndtestutil/ndtestutil.vcxproj.filters new file mode 100644 index 0000000..a434d59 --- /dev/null +++ b/src/examples/ndtestutil/ndtestutil.vcxproj.filters @@ -0,0 +1,22 @@ + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cc;cxx;c++;cppm;ixx;def;odl;idl;hpj;bat;asm;asmx + + + {93995380-89BD-4b04-88EB-625FBE52EBFB} + h;hh;hpp;hxx;h++;hm;inl;inc;ipp;xsd + + + {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} + rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms + + + + + Source Files + + + \ No newline at end of file diff --git a/src/ndutil/NuGetAssetsLock.props b/src/ndutil/NuGetAssetsLock.props deleted file mode 100644 index d69953b..0000000 --- a/src/ndutil/NuGetAssetsLock.props +++ /dev/null @@ -1,22 +0,0 @@ - - - - true - - - - - [1.0.0] - imbNHw4hg7nnbLjFuagxR1oc7TJv058rCclt+DmqJrvYYKJ10R/tGuKjne1nq94y0FTM1zd4j9v9v9n5A9Va6w== - vc150/1.0.0 - vc150.1.0.0.nupkg.sha512 - - - [1.0.3] - SeyxBzNqK/4Mh0yqD7LrJKxKu7b8Bja+iJFivyUu09B45brU4gOwTYFO7hSgk6Ll+OCjl9pA5RZYmtyy2aU0DA== - wk10/1.0.3 - wk10.1.0.3.nupkg.sha512 - - - - \ No newline at end of file diff --git a/src/ndutil/ndaddr.cpp b/src/ndutil/ndaddr.cpp index 2f409dd..af5fb3e 100644 --- a/src/ndutil/ndaddr.cpp +++ b/src/ndutil/ndaddr.cpp @@ -3,7 +3,7 @@ // Licensed under the MIT License. // -#include "precomp.h" +#include "pch.h" #include "ndaddr.h" diff --git a/src/ndutil/ndfrmwrk.cpp b/src/ndutil/ndfrmwrk.cpp index f8b2172..c75b542 100644 --- a/src/ndutil/ndfrmwrk.cpp +++ b/src/ndutil/ndfrmwrk.cpp @@ -4,7 +4,7 @@ // -#include "precomp.h" +#include "pch.h" #include "ndsupport.h" #include "ndaddr.h" #include "ndprov.h" diff --git a/src/ndutil/ndprov.cpp b/src/ndutil/ndprov.cpp index a53be72..ea9eee9 100644 --- a/src/ndutil/ndprov.cpp +++ b/src/ndutil/ndprov.cpp @@ -4,7 +4,7 @@ // -#include "precomp.h" +#include "pch.h" #include "ndaddr.h" #include "ndprov.h" diff --git a/src/ndutil/ndprov.h b/src/ndutil/ndprov.h index b18c4f1..a8d7de0 100644 --- a/src/ndutil/ndprov.h +++ b/src/ndutil/ndprov.h @@ -35,7 +35,7 @@ namespace NetworkDirect public: Provider(int version); - ~Provider(void); + virtual ~Provider(void); HRESULT Init(GUID& ProviderGuid); void MarkActive(void) { m_Active = true; } void MarkInactive(void) { m_Active = false; } @@ -80,7 +80,6 @@ namespace NetworkDirect { public: NdV1Provider(); - ~NdV1Provider(); HRESULT OpenAdapter( _In_ REFIID iid, @@ -103,7 +102,6 @@ namespace NetworkDirect { public: NdProvider(); - ~NdProvider(); HRESULT OpenAdapter( _In_ REFIID iid, diff --git a/src/ndutil/ndstatus.h b/src/ndutil/ndstatus.h new file mode 100644 index 0000000..b4e92b1 --- /dev/null +++ b/src/ndutil/ndstatus.h @@ -0,0 +1,454 @@ +/*++ + +Copyright (c) Microsoft Corporation. All rights reserved. + +ndstatus.h - NetworkDirect Status Codes + +Status codes with a facility of System map to NTSTATUS codes +of similar names. + +--*/ + +#ifndef _NDSTATUS_ +#define _NDSTATUS_ + +#pragma once + + +// +// Values are 32 bit values laid out as follows: +// +// 3 3 2 2 2 2 2 2 2 2 2 2 1 1 1 1 1 1 1 1 1 1 +// 1 0 9 8 7 6 5 4 3 2 1 0 9 8 7 6 5 4 3 2 1 0 9 8 7 6 5 4 3 2 1 0 +// +---+-+-+-----------------------+-------------------------------+ +// |Sev|C|R| Facility | Code | +// +---+-+-+-----------------------+-------------------------------+ +// +// where +// +// Sev - is the severity code +// +// 00 - Success +// 01 - Informational +// 10 - Warning +// 11 - Error +// +// C - is the Customer code flag +// +// R - is a reserved bit +// +// Facility - is the facility code +// +// Code - is the facility's status code +// +// +// Define the facility codes +// + + +// +// Define the severity codes +// +#define STATUS_SEVERITY_WARNING 0x2 +#define STATUS_SEVERITY_SUCCESS 0x0 +#define STATUS_SEVERITY_INFORMATIONAL 0x1 +#define STATUS_SEVERITY_ERROR 0x3 + + +// +// MessageId: ND_SUCCESS +// +// MessageText: +// +// ND_SUCCESS +// +#define ND_SUCCESS ((HRESULT)0x00000000L) + +// +// MessageId: ND_TIMEOUT +// +// MessageText: +// +// ND_TIMEOUT +// +#define ND_TIMEOUT ((HRESULT)0x00000102L) + +// +// MessageId: ND_PENDING +// +// MessageText: +// +// ND_PENDING +// +#define ND_PENDING ((HRESULT)0x00000103L) + +// +// MessageId: ND_BUFFER_OVERFLOW +// +// MessageText: +// +// ND_BUFFER_OVERFLOW +// +#define ND_BUFFER_OVERFLOW ((HRESULT)0x80000005L) + +// +// MessageId: ND_DEVICE_BUSY +// +// MessageText: +// +// ND_DEVICE_BUSY +// +#define ND_DEVICE_BUSY ((HRESULT)0x80000011L) + +// +// MessageId: ND_NO_MORE_ENTRIES +// +// MessageText: +// +// ND_NO_MORE_ENTRIES +// +#define ND_NO_MORE_ENTRIES ((HRESULT)0x8000001AL) + +// +// MessageId: ND_UNSUCCESSFUL +// +// MessageText: +// +// ND_UNSUCCESSFUL +// +#define ND_UNSUCCESSFUL ((HRESULT)0xC0000001L) + +// +// MessageId: ND_ACCESS_VIOLATION +// +// MessageText: +// +// ND_ACCESS_VIOLATION +// +#define ND_ACCESS_VIOLATION ((HRESULT)0xC0000005L) + +// +// MessageId: ND_INVALID_HANDLE +// +// MessageText: +// +// ND_INVALID_HANDLE +// +#define ND_INVALID_HANDLE ((HRESULT)0xC0000008L) + +// +// MessageId: ND_INVALID_DEVICE_REQUEST +// +// MessageText: +// +// ND_INVALID_DEVICE_REQUEST +// +#define ND_INVALID_DEVICE_REQUEST ((HRESULT)0xC0000010L) + +// +// MessageId: ND_INVALID_PARAMETER +// +// MessageText: +// +// ND_INVALID_PARAMETER +// +#define ND_INVALID_PARAMETER ((HRESULT)0xC000000DL) + +// +// MessageId: ND_NO_MEMORY +// +// MessageText: +// +// ND_NO_MEMORY +// +#define ND_NO_MEMORY ((HRESULT)0xC0000017L) + +// +// MessageId: ND_INVALID_PARAMETER_MIX +// +// MessageText: +// +// ND_INVALID_PARAMETER_MIX +// +#define ND_INVALID_PARAMETER_MIX ((HRESULT)0xC0000030L) + +// +// MessageId: ND_DATA_OVERRUN +// +// MessageText: +// +// ND_DATA_OVERRUN +// +#define ND_DATA_OVERRUN ((HRESULT)0xC000003CL) + +// +// MessageId: ND_SHARING_VIOLATION +// +// MessageText: +// +// ND_SHARING_VIOLATION +// +#define ND_SHARING_VIOLATION ((HRESULT)0xC0000043L) + +// +// MessageId: ND_INSUFFICIENT_RESOURCES +// +// MessageText: +// +// ND_INSUFFICIENT_RESOURCES +// +#define ND_INSUFFICIENT_RESOURCES ((HRESULT)0xC000009AL) + +// +// MessageId: ND_DEVICE_NOT_READY +// +// MessageText: +// +// ND_DEVICE_NOT_READY +// +#define ND_DEVICE_NOT_READY ((HRESULT)0xC00000A3L) + +// +// MessageId: ND_IO_TIMEOUT +// +// MessageText: +// +// ND_IO_TIMEOUT +// +#define ND_IO_TIMEOUT ((HRESULT)0xC00000B5L) + +// +// MessageId: ND_NOT_SUPPORTED +// +// MessageText: +// +// ND_NOT_SUPPORTED +// +#define ND_NOT_SUPPORTED ((HRESULT)0xC00000BBL) + +// +// MessageId: ND_INTERNAL_ERROR +// +// MessageText: +// +// ND_INTERNAL_ERROR +// +#define ND_INTERNAL_ERROR ((HRESULT)0xC00000E5L) + +// +// MessageId: ND_INVALID_PARAMETER_1 +// +// MessageText: +// +// ND_INVALID_PARAMETER_1 +// +#define ND_INVALID_PARAMETER_1 ((HRESULT)0xC00000EFL) + +// +// MessageId: ND_INVALID_PARAMETER_2 +// +// MessageText: +// +// ND_INVALID_PARAMETER_2 +// +#define ND_INVALID_PARAMETER_2 ((HRESULT)0xC00000F0L) + +// +// MessageId: ND_INVALID_PARAMETER_3 +// +// MessageText: +// +// ND_INVALID_PARAMETER_3 +// +#define ND_INVALID_PARAMETER_3 ((HRESULT)0xC00000F1L) + +// +// MessageId: ND_INVALID_PARAMETER_4 +// +// MessageText: +// +// ND_INVALID_PARAMETER_4 +// +#define ND_INVALID_PARAMETER_4 ((HRESULT)0xC00000F2L) + +// +// MessageId: ND_INVALID_PARAMETER_5 +// +// MessageText: +// +// ND_INVALID_PARAMETER_5 +// +#define ND_INVALID_PARAMETER_5 ((HRESULT)0xC00000F3L) + +// +// MessageId: ND_INVALID_PARAMETER_6 +// +// MessageText: +// +// ND_INVALID_PARAMETER_6 +// +#define ND_INVALID_PARAMETER_6 ((HRESULT)0xC00000F4L) + +// +// MessageId: ND_INVALID_PARAMETER_7 +// +// MessageText: +// +// ND_INVALID_PARAMETER_7 +// +#define ND_INVALID_PARAMETER_7 ((HRESULT)0xC00000F5L) + +// +// MessageId: ND_INVALID_PARAMETER_8 +// +// MessageText: +// +// ND_INVALID_PARAMETER_8 +// +#define ND_INVALID_PARAMETER_8 ((HRESULT)0xC00000F6L) + +// +// MessageId: ND_INVALID_PARAMETER_9 +// +// MessageText: +// +// ND_INVALID_PARAMETER_9 +// +#define ND_INVALID_PARAMETER_9 ((HRESULT)0xC00000F7L) + +// +// MessageId: ND_INVALID_PARAMETER_10 +// +// MessageText: +// +// ND_INVALID_PARAMETER_10 +// +#define ND_INVALID_PARAMETER_10 ((HRESULT)0xC00000F8L) + +// +// MessageId: ND_CANCELED +// +// MessageText: +// +// ND_CANCELED +// +#define ND_CANCELED ((HRESULT)0xC0000120L) + +// +// MessageId: ND_REMOTE_ERROR +// +// MessageText: +// +// ND_REMOTE_ERROR +// +#define ND_REMOTE_ERROR ((HRESULT)0xC000013DL) + +// +// MessageId: ND_INVALID_ADDRESS +// +// MessageText: +// +// ND_INVALID_ADDRESS +// +#define ND_INVALID_ADDRESS ((HRESULT)0xC0000141L) + +// +// MessageId: ND_INVALID_DEVICE_STATE +// +// MessageText: +// +// ND_INVALID_DEVICE_STATE +// +#define ND_INVALID_DEVICE_STATE ((HRESULT)0xC0000184L) + +// +// MessageId: ND_INVALID_BUFFER_SIZE +// +// MessageText: +// +// ND_INVALID_BUFFER_SIZE +// +#define ND_INVALID_BUFFER_SIZE ((HRESULT)0xC0000206L) + +// +// MessageId: ND_TOO_MANY_ADDRESSES +// +// MessageText: +// +// ND_TOO_MANY_ADDRESSES +// +#define ND_TOO_MANY_ADDRESSES ((HRESULT)0xC0000209L) + +// +// MessageId: ND_ADDRESS_ALREADY_EXISTS +// +// MessageText: +// +// ND_ADDRESS_ALREADY_EXISTS +// +#define ND_ADDRESS_ALREADY_EXISTS ((HRESULT)0xC000020AL) + +// +// MessageId: ND_CONNECTION_REFUSED +// +// MessageText: +// +// ND_CONNECTION_REFUSED +// +#define ND_CONNECTION_REFUSED ((HRESULT)0xC0000236L) + +// +// MessageId: ND_CONNECTION_INVALID +// +// MessageText: +// +// ND_CONNECTION_INVALID +// +#define ND_CONNECTION_INVALID ((HRESULT)0xC000023AL) + +// +// MessageId: ND_CONNECTION_ACTIVE +// +// MessageText: +// +// ND_CONNECTION_ACTIVE +// +#define ND_CONNECTION_ACTIVE ((HRESULT)0xC000023BL) + +// +// MessageId: ND_NETWORK_UNREACHABLE +// +// MessageText: +// +// ND_NETWORK_UNREACHABLE +// +#define ND_NETWORK_UNREACHABLE ((HRESULT)0xC000023CL) + +// +// MessageId: ND_HOST_UNREACHABLE +// +// MessageText: +// +// ND_HOST_UNREACHABLE +// +#define ND_HOST_UNREACHABLE ((HRESULT)0xC000023DL) + +// +// MessageId: ND_CONNECTION_ABORTED +// +// MessageText: +// +// ND_CONNECTION_ABORTED +// +#define ND_CONNECTION_ABORTED ((HRESULT)0xC0000241L) + +// +// MessageId: ND_DEVICE_REMOVED +// +// MessageText: +// +// ND_DEVICE_REMOVED +// +#define ND_DEVICE_REMOVED ((HRESULT)0xC00002B6L) + +#endif // _NDSTATUS_ diff --git a/src/ndutil/ndsupport.h b/src/ndutil/ndsupport.h index 4072557..a5d6040 100644 --- a/src/ndutil/ndsupport.h +++ b/src/ndutil/ndsupport.h @@ -10,7 +10,7 @@ #ifndef _NETDIRECT_H_ #define _NETDIRECT_H_ -#include +#include "ndspi.h" #ifdef __cplusplus diff --git a/src/ndutil/ndutil.vcxproj b/src/ndutil/ndutil.vcxproj index 0b5df8c..22f6c6e 100644 --- a/src/ndutil/ndutil.vcxproj +++ b/src/ndutil/ndutil.vcxproj @@ -1,93 +1,187 @@ - - - + + + + Debug + Win32 + + + Release + Win32 + + + Debug + x64 + + + Release + x64 + + - 15.0 - {6955ED94-3B21-4835-838A-A797AFF63183} + 16.0 Win32Proj + {dd18c55e-ad58-4881-bab8-91f41c5410bb} ndutil + 10.0 - - - $(MSBuildProjectName) - *.lib - - - + + StaticLibrary + true + v143 + Unicode + + StaticLibrary - WindowsUserModeDriver10.0 + false + v143 + true + Unicode + + + StaticLibrary + true + v143 + Unicode + false + + + StaticLibrary + false + v143 + true + Unicode + false - - + + + + + + + + + + + + + + - - + + + $(SolutionDir)$(Platform)\$(Configuration)\ + $(Platform)\$(Configuration)\ + + + $(Platform)\$(Configuration)\ + $(SolutionDir)$(Platform)\$(Configuration)\ + + + Level3 + true + WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) + true Use - _LIB;%(PreprocessorDefinitions) - precomp.h - .;$(OutIncludePath);%(AdditionalIncludeDirectories) - $(IntDir)$(TargetName).pch + pch.h + MultiThreadedDebug + + + + + true + + + + + Level3 + true + true + true + WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) + true + Use + pch.h + MultiThreaded + + + true + true + true + + + + + Level3 + true + _DEBUG;_LIB;%(PreprocessorDefinitions) + true + Use + pch.h + %(AdditionalIncludeDirectories) + MultiThreadedDebug + + + + + true + + + + + Level3 + true + true + true + NDEBUG;_LIB;%(PreprocessorDefinitions) + true + Use + pch.h + %(AdditionalIncludeDirectories) + MultiThreaded + + + + + true + true + true - - if not exist $(OutIncludePath) mkdir $(OutIncludePath) - Create Include folder - - - robocopy .\ $(OutIncludePath)\ nddef.h ndioctl.h ndspi.h -set rc=%errorlevel% -if not %rc%==1 exit %rce% else exit 0 - - - Copy header files to include folder - - + + + + - - + - - Create - + + + Create + Create + Create + Create + - - - true - $(OutIncludePath) - true - . - + - - - - - MultiThreadedDebug - - - - - - MultiThreaded - - - - + + + \ No newline at end of file diff --git a/src/ndutil/ndutil.vcxproj.filters b/src/ndutil/ndutil.vcxproj.filters new file mode 100644 index 0000000..1e2ddbe --- /dev/null +++ b/src/ndutil/ndutil.vcxproj.filters @@ -0,0 +1,69 @@ + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cc;cxx;c++;cppm;ixx;def;odl;idl;hpj;bat;asm;asmx + + + {93995380-89BD-4b04-88EB-625FBE52EBFB} + h;hh;hpp;hxx;h++;hm;inl;inc;ipp;xsd + + + {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} + rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms + + + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + + + + \ No newline at end of file diff --git a/src/ndutil/pch.cpp b/src/ndutil/pch.cpp new file mode 100644 index 0000000..64b7eef --- /dev/null +++ b/src/ndutil/pch.cpp @@ -0,0 +1,5 @@ +// pch.cpp: source file corresponding to the pre-compiled header + +#include "pch.h" + +// When you are using pre-compiled headers, this source file is necessary for compilation to succeed. diff --git a/src/ndutil/pch.h b/src/ndutil/pch.h new file mode 100644 index 0000000..59e3dbf --- /dev/null +++ b/src/ndutil/pch.h @@ -0,0 +1,19 @@ +// pch.h: This is a precompiled header file. +// Files listed below are compiled only once, improving build performance for future builds. +// This also affects IntelliSense performance, including code completion and many code browsing features. +// However, files listed here are ALL re-compiled if any one of them is updated between builds. +// Do not add files here that you will be updating frequently as this negates the performance advantage. + +#ifndef PCH_H +#define PCH_H + +// add headers that you want to pre-compile here +#include +#include +#include +#include "assertutil.h" +#include "ndutil.h" +#include "list.h" +#include "ndspi.h" + +#endif //PCH_H diff --git a/src/ndutil/precomp.h b/src/ndutil/precomp.h deleted file mode 100644 index c260aa2..0000000 --- a/src/ndutil/precomp.h +++ /dev/null @@ -1,15 +0,0 @@ -// -// Copyright(c) Microsoft Corporation.All rights reserved. -// Licensed under the MIT License. -// - -#include -#include -#include -#include - -#include "assertutil.h" -#include "ndutil.h" -#include "list.h" -#include "initguid.h" -#include "ndspi.h" diff --git a/src/netdirect.sln b/src/netdirect.sln index f1920f3..19c5c01 100644 --- a/src/netdirect.sln +++ b/src/netdirect.sln @@ -1,52 +1,98 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 15 -VisualStudioVersion = 15.0.27130.0 +# Visual Studio Version 17 +VisualStudioVersion = 17.5.33414.496 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ndutil", "ndutil\ndutil.vcxproj", "{6955ED94-3B21-4835-838A-A797AFF63183}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ndutil", "ndutil\ndutil.vcxproj", "{DD18C55E-AD58-4881-BAB8-91F41C5410BB}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ndcat", "examples\ndcat\ndcat.vcxproj", "{8DC2234B-0FFD-492B-817E-C81DC04EFF86}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ndtestutil", "examples\ndtestutil\ndtestutil.vcxproj", "{18CF640F-17B3-48AF-A936-84042FF7AC58}" + ProjectSection(ProjectDependencies) = postProject + {DD18C55E-AD58-4881-BAB8-91F41C5410BB} = {DD18C55E-AD58-4881-BAB8-91F41C5410BB} + EndProjectSection EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ndmrlat", "examples\ndmrlat\ndmrlat.vcxproj", "{432CD967-42FA-437A-80A4-61C890E72418}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ndping", "examples\ndping\ndping.vcxproj", "{FD8218C4-7D3A-4EE9-9262-02E9631E7CB6}" + ProjectSection(ProjectDependencies) = postProject + {18CF640F-17B3-48AF-A936-84042FF7AC58} = {18CF640F-17B3-48AF-A936-84042FF7AC58} + {DD18C55E-AD58-4881-BAB8-91F41C5410BB} = {DD18C55E-AD58-4881-BAB8-91F41C5410BB} + EndProjectSection EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ndmrrate", "examples\ndmrrate\ndmrrate.vcxproj", "{8D8E0152-C783-490B-B2A0-50AA4B909934}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ndadapterinfo", "examples\ndadapterinfo\ndadapterinfo.vcxproj", "{F8BB9B41-CD6B-4C1C-84C1-68D200B19952}" + ProjectSection(ProjectDependencies) = postProject + {18CF640F-17B3-48AF-A936-84042FF7AC58} = {18CF640F-17B3-48AF-A936-84042FF7AC58} + {DD18C55E-AD58-4881-BAB8-91F41C5410BB} = {DD18C55E-AD58-4881-BAB8-91F41C5410BB} + EndProjectSection EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ndping", "examples\ndping\ndping.vcxproj", "{7523D17D-72E7-4AFE-B176-6A37A3170416}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ndcat", "examples\ndcat\ndcat.vcxproj", "{CB0E86C1-D48A-4A21-B88B-A6EE9734FC67}" + ProjectSection(ProjectDependencies) = postProject + {18CF640F-17B3-48AF-A936-84042FF7AC58} = {18CF640F-17B3-48AF-A936-84042FF7AC58} + {DD18C55E-AD58-4881-BAB8-91F41C5410BB} = {DD18C55E-AD58-4881-BAB8-91F41C5410BB} + EndProjectSection EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ndpingpong", "examples\ndpingpong\ndpingpong.vcxproj", "{32A2B4B2-58B0-4878-BFD5-D6FDB8B35AAA}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ndmrlat", "examples\ndmrlat\ndmrlat.vcxproj", "{7E8A3354-1EEB-4580-8B07-B9CEDF81F727}" ProjectSection(ProjectDependencies) = postProject - {6955ED94-3B21-4835-838A-A797AFF63183} = {6955ED94-3B21-4835-838A-A797AFF63183} + {18CF640F-17B3-48AF-A936-84042FF7AC58} = {18CF640F-17B3-48AF-A936-84042FF7AC58} + {DD18C55E-AD58-4881-BAB8-91F41C5410BB} = {DD18C55E-AD58-4881-BAB8-91F41C5410BB} EndProjectSection EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ndrping", "examples\ndrping\ndrping.vcxproj", "{E4965852-D42D-4C02-8BF3-F26D521487C5}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ndmrrate", "examples\ndmrrate\ndmrrate.vcxproj", "{3906A75A-0C0E-440D-A4FE-F91888425F4C}" ProjectSection(ProjectDependencies) = postProject - {6955ED94-3B21-4835-838A-A797AFF63183} = {6955ED94-3B21-4835-838A-A797AFF63183} + {18CF640F-17B3-48AF-A936-84042FF7AC58} = {18CF640F-17B3-48AF-A936-84042FF7AC58} + {DD18C55E-AD58-4881-BAB8-91F41C5410BB} = {DD18C55E-AD58-4881-BAB8-91F41C5410BB} EndProjectSection EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ndrpingpong", "examples\ndrpingpong\ndrpingpong.vcxproj", "{104A3A1F-5C55-4FF0-A040-18B8725B3A0A}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ndpingpong", "examples\ndpingpong\ndpingpong.vcxproj", "{DF2C2C46-F5C9-4E74-A903-67D93D4157A5}" ProjectSection(ProjectDependencies) = postProject - {6955ED94-3B21-4835-838A-A797AFF63183} = {6955ED94-3B21-4835-838A-A797AFF63183} + {18CF640F-17B3-48AF-A936-84042FF7AC58} = {18CF640F-17B3-48AF-A936-84042FF7AC58} + {DD18C55E-AD58-4881-BAB8-91F41C5410BB} = {DD18C55E-AD58-4881-BAB8-91F41C5410BB} EndProjectSection EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ndtestutil", "examples\ndtestutil\ndtestutil.vcxproj", "{C71F993F-D743-41DD-B1BC-B00F500E2602}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ndrping", "examples\ndrping\ndrping.vcxproj", "{48E4E74B-9F0C-4B5C-A2BC-EBC4397086F7}" + ProjectSection(ProjectDependencies) = postProject + {18CF640F-17B3-48AF-A936-84042FF7AC58} = {18CF640F-17B3-48AF-A936-84042FF7AC58} + {DD18C55E-AD58-4881-BAB8-91F41C5410BB} = {DD18C55E-AD58-4881-BAB8-91F41C5410BB} + EndProjectSection EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ndadapterinfo", "examples\ndadapterinfo\ndadapterinfo.vcxproj", "{8D8C0B5F-A47C-46BE-A3D4-54E39F0F88B8}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ndrpingpong", "examples\ndrpingpong\ndrpingpong.vcxproj", "{0A036D35-FEE2-426D-9FC1-3694B8C15418}" + ProjectSection(ProjectDependencies) = postProject + {18CF640F-17B3-48AF-A936-84042FF7AC58} = {18CF640F-17B3-48AF-A936-84042FF7AC58} + {DD18C55E-AD58-4881-BAB8-91F41C5410BB} = {DD18C55E-AD58-4881-BAB8-91F41C5410BB} + EndProjectSection EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ndmemorytest", "unittests\ndmemorytest\ndmemorytest.vcxproj", "{FFD1D086-E7E1-4506-8957-4E083EF2ACB5}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ndconn", "unittests\ndconn\ndconn.vcxproj", "{5C35FC76-6526-4C6C-97A4-957E3A3ADA77}" ProjectSection(ProjectDependencies) = postProject - {C71F993F-D743-41DD-B1BC-B00F500E2602} = {C71F993F-D743-41DD-B1BC-B00F500E2602} - {6955ED94-3B21-4835-838A-A797AFF63183} = {6955ED94-3B21-4835-838A-A797AFF63183} + {18CF640F-17B3-48AF-A936-84042FF7AC58} = {18CF640F-17B3-48AF-A936-84042FF7AC58} + {DD18C55E-AD58-4881-BAB8-91F41C5410BB} = {DD18C55E-AD58-4881-BAB8-91F41C5410BB} EndProjectSection EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ndconn", "unittests\ndconn\ndconn.vcxproj", "{C4C6C8C3-5299-4A0C-A1F6-EDE1A653F462}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ndcq", "unittests\ndcq\ndcq.vcxproj", "{1B9CE6D3-B27A-4E94-9D06-E8493732B0C5}" + ProjectSection(ProjectDependencies) = postProject + {18CF640F-17B3-48AF-A936-84042FF7AC58} = {18CF640F-17B3-48AF-A936-84042FF7AC58} + {DD18C55E-AD58-4881-BAB8-91F41C5410BB} = {DD18C55E-AD58-4881-BAB8-91F41C5410BB} + EndProjectSection EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ndcq", "unittests\ndcq\ndcq.vcxproj", "{64B7369B-6981-4F34-8F2A-F029BC61F01E}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ndmemorytest", "unittests\ndmemorytest\ndmemorytest.vcxproj", "{067C13D4-885A-4DB7-BEB9-1DD973E5D959}" + ProjectSection(ProjectDependencies) = postProject + {18CF640F-17B3-48AF-A936-84042FF7AC58} = {18CF640F-17B3-48AF-A936-84042FF7AC58} + {DD18C55E-AD58-4881-BAB8-91F41C5410BB} = {DD18C55E-AD58-4881-BAB8-91F41C5410BB} + EndProjectSection EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ndmpic", "unittests\ndmpic\ndmpic.vcxproj", "{BF2F3362-1023-4F95-A8FB-68FE7F34049D}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ndmpic", "unittests\ndmpic\ndmpic.vcxproj", "{28EB189D-7522-4955-9B9D-CFD37EFA146C}" + ProjectSection(ProjectDependencies) = postProject + {18CF640F-17B3-48AF-A936-84042FF7AC58} = {18CF640F-17B3-48AF-A936-84042FF7AC58} + {DD18C55E-AD58-4881-BAB8-91F41C5410BB} = {DD18C55E-AD58-4881-BAB8-91F41C5410BB} + EndProjectSection EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ndmval", "unittests\ndmval\ndmval.vcxproj", "{591ADBBE-9343-4393-920B-2C969E7AFEDA}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ndmval", "unittests\ndmval\ndmval.vcxproj", "{0401631E-54B5-4445-A2E1-FAD4143F74FE}" + ProjectSection(ProjectDependencies) = postProject + {18CF640F-17B3-48AF-A936-84042FF7AC58} = {18CF640F-17B3-48AF-A936-84042FF7AC58} + {DD18C55E-AD58-4881-BAB8-91F41C5410BB} = {DD18C55E-AD58-4881-BAB8-91F41C5410BB} + EndProjectSection EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ndmw", "unittests\ndmw\ndmw.vcxproj", "{6707722C-4371-48A4-A3A2-40D126059690}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ndmw", "unittests\ndmw\ndmw.vcxproj", "{DE5B13C5-65D5-4F5D-B92A-228BE4415318}" + ProjectSection(ProjectDependencies) = postProject + {18CF640F-17B3-48AF-A936-84042FF7AC58} = {18CF640F-17B3-48AF-A936-84042FF7AC58} + {DD18C55E-AD58-4881-BAB8-91F41C5410BB} = {DD18C55E-AD58-4881-BAB8-91F41C5410BB} + EndProjectSection EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -56,147 +102,139 @@ Global Release|x86 = Release|x86 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {6955ED94-3B21-4835-838A-A797AFF63183}.Debug|x64.ActiveCfg = Debug|x64 - {6955ED94-3B21-4835-838A-A797AFF63183}.Debug|x64.Build.0 = Debug|x64 - {6955ED94-3B21-4835-838A-A797AFF63183}.Debug|x64.Deploy.0 = Debug|x64 - {6955ED94-3B21-4835-838A-A797AFF63183}.Debug|x86.ActiveCfg = Debug|Win32 - {6955ED94-3B21-4835-838A-A797AFF63183}.Debug|x86.Build.0 = Debug|Win32 - {6955ED94-3B21-4835-838A-A797AFF63183}.Debug|x86.Deploy.0 = Debug|Win32 - {6955ED94-3B21-4835-838A-A797AFF63183}.Release|x64.ActiveCfg = Release|x64 - {6955ED94-3B21-4835-838A-A797AFF63183}.Release|x64.Build.0 = Release|x64 - {6955ED94-3B21-4835-838A-A797AFF63183}.Release|x64.Deploy.0 = Release|x64 - {6955ED94-3B21-4835-838A-A797AFF63183}.Release|x86.ActiveCfg = Release|Win32 - {6955ED94-3B21-4835-838A-A797AFF63183}.Release|x86.Build.0 = Release|Win32 - {6955ED94-3B21-4835-838A-A797AFF63183}.Release|x86.Deploy.0 = Release|Win32 - {8DC2234B-0FFD-492B-817E-C81DC04EFF86}.Debug|x64.ActiveCfg = Debug|x64 - {8DC2234B-0FFD-492B-817E-C81DC04EFF86}.Debug|x64.Build.0 = Debug|x64 - {8DC2234B-0FFD-492B-817E-C81DC04EFF86}.Debug|x86.ActiveCfg = Debug|Win32 - {8DC2234B-0FFD-492B-817E-C81DC04EFF86}.Debug|x86.Build.0 = Debug|Win32 - {8DC2234B-0FFD-492B-817E-C81DC04EFF86}.Release|x64.ActiveCfg = Release|x64 - {8DC2234B-0FFD-492B-817E-C81DC04EFF86}.Release|x64.Build.0 = Release|x64 - {8DC2234B-0FFD-492B-817E-C81DC04EFF86}.Release|x86.ActiveCfg = Release|Win32 - {8DC2234B-0FFD-492B-817E-C81DC04EFF86}.Release|x86.Build.0 = Release|Win32 - {432CD967-42FA-437A-80A4-61C890E72418}.Debug|x64.ActiveCfg = Debug|x64 - {432CD967-42FA-437A-80A4-61C890E72418}.Debug|x64.Build.0 = Debug|x64 - {432CD967-42FA-437A-80A4-61C890E72418}.Debug|x86.ActiveCfg = Debug|Win32 - {432CD967-42FA-437A-80A4-61C890E72418}.Debug|x86.Build.0 = Debug|Win32 - {432CD967-42FA-437A-80A4-61C890E72418}.Release|x64.ActiveCfg = Release|x64 - {432CD967-42FA-437A-80A4-61C890E72418}.Release|x64.Build.0 = Release|x64 - {432CD967-42FA-437A-80A4-61C890E72418}.Release|x86.ActiveCfg = Release|Win32 - {432CD967-42FA-437A-80A4-61C890E72418}.Release|x86.Build.0 = Release|Win32 - {8D8E0152-C783-490B-B2A0-50AA4B909934}.Debug|x64.ActiveCfg = Debug|x64 - {8D8E0152-C783-490B-B2A0-50AA4B909934}.Debug|x64.Build.0 = Debug|x64 - {8D8E0152-C783-490B-B2A0-50AA4B909934}.Debug|x86.ActiveCfg = Debug|Win32 - {8D8E0152-C783-490B-B2A0-50AA4B909934}.Debug|x86.Build.0 = Debug|Win32 - {8D8E0152-C783-490B-B2A0-50AA4B909934}.Release|x64.ActiveCfg = Release|x64 - {8D8E0152-C783-490B-B2A0-50AA4B909934}.Release|x64.Build.0 = Release|x64 - {8D8E0152-C783-490B-B2A0-50AA4B909934}.Release|x86.ActiveCfg = Release|Win32 - {8D8E0152-C783-490B-B2A0-50AA4B909934}.Release|x86.Build.0 = Release|Win32 - {7523D17D-72E7-4AFE-B176-6A37A3170416}.Debug|x64.ActiveCfg = Debug|x64 - {7523D17D-72E7-4AFE-B176-6A37A3170416}.Debug|x64.Build.0 = Debug|x64 - {7523D17D-72E7-4AFE-B176-6A37A3170416}.Debug|x86.ActiveCfg = Debug|Win32 - {7523D17D-72E7-4AFE-B176-6A37A3170416}.Debug|x86.Build.0 = Debug|Win32 - {7523D17D-72E7-4AFE-B176-6A37A3170416}.Release|x64.ActiveCfg = Release|x64 - {7523D17D-72E7-4AFE-B176-6A37A3170416}.Release|x64.Build.0 = Release|x64 - {7523D17D-72E7-4AFE-B176-6A37A3170416}.Release|x86.ActiveCfg = Release|Win32 - {7523D17D-72E7-4AFE-B176-6A37A3170416}.Release|x86.Build.0 = Release|Win32 - {32A2B4B2-58B0-4878-BFD5-D6FDB8B35AAA}.Debug|x64.ActiveCfg = Debug|x64 - {32A2B4B2-58B0-4878-BFD5-D6FDB8B35AAA}.Debug|x64.Build.0 = Debug|x64 - {32A2B4B2-58B0-4878-BFD5-D6FDB8B35AAA}.Debug|x86.ActiveCfg = Debug|Win32 - {32A2B4B2-58B0-4878-BFD5-D6FDB8B35AAA}.Debug|x86.Build.0 = Debug|Win32 - {32A2B4B2-58B0-4878-BFD5-D6FDB8B35AAA}.Release|x64.ActiveCfg = Release|x64 - {32A2B4B2-58B0-4878-BFD5-D6FDB8B35AAA}.Release|x64.Build.0 = Release|x64 - {32A2B4B2-58B0-4878-BFD5-D6FDB8B35AAA}.Release|x86.ActiveCfg = Release|Win32 - {32A2B4B2-58B0-4878-BFD5-D6FDB8B35AAA}.Release|x86.Build.0 = Release|Win32 - {E4965852-D42D-4C02-8BF3-F26D521487C5}.Debug|x64.ActiveCfg = Debug|x64 - {E4965852-D42D-4C02-8BF3-F26D521487C5}.Debug|x64.Build.0 = Debug|x64 - {E4965852-D42D-4C02-8BF3-F26D521487C5}.Debug|x86.ActiveCfg = Debug|Win32 - {E4965852-D42D-4C02-8BF3-F26D521487C5}.Debug|x86.Build.0 = Debug|Win32 - {E4965852-D42D-4C02-8BF3-F26D521487C5}.Release|x64.ActiveCfg = Release|x64 - {E4965852-D42D-4C02-8BF3-F26D521487C5}.Release|x64.Build.0 = Release|x64 - {E4965852-D42D-4C02-8BF3-F26D521487C5}.Release|x86.ActiveCfg = Release|Win32 - {E4965852-D42D-4C02-8BF3-F26D521487C5}.Release|x86.Build.0 = Release|Win32 - {104A3A1F-5C55-4FF0-A040-18B8725B3A0A}.Debug|x64.ActiveCfg = Debug|x64 - {104A3A1F-5C55-4FF0-A040-18B8725B3A0A}.Debug|x64.Build.0 = Debug|x64 - {104A3A1F-5C55-4FF0-A040-18B8725B3A0A}.Debug|x86.ActiveCfg = Debug|Win32 - {104A3A1F-5C55-4FF0-A040-18B8725B3A0A}.Debug|x86.Build.0 = Debug|Win32 - {104A3A1F-5C55-4FF0-A040-18B8725B3A0A}.Release|x64.ActiveCfg = Release|x64 - {104A3A1F-5C55-4FF0-A040-18B8725B3A0A}.Release|x64.Build.0 = Release|x64 - {104A3A1F-5C55-4FF0-A040-18B8725B3A0A}.Release|x86.ActiveCfg = Release|Win32 - {104A3A1F-5C55-4FF0-A040-18B8725B3A0A}.Release|x86.Build.0 = Release|Win32 - {C71F993F-D743-41DD-B1BC-B00F500E2602}.Debug|x64.ActiveCfg = Debug|x64 - {C71F993F-D743-41DD-B1BC-B00F500E2602}.Debug|x64.Build.0 = Debug|x64 - {C71F993F-D743-41DD-B1BC-B00F500E2602}.Debug|x64.Deploy.0 = Debug|x64 - {C71F993F-D743-41DD-B1BC-B00F500E2602}.Debug|x86.ActiveCfg = Debug|Win32 - {C71F993F-D743-41DD-B1BC-B00F500E2602}.Debug|x86.Build.0 = Debug|Win32 - {C71F993F-D743-41DD-B1BC-B00F500E2602}.Debug|x86.Deploy.0 = Debug|Win32 - {C71F993F-D743-41DD-B1BC-B00F500E2602}.Release|x64.ActiveCfg = Release|x64 - {C71F993F-D743-41DD-B1BC-B00F500E2602}.Release|x64.Build.0 = Release|x64 - {C71F993F-D743-41DD-B1BC-B00F500E2602}.Release|x64.Deploy.0 = Release|x64 - {C71F993F-D743-41DD-B1BC-B00F500E2602}.Release|x86.ActiveCfg = Release|Win32 - {C71F993F-D743-41DD-B1BC-B00F500E2602}.Release|x86.Build.0 = Release|Win32 - {C71F993F-D743-41DD-B1BC-B00F500E2602}.Release|x86.Deploy.0 = Release|Win32 - {8D8C0B5F-A47C-46BE-A3D4-54E39F0F88B8}.Debug|x64.ActiveCfg = Debug|x64 - {8D8C0B5F-A47C-46BE-A3D4-54E39F0F88B8}.Debug|x64.Build.0 = Debug|x64 - {8D8C0B5F-A47C-46BE-A3D4-54E39F0F88B8}.Debug|x86.ActiveCfg = Debug|Win32 - {8D8C0B5F-A47C-46BE-A3D4-54E39F0F88B8}.Debug|x86.Build.0 = Debug|Win32 - {8D8C0B5F-A47C-46BE-A3D4-54E39F0F88B8}.Release|x64.ActiveCfg = Release|x64 - {8D8C0B5F-A47C-46BE-A3D4-54E39F0F88B8}.Release|x64.Build.0 = Release|x64 - {8D8C0B5F-A47C-46BE-A3D4-54E39F0F88B8}.Release|x86.ActiveCfg = Release|Win32 - {8D8C0B5F-A47C-46BE-A3D4-54E39F0F88B8}.Release|x86.Build.0 = Release|Win32 - {FFD1D086-E7E1-4506-8957-4E083EF2ACB5}.Debug|x64.ActiveCfg = Debug|x64 - {FFD1D086-E7E1-4506-8957-4E083EF2ACB5}.Debug|x64.Build.0 = Debug|x64 - {FFD1D086-E7E1-4506-8957-4E083EF2ACB5}.Debug|x86.ActiveCfg = Debug|Win32 - {FFD1D086-E7E1-4506-8957-4E083EF2ACB5}.Debug|x86.Build.0 = Debug|Win32 - {FFD1D086-E7E1-4506-8957-4E083EF2ACB5}.Release|x64.ActiveCfg = Release|x64 - {FFD1D086-E7E1-4506-8957-4E083EF2ACB5}.Release|x64.Build.0 = Release|x64 - {FFD1D086-E7E1-4506-8957-4E083EF2ACB5}.Release|x86.ActiveCfg = Release|Win32 - {FFD1D086-E7E1-4506-8957-4E083EF2ACB5}.Release|x86.Build.0 = Release|Win32 - {C4C6C8C3-5299-4A0C-A1F6-EDE1A653F462}.Debug|x64.ActiveCfg = Debug|x64 - {C4C6C8C3-5299-4A0C-A1F6-EDE1A653F462}.Debug|x64.Build.0 = Debug|x64 - {C4C6C8C3-5299-4A0C-A1F6-EDE1A653F462}.Debug|x86.ActiveCfg = Debug|Win32 - {C4C6C8C3-5299-4A0C-A1F6-EDE1A653F462}.Debug|x86.Build.0 = Debug|Win32 - {C4C6C8C3-5299-4A0C-A1F6-EDE1A653F462}.Release|x64.ActiveCfg = Release|x64 - {C4C6C8C3-5299-4A0C-A1F6-EDE1A653F462}.Release|x64.Build.0 = Release|x64 - {C4C6C8C3-5299-4A0C-A1F6-EDE1A653F462}.Release|x86.ActiveCfg = Release|Win32 - {C4C6C8C3-5299-4A0C-A1F6-EDE1A653F462}.Release|x86.Build.0 = Release|Win32 - {64B7369B-6981-4F34-8F2A-F029BC61F01E}.Debug|x64.ActiveCfg = Debug|x64 - {64B7369B-6981-4F34-8F2A-F029BC61F01E}.Debug|x64.Build.0 = Debug|x64 - {64B7369B-6981-4F34-8F2A-F029BC61F01E}.Debug|x86.ActiveCfg = Debug|Win32 - {64B7369B-6981-4F34-8F2A-F029BC61F01E}.Debug|x86.Build.0 = Debug|Win32 - {64B7369B-6981-4F34-8F2A-F029BC61F01E}.Release|x64.ActiveCfg = Release|x64 - {64B7369B-6981-4F34-8F2A-F029BC61F01E}.Release|x64.Build.0 = Release|x64 - {64B7369B-6981-4F34-8F2A-F029BC61F01E}.Release|x86.ActiveCfg = Release|Win32 - {64B7369B-6981-4F34-8F2A-F029BC61F01E}.Release|x86.Build.0 = Release|Win32 - {BF2F3362-1023-4F95-A8FB-68FE7F34049D}.Debug|x64.ActiveCfg = Debug|x64 - {BF2F3362-1023-4F95-A8FB-68FE7F34049D}.Debug|x64.Build.0 = Debug|x64 - {BF2F3362-1023-4F95-A8FB-68FE7F34049D}.Debug|x86.ActiveCfg = Debug|Win32 - {BF2F3362-1023-4F95-A8FB-68FE7F34049D}.Debug|x86.Build.0 = Debug|Win32 - {BF2F3362-1023-4F95-A8FB-68FE7F34049D}.Release|x64.ActiveCfg = Release|x64 - {BF2F3362-1023-4F95-A8FB-68FE7F34049D}.Release|x64.Build.0 = Release|x64 - {BF2F3362-1023-4F95-A8FB-68FE7F34049D}.Release|x86.ActiveCfg = Release|Win32 - {BF2F3362-1023-4F95-A8FB-68FE7F34049D}.Release|x86.Build.0 = Release|Win32 - {591ADBBE-9343-4393-920B-2C969E7AFEDA}.Debug|x64.ActiveCfg = Debug|x64 - {591ADBBE-9343-4393-920B-2C969E7AFEDA}.Debug|x64.Build.0 = Debug|x64 - {591ADBBE-9343-4393-920B-2C969E7AFEDA}.Debug|x86.ActiveCfg = Debug|Win32 - {591ADBBE-9343-4393-920B-2C969E7AFEDA}.Debug|x86.Build.0 = Debug|Win32 - {591ADBBE-9343-4393-920B-2C969E7AFEDA}.Release|x64.ActiveCfg = Release|x64 - {591ADBBE-9343-4393-920B-2C969E7AFEDA}.Release|x64.Build.0 = Release|x64 - {591ADBBE-9343-4393-920B-2C969E7AFEDA}.Release|x86.ActiveCfg = Release|Win32 - {591ADBBE-9343-4393-920B-2C969E7AFEDA}.Release|x86.Build.0 = Release|Win32 - {6707722C-4371-48A4-A3A2-40D126059690}.Debug|x64.ActiveCfg = Debug|x64 - {6707722C-4371-48A4-A3A2-40D126059690}.Debug|x64.Build.0 = Debug|x64 - {6707722C-4371-48A4-A3A2-40D126059690}.Debug|x86.ActiveCfg = Debug|Win32 - {6707722C-4371-48A4-A3A2-40D126059690}.Debug|x86.Build.0 = Debug|Win32 - {6707722C-4371-48A4-A3A2-40D126059690}.Release|x64.ActiveCfg = Release|x64 - {6707722C-4371-48A4-A3A2-40D126059690}.Release|x64.Build.0 = Release|x64 - {6707722C-4371-48A4-A3A2-40D126059690}.Release|x86.ActiveCfg = Release|Win32 - {6707722C-4371-48A4-A3A2-40D126059690}.Release|x86.Build.0 = Release|Win32 + {DD18C55E-AD58-4881-BAB8-91F41C5410BB}.Debug|x64.ActiveCfg = Debug|x64 + {DD18C55E-AD58-4881-BAB8-91F41C5410BB}.Debug|x64.Build.0 = Debug|x64 + {DD18C55E-AD58-4881-BAB8-91F41C5410BB}.Debug|x86.ActiveCfg = Debug|Win32 + {DD18C55E-AD58-4881-BAB8-91F41C5410BB}.Debug|x86.Build.0 = Debug|Win32 + {DD18C55E-AD58-4881-BAB8-91F41C5410BB}.Release|x64.ActiveCfg = Release|x64 + {DD18C55E-AD58-4881-BAB8-91F41C5410BB}.Release|x64.Build.0 = Release|x64 + {DD18C55E-AD58-4881-BAB8-91F41C5410BB}.Release|x86.ActiveCfg = Release|Win32 + {DD18C55E-AD58-4881-BAB8-91F41C5410BB}.Release|x86.Build.0 = Release|Win32 + {18CF640F-17B3-48AF-A936-84042FF7AC58}.Debug|x64.ActiveCfg = Debug|x64 + {18CF640F-17B3-48AF-A936-84042FF7AC58}.Debug|x64.Build.0 = Debug|x64 + {18CF640F-17B3-48AF-A936-84042FF7AC58}.Debug|x86.ActiveCfg = Debug|Win32 + {18CF640F-17B3-48AF-A936-84042FF7AC58}.Debug|x86.Build.0 = Debug|Win32 + {18CF640F-17B3-48AF-A936-84042FF7AC58}.Release|x64.ActiveCfg = Release|x64 + {18CF640F-17B3-48AF-A936-84042FF7AC58}.Release|x64.Build.0 = Release|x64 + {18CF640F-17B3-48AF-A936-84042FF7AC58}.Release|x86.ActiveCfg = Release|Win32 + {18CF640F-17B3-48AF-A936-84042FF7AC58}.Release|x86.Build.0 = Release|Win32 + {FD8218C4-7D3A-4EE9-9262-02E9631E7CB6}.Debug|x64.ActiveCfg = Debug|x64 + {FD8218C4-7D3A-4EE9-9262-02E9631E7CB6}.Debug|x64.Build.0 = Debug|x64 + {FD8218C4-7D3A-4EE9-9262-02E9631E7CB6}.Debug|x86.ActiveCfg = Debug|Win32 + {FD8218C4-7D3A-4EE9-9262-02E9631E7CB6}.Debug|x86.Build.0 = Debug|Win32 + {FD8218C4-7D3A-4EE9-9262-02E9631E7CB6}.Release|x64.ActiveCfg = Release|x64 + {FD8218C4-7D3A-4EE9-9262-02E9631E7CB6}.Release|x64.Build.0 = Release|x64 + {FD8218C4-7D3A-4EE9-9262-02E9631E7CB6}.Release|x86.ActiveCfg = Release|Win32 + {FD8218C4-7D3A-4EE9-9262-02E9631E7CB6}.Release|x86.Build.0 = Release|Win32 + {F8BB9B41-CD6B-4C1C-84C1-68D200B19952}.Debug|x64.ActiveCfg = Debug|x64 + {F8BB9B41-CD6B-4C1C-84C1-68D200B19952}.Debug|x64.Build.0 = Debug|x64 + {F8BB9B41-CD6B-4C1C-84C1-68D200B19952}.Debug|x86.ActiveCfg = Debug|Win32 + {F8BB9B41-CD6B-4C1C-84C1-68D200B19952}.Debug|x86.Build.0 = Debug|Win32 + {F8BB9B41-CD6B-4C1C-84C1-68D200B19952}.Release|x64.ActiveCfg = Release|x64 + {F8BB9B41-CD6B-4C1C-84C1-68D200B19952}.Release|x64.Build.0 = Release|x64 + {F8BB9B41-CD6B-4C1C-84C1-68D200B19952}.Release|x86.ActiveCfg = Release|Win32 + {F8BB9B41-CD6B-4C1C-84C1-68D200B19952}.Release|x86.Build.0 = Release|Win32 + {CB0E86C1-D48A-4A21-B88B-A6EE9734FC67}.Debug|x64.ActiveCfg = Debug|x64 + {CB0E86C1-D48A-4A21-B88B-A6EE9734FC67}.Debug|x64.Build.0 = Debug|x64 + {CB0E86C1-D48A-4A21-B88B-A6EE9734FC67}.Debug|x86.ActiveCfg = Debug|Win32 + {CB0E86C1-D48A-4A21-B88B-A6EE9734FC67}.Debug|x86.Build.0 = Debug|Win32 + {CB0E86C1-D48A-4A21-B88B-A6EE9734FC67}.Release|x64.ActiveCfg = Release|x64 + {CB0E86C1-D48A-4A21-B88B-A6EE9734FC67}.Release|x64.Build.0 = Release|x64 + {CB0E86C1-D48A-4A21-B88B-A6EE9734FC67}.Release|x86.ActiveCfg = Release|Win32 + {CB0E86C1-D48A-4A21-B88B-A6EE9734FC67}.Release|x86.Build.0 = Release|Win32 + {7E8A3354-1EEB-4580-8B07-B9CEDF81F727}.Debug|x64.ActiveCfg = Debug|x64 + {7E8A3354-1EEB-4580-8B07-B9CEDF81F727}.Debug|x64.Build.0 = Debug|x64 + {7E8A3354-1EEB-4580-8B07-B9CEDF81F727}.Debug|x86.ActiveCfg = Debug|Win32 + {7E8A3354-1EEB-4580-8B07-B9CEDF81F727}.Debug|x86.Build.0 = Debug|Win32 + {7E8A3354-1EEB-4580-8B07-B9CEDF81F727}.Release|x64.ActiveCfg = Release|x64 + {7E8A3354-1EEB-4580-8B07-B9CEDF81F727}.Release|x64.Build.0 = Release|x64 + {7E8A3354-1EEB-4580-8B07-B9CEDF81F727}.Release|x86.ActiveCfg = Release|Win32 + {7E8A3354-1EEB-4580-8B07-B9CEDF81F727}.Release|x86.Build.0 = Release|Win32 + {3906A75A-0C0E-440D-A4FE-F91888425F4C}.Debug|x64.ActiveCfg = Debug|x64 + {3906A75A-0C0E-440D-A4FE-F91888425F4C}.Debug|x64.Build.0 = Debug|x64 + {3906A75A-0C0E-440D-A4FE-F91888425F4C}.Debug|x86.ActiveCfg = Debug|Win32 + {3906A75A-0C0E-440D-A4FE-F91888425F4C}.Debug|x86.Build.0 = Debug|Win32 + {3906A75A-0C0E-440D-A4FE-F91888425F4C}.Release|x64.ActiveCfg = Release|x64 + {3906A75A-0C0E-440D-A4FE-F91888425F4C}.Release|x64.Build.0 = Release|x64 + {3906A75A-0C0E-440D-A4FE-F91888425F4C}.Release|x86.ActiveCfg = Release|Win32 + {3906A75A-0C0E-440D-A4FE-F91888425F4C}.Release|x86.Build.0 = Release|Win32 + {DF2C2C46-F5C9-4E74-A903-67D93D4157A5}.Debug|x64.ActiveCfg = Debug|x64 + {DF2C2C46-F5C9-4E74-A903-67D93D4157A5}.Debug|x64.Build.0 = Debug|x64 + {DF2C2C46-F5C9-4E74-A903-67D93D4157A5}.Debug|x86.ActiveCfg = Debug|Win32 + {DF2C2C46-F5C9-4E74-A903-67D93D4157A5}.Debug|x86.Build.0 = Debug|Win32 + {DF2C2C46-F5C9-4E74-A903-67D93D4157A5}.Release|x64.ActiveCfg = Release|x64 + {DF2C2C46-F5C9-4E74-A903-67D93D4157A5}.Release|x64.Build.0 = Release|x64 + {DF2C2C46-F5C9-4E74-A903-67D93D4157A5}.Release|x86.ActiveCfg = Release|Win32 + {DF2C2C46-F5C9-4E74-A903-67D93D4157A5}.Release|x86.Build.0 = Release|Win32 + {48E4E74B-9F0C-4B5C-A2BC-EBC4397086F7}.Debug|x64.ActiveCfg = Debug|x64 + {48E4E74B-9F0C-4B5C-A2BC-EBC4397086F7}.Debug|x64.Build.0 = Debug|x64 + {48E4E74B-9F0C-4B5C-A2BC-EBC4397086F7}.Debug|x86.ActiveCfg = Debug|Win32 + {48E4E74B-9F0C-4B5C-A2BC-EBC4397086F7}.Debug|x86.Build.0 = Debug|Win32 + {48E4E74B-9F0C-4B5C-A2BC-EBC4397086F7}.Release|x64.ActiveCfg = Release|x64 + {48E4E74B-9F0C-4B5C-A2BC-EBC4397086F7}.Release|x64.Build.0 = Release|x64 + {48E4E74B-9F0C-4B5C-A2BC-EBC4397086F7}.Release|x86.ActiveCfg = Release|Win32 + {48E4E74B-9F0C-4B5C-A2BC-EBC4397086F7}.Release|x86.Build.0 = Release|Win32 + {0A036D35-FEE2-426D-9FC1-3694B8C15418}.Debug|x64.ActiveCfg = Debug|x64 + {0A036D35-FEE2-426D-9FC1-3694B8C15418}.Debug|x64.Build.0 = Debug|x64 + {0A036D35-FEE2-426D-9FC1-3694B8C15418}.Debug|x86.ActiveCfg = Debug|Win32 + {0A036D35-FEE2-426D-9FC1-3694B8C15418}.Debug|x86.Build.0 = Debug|Win32 + {0A036D35-FEE2-426D-9FC1-3694B8C15418}.Release|x64.ActiveCfg = Release|x64 + {0A036D35-FEE2-426D-9FC1-3694B8C15418}.Release|x64.Build.0 = Release|x64 + {0A036D35-FEE2-426D-9FC1-3694B8C15418}.Release|x86.ActiveCfg = Release|Win32 + {0A036D35-FEE2-426D-9FC1-3694B8C15418}.Release|x86.Build.0 = Release|Win32 + {5C35FC76-6526-4C6C-97A4-957E3A3ADA77}.Debug|x64.ActiveCfg = Debug|x64 + {5C35FC76-6526-4C6C-97A4-957E3A3ADA77}.Debug|x64.Build.0 = Debug|x64 + {5C35FC76-6526-4C6C-97A4-957E3A3ADA77}.Debug|x86.ActiveCfg = Debug|Win32 + {5C35FC76-6526-4C6C-97A4-957E3A3ADA77}.Debug|x86.Build.0 = Debug|Win32 + {5C35FC76-6526-4C6C-97A4-957E3A3ADA77}.Release|x64.ActiveCfg = Release|x64 + {5C35FC76-6526-4C6C-97A4-957E3A3ADA77}.Release|x64.Build.0 = Release|x64 + {5C35FC76-6526-4C6C-97A4-957E3A3ADA77}.Release|x86.ActiveCfg = Release|Win32 + {5C35FC76-6526-4C6C-97A4-957E3A3ADA77}.Release|x86.Build.0 = Release|Win32 + {1B9CE6D3-B27A-4E94-9D06-E8493732B0C5}.Debug|x64.ActiveCfg = Debug|x64 + {1B9CE6D3-B27A-4E94-9D06-E8493732B0C5}.Debug|x64.Build.0 = Debug|x64 + {1B9CE6D3-B27A-4E94-9D06-E8493732B0C5}.Debug|x86.ActiveCfg = Debug|Win32 + {1B9CE6D3-B27A-4E94-9D06-E8493732B0C5}.Debug|x86.Build.0 = Debug|Win32 + {1B9CE6D3-B27A-4E94-9D06-E8493732B0C5}.Release|x64.ActiveCfg = Release|x64 + {1B9CE6D3-B27A-4E94-9D06-E8493732B0C5}.Release|x64.Build.0 = Release|x64 + {1B9CE6D3-B27A-4E94-9D06-E8493732B0C5}.Release|x86.ActiveCfg = Release|Win32 + {1B9CE6D3-B27A-4E94-9D06-E8493732B0C5}.Release|x86.Build.0 = Release|Win32 + {067C13D4-885A-4DB7-BEB9-1DD973E5D959}.Debug|x64.ActiveCfg = Debug|x64 + {067C13D4-885A-4DB7-BEB9-1DD973E5D959}.Debug|x64.Build.0 = Debug|x64 + {067C13D4-885A-4DB7-BEB9-1DD973E5D959}.Debug|x86.ActiveCfg = Debug|Win32 + {067C13D4-885A-4DB7-BEB9-1DD973E5D959}.Debug|x86.Build.0 = Debug|Win32 + {067C13D4-885A-4DB7-BEB9-1DD973E5D959}.Release|x64.ActiveCfg = Release|x64 + {067C13D4-885A-4DB7-BEB9-1DD973E5D959}.Release|x64.Build.0 = Release|x64 + {067C13D4-885A-4DB7-BEB9-1DD973E5D959}.Release|x86.ActiveCfg = Release|Win32 + {067C13D4-885A-4DB7-BEB9-1DD973E5D959}.Release|x86.Build.0 = Release|Win32 + {28EB189D-7522-4955-9B9D-CFD37EFA146C}.Debug|x64.ActiveCfg = Debug|x64 + {28EB189D-7522-4955-9B9D-CFD37EFA146C}.Debug|x64.Build.0 = Debug|x64 + {28EB189D-7522-4955-9B9D-CFD37EFA146C}.Debug|x86.ActiveCfg = Debug|Win32 + {28EB189D-7522-4955-9B9D-CFD37EFA146C}.Debug|x86.Build.0 = Debug|Win32 + {28EB189D-7522-4955-9B9D-CFD37EFA146C}.Release|x64.ActiveCfg = Release|x64 + {28EB189D-7522-4955-9B9D-CFD37EFA146C}.Release|x64.Build.0 = Release|x64 + {28EB189D-7522-4955-9B9D-CFD37EFA146C}.Release|x86.ActiveCfg = Release|Win32 + {28EB189D-7522-4955-9B9D-CFD37EFA146C}.Release|x86.Build.0 = Release|Win32 + {0401631E-54B5-4445-A2E1-FAD4143F74FE}.Debug|x64.ActiveCfg = Debug|x64 + {0401631E-54B5-4445-A2E1-FAD4143F74FE}.Debug|x64.Build.0 = Debug|x64 + {0401631E-54B5-4445-A2E1-FAD4143F74FE}.Debug|x86.ActiveCfg = Debug|Win32 + {0401631E-54B5-4445-A2E1-FAD4143F74FE}.Debug|x86.Build.0 = Debug|Win32 + {0401631E-54B5-4445-A2E1-FAD4143F74FE}.Release|x64.ActiveCfg = Release|x64 + {0401631E-54B5-4445-A2E1-FAD4143F74FE}.Release|x64.Build.0 = Release|x64 + {0401631E-54B5-4445-A2E1-FAD4143F74FE}.Release|x86.ActiveCfg = Release|Win32 + {0401631E-54B5-4445-A2E1-FAD4143F74FE}.Release|x86.Build.0 = Release|Win32 + {DE5B13C5-65D5-4F5D-B92A-228BE4415318}.Debug|x64.ActiveCfg = Debug|x64 + {DE5B13C5-65D5-4F5D-B92A-228BE4415318}.Debug|x64.Build.0 = Debug|x64 + {DE5B13C5-65D5-4F5D-B92A-228BE4415318}.Debug|x86.ActiveCfg = Debug|Win32 + {DE5B13C5-65D5-4F5D-B92A-228BE4415318}.Debug|x86.Build.0 = Debug|Win32 + {DE5B13C5-65D5-4F5D-B92A-228BE4415318}.Release|x64.ActiveCfg = Release|x64 + {DE5B13C5-65D5-4F5D-B92A-228BE4415318}.Release|x64.Build.0 = Release|x64 + {DE5B13C5-65D5-4F5D-B92A-228BE4415318}.Release|x86.ActiveCfg = Release|Win32 + {DE5B13C5-65D5-4F5D-B92A-228BE4415318}.Release|x86.Build.0 = Release|Win32 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution - SolutionGuid = {5EAE1F2C-58C8-436F-B507-ACE97F8BFEE5} + SolutionGuid = {37347CE7-24EB-496D-A4A7-ED98B5D30CF6} EndGlobalSection EndGlobal diff --git a/src/src.props b/src/src.props deleted file mode 100644 index ecb3bfc..0000000 --- a/src/src.props +++ /dev/null @@ -1,29 +0,0 @@ - - - - - Debug - Win32 - - - Release - Win32 - - - Debug - Win32 - - - Release - Win32 - - - Debug - x64 - - - Release - x64 - - - \ No newline at end of file diff --git a/src/unittests/dirs.proj b/src/unittests/dirs.proj deleted file mode 100644 index 73cd5da..0000000 --- a/src/unittests/dirs.proj +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - diff --git a/src/unittests/ndconn/NuGetAssetsLock.props b/src/unittests/ndconn/NuGetAssetsLock.props deleted file mode 100644 index d69953b..0000000 --- a/src/unittests/ndconn/NuGetAssetsLock.props +++ /dev/null @@ -1,22 +0,0 @@ - - - - true - - - - - [1.0.0] - imbNHw4hg7nnbLjFuagxR1oc7TJv058rCclt+DmqJrvYYKJ10R/tGuKjne1nq94y0FTM1zd4j9v9v9n5A9Va6w== - vc150/1.0.0 - vc150.1.0.0.nupkg.sha512 - - - [1.0.3] - SeyxBzNqK/4Mh0yqD7LrJKxKu7b8Bja+iJFivyUu09B45brU4gOwTYFO7hSgk6Ll+OCjl9pA5RZYmtyy2aU0DA== - wk10/1.0.3 - wk10.1.0.3.nupkg.sha512 - - - - \ No newline at end of file diff --git a/src/unittests/ndconn/ndconn.cpp b/src/unittests/ndconn/ndconn.cpp index 5b6e0f4..e1ed7be 100644 --- a/src/unittests/ndconn/ndconn.cpp +++ b/src/unittests/ndconn/ndconn.cpp @@ -4,8 +4,12 @@ // ndconn.cpp - NetworkDirect connection scalability test // -#include "ntstatus.h" -#define WIN32_NO_STATUS +typedef long NTSTATUS; // required by ntstatus.h +#include +#define WIN32_LEAN_AND_MEAN +#define WIN32_NO_STATUS // prevent STATUS_XXX codes being redefined when we include windows.h +#include +#include #include "ndcommon.h" #include "ndconn.h" #include "logging.h" diff --git a/src/unittests/ndconn/ndconn.vcxproj b/src/unittests/ndconn/ndconn.vcxproj index 414e276..fc0e350 100644 --- a/src/unittests/ndconn/ndconn.vcxproj +++ b/src/unittests/ndconn/ndconn.vcxproj @@ -1,36 +1,167 @@ - - + + + + Debug + Win32 + + + Release + Win32 + + + Debug + x64 + + + Release + x64 + + - 15.0 - {c4c6c8c3-5299-4a0c-a1f6-ede1a653f462} + 16.0 Win32Proj + {5c35fc76-6526-4c6c-97a4-957e3a3ada77} ndconn + 10.0 - + + Application + true + v143 + Unicode + + + Application + false + v143 + true + Unicode + + Application + true + v143 + Unicode + false + + + Application + false + v143 + true + Unicode + false - + + + + + - + + + + + + + + + + + + + Level3 + true + WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + MultiThreadedDebug + ..\..\examples\;..\..\examples\ndtestutil;..\..\ndutil;%(AdditionalIncludeDirectories) + + + Console + true + ..\..\$(Platform)\$(Configuration)\ndutil.lib;..\..\$(Platform)\$(Configuration)\ndtestutil.lib;uuid.lib;Ws2_32.lib;$(CoreLibraryDependencies);%(AdditionalDependencies) + + + ..\ + + + + + Level3 + true + true + true + WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + MultiThreaded + ..\..\examples\;..\..\examples\ndtestutil;..\..\ndutil;%(AdditionalIncludeDirectories) + + + Console + true + true + true + ..\..\$(Platform)\$(Configuration)\ndutil.lib;..\..\$(Platform)\$(Configuration)\ndtestutil.lib;uuid.lib;Ws2_32.lib;$(CoreLibraryDependencies);%(AdditionalDependencies) + + + ..\ + + + - _CONSOLE;%(PreprocessorDefinitions) + Level3 + true + _DEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + ..\..\examples\;..\..\examples\ndtestutil;..\..\ndutil;%(AdditionalIncludeDirectories) + MultiThreadedDebug Console + true + ..\..\$(Platform)\$(Configuration)\ndutil.lib;..\..\$(Platform)\$(Configuration)\ndtestutil.lib;uuid.lib;Ws2_32.lib;$(CoreLibraryDependencies);%(AdditionalDependencies) + + ..\ + + + + + Level3 + true + true + true + NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + ..\..\examples\;..\..\examples\ndtestutil;..\..\ndutil;%(AdditionalIncludeDirectories) + MultiThreaded + + + Console + true + true + true + ..\..\$(Platform)\$(Configuration)\ndutil.lib;..\..\$(Platform)\$(Configuration)\ndtestutil.lib;uuid.lib;Ws2_32.lib;$(CoreLibraryDependencies);%(AdditionalDependencies) + + + ..\ + - + - + + + \ No newline at end of file diff --git a/src/unittests/ndconn/ndconn.vcxproj.filters b/src/unittests/ndconn/ndconn.vcxproj.filters new file mode 100644 index 0000000..fc0ccbe --- /dev/null +++ b/src/unittests/ndconn/ndconn.vcxproj.filters @@ -0,0 +1,32 @@ + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cc;cxx;c++;cppm;ixx;def;odl;idl;hpj;bat;asm;asmx + + + {93995380-89BD-4b04-88EB-625FBE52EBFB} + h;hh;hpp;hxx;h++;hm;inl;inc;ipp;xsd + + + {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} + rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms + + + + + Source Files + + + + + Header Files + + + + + Resource Files + + + \ No newline at end of file diff --git a/src/unittests/ndcq/NuGetAssetsLock.props b/src/unittests/ndcq/NuGetAssetsLock.props deleted file mode 100644 index d69953b..0000000 --- a/src/unittests/ndcq/NuGetAssetsLock.props +++ /dev/null @@ -1,22 +0,0 @@ - - - - true - - - - - [1.0.0] - imbNHw4hg7nnbLjFuagxR1oc7TJv058rCclt+DmqJrvYYKJ10R/tGuKjne1nq94y0FTM1zd4j9v9v9n5A9Va6w== - vc150/1.0.0 - vc150.1.0.0.nupkg.sha512 - - - [1.0.3] - SeyxBzNqK/4Mh0yqD7LrJKxKu7b8Bja+iJFivyUu09B45brU4gOwTYFO7hSgk6Ll+OCjl9pA5RZYmtyy2aU0DA== - wk10/1.0.3 - wk10.1.0.3.nupkg.sha512 - - - - \ No newline at end of file diff --git a/src/unittests/ndcq/ndcq.cpp b/src/unittests/ndcq/ndcq.cpp index 392d6c1..00a53bb 100644 --- a/src/unittests/ndcq/ndcq.cpp +++ b/src/unittests/ndcq/ndcq.cpp @@ -3,7 +3,9 @@ // // ndcq.cpp - NetworkDirect Completion Queue test // - +#define WIN32_LEAN_AND_MEAN +#include +#include #include "ndcommon.h" #include "ndtestutil.h" #include diff --git a/src/unittests/ndcq/ndcq.vcxproj b/src/unittests/ndcq/ndcq.vcxproj index d1a703a..0e371cc 100644 --- a/src/unittests/ndcq/ndcq.vcxproj +++ b/src/unittests/ndcq/ndcq.vcxproj @@ -1,27 +1,156 @@ - - + + + + Debug + Win32 + + + Release + Win32 + + + Debug + x64 + + + Release + x64 + + - 15.0 - {64b7369b-6981-4f34-8f2a-f029bc61f01e} + 16.0 Win32Proj + {1b9ce6d3-b27a-4e94-9d06-e8493732b0c5} ndcq + 10.0 - + + Application + true + v143 + Unicode + + + Application + false + v143 + true + Unicode + + Application + true + v143 + Unicode + false + + + Application + false + v143 + true + Unicode + false - + + + + + - + + + + + + + + + + + + + Level3 + true + WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + MultiThreadedDebug + ..\..\examples\;..\..\examples\ndtestutil;..\..\ndutil;%(AdditionalIncludeDirectories) + + + Console + true + ..\..\$(Platform)\$(Configuration)\ndutil.lib;..\..\$(Platform)\$(Configuration)\ndtestutil.lib;uuid.lib;Ws2_32.lib;$(CoreLibraryDependencies);%(AdditionalDependencies) + + + ..\ + + + - _CONSOLE;%(PreprocessorDefinitions) + Level3 + true + true + true + WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + MultiThreaded + ..\..\examples\;..\..\examples\ndtestutil;..\..\ndutil;%(AdditionalIncludeDirectories) Console + true + true + true + ..\..\$(Platform)\$(Configuration)\ndutil.lib;..\..\$(Platform)\$(Configuration)\ndtestutil.lib;uuid.lib;Ws2_32.lib;$(CoreLibraryDependencies);%(AdditionalDependencies) + + ..\ + + + + + Level3 + true + _DEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + ..\..\examples\;..\..\examples\ndtestutil;..\..\ndutil;%(AdditionalIncludeDirectories) + MultiThreadedDebug + + + Console + true + ..\..\$(Platform)\$(Configuration)\ndutil.lib;..\..\$(Platform)\$(Configuration)\ndtestutil.lib;uuid.lib;Ws2_32.lib;$(CoreLibraryDependencies);%(AdditionalDependencies) + + + ..\ + + + + + Level3 + true + true + true + NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + ..\..\examples\;..\..\examples\ndtestutil;..\..\ndutil;%(AdditionalIncludeDirectories) + MultiThreaded + + + Console + true + true + true + ..\..\$(Platform)\$(Configuration)\ndutil.lib;..\..\$(Platform)\$(Configuration)\ndtestutil.lib;uuid.lib;Ws2_32.lib;$(CoreLibraryDependencies);%(AdditionalDependencies) + + + ..\ + @@ -30,4 +159,6 @@ - + + + \ No newline at end of file diff --git a/src/unittests/ndcq/ndcq.vcxproj.filters b/src/unittests/ndcq/ndcq.vcxproj.filters new file mode 100644 index 0000000..f4ed93c --- /dev/null +++ b/src/unittests/ndcq/ndcq.vcxproj.filters @@ -0,0 +1,27 @@ + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cc;cxx;c++;cppm;ixx;def;odl;idl;hpj;bat;asm;asmx + + + {93995380-89BD-4b04-88EB-625FBE52EBFB} + h;hh;hpp;hxx;h++;hm;inl;inc;ipp;xsd + + + {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} + rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms + + + + + Source Files + + + + + Resource Files + + + \ No newline at end of file diff --git a/src/unittests/ndmemorytest/NuGetAssetsLock.props b/src/unittests/ndmemorytest/NuGetAssetsLock.props deleted file mode 100644 index d69953b..0000000 --- a/src/unittests/ndmemorytest/NuGetAssetsLock.props +++ /dev/null @@ -1,22 +0,0 @@ - - - - true - - - - - [1.0.0] - imbNHw4hg7nnbLjFuagxR1oc7TJv058rCclt+DmqJrvYYKJ10R/tGuKjne1nq94y0FTM1zd4j9v9v9n5A9Va6w== - vc150/1.0.0 - vc150.1.0.0.nupkg.sha512 - - - [1.0.3] - SeyxBzNqK/4Mh0yqD7LrJKxKu7b8Bja+iJFivyUu09B45brU4gOwTYFO7hSgk6Ll+OCjl9pA5RZYmtyy2aU0DA== - wk10/1.0.3 - wk10.1.0.3.nupkg.sha512 - - - - \ No newline at end of file diff --git a/src/unittests/ndmemorytest/ndconnectlistenerclosing.cpp b/src/unittests/ndmemorytest/ndconnectlistenerclosing.cpp index 1e2781b..cfa63a7 100644 --- a/src/unittests/ndmemorytest/ndconnectlistenerclosing.cpp +++ b/src/unittests/ndmemorytest/ndconnectlistenerclosing.cpp @@ -17,7 +17,7 @@ void NdConnectListenerClosingServer::RunTest( NdTestBase::Init(v4Src); NdTestBase::CreateMR(); NdTestBase::RegisterDataBuffer(x_HdrLen + x_MaxXfer + 1, ND_MR_FLAG_ALLOW_LOCAL_WRITE); - NdTestBase::CreateCQ(nSge); + NdTestBase::CreateCQ(queueDepth*2); NdTestBase::CreateConnector(); NdTestBase::CreateQueuePair(queueDepth, nSge); @@ -44,7 +44,7 @@ void NdConnectListenerClosingClient::RunTest( NdTestBase::Init(v4Src); NdTestBase::CreateMR(); NdTestBase::RegisterDataBuffer(x_MaxXfer, ND_MR_FLAG_ALLOW_LOCAL_WRITE, ND_SUCCESS); - NdTestBase::CreateCQ(nSge, ND_SUCCESS); + NdTestBase::CreateCQ(queueDepth*2, ND_SUCCESS); NdTestBase::CreateConnector(); NdTestBase::CreateQueuePair(queueDepth, nSge); diff --git a/src/unittests/ndmemorytest/ndconnrejectclose.cpp b/src/unittests/ndmemorytest/ndconnrejectclose.cpp index 67733b7..e77e5f5 100644 --- a/src/unittests/ndmemorytest/ndconnrejectclose.cpp +++ b/src/unittests/ndmemorytest/ndconnrejectclose.cpp @@ -18,7 +18,7 @@ void NdConnRejectCloseServer::RunTest( NdTestBase::Init(v4Src); NdTestBase::CreateMR(); NdTestBase::RegisterDataBuffer(x_HdrLen + x_MaxXfer, ND_MR_FLAG_ALLOW_LOCAL_WRITE); - NdTestBase::CreateCQ(nSge); + NdTestBase::CreateCQ(queueDepth*2); NdTestBase::CreateConnector(); NdTestBase::CreateQueuePair(queueDepth, nSge); @@ -46,7 +46,7 @@ void NdConnRejectClient::RunTest( NdTestBase::Init(v4Src); NdTestBase::CreateMR(); NdTestBase::RegisterDataBuffer(x_MaxXfer, ND_MR_FLAG_ALLOW_LOCAL_WRITE); - NdTestBase::CreateCQ(nSge, ND_SUCCESS); + NdTestBase::CreateCQ(queueDepth*2, ND_SUCCESS); NdTestBase::CreateConnector(); NdTestBase::CreateQueuePair(queueDepth, nSge); @@ -75,7 +75,7 @@ void NdConnCloseClient::RunTest( NdTestBase::Init(v4Src); NdTestBase::CreateMR(); NdTestBase::RegisterDataBuffer(x_MaxXfer, ND_MR_FLAG_ALLOW_LOCAL_WRITE, ND_SUCCESS); - NdTestBase::CreateCQ(nSge, ND_SUCCESS); + NdTestBase::CreateCQ(queueDepth*2, ND_SUCCESS); NdTestBase::CreateConnector(); NdTestBase::CreateQueuePair(queueDepth, nSge); diff --git a/src/unittests/ndmemorytest/nddualconnection.cpp b/src/unittests/ndmemorytest/nddualconnection.cpp index 74b608d..5ef26f5 100644 --- a/src/unittests/ndmemorytest/nddualconnection.cpp +++ b/src/unittests/ndmemorytest/nddualconnection.cpp @@ -17,7 +17,7 @@ void NdDualConnectionServer::RunTest( NdTestBase::Init(v4Src); NdTestBase::CreateMR(); NdTestBase::RegisterDataBuffer(x_HdrLen + x_MaxXfer, ND_MR_FLAG_ALLOW_LOCAL_WRITE); - NdTestBase::CreateCQ(nSge); + NdTestBase::CreateCQ(queueDepth*2); NdTestBase::CreateConnector(); NdTestBase::CreateQueuePair(queueDepth, nSge); @@ -43,7 +43,7 @@ void NdDualConnectionClient::RunTest( NdTestBase::Init(v4Src); NdTestBase::CreateMR(); NdTestBase::RegisterDataBuffer(x_MaxXfer, ND_MR_FLAG_ALLOW_LOCAL_WRITE); - NdTestBase::CreateCQ(nSge, ND_SUCCESS); + NdTestBase::CreateCQ(queueDepth*2, ND_SUCCESS); NdTestBase::CreateConnector(); NdTestBase::CreateQueuePair(queueDepth, nSge); diff --git a/src/unittests/ndmemorytest/ndinvalidip.cpp b/src/unittests/ndmemorytest/ndinvalidip.cpp index 7680610..72c525f 100644 --- a/src/unittests/ndmemorytest/ndinvalidip.cpp +++ b/src/unittests/ndmemorytest/ndinvalidip.cpp @@ -27,7 +27,7 @@ void NdInvalidIPClient::RunTest( NdTestBase::Init(v4Src); NdTestBase::CreateMR(); NdTestBase::RegisterDataBuffer(x_MaxXfer, ND_MR_FLAG_ALLOW_LOCAL_WRITE); - NdTestBase::CreateCQ(nSge, ND_SUCCESS); + NdTestBase::CreateCQ(queueDepth*2, ND_SUCCESS); NdTestBase::CreateConnector(); NdTestBase::CreateQueuePair(queueDepth, nSge); diff --git a/src/unittests/ndmemorytest/ndinvalidreadwrite.cpp b/src/unittests/ndmemorytest/ndinvalidreadwrite.cpp index b18f1da..7b29927 100644 --- a/src/unittests/ndmemorytest/ndinvalidreadwrite.cpp +++ b/src/unittests/ndmemorytest/ndinvalidreadwrite.cpp @@ -125,7 +125,7 @@ void NdInvalidReadWriteClient::RunTest( NdTestBase::RegisterDataBuffer(x_HdrLen + x_MaxXfer, ND_MR_FLAG_ALLOW_REMOTE_READ | ND_MR_FLAG_ALLOW_REMOTE_WRITE); - NdTestBase::CreateCQ(2, ND_SUCCESS); + NdTestBase::CreateCQ(4, ND_SUCCESS); NdTestBase::CreateConnector(); NdTestBase::CreateQueuePair(2, 1); NdTestClientBase::Connect(v4Src, v4Dst, 1, 1); diff --git a/src/unittests/ndmemorytest/ndlargeprivatedata.cpp b/src/unittests/ndmemorytest/ndlargeprivatedata.cpp index b4d7fa6..5c7cab0 100644 --- a/src/unittests/ndmemorytest/ndlargeprivatedata.cpp +++ b/src/unittests/ndmemorytest/ndlargeprivatedata.cpp @@ -17,7 +17,7 @@ void NdLargePrivateDataServer::RunTest( NdTestBase::CreateMR(); NdTestBase::RegisterDataBuffer(x_HdrLen + x_MaxXfer, ND_MR_FLAG_ALLOW_LOCAL_WRITE); - NdTestBase::CreateCQ(nSge); + NdTestBase::CreateCQ(queueDepth*2); NdTestBase::CreateConnector(); NdTestBase::CreateQueuePair(queueDepth, nSge); NdTestServerBase::CreateListener(); @@ -68,7 +68,7 @@ void NdLargePrivateDataClient::RunTest( NdTestBase::CreateMR(); NdTestBase::RegisterDataBuffer(x_MaxXfer, ND_MR_FLAG_ALLOW_REMOTE_READ | ND_MR_FLAG_ALLOW_REMOTE_WRITE); - NdTestBase::CreateCQ(nSge, ND_SUCCESS); + NdTestBase::CreateCQ(queueDepth*2, ND_SUCCESS); NdTestBase::CreateConnector(); NdTestBase::CreateQueuePair(queueDepth, nSge); diff --git a/src/unittests/ndmemorytest/ndmemorytest.h b/src/unittests/ndmemorytest/ndmemorytest.h index e586624..726d531 100644 --- a/src/unittests/ndmemorytest/ndmemorytest.h +++ b/src/unittests/ndmemorytest/ndmemorytest.h @@ -7,10 +7,13 @@ #define _ND_MEMORY_TEST_ // to get STATUS_DATA_ERROR +typedef long NTSTATUS; #include // define WIN32_NO_STATUS so that STATUS_* types are not defined again #define WIN32_NO_STATUS - +#define WIN32_LEAN_AND_MEAN +#include +#include #include "time.h" #include "ndtestutil.h" #include "string.h" diff --git a/src/unittests/ndmemorytest/ndmemorytest.vcxproj b/src/unittests/ndmemorytest/ndmemorytest.vcxproj index c4e31d6..a4f4464 100644 --- a/src/unittests/ndmemorytest/ndmemorytest.vcxproj +++ b/src/unittests/ndmemorytest/ndmemorytest.vcxproj @@ -1,52 +1,168 @@ - - + + + + Debug + Win32 + + + Release + Win32 + + + Debug + x64 + + + Release + x64 + + - 15.0 - {ffd1d086-e7e1-4506-8957-4e083ef2acb5} + 16.0 Win32Proj - ndMemoryTest - ndmemorytest + {067c13d4-885a-4db7-beb9-1dd973e5d959} + ndmemorytest + 10.0 + + Application + true + v143 + Unicode + + + Application + false + v143 + true + Unicode + + + Application + true + v143 + Unicode + false + + + Application + false + v143 + true + Unicode + false + - + + + + + + + + - + + + + + + + + - _CONSOLE;%(PreprocessorDefinitions) - StdCall + Level3 + true + WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + MultiThreadedDebug + ..\..\examples\;..\..\examples\ndtestutil;..\..\ndutil;%(AdditionalIncludeDirectories) Console + true + ..\..\$(Platform)\$(Configuration)\ndutil.lib;..\..\$(Platform)\$(Configuration)\ndtestutil.lib;uuid.lib;Ws2_32.lib;$(CoreLibraryDependencies);%(AdditionalDependencies) + + + + + Level3 + true + true + true + WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + MultiThreaded + ..\..\examples\;..\..\examples\ndtestutil;..\..\ndutil;%(AdditionalIncludeDirectories) + + + Console + true + true + true + ..\..\$(Platform)\$(Configuration)\ndutil.lib;..\..\$(Platform)\$(Configuration)\ndtestutil.lib;uuid.lib;Ws2_32.lib;$(CoreLibraryDependencies);%(AdditionalDependencies) + + + + + Level3 + true + _DEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + ..\..\examples\;..\..\examples\ndtestutil;..\..\ndutil;%(AdditionalIncludeDirectories) + MultiThreadedDebug + + + Console + true + ..\..\$(Platform)\$(Configuration)\ndutil.lib;..\..\$(Platform)\$(Configuration)\ndtestutil.lib;uuid.lib;Ws2_32.lib;$(CoreLibraryDependencies);%(AdditionalDependencies) + + + + + Level3 + true + true + true + NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + ..\..\examples\;..\..\examples\ndtestutil;..\..\ndutil;%(AdditionalIncludeDirectories) + MultiThreaded + + + Console + true + true + true + ..\..\$(Platform)\$(Configuration)\ndutil.lib;..\..\$(Platform)\$(Configuration)\ndtestutil.lib;uuid.lib;Ws2_32.lib;$(CoreLibraryDependencies);%(AdditionalDependencies) - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + - - Application - Unicode - + + \ No newline at end of file diff --git a/src/unittests/ndmemorytest/ndmemorytest.vcxproj.filters b/src/unittests/ndmemorytest/ndmemorytest.vcxproj.filters new file mode 100644 index 0000000..979e586 --- /dev/null +++ b/src/unittests/ndmemorytest/ndmemorytest.vcxproj.filters @@ -0,0 +1,75 @@ + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cc;cxx;c++;cppm;ixx;def;odl;idl;hpj;bat;asm;asmx + + + {93995380-89BD-4b04-88EB-625FBE52EBFB} + h;hh;hpp;hxx;h++;hm;inl;inc;ipp;xsd + + + {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} + rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms + + + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + + + Header Files + + + \ No newline at end of file diff --git a/src/unittests/ndmemorytest/ndmrderegister.cpp b/src/unittests/ndmemorytest/ndmrderegister.cpp index a500f17..c3106c7 100644 --- a/src/unittests/ndmemorytest/ndmrderegister.cpp +++ b/src/unittests/ndmemorytest/ndmrderegister.cpp @@ -17,7 +17,7 @@ void NdMRDeregisterServer::RunTest( NdTestBase::Init(v4Src); NdTestBase::CreateMR(); NdTestBase::RegisterDataBuffer(x_HdrLen + x_MaxXfer, ND_MR_FLAG_ALLOW_LOCAL_WRITE); - NdTestBase::CreateCQ(nSge); + NdTestBase::CreateCQ(queueDepth*2); NdTestBase::CreateConnector(); NdTestBase::CreateQueuePair(queueDepth, nSge); @@ -35,6 +35,11 @@ void NdMRDeregisterServer::RunTest( //this call should fail, because there's still memory window bound to it HRESULT hr = m_pMr->Deregister(&m_Ov); + + if (hr == ND_PENDING) + { + hr = m_pMr->GetOverlappedResult(&m_Ov, TRUE); + } LogIfErrorExit(hr, ND_DEVICE_BUSY, "Deregistering memory region with memory window bound it should get ND_DEVICE_BUSY!", __LINE__); @@ -54,7 +59,7 @@ void NdMRDeregisterClient::RunTest( NdTestBase::Init(v4Src); NdTestBase::CreateMR(); NdTestBase::RegisterDataBuffer(x_MaxXfer, ND_MR_FLAG_ALLOW_LOCAL_WRITE); - NdTestBase::CreateCQ(nSge, ND_SUCCESS); + NdTestBase::CreateCQ(queueDepth*2, ND_SUCCESS); NdTestBase::CreateConnector(); NdTestBase::CreateQueuePair(queueDepth, nSge); diff --git a/src/unittests/ndmemorytest/ndoverreadwrite.cpp b/src/unittests/ndmemorytest/ndoverreadwrite.cpp index 802ccf9..085d1e4 100644 --- a/src/unittests/ndmemorytest/ndoverreadwrite.cpp +++ b/src/unittests/ndmemorytest/ndoverreadwrite.cpp @@ -125,7 +125,7 @@ void NdOverReadWriteClient::RunTest( NdTestBase::CreateMR(); NdTestBase::RegisterDataBuffer(x_MaxXfer, ND_MR_FLAG_ALLOW_REMOTE_READ | ND_MR_FLAG_ALLOW_REMOTE_WRITE); - NdTestBase::CreateCQ(2, ND_SUCCESS); + NdTestBase::CreateCQ(4, ND_SUCCESS); NdTestBase::CreateConnector(); NdTestBase::CreateQueuePair(2, 1); NdTestClientBase::Connect(v4Src, v4Dst, 1, 1); diff --git a/src/unittests/ndmemorytest/ndqpmaxall.cpp b/src/unittests/ndmemorytest/ndqpmaxall.cpp index ae181b7..81b8baf 100644 --- a/src/unittests/ndmemorytest/ndqpmaxall.cpp +++ b/src/unittests/ndmemorytest/ndqpmaxall.cpp @@ -17,8 +17,6 @@ void NdQPMaxAllServer::RunTest( NdTestBase::Init(v4Src); NdTestBase::CreateMR(); NdTestBase::RegisterDataBuffer(x_HdrLen + x_MaxXfer, ND_MR_FLAG_ALLOW_LOCAL_WRITE); - NdTestBase::CreateCQ(nSge); - NdTestBase::CreateConnector(); //get the max supported depth QP, and receive Sgn number ND2_ADAPTER_INFO adaptorInfo; @@ -29,6 +27,9 @@ void NdQPMaxAllServer::RunTest( queueDepth = adaptorInfo.MaxReceiveQueueDepth; nSge = adaptorInfo.MaxReceiveSge; + NdTestBase::CreateCQ(queueDepth*2); + NdTestBase::CreateConnector(); + //create queue pair, expecting success NdTestBase::CreateQueuePair(queueDepth, adaptorInfo.MaxInitiatorQueueDepth, nSge, adaptorInfo.MaxInitiatorSge); diff --git a/src/unittests/ndmemorytest/ndreceiveconnectorclosed.cpp b/src/unittests/ndmemorytest/ndreceiveconnectorclosed.cpp index 1df6988..46e6fb1 100644 --- a/src/unittests/ndmemorytest/ndreceiveconnectorclosed.cpp +++ b/src/unittests/ndmemorytest/ndreceiveconnectorclosed.cpp @@ -18,7 +18,7 @@ void NdReceiveConnectorClosedServer::RunTest( NdTestBase::Init(v4Src); NdTestBase::CreateMR(); NdTestBase::RegisterDataBuffer(x_HdrLen + x_MaxXfer + 1, ND_MR_FLAG_ALLOW_LOCAL_WRITE, ND_SUCCESS); - NdTestBase::CreateCQ(nSge); + NdTestBase::CreateCQ(queueDepth*2); NdTestBase::CreateConnector(); NdTestBase::CreateQueuePair(queueDepth, nSge); NdTestServerBase::CreateListener(); @@ -59,7 +59,7 @@ void NdReceiveConnectorClosedClient::RunTest( NdTestBase::Init(v4Src); NdTestBase::CreateMR(); NdTestBase::RegisterDataBuffer(x_MaxXfer, ND_MR_FLAG_ALLOW_LOCAL_WRITE, ND_SUCCESS); - NdTestBase::CreateCQ(nSge, ND_SUCCESS); + NdTestBase::CreateCQ(queueDepth*2, ND_SUCCESS); NdTestBase::CreateConnector(); NdTestBase::CreateQueuePair(queueDepth, nSge); diff --git a/src/unittests/ndmemorytest/ndreceiveflushqp.cpp b/src/unittests/ndmemorytest/ndreceiveflushqp.cpp index b8b32c0..87cfab5 100644 --- a/src/unittests/ndmemorytest/ndreceiveflushqp.cpp +++ b/src/unittests/ndmemorytest/ndreceiveflushqp.cpp @@ -20,7 +20,7 @@ void NdReceiveFlushQPServer::RunTest( NdTestBase::Init(v4Src); NdTestBase::CreateMR(); NdTestBase::RegisterDataBuffer(x_HdrLen + x_MaxXfer + 1, ND_MR_FLAG_ALLOW_LOCAL_WRITE, ND_SUCCESS); - NdTestBase::CreateCQ(nSge); + NdTestBase::CreateCQ(queueDepth*2); NdTestBase::CreateConnector(); NdTestBase::CreateQueuePair(queueDepth, nSge); NdTestServerBase::CreateListener(); diff --git a/src/unittests/ndmemorytest/ndsendnoreceive.cpp b/src/unittests/ndmemorytest/ndsendnoreceive.cpp index 4932dc3..aad685b 100644 --- a/src/unittests/ndmemorytest/ndsendnoreceive.cpp +++ b/src/unittests/ndmemorytest/ndsendnoreceive.cpp @@ -19,7 +19,7 @@ void NdSendNoReceiveServer::RunTest( NdTestBase::Init(v4Src); NdTestBase::CreateMR(); NdTestBase::RegisterDataBuffer(x_HdrLen + x_MaxXfer + 1, ND_MR_FLAG_ALLOW_LOCAL_WRITE, ND_SUCCESS); - NdTestBase::CreateCQ(nSge); + NdTestBase::CreateCQ(queueDepth*2); NdTestBase::CreateConnector(); NdTestBase::CreateQueuePair(queueDepth, nSge); NdTestServerBase::CreateListener(); @@ -56,7 +56,7 @@ void NdSendNoReceiveClient::RunTest( NdTestBase::Init(v4Src); NdTestBase::CreateMR(); NdTestBase::RegisterDataBuffer(x_MaxXfer, ND_MR_FLAG_ALLOW_LOCAL_WRITE, ND_SUCCESS); - NdTestBase::CreateCQ(nSge, ND_SUCCESS); + NdTestBase::CreateCQ(queueDepth*2, ND_SUCCESS); NdTestBase::CreateConnector(); NdTestBase::CreateQueuePair(queueDepth, nSge); NdTestClientBase::Connect(v4Src, v4Dst, 1, 1); diff --git a/src/unittests/ndmemorytest/ndwriteviolation.cpp b/src/unittests/ndmemorytest/ndwriteviolation.cpp index fa4c0c7..7864493 100644 --- a/src/unittests/ndmemorytest/ndwriteviolation.cpp +++ b/src/unittests/ndmemorytest/ndwriteviolation.cpp @@ -69,7 +69,7 @@ void NdWriteViolationClient::RunTest( NdTestBase::CreateMR(); NdTestBase::RegisterDataBuffer(x_MaxXfer, ND_MR_FLAG_ALLOW_LOCAL_WRITE); - NdTestBase::CreateCQ(2, ND_SUCCESS); + NdTestBase::CreateCQ(4, ND_SUCCESS); NdTestBase::CreateConnector(); NdTestBase::CreateQueuePair(2, 1); NdTestClientBase::Connect(v4Src, v4Dst, 1, 1); diff --git a/src/unittests/ndmpic/NuGetAssetsLock.props b/src/unittests/ndmpic/NuGetAssetsLock.props deleted file mode 100644 index d69953b..0000000 --- a/src/unittests/ndmpic/NuGetAssetsLock.props +++ /dev/null @@ -1,22 +0,0 @@ - - - - true - - - - - [1.0.0] - imbNHw4hg7nnbLjFuagxR1oc7TJv058rCclt+DmqJrvYYKJ10R/tGuKjne1nq94y0FTM1zd4j9v9v9n5A9Va6w== - vc150/1.0.0 - vc150.1.0.0.nupkg.sha512 - - - [1.0.3] - SeyxBzNqK/4Mh0yqD7LrJKxKu7b8Bja+iJFivyUu09B45brU4gOwTYFO7hSgk6Ll+OCjl9pA5RZYmtyy2aU0DA== - wk10/1.0.3 - wk10.1.0.3.nupkg.sha512 - - - - \ No newline at end of file diff --git a/src/unittests/ndmpic/ndmpic.cpp b/src/unittests/ndmpic/ndmpic.cpp index d1ef353..2023969 100644 --- a/src/unittests/ndmpic/ndmpic.cpp +++ b/src/unittests/ndmpic/ndmpic.cpp @@ -22,7 +22,9 @@ // 4. On each connection, acknowledge the 'close' message with a 'close_ack' // 5. Wait for completion of 'close_ack' send // 6. Tear-down connection - +#define WIN32_LEAN_AND_MEAN +#include +#include #include "ndcommon.h" #include diff --git a/src/unittests/ndmpic/ndmpic.vcxproj b/src/unittests/ndmpic/ndmpic.vcxproj index c695fb1..f9c2bfb 100644 --- a/src/unittests/ndmpic/ndmpic.vcxproj +++ b/src/unittests/ndmpic/ndmpic.vcxproj @@ -1,24 +1,156 @@ - - + + + + Debug + Win32 + + + Release + Win32 + + + Debug + x64 + + + Release + x64 + + - 15.0 - {bf2f3362-1023-4f95-a8fb-68fe7f34049d} + 16.0 Win32Proj + {28eb189d-7522-4955-9b9d-cfd37efa146c} ndmpic + 10.0 + + Application + true + v143 + Unicode + + + Application + false + v143 + true + Unicode + + + Application + true + v143 + Unicode + false + + + Application + false + v143 + true + Unicode + false + - + + + + + + + + - + + + + + + + + - _CONSOLE;%(PreprocessorDefinitions) + Level3 + true + WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + MultiThreadedDebug + ..\..\examples\;..\..\examples\ndtestutil;..\..\ndutil;%(AdditionalIncludeDirectories) Console + true + ..\..\$(Platform)\$(Configuration)\ndutil.lib;..\..\$(Platform)\$(Configuration)\ndtestutil.lib;uuid.lib;Ws2_32.lib;$(CoreLibraryDependencies);%(AdditionalDependencies) + + ..\ + + + + + Level3 + true + true + true + WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + MultiThreaded + ..\..\examples\;..\..\examples\ndtestutil;..\..\ndutil;%(AdditionalIncludeDirectories) + + + Console + true + true + true + ..\..\$(Platform)\$(Configuration)\ndutil.lib;..\..\$(Platform)\$(Configuration)\ndtestutil.lib;uuid.lib;Ws2_32.lib;$(CoreLibraryDependencies);%(AdditionalDependencies) + + + ..\ + + + + + Level3 + true + _DEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + ..\..\examples\;..\..\examples\ndtestutil;..\..\ndutil;%(AdditionalIncludeDirectories) + MultiThreadedDebug + + + Console + true + ..\..\$(Platform)\$(Configuration)\ndutil.lib;..\..\$(Platform)\$(Configuration)\ndtestutil.lib;uuid.lib;Ws2_32.lib;$(CoreLibraryDependencies);%(AdditionalDependencies) + + + ..\ + + + + + Level3 + true + true + true + NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + ..\..\examples\;..\..\examples\ndtestutil;..\..\ndutil;%(AdditionalIncludeDirectories) + MultiThreaded + + + Console + true + true + true + ..\..\$(Platform)\$(Configuration)\ndutil.lib;..\..\$(Platform)\$(Configuration)\ndtestutil.lib;uuid.lib;Ws2_32.lib;$(CoreLibraryDependencies);%(AdditionalDependencies) + + + ..\ + @@ -26,9 +158,7 @@ - - Application - Unicode - + + \ No newline at end of file diff --git a/src/unittests/ndmpic/ndmpic.vcxproj.filters b/src/unittests/ndmpic/ndmpic.vcxproj.filters new file mode 100644 index 0000000..4214080 --- /dev/null +++ b/src/unittests/ndmpic/ndmpic.vcxproj.filters @@ -0,0 +1,27 @@ + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cc;cxx;c++;cppm;ixx;def;odl;idl;hpj;bat;asm;asmx + + + {93995380-89BD-4b04-88EB-625FBE52EBFB} + h;hh;hpp;hxx;h++;hm;inl;inc;ipp;xsd + + + {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} + rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms + + + + + Source Files + + + + + Resource Files + + + \ No newline at end of file diff --git a/src/unittests/ndmval/NuGetAssetsLock.props b/src/unittests/ndmval/NuGetAssetsLock.props deleted file mode 100644 index d69953b..0000000 --- a/src/unittests/ndmval/NuGetAssetsLock.props +++ /dev/null @@ -1,22 +0,0 @@ - - - - true - - - - - [1.0.0] - imbNHw4hg7nnbLjFuagxR1oc7TJv058rCclt+DmqJrvYYKJ10R/tGuKjne1nq94y0FTM1zd4j9v9v9n5A9Va6w== - vc150/1.0.0 - vc150.1.0.0.nupkg.sha512 - - - [1.0.3] - SeyxBzNqK/4Mh0yqD7LrJKxKu7b8Bja+iJFivyUu09B45brU4gOwTYFO7hSgk6Ll+OCjl9pA5RZYmtyy2aU0DA== - wk10/1.0.3 - wk10.1.0.3.nupkg.sha512 - - - - \ No newline at end of file diff --git a/src/unittests/ndmval/ndmval.cpp b/src/unittests/ndmval/ndmval.cpp index e0d483f..9fb242b 100644 --- a/src/unittests/ndmval/ndmval.cpp +++ b/src/unittests/ndmval/ndmval.cpp @@ -16,10 +16,14 @@ // 3. Try to receive from client // 4. Expect ND_BUFFER_OVERFLOW +typedef long NTSTATUS; // to get STATUS_DATA_ERROR #include // define WIN32_NO_STATUS so that STATUS_* types are not defined again #define WIN32_NO_STATUS +#define WIN32_LEAN_AND_MEAN +#include +#include #include "ndcommon.h" #include #include @@ -80,7 +84,7 @@ class NdMValClient : public NdTestClientBase NdTestBase::CreateCQ(adapterInfo.MaxCompletionQueueDepth); NdTestBase::CreateConnector(); - NdTestBase::CreateQueuePair(adapterInfo.MaxReceiveQueueDepth, 1); + NdTestBase::CreateQueuePair(min(adapterInfo.MaxInitiatorQueueDepth, adapterInfo.MaxReceiveQueueDepth), 1); NdTestClientBase::Connect(v4Src, v4Dst, 0, 0); NdTestClientBase::CompleteConnect(); @@ -160,7 +164,7 @@ class NdMValServer : public NdTestServerBase NdTestBase::GetAdapterInfo(&adapterInfo); NdTestBase::CreateCQ(adapterInfo.MaxCompletionQueueDepth); NdTestBase::CreateConnector(); - NdTestBase::CreateQueuePair(adapterInfo.MaxReceiveQueueDepth, 1); + NdTestBase::CreateQueuePair(min(adapterInfo.MaxReceiveQueueDepth, adapterInfo.MaxInitiatorQueueDepth), 1); NdTestServerBase::CreateListener(); NdTestServerBase::Listen(v4Src); NdTestServerBase::GetConnectionRequest(); @@ -308,3 +312,4 @@ int __cdecl _tmain(int argc, TCHAR* argv[]) WSACleanup(); return 0; } + diff --git a/src/unittests/ndmval/ndmval.vcxproj b/src/unittests/ndmval/ndmval.vcxproj index cdf3241..230a97a 100644 --- a/src/unittests/ndmval/ndmval.vcxproj +++ b/src/unittests/ndmval/ndmval.vcxproj @@ -1,24 +1,156 @@ - - + + + + Debug + Win32 + + + Release + Win32 + + + Debug + x64 + + + Release + x64 + + - 15.0 - {591adbbe-9343-4393-920b-2c969e7afeda} + 16.0 Win32Proj + {0401631e-54b5-4445-a2e1-fad4143f74fe} ndmval + 10.0 + + Application + true + v143 + Unicode + + + Application + false + v143 + true + Unicode + + + Application + true + v143 + Unicode + false + + + Application + false + v143 + true + Unicode + false + - + + + + + + + + - + + + + + + + + - _CONSOLE;%(PreprocessorDefinitions) + Level3 + true + WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + MultiThreadedDebug + ..\..\examples\;..\..\examples\ndtestutil;..\..\ndutil;%(AdditionalIncludeDirectories) Console + true + ..\..\$(Platform)\$(Configuration)\ndutil.lib;..\..\$(Platform)\$(Configuration)\ndtestutil.lib;uuid.lib;Ws2_32.lib;$(CoreLibraryDependencies);%(AdditionalDependencies) + + ..\ + + + + + Level3 + true + true + true + WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + MultiThreaded + ..\..\examples\;..\..\examples\ndtestutil;..\..\ndutil;%(AdditionalIncludeDirectories) + + + Console + true + true + true + ..\..\$(Platform)\$(Configuration)\ndutil.lib;..\..\$(Platform)\$(Configuration)\ndtestutil.lib;uuid.lib;Ws2_32.lib;$(CoreLibraryDependencies);%(AdditionalDependencies) + + + ..\ + + + + + Level3 + true + _DEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + ..\..\examples\;..\..\examples\ndtestutil;..\..\ndutil;%(AdditionalIncludeDirectories) + MultiThreadedDebug + + + Console + true + ..\..\$(Platform)\$(Configuration)\ndutil.lib;..\..\$(Platform)\$(Configuration)\ndtestutil.lib;uuid.lib;Ws2_32.lib;$(CoreLibraryDependencies);%(AdditionalDependencies) + + + ..\ + + + + + Level3 + true + true + true + NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + ..\..\examples\;..\..\examples\ndtestutil;..\..\ndutil;%(AdditionalIncludeDirectories) + MultiThreaded + + + Console + true + true + true + ..\..\$(Platform)\$(Configuration)\ndutil.lib;..\..\$(Platform)\$(Configuration)\ndtestutil.lib;uuid.lib;Ws2_32.lib;$(CoreLibraryDependencies);%(AdditionalDependencies) + + + ..\ + @@ -26,9 +158,7 @@ - - Application - Unicode - + + \ No newline at end of file diff --git a/src/unittests/ndmval/ndmval.vcxproj.filters b/src/unittests/ndmval/ndmval.vcxproj.filters new file mode 100644 index 0000000..d9f5648 --- /dev/null +++ b/src/unittests/ndmval/ndmval.vcxproj.filters @@ -0,0 +1,27 @@ + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cc;cxx;c++;cppm;ixx;def;odl;idl;hpj;bat;asm;asmx + + + {93995380-89BD-4b04-88EB-625FBE52EBFB} + h;hh;hpp;hxx;h++;hm;inl;inc;ipp;xsd + + + {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} + rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms + + + + + Source Files + + + + + Resource Files + + + \ No newline at end of file diff --git a/src/unittests/ndmw/NuGetAssetsLock.props b/src/unittests/ndmw/NuGetAssetsLock.props deleted file mode 100644 index d69953b..0000000 --- a/src/unittests/ndmw/NuGetAssetsLock.props +++ /dev/null @@ -1,22 +0,0 @@ - - - - true - - - - - [1.0.0] - imbNHw4hg7nnbLjFuagxR1oc7TJv058rCclt+DmqJrvYYKJ10R/tGuKjne1nq94y0FTM1zd4j9v9v9n5A9Va6w== - vc150/1.0.0 - vc150.1.0.0.nupkg.sha512 - - - [1.0.3] - SeyxBzNqK/4Mh0yqD7LrJKxKu7b8Bja+iJFivyUu09B45brU4gOwTYFO7hSgk6Ll+OCjl9pA5RZYmtyy2aU0DA== - wk10/1.0.3 - wk10.1.0.3.nupkg.sha512 - - - - \ No newline at end of file diff --git a/src/unittests/ndmw/ndmw.cpp b/src/unittests/ndmw/ndmw.cpp index cbdab4e..f4b5641 100644 --- a/src/unittests/ndmw/ndmw.cpp +++ b/src/unittests/ndmw/ndmw.cpp @@ -36,6 +36,9 @@ // 12. Send 0-byte message indicating second test complete. // 13. Disconnect +#define WIN32_LEAN_AND_MEAN +#include +#include #include "ndcommon.h" #include #include diff --git a/src/unittests/ndmw/ndmw.vcxproj b/src/unittests/ndmw/ndmw.vcxproj index 120d819..73a227e 100644 --- a/src/unittests/ndmw/ndmw.vcxproj +++ b/src/unittests/ndmw/ndmw.vcxproj @@ -1,24 +1,156 @@ - - + + + + Debug + Win32 + + + Release + Win32 + + + Debug + x64 + + + Release + x64 + + - 15.0 - {6707722c-4371-48a4-a3a2-40d126059690} + 16.0 Win32Proj + {de5b13c5-65d5-4f5d-b92a-228be4415318} ndmw + 10.0 + + Application + true + v143 + Unicode + + + Application + false + v143 + true + Unicode + + + Application + true + v143 + Unicode + false + + + Application + false + v143 + true + Unicode + false + - + + + + + + + + - + + + + + + + + - _CONSOLE;%(PreprocessorDefinitions) + Level3 + true + WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + MultiThreadedDebug + ..\..\examples\;..\..\examples\ndtestutil;..\..\ndutil;%(AdditionalIncludeDirectories) Console + true + ..\..\$(Platform)\$(Configuration)\ndutil.lib;..\..\$(Platform)\$(Configuration)\ndtestutil.lib;uuid.lib;Ws2_32.lib;$(CoreLibraryDependencies);%(AdditionalDependencies) + + ..\ + + + + + Level3 + true + true + true + WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + MultiThreaded + ..\..\examples\;..\..\examples\ndtestutil;..\..\ndutil;%(AdditionalIncludeDirectories) + + + Console + true + true + true + ..\..\$(Platform)\$(Configuration)\ndutil.lib;..\..\$(Platform)\$(Configuration)\ndtestutil.lib;uuid.lib;Ws2_32.lib;$(CoreLibraryDependencies);%(AdditionalDependencies) + + + ..\ + + + + + Level3 + true + _DEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + ..\..\examples\;..\..\examples\ndtestutil;..\..\ndutil;%(AdditionalIncludeDirectories) + MultiThreadedDebug + + + Console + true + ..\..\$(Platform)\$(Configuration)\ndutil.lib;..\..\$(Platform)\$(Configuration)\ndtestutil.lib;uuid.lib;Ws2_32.lib;$(CoreLibraryDependencies);%(AdditionalDependencies) + + + ..\ + + + + + Level3 + true + true + true + NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + ..\..\examples\;..\..\examples\ndtestutil;..\..\ndutil;%(AdditionalIncludeDirectories) + MultiThreaded + + + Console + true + true + true + ..\..\$(Platform)\$(Configuration)\ndutil.lib;..\..\$(Platform)\$(Configuration)\ndtestutil.lib;uuid.lib;Ws2_32.lib;$(CoreLibraryDependencies);%(AdditionalDependencies) + + + ..\ + @@ -26,9 +158,7 @@ - - Application - Unicode - + + \ No newline at end of file diff --git a/src/unittests/ndmw/ndmw.vcxproj.filters b/src/unittests/ndmw/ndmw.vcxproj.filters new file mode 100644 index 0000000..a487cbe --- /dev/null +++ b/src/unittests/ndmw/ndmw.vcxproj.filters @@ -0,0 +1,27 @@ + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cc;cxx;c++;cppm;ixx;def;odl;idl;hpj;bat;asm;asmx + + + {93995380-89BD-4b04-88EB-625FBE52EBFB} + h;hh;hpp;hxx;h++;hm;inl;inc;ipp;xsd + + + {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} + rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms + + + + + Source Files + + + + + Resource Files + + + \ No newline at end of file diff --git a/src/unittests/unittests.props b/src/unittests/unittests.props deleted file mode 100644 index e64046c..0000000 --- a/src/unittests/unittests.props +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - - ..\..\examples;..\..\examples\ndtestutil\;$(OutIncludePath);%(AdditionalIncludeDirectories) - - - kernel32.lib;ws2_32.lib;uuid.lib;Iphlpapi.lib;%(AdditionalDependencies) - $(OutDir)\..\ndutil\;%(AdditionalLibraryDirectories) - - - ..;%(AdditionalIncludeDirectories) - - - - - unittests - *.exe - - - - - - - - - - - \ No newline at end of file