pastebin - collaborative debugging tool
rovema.kpaste.net RSS


msnfs41client: Patches for SDK/WDK paths, VS2022+misc, 2024-11-18
Posted by Anonymous on Mon 18th Nov 2024 18:48
raw | new post

  1. From cb8b8dbf50ff3ac7441eb18b1f5e4ae13d7af541 Mon Sep 17 00:00:00 2001
  2. From: Roland Mainz <roland.mainz@nrubsig.org>
  3. Date: Mon, 18 Nov 2024 17:54:24 +0100
  4. Subject: [PATCH 1/4] build.vc19: Replace hardcoded DDK version numbers with
  5.  DDK_INC_PATH/DDK_LIB_PATH
  6.  
  7. Replace hardcoded DDK version numbers with DDK_INC_PATH/DDK_LIB_PATH,
  8. so we don't have to edit nfs41_driver.vcxproj each time
  9. we switch Visual Studio versions.
  10. Tested with VS2019 and VS2022.
  11.  
  12. Signed-off-by: Cedric Blancher <cedric.blancher@gmail.com>
  13. ---
  14. build.vc19/nfs41_driver/nfs41_driver.vcxproj | 32 ++++++++++----------
  15.  1 file changed, 16 insertions(+), 16 deletions(-)
  16.  
  17. diff --git a/build.vc19/nfs41_driver/nfs41_driver.vcxproj b/build.vc19/nfs41_driver/nfs41_driver.vcxproj
  18. index 98366d6..8a93883 100644
  19. --- a/build.vc19/nfs41_driver/nfs41_driver.vcxproj
  20. +++ b/build.vc19/nfs41_driver/nfs41_driver.vcxproj
  21. @@ -135,7 +135,7 @@
  22.    </PropertyGroup>
  23.    <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">
  24.      <ClCompile>
  25. -      <AdditionalIncludeDirectories>..\..\include;..\..\dll;..\..;$(WindowsSdkDir)Include0.0.19041.0\km;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
  26. +      <AdditionalIncludeDirectories>..\..\include;..\..\dll;..\..;$(DDK_INC_PATH);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
  27.        <WarningLevel>Level4</WarningLevel>
  28.        <Optimization>Disabled</Optimization>
  29.        <PreprocessorDefinitions>EXPLODE_POOLTAGS;MONOLITHIC_MINIRDR;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
  30. @@ -144,12 +144,12 @@
  31.        <AdditionalOptions>/std:c17 /Zc:preprocessor- /kernel /wd4100 /wd4201 /wd5104</AdditionalOptions>
  32.      </ClCompile>
  33.      <Link>
  34. -      <AdditionalDependencies>$(WindowsSdkDir)lib0.0.19041.0\km\$(DDKPlatform)\ntoskrnl.lib;$(WindowsSdkDir)lib0.0.19041.0\km\$(DDKPlatform)\hal.lib;$(WindowsSdkDir)lib0.0.19041.0\km\$(DDKPlatform)\BufferOverflowfastfailK.lib;$(WindowsSdkDir)lib0.0.19041.0\km\$(DDKPlatform)\ksecdd.lib;$(WindowsSdkDir)lib0.0.19041.0\km\$(DDKPlatform)\rxce.lib;$(WindowsSdkDir)lib0.0.19041.0\km\$(DDKPlatform)\rdbsslib.lib</AdditionalDependencies>
  35. +      <AdditionalDependencies>$(DDK_LIB_PATH)\ntoskrnl.lib;$(DDK_LIB_PATH)\hal.lib;$(DDK_LIB_PATH)\BufferOverflowfastfailK.lib;$(DDK_LIB_PATH)\ksecdd.lib;$(DDK_LIB_PATH)\rxce.lib;$(DDK_LIB_PATH)\rdbsslib.lib</AdditionalDependencies>
  36.      </Link>
  37.    </ItemDefinitionGroup>
  38.    <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">
  39.      <ClCompile>
  40. -      <AdditionalIncludeDirectories>..\..\include;..\..\dll;..\..;$(WindowsSdkDir)Include0.0.19041.0\km;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
  41. +      <AdditionalIncludeDirectories>..\..\include;..\..\dll;..\..;$(DDK_INC_PATH);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
  42.        <WarningLevel>Level4</WarningLevel>
  43.        <Optimization>MaxSpeed</Optimization>
  44.        <PreprocessorDefinitions>EXPLODE_POOLTAGS;MONOLITHIC_MINIRDR;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
  45. @@ -158,12 +158,12 @@
  46.        <AdditionalOptions>/std:c17 /Zc:preprocessor- /kernel /wd4100 /wd4201 /wd5104</AdditionalOptions>
  47.      </ClCompile>
  48.      <Link>
  49. -      <AdditionalDependencies>$(WindowsSdkDir)lib0.0.19041.0\km\$(DDKPlatform)\ntoskrnl.lib;$(WindowsSdkDir)lib0.0.19041.0\km\$(DDKPlatform)\hal.lib;$(WindowsSdkDir)lib0.0.19041.0\km\$(DDKPlatform)\BufferOverflowfastfailK.lib;$(WindowsSdkDir)lib0.0.19041.0\km\$(DDKPlatform)\ksecdd.lib;$(WindowsSdkDir)lib0.0.19041.0\km\$(DDKPlatform)\rxce.lib;$(WindowsSdkDir)lib0.0.19041.0\km\$(DDKPlatform)\rdbsslib.lib</AdditionalDependencies>
  50. +      <AdditionalDependencies>$(DDK_LIB_PATH)\ntoskrnl.lib;$(DDK_LIB_PATH)\hal.lib;$(DDK_LIB_PATH)\BufferOverflowfastfailK.lib;$(DDK_LIB_PATH)\ksecdd.lib;$(DDK_LIB_PATH)\rxce.lib;$(DDK_LIB_PATH)\rdbsslib.lib</AdditionalDependencies>
  51.      </Link>
  52.    </ItemDefinitionGroup>
  53.    <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
  54.      <ClCompile>
  55. -      <AdditionalIncludeDirectories>..\..\include;..\..\dll;..\..;$(WindowsSdkDir)Include0.0.19041.0\km;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
  56. +      <AdditionalIncludeDirectories>..\..\include;..\..\dll;..\..;$(DDK_INC_PATH);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
  57.        <WarningLevel>Level4</WarningLevel>
  58.        <Optimization>Disabled</Optimization>
  59.        <PreprocessorDefinitions>EXPLODE_POOLTAGS;MONOLITHIC_MINIRDR;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
  60. @@ -172,7 +172,7 @@
  61.        <AdditionalOptions>/std:c17 /Zc:preprocessor- /kernel /wd4100 /wd4201 /wd5104</AdditionalOptions>
  62.      </ClCompile>
  63.      <Link>
  64. -      <AdditionalDependencies>$(WindowsSdkDir)lib0.0.19041.0\km\$(DDKPlatform)\ntoskrnl.lib;$(WindowsSdkDir)lib0.0.19041.0\km\$(DDKPlatform)\hal.lib;$(WindowsSdkDir)lib0.0.19041.0\km\$(DDKPlatform)\BufferOverflowfastfailK.lib;$(WindowsSdkDir)lib0.0.19041.0\km\$(DDKPlatform)\ksecdd.lib;$(WindowsSdkDir)lib0.0.19041.0\km\$(DDKPlatform)\rxce.lib;$(WindowsSdkDir)lib0.0.19041.0\km\$(DDKPlatform)\rdbsslib.lib</AdditionalDependencies>
  65. +      <AdditionalDependencies>$(DDK_LIB_PATH)\ntoskrnl.lib;$(DDK_LIB_PATH)\hal.lib;$(DDK_LIB_PATH)\BufferOverflowfastfailK.lib;$(DDK_LIB_PATH)\ksecdd.lib;$(DDK_LIB_PATH)\rxce.lib;$(DDK_LIB_PATH)\rdbsslib.lib</AdditionalDependencies>
  66.      </Link>
  67.      <DriverSign>
  68.        <FileDigestAlgorithm>sha256</FileDigestAlgorithm>
  69. @@ -180,7 +180,7 @@
  70.    </ItemDefinitionGroup>
  71.    <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
  72.      <ClCompile>
  73. -      <AdditionalIncludeDirectories>..\..\include;..\..\dll;..\..;$(WindowsSdkDir)Include0.0.19041.0\km;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
  74. +      <AdditionalIncludeDirectories>..\..\include;..\..\dll;..\..;$(DDK_INC_PATH);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
  75.        <WarningLevel>Level4</WarningLevel>
  76.        <Optimization>MaxSpeed</Optimization>
  77.        <PreprocessorDefinitions>EXPLODE_POOLTAGS;MONOLITHIC_MINIRDR;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
  78. @@ -189,7 +189,7 @@
  79.        <AdditionalOptions>/std:c17 /Zc:preprocessor- /kernel /wd4100 /wd4201 /wd5104</AdditionalOptions>
  80.      </ClCompile>
  81.      <Link>
  82. -      <AdditionalDependencies>$(WindowsSdkDir)lib0.0.19041.0\km\$(DDKPlatform)\ntoskrnl.lib;$(WindowsSdkDir)lib0.0.19041.0\km\$(DDKPlatform)\hal.lib;$(WindowsSdkDir)lib0.0.19041.0\km\$(DDKPlatform)\BufferOverflowfastfailK.lib;$(WindowsSdkDir)lib0.0.19041.0\km\$(DDKPlatform)\ksecdd.lib;$(WindowsSdkDir)lib0.0.19041.0\km\$(DDKPlatform)\rxce.lib;$(WindowsSdkDir)lib0.0.19041.0\km\$(DDKPlatform)\rdbsslib.lib</AdditionalDependencies>
  83. +      <AdditionalDependencies>$(DDK_LIB_PATH)\ntoskrnl.lib;$(DDK_LIB_PATH)\hal.lib;$(DDK_LIB_PATH)\BufferOverflowfastfailK.lib;$(DDK_LIB_PATH)\ksecdd.lib;$(DDK_LIB_PATH)\rxce.lib;$(DDK_LIB_PATH)\rdbsslib.lib</AdditionalDependencies>
  84.      </Link>
  85.      <DriverSign>
  86.        <FileDigestAlgorithm>sha256</FileDigestAlgorithm>
  87. @@ -197,7 +197,7 @@
  88.    </ItemDefinitionGroup>
  89.    <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">
  90.      <ClCompile>
  91. -      <AdditionalIncludeDirectories>..\..\include;..\..\dll;..\..;$(WindowsSdkDir)Include0.0.19041.0\km;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
  92. +      <AdditionalIncludeDirectories>..\..\include;..\..\dll;..\..;$(DDK_INC_PATH);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
  93.        <WarningLevel>Level4</WarningLevel>
  94.        <Optimization>Disabled</Optimization>
  95.        <PreprocessorDefinitions>EXPLODE_POOLTAGS;MONOLITHIC_MINIRDR;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
  96. @@ -206,12 +206,12 @@
  97.        <AdditionalOptions>/std:c17 /Zc:preprocessor- /kernel /wd4100 /wd4201 /wd5104</AdditionalOptions>
  98.      </ClCompile>
  99.      <Link>
  100. -      <AdditionalDependencies>$(WindowsSdkDir)lib0.0.19041.0\km\$(DDKPlatform)\ntoskrnl.lib;$(WindowsSdkDir)lib0.0.19041.0\km\$(DDKPlatform)\hal.lib;$(WindowsSdkDir)lib0.0.19041.0\km\$(DDKPlatform)\BufferOverflowfastfailK.lib;$(WindowsSdkDir)lib0.0.19041.0\km\$(DDKPlatform)\ksecdd.lib;$(WindowsSdkDir)lib0.0.19041.0\km\$(DDKPlatform)\rxce.lib;$(WindowsSdkDir)lib0.0.19041.0\km\$(DDKPlatform)\rdbsslib.lib</AdditionalDependencies>
  101. +      <AdditionalDependencies>$(DDK_LIB_PATH)\ntoskrnl.lib;$(DDK_LIB_PATH)\hal.lib;$(DDK_LIB_PATH)\BufferOverflowfastfailK.lib;$(DDK_LIB_PATH)\ksecdd.lib;$(DDK_LIB_PATH)\rxce.lib;$(DDK_LIB_PATH)\rdbsslib.lib</AdditionalDependencies>
  102.      </Link>
  103.    </ItemDefinitionGroup>
  104.    <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">
  105.      <ClCompile>
  106. -      <AdditionalIncludeDirectories>..\..\include;..\..\dll;..\..;$(WindowsSdkDir)Include0.0.19041.0\km;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
  107. +      <AdditionalIncludeDirectories>..\..\include;..\..\dll;..\..;$(DDK_INC_PATH);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
  108.        <WarningLevel>Level4</WarningLevel>
  109.        <Optimization>MaxSpeed</Optimization>
  110.        <PreprocessorDefinitions>EXPLODE_POOLTAGS;MONOLITHIC_MINIRDR;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
  111. @@ -220,12 +220,12 @@
  112.        <AdditionalOptions>/std:c17 /Zc:preprocessor- /kernel /wd4100 /wd4201 /wd5104</AdditionalOptions>
  113.      </ClCompile>
  114.      <Link>
  115. -      <AdditionalDependencies>$(WindowsSdkDir)lib0.0.19041.0\km\$(DDKPlatform)\ntoskrnl.lib;$(WindowsSdkDir)lib0.0.19041.0\km\$(DDKPlatform)\hal.lib;$(WindowsSdkDir)lib0.0.19041.0\km\$(DDKPlatform)\BufferOverflowfastfailK.lib;$(WindowsSdkDir)lib0.0.19041.0\km\$(DDKPlatform)\ksecdd.lib;$(WindowsSdkDir)lib0.0.19041.0\km\$(DDKPlatform)\rxce.lib;$(WindowsSdkDir)lib0.0.19041.0\km\$(DDKPlatform)\rdbsslib.lib</AdditionalDependencies>
  116. +      <AdditionalDependencies>$(DDK_LIB_PATH)\ntoskrnl.lib;$(DDK_LIB_PATH)\hal.lib;$(DDK_LIB_PATH)\BufferOverflowfastfailK.lib;$(DDK_LIB_PATH)\ksecdd.lib;$(DDK_LIB_PATH)\rxce.lib;$(DDK_LIB_PATH)\rdbsslib.lib</AdditionalDependencies>
  117.      </Link>
  118.    </ItemDefinitionGroup>
  119.    <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
  120.      <ClCompile>
  121. -      <AdditionalIncludeDirectories>..\..\include;..\..\dll;..\..;$(WindowsSdkDir)Include0.0.19041.0\km;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
  122. +      <AdditionalIncludeDirectories>..\..\include;..\..\dll;..\..;$(DDK_INC_PATH);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
  123.        <WarningLevel>Level4</WarningLevel>
  124.        <Optimization>Disabled</Optimization>
  125.        <PreprocessorDefinitions>EXPLODE_POOLTAGS;MONOLITHIC_MINIRDR;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
  126. @@ -234,7 +234,7 @@
  127.        <AdditionalOptions>/std:c17 /Zc:preprocessor- /kernel /wd4100 /wd4201 /wd5104</AdditionalOptions>
  128.      </ClCompile>
  129.      <Link>
  130. -      <AdditionalDependencies>$(WindowsSdkDir)lib0.0.19041.0\km\$(DDKPlatform)\ntoskrnl.lib;$(WindowsSdkDir)lib0.0.19041.0\km\$(DDKPlatform)\hal.lib;$(WindowsSdkDir)lib0.0.19041.0\km\$(DDKPlatform)\BufferOverflowfastfailK.lib;$(WindowsSdkDir)lib0.0.19041.0\km\$(DDKPlatform)\ksecdd.lib;$(WindowsSdkDir)lib0.0.19041.0\km\$(DDKPlatform)\rxce.lib;$(WindowsSdkDir)lib0.0.19041.0\km\$(DDKPlatform)\rdbsslib.lib</AdditionalDependencies>
  131. +      <AdditionalDependencies>$(DDK_LIB_PATH)\ntoskrnl.lib;$(DDK_LIB_PATH)\hal.lib;$(DDK_LIB_PATH)\BufferOverflowfastfailK.lib;$(DDK_LIB_PATH)\ksecdd.lib;$(DDK_LIB_PATH)\rxce.lib;$(DDK_LIB_PATH)\rdbsslib.lib</AdditionalDependencies>
  132.      </Link>
  133.      <DriverSign>
  134.        <FileDigestAlgorithm>sha256</FileDigestAlgorithm>
  135. @@ -242,7 +242,7 @@
  136.    </ItemDefinitionGroup>
  137.    <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
  138.      <ClCompile>
  139. -      <AdditionalIncludeDirectories>..\..\include;..\..\dll;..\..;$(WindowsSdkDir)Include0.0.19041.0\km;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
  140. +      <AdditionalIncludeDirectories>..\..\include;..\..\dll;..\..;$(DDK_INC_PATH);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
  141.        <WarningLevel>Level4</WarningLevel>
  142.        <Optimization>MaxSpeed</Optimization>
  143.        <PreprocessorDefinitions>EXPLODE_POOLTAGS;MONOLITHIC_MINIRDR;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
  144. @@ -251,7 +251,7 @@
  145.        <AdditionalOptions>/std:c17 /Zc:preprocessor- /kernel /wd4100 /wd4201 /wd5104</AdditionalOptions>
  146.      </ClCompile>
  147.      <Link>
  148. -      <AdditionalDependencies>$(WindowsSdkDir)lib0.0.19041.0\km\$(DDKPlatform)\ntoskrnl.lib;$(WindowsSdkDir)lib0.0.19041.0\km\$(DDKPlatform)\hal.lib;$(WindowsSdkDir)lib0.0.19041.0\km\$(DDKPlatform)\BufferOverflowfastfailK.lib;$(WindowsSdkDir)lib0.0.19041.0\km\$(DDKPlatform)\ksecdd.lib;$(WindowsSdkDir)lib0.0.19041.0\km\$(DDKPlatform)\rxce.lib;$(WindowsSdkDir)lib0.0.19041.0\km\$(DDKPlatform)\rdbsslib.lib</AdditionalDependencies>
  149. +      <AdditionalDependencies>$(DDK_LIB_PATH)\ntoskrnl.lib;$(DDK_LIB_PATH)\hal.lib;$(DDK_LIB_PATH)\BufferOverflowfastfailK.lib;$(DDK_LIB_PATH)\ksecdd.lib;$(DDK_LIB_PATH)\rxce.lib;$(DDK_LIB_PATH)\rdbsslib.lib</AdditionalDependencies>
  150.      </Link>
  151.      <DriverSign>
  152.        <FileDigestAlgorithm>sha256</FileDigestAlgorithm>
  153. --
  154. 2.45.1
  155.  
  156. From f9796952f6164dec0acbff7e32f015ae8add5422 Mon Sep 17 00:00:00 2001
  157. From: Roland Mainz <roland.mainz@nrubsig.org>
  158. Date: Mon, 18 Nov 2024 17:59:23 +0100
  159. Subject: [PATCH 2/4] include: Fix
  160.  |FILE_STAT_INFORMATION|+|FILE_STAT_LX_INFORMATION| for newer WDK
  161.  
  162. Fix |FILE_STAT_INFORMATION|+|FILE_STAT_LX_INFORMATION| for newer WDK
  163. used by Visual Studio 2022.
  164.  
  165. Signed-off-by: Cedric Blancher <cedric.blancher@gmail.com>
  166. ---
  167. include/from_kernel.h | 31 +++++++++++++++++--------------
  168.  1 file changed, 17 insertions(+), 14 deletions(-)
  169.  
  170. diff --git a/include/from_kernel.h b/include/from_kernel.h
  171. index b4ff4cc..ebd89d0 100644
  172. --- a/include/from_kernel.h
  173. +++ b/include/from_kernel.h
  174. @@ -1,8 +1,10 @@
  175.  /* NFSv4.1 client for Windows
  176. - * Copyright (C) 2012 The Regents of the University of Michigan
  177. + * Copyright (C) 2012 The Regents of the University of Michigan
  178. + * Copyright (C) 2023-2024 Roland Mainz <roland.mainz@nrubsig.org>
  179.   *
  180.   * Olga Kornievskaia <aglo@umich.edu>
  181.   * Casey Bodley <cbodley@umich.edu>
  182. + * Roland Mainz <roland.mainz@nrubsig.org>
  183.   *
  184.   * This library is free software; you can redistribute it and/or modify it
  185.   * under the terms of the GNU Lesser General Public License as published by
  186. @@ -246,6 +248,7 @@ typedef struct _FILE_NETWORK_OPEN_INFORMATION {
  187.      ULONG FileAttributes;
  188.  } FILE_NETWORK_OPEN_INFORMATION, *PFILE_NETWORK_OPEN_INFORMATION;
  189.  
  190. +#ifndef LX_FILE_METADATA_HAS_UID
  191.  typedef struct _FILE_STAT_INFORMATION {
  192.      LARGE_INTEGER FileId;
  193.      LARGE_INTEGER CreationTime;
  194. @@ -254,9 +257,9 @@ typedef struct _FILE_STAT_INFORMATION {
  195.      LARGE_INTEGER ChangeTime;
  196.      LARGE_INTEGER AllocationSize;
  197.      LARGE_INTEGER EndOfFile;
  198. -    ULONG FileAttributes;
  199. -    ULONG ReparseTag;
  200. -    ULONG NumberOfLinks;
  201. +    DWORD FileAttributes;
  202. +    DWORD ReparseTag;
  203. +    DWORD NumberOfLinks;
  204.      ACCESS_MASK EffectiveAccess;
  205.  } FILE_STAT_INFORMATION, *PFILE_STAT_INFORMATION;
  206.  
  207. @@ -268,18 +271,18 @@ typedef struct _FILE_STAT_LX_INFORMATION {
  208.      LARGE_INTEGER ChangeTime;
  209.      LARGE_INTEGER AllocationSize;
  210.      LARGE_INTEGER EndOfFile;
  211. -    ULONG FileAttributes;
  212. -    ULONG ReparseTag;
  213. -    ULONG NumberOfLinks;
  214. +    DWORD FileAttributes;
  215. +    DWORD ReparseTag;
  216. +    DWORD NumberOfLinks;
  217.      ACCESS_MASK EffectiveAccess;
  218. -    ULONG LxFlags;
  219. -    ULONG LxUid;
  220. -    ULONG LxGid;
  221. -    ULONG LxMode;
  222. -    ULONG LxDeviceIdMajor;
  223. -    ULONG LxDeviceIdMinor;
  224. +    DWORD LxFlags;
  225. +    DWORD LxUid;
  226. +    DWORD LxGid;
  227. +    DWORD LxMode;
  228. +    DWORD LxDeviceIdMajor;
  229. +    DWORD LxDeviceIdMinor;
  230.  } FILE_STAT_LX_INFORMATION, *PFILE_STAT_LX_INFORMATION;
  231. -
  232. +#endif /* !LX_FILE_METADATA_HAS_UID */
  233.  /* Flags for |LxFlags| field */
  234.  #define LX_FILE_METADATA_HAS_UID        0x1
  235.  #define LX_FILE_METADATA_HAS_GID        0x2
  236. --
  237. 2.45.1
  238.  
  239. From 0e85d17a53b29903a4b3a68edea0478d155c2d07 Mon Sep 17 00:00:00 2001
  240. From: Roland Mainz <roland.mainz@nrubsig.org>
  241. Date: Mon, 18 Nov 2024 18:25:32 +0100
  242. Subject: [PATCH 3/4] cygwin: Split cygwin/Makefile installdest target into
  243.  installdest32+installdest64
  244.  
  245. Split cygwin/Makefile installdest target into installdest32+installdest64
  246. targets.
  247.  
  248. Signed-off-by: Cedric Blancher <cedric.blancher@gmail.com>
  249. ---
  250. cygwin/Makefile | 35 ++++++++++++++++++++++-------------
  251.  1 file changed, 22 insertions(+), 13 deletions(-)
  252.  
  253. diff --git a/cygwin/Makefile b/cygwin/Makefile
  254. index 952d209..aa29bfe 100644
  255. --- a/cygwin/Makefile
  256. +++ b/cygwin/Makefile
  257. @@ -82,19 +82,7 @@ clean:
  258.         (cd "$(PROJECT_BASEDIR_DIR)/tests/winfsinfo1" && make clean)
  259.         (cd "$(PROJECT_BASEDIR_DIR)/tests/winsg" && make clean)
  260.  
  261. -installdest: \
  262. -       $(VS_BUILD_DIR32)/nfsd.exe \
  263. -       $(VS_BUILD_DIR32)/nfs_mount.exe \
  264. -       $(VS_BUILD_DIR32)/nfs_install.exe \
  265. -       $(VS_BUILD_DIR32)/nfs_mount.exe \
  266. -       $(VS_BUILD_DIR32)/nfs41_driver.sys \
  267. -       $(VS_BUILD_DIR32)/libtirpc.dll \
  268. -       $(VS_BUILD_DIR64)/nfsd.exe \
  269. -       $(VS_BUILD_DIR64)/nfs_mount.exe \
  270. -       $(VS_BUILD_DIR64)/nfs_install.exe \
  271. -       $(VS_BUILD_DIR64)/nfs_mount.exe \
  272. -       $(VS_BUILD_DIR64)/nfs41_driver.sys \
  273. -       $(VS_BUILD_DIR64)/libtirpc.dll \
  274. +installdest_util: \
  275.         $(PROJECT_BASEDIR_DIR)/nfs41rdr.inf \
  276.         $(PROJECT_BASEDIR_DIR)/etc_netconfig \
  277.         $(PROJECT_BASEDIR_DIR)/ms-nfs41-idmap.conf \
  278. @@ -102,17 +90,38 @@ installdest: \
  279.         $(PROJECT_BASEDIR_DIR)/tests/winfsinfo1/winfsinfo.exe \
  280.         $(PROJECT_BASEDIR_DIR)/tests/winsg/winsg.exe \
  281.         $(CYGWIN_MAKEFILE_DIR)/devel/msnfs41client.bash
  282. +
  283. +installdest32: \
  284. +       $(VS_BUILD_DIR32)/nfsd.exe \
  285. +       $(VS_BUILD_DIR32)/nfs_mount.exe \
  286. +       $(VS_BUILD_DIR32)/nfs_install.exe \
  287. +       $(VS_BUILD_DIR32)/nfs_mount.exe \
  288. +       $(VS_BUILD_DIR32)/nfs41_driver.sys \
  289. +       $(VS_BUILD_DIR32)/libtirpc.dll \
  290.         # installdest 32bit Windows
  291.         make -f $(CYGWIN_MAKEFILE_DIR)/Makefile.install \
  292.                 installdest \
  293.                 VS_BUILD_DIR="$(VS_BUILD_DIR32)" \
  294.                 CYGWIN_BASEPATH=/cygdrive/c/cygwin/
  295. +
  296. +installdest64: \
  297. +       $(VS_BUILD_DIR64)/nfsd.exe \
  298. +       $(VS_BUILD_DIR64)/nfs_mount.exe \
  299. +       $(VS_BUILD_DIR64)/nfs_install.exe \
  300. +       $(VS_BUILD_DIR64)/nfs_mount.exe \
  301. +       $(VS_BUILD_DIR64)/nfs41_driver.sys \
  302. +       $(VS_BUILD_DIR64)/libtirpc.dll \
  303.         # installdest 64bit Windows
  304.         make -f $(CYGWIN_MAKEFILE_DIR)/Makefile.install \
  305.                 installdest \
  306.                 VS_BUILD_DIR="$(VS_BUILD_DIR64)" \
  307.                 CYGWIN_BASEPATH=/cygdrive/c/cygwin64/
  308.  
  309. +# installdest: we need a .WAIT here becase Makefile.install uses git commands
  310. +# to create a git bundle, and the commands do not like to run
  311. +# in parallel
  312. +installdest: installdest_util installdest32 .WAIT installdest64
  313. +
  314.  bintarball: installdest
  315.         set -o errexit ; set -o xtrace ; \
  316.         base_filename="msnfs41client_cygwin_binaries_$$(date +%Y%m%d_%Hh%Mm)_git$$(git rev-parse --short HEAD)" ; \
  317. --
  318. 2.45.1
  319.  
  320. From 8d70c32d15ceb7c1983c61c3d6bde3570ef7525e Mon Sep 17 00:00:00 2001
  321. From: Roland Mainz <roland.mainz@nrubsig.org>
  322. Date: Mon, 18 Nov 2024 18:55:31 +0100
  323. Subject: [PATCH 4/4] cygwin: Fix dependencies in cygwin/Makefile
  324.  
  325. Fix dependencies in cygwin/Makefile
  326.  
  327. Signed-off-by: Cedric Blancher <cedric.blancher@gmail.com>
  328. ---
  329. cygwin/Makefile | 13 ++++++++-----
  330.  1 file changed, 8 insertions(+), 5 deletions(-)
  331.  
  332. diff --git a/cygwin/Makefile b/cygwin/Makefile
  333. index aa29bfe..0775b24 100644
  334. --- a/cygwin/Makefile
  335. +++ b/cygwin/Makefile
  336. @@ -22,15 +22,15 @@ VS_BUILD_DIR64:=$(PROJECT_BASEDIR_DIR)/build.vc19/x64/Debug/
  337.  $(VS_BUILD_DIR32)/nfsd.exe \
  338.         $(VS_BUILD_DIR32)/nfs_mount.exe \
  339.         $(VS_BUILD_DIR32)/nfs_install.exe \
  340. -       $(VS_BUILD_DIR32)/nfs_mount.exe \
  341.         $(VS_BUILD_DIR32)/nfs41_driver.sys \
  342.         $(VS_BUILD_DIR32)/libtirpc.dll \
  343. +       $(VS_BUILD_DIR32)/nfs41_np.dll \
  344.         $(VS_BUILD_DIR64)/nfsd.exe \
  345.         $(VS_BUILD_DIR64)/nfs_mount.exe \
  346.         $(VS_BUILD_DIR64)/nfs_install.exe \
  347. -       $(VS_BUILD_DIR64)/nfs_mount.exe \
  348.         $(VS_BUILD_DIR64)/nfs41_driver.sys \
  349. -       $(VS_BUILD_DIR64)/libtirpc.dll: build
  350. +       $(VS_BUILD_DIR64)/libtirpc.dll \
  351. +       $(VS_BUILD_DIR64)/nfs41_np.dll: build
  352.  
  353.  # trigger "build_testutils" target when these binaries are needed
  354.  $(PROJECT_BASEDIR_DIR)/tests/ea/nfs_ea.exe \
  355. @@ -95,22 +95,25 @@ installdest32: \
  356.         $(VS_BUILD_DIR32)/nfsd.exe \
  357.         $(VS_BUILD_DIR32)/nfs_mount.exe \
  358.         $(VS_BUILD_DIR32)/nfs_install.exe \
  359. -       $(VS_BUILD_DIR32)/nfs_mount.exe \
  360.         $(VS_BUILD_DIR32)/nfs41_driver.sys \
  361.         $(VS_BUILD_DIR32)/libtirpc.dll \
  362. +       $(VS_BUILD_DIR32)/nfs41_np.dll \
  363.         # installdest 32bit Windows
  364.         make -f $(CYGWIN_MAKEFILE_DIR)/Makefile.install \
  365.                 installdest \
  366.                 VS_BUILD_DIR="$(VS_BUILD_DIR32)" \
  367.                 CYGWIN_BASEPATH=/cygdrive/c/cygwin/
  368.  
  369. +# installdest64: 32bit nfs41_np.dll is required to support 32bit
  370. +# apps on 64bit Windows
  371.  installdest64: \
  372.         $(VS_BUILD_DIR64)/nfsd.exe \
  373.         $(VS_BUILD_DIR64)/nfs_mount.exe \
  374.         $(VS_BUILD_DIR64)/nfs_install.exe \
  375. -       $(VS_BUILD_DIR64)/nfs_mount.exe \
  376.         $(VS_BUILD_DIR64)/nfs41_driver.sys \
  377.         $(VS_BUILD_DIR64)/libtirpc.dll \
  378. +       $(VS_BUILD_DIR32)/nfs41_np.dll \
  379. +       $(VS_BUILD_DIR64)/nfs41_np.dll \
  380.         # installdest 64bit Windows
  381.         make -f $(CYGWIN_MAKEFILE_DIR)/Makefile.install \
  382.                 installdest \
  383. --
  384. 2.45.1

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

Syntax highlighting:

To highlight particular lines, prefix each line with {%HIGHLIGHT}




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