pastebin - collaborative debugging tool
rovema.kpaste.net RSS


msnfs41client: Build fixes for new VS2019 version+warning fixes+misc, 2025-08-13
Posted by Anonymous on Wed 13th Aug 2025 20:25
raw | new post

  1. From fb1415e6e095df4c8ce798521e5d9263db53a679 Mon Sep 17 00:00:00 2001
  2. From: Roland Mainz <roland.mainz@nrubsig.org>
  3. Date: Wed, 13 Aug 2025 19:16:19 +0200
  4. Subject: [PATCH 1/4] build.vc19: Workaround for new VS2019
  5.  "um\winbase.h(9572,5): warning C5105: macro expansion producing 'defined' has
  6.  undefined behavior" warning
  7.  
  8. Add workaround for "C:\Program Files (x86)\Windows Kits\10\Include\10.0.19041.0\um\winbase.h(9572,5):
  9. warning C5105: macro expansion producing 'defined' has undefined behavior"
  10. warning which popped-up after the last Visual Studio 2019+SDK 10.0.19041.0
  11. update.
  12.  
  13. Signed-off-by: Cedric Blancher <cedric.blancher@gmail.com>
  14. ---
  15. build.vc19/libtirpc/libtirpc.vcxproj         | 12 ++++++------
  16.  build.vc19/nfs41_driver/nfs41_driver.vcxproj | 12 ++++++------
  17.  build.vc19/nfs41_np/nfs41_np.vcxproj         | 12 ++++++------
  18.  build.vc19/nfs_install/nfs_install.vcxproj   |  6 ++++++
  19.  build.vc19/nfs_mount/nfs_mount.vcxproj       |  6 ++++++
  20.  build.vc19/nfsd/nfsd.vcxproj                 | 12 ++++++------
  21.  6 files changed, 36 insertions(+), 24 deletions(-)
  22.  
  23. diff --git a/build.vc19/libtirpc/libtirpc.vcxproj b/build.vc19/libtirpc/libtirpc.vcxproj
  24. index 812befd..5f889fb 100644
  25. --- a/build.vc19/libtirpc/libtirpc.vcxproj
  26. +++ b/build.vc19/libtirpc/libtirpc.vcxproj
  27. @@ -133,7 +133,7 @@
  28.        <BasicRuntimeChecks>Default</BasicRuntimeChecks>
  29.        <BufferSecurityCheck>false</BufferSecurityCheck>
  30.        <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
  31. -      <AdditionalOptions>/wd4100 /wd4131 /wd4389</AdditionalOptions>
  32. +      <AdditionalOptions>/wd4100 /wd4131 /wd4389 /wd5105</AdditionalOptions>
  33.        <SupportJustMyCode>false</SupportJustMyCode>
  34.        <OmitFramePointers>false</OmitFramePointers>
  35.        <IntrinsicFunctions>true</IntrinsicFunctions>
  36. @@ -159,7 +159,7 @@
  37.        <BasicRuntimeChecks>Default</BasicRuntimeChecks>
  38.        <BufferSecurityCheck>false</BufferSecurityCheck>
  39.        <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
  40. -      <AdditionalOptions>/wd4100 /wd4131 /wd4389</AdditionalOptions>
  41. +      <AdditionalOptions>/wd4100 /wd4131 /wd4389 /wd5105</AdditionalOptions>
  42.        <SupportJustMyCode>false</SupportJustMyCode>
  43.        <OmitFramePointers>false</OmitFramePointers>
  44.        <IntrinsicFunctions>true</IntrinsicFunctions>
  45. @@ -185,7 +185,7 @@
  46.        <BasicRuntimeChecks>Default</BasicRuntimeChecks>
  47.        <BufferSecurityCheck>false</BufferSecurityCheck>
  48.        <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
  49. -      <AdditionalOptions>/wd4100 /wd4131 /wd4389</AdditionalOptions>
  50. +      <AdditionalOptions>/wd4100 /wd4131 /wd4389 /wd5105</AdditionalOptions>
  51.        <SupportJustMyCode>false</SupportJustMyCode>
  52.        <IntrinsicFunctions>true</IntrinsicFunctions>
  53.        <WholeProgramOptimization>false</WholeProgramOptimization>
  54. @@ -210,7 +210,7 @@
  55.        <StringPooling>true</StringPooling>
  56.        <BufferSecurityCheck>false</BufferSecurityCheck>
  57.        <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
  58. -      <AdditionalOptions>/wd4100 /wd4131 /wd4389</AdditionalOptions>
  59. +      <AdditionalOptions>/wd4100 /wd4131 /wd4389 /wd5105</AdditionalOptions>
  60.        <OmitFramePointers>false</OmitFramePointers>
  61.        <IntrinsicFunctions>true</IntrinsicFunctions>
  62.        <WholeProgramOptimization>true</WholeProgramOptimization>
  63. @@ -240,7 +240,7 @@
  64.        <StringPooling>true</StringPooling>
  65.        <BufferSecurityCheck>false</BufferSecurityCheck>
  66.        <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
  67. -      <AdditionalOptions>/wd4100 /wd4131 /wd4389</AdditionalOptions>
  68. +      <AdditionalOptions>/wd4100 /wd4131 /wd4389 /wd5105</AdditionalOptions>
  69.        <OmitFramePointers>false</OmitFramePointers>
  70.        <IntrinsicFunctions>true</IntrinsicFunctions>
  71.        <WholeProgramOptimization>true</WholeProgramOptimization>
  72. @@ -270,7 +270,7 @@
  73.        <StringPooling>true</StringPooling>
  74.        <BufferSecurityCheck>false</BufferSecurityCheck>
  75.        <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
  76. -      <AdditionalOptions>/wd4100 /wd4131 /wd4389</AdditionalOptions>
  77. +      <AdditionalOptions>/wd4100 /wd4131 /wd4389 /wd5105</AdditionalOptions>
  78.        <IntrinsicFunctions>true</IntrinsicFunctions>
  79.        <WholeProgramOptimization>true</WholeProgramOptimization>
  80.        <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
  81. diff --git a/build.vc19/nfs41_driver/nfs41_driver.vcxproj b/build.vc19/nfs41_driver/nfs41_driver.vcxproj
  82. index afd079e..4668930 100644
  83. --- a/build.vc19/nfs41_driver/nfs41_driver.vcxproj
  84. +++ b/build.vc19/nfs41_driver/nfs41_driver.vcxproj
  85. @@ -113,7 +113,7 @@
  86.        <PreprocessorDefinitions>EXPLODE_POOLTAGS;MONOLITHIC_MINIRDR;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
  87.        <LanguageStandard_C>stdc17</LanguageStandard_C>
  88.        <StringPooling>true</StringPooling>
  89. -      <AdditionalOptions>/std:c17 /Zc:preprocessor- /kernel /wd4100 /wd4201 /wd5104</AdditionalOptions>
  90. +      <AdditionalOptions>/std:c17 /Zc:preprocessor- /kernel /wd4100 /wd4201 /wd5104 /wd5105</AdditionalOptions>
  91.        <IntrinsicFunctions>true</IntrinsicFunctions>
  92.        <WholeProgramOptimization>false</WholeProgramOptimization>
  93.      </ClCompile>
  94. @@ -129,7 +129,7 @@
  95.        <PreprocessorDefinitions>EXPLODE_POOLTAGS;MONOLITHIC_MINIRDR;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
  96.        <LanguageStandard_C>stdc17</LanguageStandard_C>
  97.        <StringPooling>true</StringPooling>
  98. -      <AdditionalOptions>/std:c17 /Zc:preprocessor- /kernel /wd4100 /wd4201 /wd5104</AdditionalOptions>
  99. +      <AdditionalOptions>/std:c17 /Zc:preprocessor- /kernel /wd4100 /wd4201 /wd5104 /wd5105</AdditionalOptions>
  100.        <IntrinsicFunctions>true</IntrinsicFunctions>
  101.        <WholeProgramOptimization>true</WholeProgramOptimization>
  102.      </ClCompile>
  103. @@ -146,7 +146,7 @@
  104.        <PreprocessorDefinitions>EXPLODE_POOLTAGS;MONOLITHIC_MINIRDR;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
  105.        <LanguageStandard_C>stdc17</LanguageStandard_C>
  106.        <StringPooling>true</StringPooling>
  107. -      <AdditionalOptions>/std:c17 /Zc:preprocessor- /kernel /wd4100 /wd4201 /wd5104</AdditionalOptions>
  108. +      <AdditionalOptions>/std:c17 /Zc:preprocessor- /kernel /wd4100 /wd4201 /wd5104 /wd5105</AdditionalOptions>
  109.        <IntrinsicFunctions>true</IntrinsicFunctions>
  110.        <WholeProgramOptimization>false</WholeProgramOptimization>
  111.      </ClCompile>
  112. @@ -165,7 +165,7 @@
  113.        <PreprocessorDefinitions>EXPLODE_POOLTAGS;MONOLITHIC_MINIRDR;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
  114.        <LanguageStandard_C>stdc17</LanguageStandard_C>
  115.        <StringPooling>true</StringPooling>
  116. -      <AdditionalOptions>/std:c17 /Zc:preprocessor- /kernel /wd4100 /wd4201 /wd5104</AdditionalOptions>
  117. +      <AdditionalOptions>/std:c17 /Zc:preprocessor- /kernel /wd4100 /wd4201 /wd5104 /wd5105</AdditionalOptions>
  118.        <IntrinsicFunctions>true</IntrinsicFunctions>
  119.        <WholeProgramOptimization>true</WholeProgramOptimization>
  120.      </ClCompile>
  121. @@ -185,7 +185,7 @@
  122.        <PreprocessorDefinitions>EXPLODE_POOLTAGS;MONOLITHIC_MINIRDR;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
  123.        <LanguageStandard_C>stdc17</LanguageStandard_C>
  124.        <StringPooling>true</StringPooling>
  125. -      <AdditionalOptions>/std:c17 /Zc:preprocessor- /kernel /wd4100 /wd4201 /wd5104</AdditionalOptions>
  126. +      <AdditionalOptions>/std:c17 /Zc:preprocessor- /kernel /wd4100 /wd4201 /wd5104 /wd5105</AdditionalOptions>
  127.        <IntrinsicFunctions>true</IntrinsicFunctions>
  128.        <WholeProgramOptimization>false</WholeProgramOptimization>
  129.      </ClCompile>
  130. @@ -204,7 +204,7 @@
  131.        <PreprocessorDefinitions>EXPLODE_POOLTAGS;MONOLITHIC_MINIRDR;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
  132.        <LanguageStandard_C>stdc17</LanguageStandard_C>
  133.        <StringPooling>true</StringPooling>
  134. -      <AdditionalOptions>/std:c17 /Zc:preprocessor- /kernel /wd4100 /wd4201 /wd5104</AdditionalOptions>
  135. +      <AdditionalOptions>/std:c17 /Zc:preprocessor- /kernel /wd4100 /wd4201 /wd5104 /wd5105</AdditionalOptions>
  136.        <IntrinsicFunctions>true</IntrinsicFunctions>
  137.        <WholeProgramOptimization>true</WholeProgramOptimization>
  138.      </ClCompile>
  139. diff --git a/build.vc19/nfs41_np/nfs41_np.vcxproj b/build.vc19/nfs41_np/nfs41_np.vcxproj
  140. index 938acc5..e922c2e 100644
  141. --- a/build.vc19/nfs41_np/nfs41_np.vcxproj
  142. +++ b/build.vc19/nfs41_np/nfs41_np.vcxproj
  143. @@ -133,7 +133,7 @@
  144.        <AdditionalIncludeDirectories>..\..\include;..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
  145.        <LanguageStandard_C>stdc17</LanguageStandard_C>
  146.        <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
  147. -      <AdditionalOptions>/wd4100</AdditionalOptions>
  148. +      <AdditionalOptions>/wd4100 /wd5105</AdditionalOptions>
  149.        <SupportJustMyCode>false</SupportJustMyCode>
  150.        <IntrinsicFunctions>true</IntrinsicFunctions>
  151.        <OmitFramePointers>false</OmitFramePointers>
  152. @@ -154,7 +154,7 @@
  153.        <AdditionalIncludeDirectories>..\..\include;..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
  154.        <LanguageStandard_C>stdc17</LanguageStandard_C>
  155.        <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
  156. -      <AdditionalOptions>/wd4100</AdditionalOptions>
  157. +      <AdditionalOptions>/wd4100 /wd5105</AdditionalOptions>
  158.        <SupportJustMyCode>false</SupportJustMyCode>
  159.        <IntrinsicFunctions>true</IntrinsicFunctions>
  160.        <OmitFramePointers>false</OmitFramePointers>
  161. @@ -175,7 +175,7 @@
  162.        <AdditionalIncludeDirectories>..\..\include;..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
  163.        <LanguageStandard_C>stdc17</LanguageStandard_C>
  164.        <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
  165. -      <AdditionalOptions>/wd4100</AdditionalOptions>
  166. +      <AdditionalOptions>/wd4100 /wd5105</AdditionalOptions>
  167.        <SupportJustMyCode>false</SupportJustMyCode>
  168.        <IntrinsicFunctions>true</IntrinsicFunctions>
  169.      </ClCompile>
  170. @@ -197,7 +197,7 @@
  171.        <AdditionalIncludeDirectories>..\..\include;..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
  172.        <LanguageStandard_C>stdc17</LanguageStandard_C>
  173.        <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
  174. -      <AdditionalOptions>/wd4100</AdditionalOptions>
  175. +      <AdditionalOptions>/wd4100 /wd5105</AdditionalOptions>
  176.        <OmitFramePointers>false</OmitFramePointers>
  177.      </ClCompile>
  178.      <Link>
  179. @@ -221,7 +221,7 @@
  180.        <AdditionalIncludeDirectories>..\..\include;..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
  181.        <LanguageStandard_C>stdc17</LanguageStandard_C>
  182.        <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
  183. -      <AdditionalOptions>/wd4100</AdditionalOptions>
  184. +      <AdditionalOptions>/wd4100 /wd5105</AdditionalOptions>
  185.        <OmitFramePointers>false</OmitFramePointers>
  186.      </ClCompile>
  187.      <Link>
  188. @@ -245,7 +245,7 @@
  189.        <AdditionalIncludeDirectories>..\..\include;..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
  190.        <LanguageStandard_C>stdc17</LanguageStandard_C>
  191.        <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
  192. -      <AdditionalOptions>/wd4100</AdditionalOptions>
  193. +      <AdditionalOptions>/wd4100 /wd5105</AdditionalOptions>
  194.      </ClCompile>
  195.      <Link>
  196.        <SubSystem>Windows</SubSystem>
  197. diff --git a/build.vc19/nfs_install/nfs_install.vcxproj b/build.vc19/nfs_install/nfs_install.vcxproj
  198. index c1364e0..19b133e 100644
  199. --- a/build.vc19/nfs_install/nfs_install.vcxproj
  200. +++ b/build.vc19/nfs_install/nfs_install.vcxproj
  201. @@ -130,6 +130,7 @@
  202.        <AdditionalIncludeDirectories>..\..\sys;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
  203.        <LanguageStandard_C>stdc17</LanguageStandard_C>
  204.        <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
  205. +      <AdditionalOptions>/wd5105</AdditionalOptions>
  206.        <SupportJustMyCode>false</SupportJustMyCode>
  207.      </ClCompile>
  208.      <Link>
  209. @@ -147,6 +148,7 @@
  210.        <AdditionalIncludeDirectories>..\..\sys;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
  211.        <LanguageStandard_C>stdc17</LanguageStandard_C>
  212.        <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
  213. +      <AdditionalOptions>/wd5105</AdditionalOptions>
  214.        <SupportJustMyCode>false</SupportJustMyCode>
  215.      </ClCompile>
  216.      <Link>
  217. @@ -164,6 +166,7 @@
  218.        <AdditionalIncludeDirectories>..\..\sys;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
  219.        <LanguageStandard_C>stdc17</LanguageStandard_C>
  220.        <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
  221. +      <AdditionalOptions>/wd5105</AdditionalOptions>
  222.        <SupportJustMyCode>false</SupportJustMyCode>
  223.      </ClCompile>
  224.      <Link>
  225. @@ -183,6 +186,7 @@
  226.        <AdditionalIncludeDirectories>..\..\sys;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
  227.        <LanguageStandard_C>stdc17</LanguageStandard_C>
  228.        <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
  229. +      <AdditionalOptions>/wd5105</AdditionalOptions>
  230.      </ClCompile>
  231.      <Link>
  232.        <SubSystem>Console</SubSystem>
  233. @@ -203,6 +207,7 @@
  234.        <AdditionalIncludeDirectories>..\..\sys;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
  235.        <LanguageStandard_C>stdc17</LanguageStandard_C>
  236.        <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
  237. +      <AdditionalOptions>/wd5105</AdditionalOptions>
  238.      </ClCompile>
  239.      <Link>
  240.        <SubSystem>Console</SubSystem>
  241. @@ -223,6 +228,7 @@
  242.        <AdditionalIncludeDirectories>..\..\sys;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
  243.        <LanguageStandard_C>stdc17</LanguageStandard_C>
  244.        <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
  245. +      <AdditionalOptions>/wd5105</AdditionalOptions>
  246.      </ClCompile>
  247.      <Link>
  248.        <SubSystem>Console</SubSystem>
  249. diff --git a/build.vc19/nfs_mount/nfs_mount.vcxproj b/build.vc19/nfs_mount/nfs_mount.vcxproj
  250. index 675bb27..6d590d1 100644
  251. --- a/build.vc19/nfs_mount/nfs_mount.vcxproj
  252. +++ b/build.vc19/nfs_mount/nfs_mount.vcxproj
  253. @@ -136,6 +136,7 @@
  254.        <AdditionalIncludeDirectories>..\..\include;..\..;$(IntermediateOutputPath);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
  255.        <LanguageStandard_C>stdc17</LanguageStandard_C>
  256.        <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
  257. +      <AdditionalOptions>/wd5105</AdditionalOptions>
  258.        <SupportJustMyCode>false</SupportJustMyCode>
  259.      </ClCompile>
  260.      <Link>
  261. @@ -154,6 +155,7 @@
  262.        <AdditionalIncludeDirectories>..\..\include;..\..;$(IntermediateOutputPath);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
  263.        <LanguageStandard_C>stdc17</LanguageStandard_C>
  264.        <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
  265. +      <AdditionalOptions>/wd5105</AdditionalOptions>
  266.        <SupportJustMyCode>false</SupportJustMyCode>
  267.      </ClCompile>
  268.      <Link>
  269. @@ -172,6 +174,7 @@
  270.        <AdditionalIncludeDirectories>..\..\include;..\..;$(IntermediateOutputPath);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
  271.        <LanguageStandard_C>stdc17</LanguageStandard_C>
  272.        <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
  273. +      <AdditionalOptions>/wd5105</AdditionalOptions>
  274.        <SupportJustMyCode>false</SupportJustMyCode>
  275.      </ClCompile>
  276.      <Link>
  277. @@ -192,6 +195,7 @@
  278.        <AdditionalIncludeDirectories>..\..\include;..\..;$(IntermediateOutputPath);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
  279.        <LanguageStandard_C>stdc17</LanguageStandard_C>
  280.        <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
  281. +      <AdditionalOptions>/wd5105</AdditionalOptions>
  282.      </ClCompile>
  283.      <Link>
  284.        <SubSystem>Console</SubSystem>
  285. @@ -213,6 +217,7 @@
  286.        <AdditionalIncludeDirectories>..\..\include;..\..;$(IntermediateOutputPath);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
  287.        <LanguageStandard_C>stdc17</LanguageStandard_C>
  288.        <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
  289. +      <AdditionalOptions>/wd5105</AdditionalOptions>
  290.      </ClCompile>
  291.      <Link>
  292.        <SubSystem>Console</SubSystem>
  293. @@ -234,6 +239,7 @@
  294.        <AdditionalIncludeDirectories>..\..\include;..\..;$(IntermediateOutputPath);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
  295.        <LanguageStandard_C>stdc17</LanguageStandard_C>
  296.        <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
  297. +      <AdditionalOptions>/wd5105</AdditionalOptions>
  298.      </ClCompile>
  299.      <Link>
  300.        <SubSystem>Console</SubSystem>
  301. diff --git a/build.vc19/nfsd/nfsd.vcxproj b/build.vc19/nfsd/nfsd.vcxproj
  302. index c33081b..c22efd1 100644
  303. --- a/build.vc19/nfsd/nfsd.vcxproj
  304. +++ b/build.vc19/nfsd/nfsd.vcxproj
  305. @@ -139,7 +139,7 @@
  306.        <BufferSecurityCheck>false</BufferSecurityCheck>
  307.        <StringPooling>true</StringPooling>
  308.        <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
  309. -      <AdditionalOptions>/wd4100</AdditionalOptions>
  310. +      <AdditionalOptions>/wd4100 /wd5105</AdditionalOptions>
  311.        <SupportJustMyCode>false</SupportJustMyCode>
  312.        <IntrinsicFunctions>true</IntrinsicFunctions>
  313.        <WholeProgramOptimization>false</WholeProgramOptimization>
  314. @@ -164,7 +164,7 @@
  315.        <BufferSecurityCheck>false</BufferSecurityCheck>
  316.        <StringPooling>true</StringPooling>
  317.        <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
  318. -      <AdditionalOptions>/wd4100</AdditionalOptions>
  319. +      <AdditionalOptions>/wd4100 /wd5105</AdditionalOptions>
  320.        <SupportJustMyCode>false</SupportJustMyCode>
  321.        <OmitFramePointers>false</OmitFramePointers>
  322.        <IntrinsicFunctions>true</IntrinsicFunctions>
  323. @@ -190,7 +190,7 @@
  324.        <BufferSecurityCheck>false</BufferSecurityCheck>
  325.        <StringPooling>true</StringPooling>
  326.        <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
  327. -      <AdditionalOptions>/wd4100</AdditionalOptions>
  328. +      <AdditionalOptions>/wd4100 /wd5105</AdditionalOptions>
  329.        <SupportJustMyCode>false</SupportJustMyCode>
  330.        <IntrinsicFunctions>true</IntrinsicFunctions>
  331.        <WholeProgramOptimization>false</WholeProgramOptimization>
  332. @@ -216,7 +216,7 @@
  333.        <BufferSecurityCheck>false</BufferSecurityCheck>
  334.        <StringPooling>true</StringPooling>
  335.        <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
  336. -      <AdditionalOptions>/wd4100</AdditionalOptions>
  337. +      <AdditionalOptions>/wd4100 /wd5105</AdditionalOptions>
  338.        <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
  339.        <WholeProgramOptimization>true</WholeProgramOptimization>
  340.        <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
  341. @@ -244,7 +244,7 @@
  342.        <BufferSecurityCheck>false</BufferSecurityCheck>
  343.        <StringPooling>true</StringPooling>
  344.        <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
  345. -      <AdditionalOptions>/wd4100</AdditionalOptions>
  346. +      <AdditionalOptions>/wd4100 /wd5105</AdditionalOptions>
  347.        <OmitFramePointers>false</OmitFramePointers>
  348.        <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
  349.        <WholeProgramOptimization>true</WholeProgramOptimization>
  350. @@ -273,7 +273,7 @@
  351.        <BufferSecurityCheck>false</BufferSecurityCheck>
  352.        <StringPooling>true</StringPooling>
  353.        <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
  354. -      <AdditionalOptions>/wd4100</AdditionalOptions>
  355. +      <AdditionalOptions>/wd4100 /wd5105</AdditionalOptions>
  356.        <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
  357.        <WholeProgramOptimization>true</WholeProgramOptimization>
  358.      </ClCompile>
  359. --
  360. 2.45.1
  361.  
  362. From dd88dd00a479d05f07fbfb08ffd78e3a8aec7b62 Mon Sep 17 00:00:00 2001
  363. From: Roland Mainz <roland.mainz@nrubsig.org>
  364. Date: Wed, 13 Aug 2025 19:33:39 +0200
  365. Subject: [PATCH 2/4] tests: winsg.exe should forward the exit code of the
  366.  child process
  367.  
  368. winsg.exe should forward the exit code of the child process.
  369.  
  370. Reported-by: Aurelien Couderc <aurelien.couderc2002@gmail.com>
  371. Signed-off-by: Cedric Blancher <cedric.blancher@gmail.com>
  372. ---
  373. tests/winsg/Makefile | 4 ++--
  374.  tests/winsg/winsg.c  | 1 +
  375.  2 files changed, 3 insertions(+), 2 deletions(-)
  376.  
  377. diff --git a/tests/winsg/Makefile b/tests/winsg/Makefile
  378. index 7a1ef4c..5006dce 100644
  379. --- a/tests/winsg/Makefile
  380. +++ b/tests/winsg/Makefile
  381. @@ -7,10 +7,10 @@
  382.  all: winsg.i686.exe winsg.x86_64.exe winsg.exe
  383.  
  384.  winsg.i686.exe: winsg.c
  385. -       clang -target i686-pc-windows-gnu -municode -Wall -Wextra -DUNICODE=1 -D_UNICODE=1 -g winsg.c -o winsg.i686.exe
  386. +       clang -target i686-pc-windows-gnu -std=gnu17 -municode -Wall -Wextra -DUNICODE=1 -D_UNICODE=1 -g winsg.c -o winsg.i686.exe
  387.  
  388.  winsg.x86_64.exe: winsg.c
  389. -       clang -target x86_64-pc-windows-gnu -municode -Wall -Wextra -DUNICODE=1 -D_UNICODE=1 -g winsg.c -o winsg.x86_64.exe
  390. +       clang -target x86_64-pc-windows-gnu -std=gnu17 -municode -Wall -Wextra -DUNICODE=1 -D_UNICODE=1 -g winsg.c -o winsg.x86_64.exe
  391.  
  392.  winsg.exe: winsg.x86_64.exe
  393.         ln -s winsg.x86_64.exe winsg.exe
  394. diff --git a/tests/winsg/winsg.c b/tests/winsg/winsg.c
  395. index 21ff821..bce272e 100644
  396. --- a/tests/winsg/winsg.c
  397. +++ b/tests/winsg/winsg.c
  398. @@ -578,6 +578,7 @@ int wmain(int ac, wchar_t *av[])
  399.  
  400.      D((void)fwprintf(stdout, L"#mark winsg done, subcmdret=%d\n",
  401.          (int)subcmdret));
  402. +    retval = subcmdret;
  403.  
  404.  done:
  405.      if (tok != INVALID_HANDLE_VALUE) {
  406. --
  407. 2.45.1
  408.  
  409. From a1ebace610d0dd1ecba2821f5ab529298f7070cd Mon Sep 17 00:00:00 2001
  410. From: Roland Mainz <roland.mainz@nrubsig.org>
  411. Date: Wed, 13 Aug 2025 20:44:42 +0200
  412. Subject: [PATCH 3/4] daemon: Fix build warning in |write_to_mds()|
  413.  
  414. Fix build warning in |write_to_mds()|, and leave a commit which
  415. attributes should actually be updated in this case.
  416.  
  417. Signed-off-by: Cedric Blancher <cedric.blancher@gmail.com>
  418. ---
  419. daemon/readwrite.c | 19 +++++++++++++------
  420.  1 file changed, 13 insertions(+), 6 deletions(-)
  421.  
  422. diff --git a/daemon/readwrite.c b/daemon/readwrite.c
  423. index ae9a08f..c401b74 100644
  424. --- a/daemon/readwrite.c
  425. +++ b/daemon/readwrite.c
  426. @@ -305,13 +305,20 @@ retry_write:
  427.              goto out_verify_failed;
  428.          }
  429.      } else if (stable == UNSTABLE4) {
  430. -               nfs41_file_info info;
  431. -        bitmap4 attr_request;
  432. +        nfs41_file_info dummyinfo;
  433. +        bitmap4 attr_request;
  434. +
  435. +        /*
  436. +         * FIXME: Which minimum set of attributes should be updated here (and
  437. +         * for |nfs41_commit()| above ?) ?
  438. +         */
  439.          nfs41_superblock_getattr_mask(file->fh.superblock, &attr_request);
  440. -               status = nfs41_getattr(session, file, &attr_request, &info);
  441. -               if (status)
  442. -                       goto out;
  443. -       }
  444. +
  445. +        /* Update attributes in the cache... */
  446. +        status = nfs41_getattr(session, file, &attr_request, &dummyinfo);
  447. +        if (status)
  448. +            goto out;
  449. +    }
  450.  
  451.      EASSERT(bitmap_isset(&info.attrmask, 0, FATTR4_WORD0_CHANGE));
  452.      args->ctime = info.change;
  453. --
  454. 2.45.1
  455.  
  456. From 4eab8d870ef62fe09858ea887140f538a7ad4155 Mon Sep 17 00:00:00 2001
  457. From: Roland Mainz <roland.mainz@nrubsig.org>
  458. Date: Wed, 13 Aug 2025 20:51:11 +0200
  459. Subject: [PATCH 4/4] tests: Make sure all tests&&test utilities are explicitly
  460.  compiled with -std=gnu17
  461.  
  462. Make sure all tests&&test utilities are explicitly compiled with
  463. clang/gcc -std=gnu17.
  464.  
  465. Signed-off-by: Cedric Blancher <cedric.blancher@gmail.com>
  466. ---
  467. tests/filemmaptests/Makefile | 4 ++--
  468.  tests/winclonefile/Makefile  | 4 ++--
  469.  tests/winfsinfo1/Makefile    | 4 ++--
  470.  3 files changed, 6 insertions(+), 6 deletions(-)
  471.  
  472. diff --git a/tests/filemmaptests/Makefile b/tests/filemmaptests/Makefile
  473. index 651f1bd..e191725 100644
  474. --- a/tests/filemmaptests/Makefile
  475. +++ b/tests/filemmaptests/Makefile
  476. @@ -10,10 +10,10 @@ all: \
  477.         qsortonmmapedfile1.exe
  478.  
  479.  qsortonmmapedfile1.i686.exe: qsortonmmapedfile1.c
  480. -       clang -target i686-pc-windows-gnu -Wall -Wextra -DUNICODE=1 -D_UNICODE=1 -g -O qsortonmmapedfile1.c -o qsortonmmapedfile1.i686.exe
  481. +       clang -target i686-pc-windows-gnu -std=gnu17 -Wall -Wextra -DUNICODE=1 -D_UNICODE=1 -g -O qsortonmmapedfile1.c -o qsortonmmapedfile1.i686.exe
  482.  
  483.  qsortonmmapedfile1.x86_64.exe: qsortonmmapedfile1.c
  484. -       clang -target x86_64-pc-windows-gnu -Wall -Wextra -DUNICODE=1 -D_UNICODE=1 -g -O qsortonmmapedfile1.c -o qsortonmmapedfile1.x86_64.exe
  485. +       clang -target x86_64-pc-windows-gnu -std=gnu17 -Wall -Wextra -DUNICODE=1 -D_UNICODE=1 -g -O qsortonmmapedfile1.c -o qsortonmmapedfile1.x86_64.exe
  486.  
  487.  qsortonmmapedfile1.exe: qsortonmmapedfile1.x86_64.exe
  488.         ln -s qsortonmmapedfile1.x86_64.exe qsortonmmapedfile1.exe
  489. diff --git a/tests/winclonefile/Makefile b/tests/winclonefile/Makefile
  490. index f541936..d4d14a7 100644
  491. --- a/tests/winclonefile/Makefile
  492. +++ b/tests/winclonefile/Makefile
  493. @@ -7,10 +7,10 @@
  494.  all: winclonefile.i686.exe winclonefile.x86_64.exe winclonefile.exe
  495.  
  496.  winclonefile.i686.exe: winclonefile.c
  497. -       clang -target i686-pc-windows-gnu -Wall -Wextra -DUNICODE=1 -D_UNICODE=1 -I../../include -g winclonefile.c -lntdll -o winclonefile.i686.exe
  498. +       clang -target i686-pc-windows-gnu -std=gnu17 -Wall -Wextra -DUNICODE=1 -D_UNICODE=1 -I../../include -g winclonefile.c -lntdll -o winclonefile.i686.exe
  499.  
  500.  winclonefile.x86_64.exe: winclonefile.c
  501. -       clang -target x86_64-pc-windows-gnu -Wall -Wextra -DUNICODE=1 -D_UNICODE=1 -I../../include -g winclonefile.c -lntdll -o winclonefile.x86_64.exe
  502. +       clang -target x86_64-pc-windows-gnu -std=gnu17 -Wall -Wextra -DUNICODE=1 -D_UNICODE=1 -I../../include -g winclonefile.c -lntdll -o winclonefile.x86_64.exe
  503.  
  504.  winclonefile.exe: winclonefile.x86_64.exe
  505.         ln -s winclonefile.x86_64.exe winclonefile.exe
  506. diff --git a/tests/winfsinfo1/Makefile b/tests/winfsinfo1/Makefile
  507. index 3833941..c927704 100644
  508. --- a/tests/winfsinfo1/Makefile
  509. +++ b/tests/winfsinfo1/Makefile
  510. @@ -7,10 +7,10 @@
  511.  all: winfsinfo.i686.exe winfsinfo.x86_64.exe winfsinfo.exe
  512.  
  513.  winfsinfo.i686.exe: winfsinfo.c
  514. -       clang -target i686-pc-windows-gnu -Wall -Wextra -DUNICODE=1 -D_UNICODE=1 -I../../include -g winfsinfo.c -lmpr -lntdll -o winfsinfo.i686.exe
  515. +       clang -target i686-pc-windows-gnu -std=gnu17 -Wall -Wextra -DUNICODE=1 -D_UNICODE=1 -I../../include -g winfsinfo.c -lmpr -lntdll -o winfsinfo.i686.exe
  516.  
  517.  winfsinfo.x86_64.exe: winfsinfo.c
  518. -       clang -target x86_64-pc-windows-gnu -Wall -Wextra -DUNICODE=1 -D_UNICODE=1 -I../../include -g winfsinfo.c -lmpr -lntdll -o winfsinfo.x86_64.exe
  519. +       clang -target x86_64-pc-windows-gnu -std=gnu17 -Wall -Wextra -DUNICODE=1 -D_UNICODE=1 -I../../include -g winfsinfo.c -lmpr -lntdll -o winfsinfo.x86_64.exe
  520.  
  521.  winfsinfo.exe: winfsinfo.x86_64.exe
  522.         ln -s winfsinfo.x86_64.exe winfsinfo.exe
  523. --
  524. 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