[PATCH 0/1] MR11237: ntdll: Move ALPC helpers to a private header.

[Zhiyi Zhang (＠zhiyi)]

So that these functions can be used in the Unix side as well.

-- 
https://gitlab.winehq.org/wine/wine/-/merge_requests/11237

[PATCH 1/1] ntdll: Move ALPC helpers to a private header.

[Zhiyi Zhang]

From: Zhiyi Zhang <[e-mail]>

So that these functions can be used in the Unix side as well.
---
 dlls/ntdll/alpc.c         | 63 ++------------------------
 dlls/ntdll/alpc_private.h | 95 +++++++++++++++++++++++++++++++++++++++
 2 files changed, 99 insertions(+), 59 deletions(-)
 create mode 100644 dlls/ntdll/alpc_private.h

diff --git a/dlls/ntdll/alpc.c b/dlls/ntdll/alpc.c
index cba85e19a83..80577df9b82 100644
--- a/dlls/ntdll/alpc.c
+++ b/dlls/ntdll/alpc.c
@@ -18,81 +18,26 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include <stdarg.h>
-#include <windef.h>
-#include <winternl.h>
-#include <ntstatus.h>
 #include "wine/debug.h"
+#include "alpc_private.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(alpc);
 
 SIZE_T WINAPI AlpcGetHeaderSize(ULONG attribute_flags)
 {
-    static const struct
-    {
-        ULONG attribute;
-        SIZE_T size;
-    } attribute_sizes[] =
-    {
-        /* Attribute with a higher bit is stored before that with a lower bit */
-        {ALPC_MESSAGE_SECURITY_ATTRIBUTE, sizeof(ALPC_SECURITY_ATTR)},
-        {ALPC_MESSAGE_VIEW_ATTRIBUTE, sizeof(ALPC_VIEW_ATTR)},
-        {ALPC_MESSAGE_CONTEXT_ATTRIBUTE, sizeof(ALPC_CONTEXT_ATTR)},
-        {ALPC_MESSAGE_HANDLE_ATTRIBUTE, sizeof(ALPC_HANDLE_ATTR)},
-        {ALPC_MESSAGE_TOKEN_ATTRIBUTE, sizeof(ALPC_TOKEN_ATTR)},
-        {ALPC_MESSAGE_DIRECT_ATTRIBUTE, sizeof(ALPC_DIRECT_ATTR)},
-        {ALPC_MESSAGE_WORK_ON_BEHALF_ATTRIBUTE, sizeof(ALPC_WORK_ON_BEHALF_ATTR)},
-    };
-    unsigned int i;
-    SIZE_T size;
-
     TRACE("%#lx.\n", attribute_flags);
-
-    size = sizeof(ALPC_MESSAGE_ATTRIBUTES);
-    for (i = 0; i < ARRAY_SIZE(attribute_sizes); i++)
-    {
-        if (attribute_flags & attribute_sizes[i].attribute)
-            size += attribute_sizes[i].size;
-    }
-
-    return size;
+    return alpc_get_header_size(attribute_flags);
 }
 
 void * WINAPI AlpcGetMessageAttribute(ALPC_MESSAGE_ATTRIBUTES *attributes, ULONG attribute_flag)
 {
     TRACE("%p, %lx.\n", attributes, attribute_flag);
-
-    /* If no flag is specified */
-    if (!attribute_flag)
-        return NULL;
-
-    /* If more than one flag is specified */
-    if (attribute_flag & (attribute_flag - 1))
-        return NULL;
-
-    /* If the specified flag is not in allocated attributes */
-    if ((attribute_flag & attributes->AllocatedAttributes & ALPC_MESSAGE_ATTRIBUTE_ALL) != attribute_flag)
-        return NULL;
-
-    return (unsigned char *)attributes + AlpcGetHeaderSize(attributes->AllocatedAttributes & ~(attribute_flag | (attribute_flag - 1)));
+    return alpc_get_message_attribute(attributes, attribute_flag);
 }
 
 NTSTATUS WINAPI AlpcInitializeMessageAttribute(ULONG attribute_flags, ALPC_MESSAGE_ATTRIBUTES *buffer,
                                                SIZE_T buffer_size, SIZE_T *required_buffer_size)
 {
     TRACE("%#lx, %p, %Ix, %p.\n", attribute_flags, buffer, buffer_size, required_buffer_size);
-
-    *required_buffer_size = AlpcGetHeaderSize(attribute_flags);
-
-    if (buffer_size < *required_buffer_size)
-        return STATUS_BUFFER_TOO_SMALL;
-
-    if (buffer)
-    {
-        buffer->AllocatedAttributes = attribute_flags;
-        buffer->ValidAttributes = 0;
-    }
-
-    return STATUS_SUCCESS;
-
+    return alpc_initialize_message_attribute(attribute_flags, buffer, buffer_size, required_buffer_size);
 }
diff --git a/dlls/ntdll/alpc_private.h b/dlls/ntdll/alpc_private.h
new file mode 100644
index 00000000000..ca3f160cddb
--- /dev/null
+++ b/dlls/ntdll/alpc_private.h
@@ -0,0 +1,95 @@
+/*
+ * ALPC helpers for PE and Unix side
+ *
+ * Copyright 2026 Zhiyi Zhang for CodeWeavers
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
+ */
+#ifndef __NTDLL_ALPC_PRIVATE_H
+#define __NTDLL_ALPC_PRIVATE_H
+
+#include <stdarg.h>
+#include <windef.h>
+#include <winternl.h>
+#include <ntstatus.h>
+
+static inline SIZE_T alpc_get_header_size( ULONG attribute_flags )
+{
+    static const struct
+    {
+        ULONG attribute;
+        SIZE_T size;
+    }
+    attribute_sizes[] =
+    {
+        /* Attribute with a higher bit is stored before that with a lower bit */
+        {ALPC_MESSAGE_SECURITY_ATTRIBUTE, sizeof(ALPC_SECURITY_ATTR)},
+        {ALPC_MESSAGE_VIEW_ATTRIBUTE, sizeof(ALPC_VIEW_ATTR)},
+        {ALPC_MESSAGE_CONTEXT_ATTRIBUTE, sizeof(ALPC_CONTEXT_ATTR)},
+        {ALPC_MESSAGE_HANDLE_ATTRIBUTE, sizeof(ALPC_HANDLE_ATTR)},
+        {ALPC_MESSAGE_TOKEN_ATTRIBUTE, sizeof(ALPC_TOKEN_ATTR)},
+        {ALPC_MESSAGE_DIRECT_ATTRIBUTE, sizeof(ALPC_DIRECT_ATTR)},
+        {ALPC_MESSAGE_WORK_ON_BEHALF_ATTRIBUTE, sizeof(ALPC_WORK_ON_BEHALF_ATTR)},
+    };
+    unsigned int i;
+    SIZE_T size;
+
+    size = sizeof(ALPC_MESSAGE_ATTRIBUTES);
+    for (i = 0; i < ARRAY_SIZE(attribute_sizes); i++)
+    {
+        if (attribute_flags & attribute_sizes[i].attribute)
+            size += attribute_sizes[i].size;
+    }
+
+    return size;
+}
+
+static inline void *alpc_get_message_attribute( ALPC_MESSAGE_ATTRIBUTES *attributes, ULONG attribute_flag )
+{
+    /* If no flag is specified */
+    if (!attribute_flag)
+        return NULL;
+
+    /* If more than one flag is specified */
+    if (attribute_flag & (attribute_flag - 1))
+        return NULL;
+
+    /* If the specified flag is not in allocated attributes */
+    if ((attribute_flag & attributes->AllocatedAttributes & ALPC_MESSAGE_ATTRIBUTE_ALL) != attribute_flag)
+        return NULL;
+
+    return (unsigned char *)attributes + alpc_get_header_size(attributes->AllocatedAttributes & ~(attribute_flag | (attribute_flag - 1)));
+}
+
+static inline NTSTATUS alpc_initialize_message_attribute( ULONG attribute_flags,
+                                                          ALPC_MESSAGE_ATTRIBUTES *buffer,
+                                                          SIZE_T buffer_size,
+                                                          SIZE_T *required_buffer_size )
+{
+    *required_buffer_size = alpc_get_header_size(attribute_flags);
+
+    if (buffer_size < *required_buffer_size)
+        return STATUS_BUFFER_TOO_SMALL;
+
+    if (buffer)
+    {
+        buffer->AllocatedAttributes = attribute_flags;
+        buffer->ValidAttributes = 0;
+    }
+
+    return STATUS_SUCCESS;
+}
+
+#endif /* __NTDLL_ALPC_PRIVATE_H */
-- 
GitLab

https://gitlab.winehq.org/wine/wine/-/merge_requests/11237

[PATCH 0/1] MR11237: ntdll: Move ALPC helpers to a private header. - closed

[Zhiyi Zhang (＠zhiyi)]

This merge request was closed by Zhiyi Zhang.
-- 
https://gitlab.winehq.org/wine/wine/-/merge_requests/11237