msnfs41client: Patches for fixing git bundle generation+do not use deprecated |ExAllocatePoolWithTag()|, 2024-10-15
Posted by Anonymous on Tue 15th Oct 2024 17:01
raw | new post

From 84160fbf698ea9b002cdb926e3c3f4bd1bd141bf Mon Sep 17 00:00:00 2001
From: Roland Mainz <roland.mainz@nrubsig.org>
Date: Tue, 15 Oct 2024 16:19:28 +0200
Subject: [PATCH 1/2] cygwin: Fix git bundle generation on network filesystems

Fix git bundle generation on network filesystems

Signed-off-by: Cedric Blancher <cedric.blancher@gmail.com>
---
 cygwin/Makefile.install | 1 +
 1 file changed, 1 insertion(+)

diff --git a/cygwin/Makefile.install b/cygwin/Makefile.install
index dee542c..438475b 100644
--- a/cygwin/Makefile.install
+++ b/cygwin/Makefile.install
@@ -54,6 +54,7 @@ installdest:
        (cd "$(DESTDIR)/$(CYGWIN_BASEPATH)/sbin/" && ln -sf ../lib/msnfs41client/msnfs41client .)
        cp $(PROJECT_BASEDIR_DIR)/cygwin_idmapper.ksh           $(DESTDIR)/$(CYGWIN_BASEPATH)/lib/msnfs41client/.
        @ printf "# Package sources and diffs\n"
+       git config --global --add safe.directory "$(PROJECT_BASEDIR_DIR)"
        git bundle create "$(DESTDIR)/$(CYGWIN_BASEPATH)/usr/src/msnfs41client/msnfs41client_git.bundle" HEAD
        git diff -w     >"$(DESTDIR)/$(CYGWIN_BASEPATH)/usr/src/msnfs41client/msnfs41client_diff_w.diff"
        git diff        >"$(DESTDIR)/$(CYGWIN_BASEPATH)/usr/src/msnfs41client/msnfs41client_diff.diff"
--
2.45.1

From 70ddd7760643f3186b9834ade60aad967f72ed28 Mon Sep 17 00:00:00 2001
From: Roland Mainz <roland.mainz@nrubsig.org>
Date: Tue, 15 Oct 2024 17:29:35 +0200
Subject: [PATCH 2/2] sys: Add workaround for |RxAllocatePoolWithTag()| using
 deprecated |ExAllocatePoolWithTag()|

Add workaround for |RxAllocatePoolWithTag()| using |ExAllocatePoolWithTag()|,
which is deprecated in the Win11 WDK ("warning C4996: 'ExAllocatePoolWithTag':
ExAllocatePoolWithTag is deprecated, use ExAllocatePool2.").

The workaround redefines |RxAllocatePoolWithTag()| with a version
which uses |ExAllocatePool2()|.

Signed-off-by: Cedric Blancher <cedric.blancher@gmail.com>
---
 sys/nfs41sys_driver.h | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/sys/nfs41sys_driver.h b/sys/nfs41sys_driver.h
index 67d5a29..ab52fb8 100644
--- a/sys/nfs41sys_driver.h
+++ b/sys/nfs41sys_driver.h
@@ -33,6 +33,27 @@

 #include "nfs_ea.h"

+#define EXALLOCATEPOOLWITHTAG_DEPRECATED 1
+
+#ifdef EXALLOCATEPOOLWITHTAG_DEPRECATED
+/*
+ * Workaround for WDK11 issue: |ExAllocatePoolWithTag()| is
+ * deprecated ('warning C4996: 'ExAllocatePoolWithTag':"
+ * ExAllocatePoolWithTag is deprecated, use ExAllocatePool2.')
+ * but |RxAllocatePoolWithTag()| is still mapped to
+ * |ExAllocatePoolWithTag()|
+ */
+#undef RxAllocatePoolWithTag
+#define RXALLOCATEPOOL_DEFAULT_ALLOCATEPOOL2FLAGS \
+    (POOL_FLAG_UNINITIALIZED|POOL_FLAG_CACHE_ALIGNED)
+
+#define RxAllocatePoolWithTag(rxallocpool, numbytes, tag) \
+    ExAllocatePool2(((((rxallocpool) == NonPagedPoolNx)? \
+            POOL_FLAG_NON_PAGED:POOL_FLAG_NON_PAGED_EXECUTE) | \
+            RXALLOCATEPOOL_DEFAULT_ALLOCATEPOOL2FLAGS), \
+        (numbytes), (tag))
+#endif /* EXALLOCATEPOOLWITHTAG_DEPRECATED */
+
 #define DECLARE_CONST_ANSI_STRING(_var, _string) \
     const CHAR _var ## _buffer[] = _string; \
     const ANSI_STRING _var = { sizeof(_string) - sizeof(CHAR), \
--
2.45.1