From 9675f756ceac5c9e4d20815df3c7f1035cd110c5 Mon Sep 17 00:00:00 2001 From: Timo Kreuzer Date: Wed, 29 Jun 2022 08:51:26 +0200 Subject: [PATCH] [NDK] Fix definition of OB_CLOSE_METHOD --- drivers/filters/fltmgr/Messaging.c | 8 ++++---- modules/rostests/kmtests/ntos_ob/ObType.cpp | 4 ++-- ntoskrnl/config/cmsysini.c | 4 ++-- ntoskrnl/dbgk/dbgkobj.c | 4 ++-- ntoskrnl/ex/win32k.c | 4 ++-- ntoskrnl/include/internal/cm.h | 4 ++-- ntoskrnl/include/internal/io.h | 4 ++-- ntoskrnl/include/internal/lpc.h | 4 ++-- ntoskrnl/io/iomgr/file.c | 4 ++-- ntoskrnl/lpc/close.c | 4 ++-- ntoskrnl/mm/section.c | 4 ++-- ntoskrnl/wmi/guidobj.c | 4 ++-- sdk/include/ndk/obtypes.h | 4 ++-- 13 files changed, 28 insertions(+), 28 deletions(-) diff --git a/drivers/filters/fltmgr/Messaging.c b/drivers/filters/fltmgr/Messaging.c index 713e8fd1770..8b1c33eeb33 100644 --- a/drivers/filters/fltmgr/Messaging.c +++ b/drivers/filters/fltmgr/Messaging.c @@ -289,8 +289,8 @@ NTAPI FltpServerPortClose(_In_opt_ PEPROCESS Process, _In_ PVOID Object, _In_ ACCESS_MASK GrantedAccess, - _In_ ULONG ProcessHandleCount, - _In_ ULONG SystemHandleCount) + _In_ ULONG_PTR ProcessHandleCount, + _In_ ULONG_PTR SystemHandleCount) { PFLT_SERVER_PORT_OBJECT PortObject; PFAST_MUTEX Lock; @@ -327,8 +327,8 @@ NTAPI FltpClientPortClose(_In_opt_ PEPROCESS Process, _In_ PVOID Object, _In_ ACCESS_MASK GrantedAccess, - _In_ ULONG ProcessHandleCount, - _In_ ULONG SystemHandleCount) + _In_ ULONG_PTR ProcessHandleCount, + _In_ ULONG_PTR SystemHandleCount) { PFLT_PORT_OBJECT PortObject = (PFLT_PORT_OBJECT)Object; diff --git a/modules/rostests/kmtests/ntos_ob/ObType.cpp b/modules/rostests/kmtests/ntos_ob/ObType.cpp index a03ad89831c..6659f65e0f0 100644 --- a/modules/rostests/kmtests/ntos_ob/ObType.cpp +++ b/modules/rostests/kmtests/ntos_ob/ObType.cpp @@ -110,8 +110,8 @@ CloseProc( IN PEPROCESS Process, IN PVOID Object, IN ACCESS_MASK GrantedAccess, - IN ULONG ProcessHandleCount, - IN ULONG SystemHandleCount) + IN ULONG_PTR ProcessHandleCount, + IN ULONG_PTR SystemHandleCount) { DPRINT("CloseProc() 0x%p, ProcessHandleCount %lu, SystemHandleCount %lu, AccessMask 0x%lX\n", Object, ProcessHandleCount, SystemHandleCount, GrantedAccess); diff --git a/ntoskrnl/config/cmsysini.c b/ntoskrnl/config/cmsysini.c index 8ea6caf7b42..db9037ed1f0 100644 --- a/ntoskrnl/config/cmsysini.c +++ b/ntoskrnl/config/cmsysini.c @@ -162,8 +162,8 @@ NTAPI CmpCloseKeyObject(IN PEPROCESS Process OPTIONAL, IN PVOID Object, IN ACCESS_MASK GrantedAccess, - IN ULONG ProcessHandleCount, - IN ULONG SystemHandleCount) + IN ULONG_PTR ProcessHandleCount, + IN ULONG_PTR SystemHandleCount) { PCM_KEY_BODY KeyBody = (PCM_KEY_BODY)Object; PAGED_CODE(); diff --git a/ntoskrnl/dbgk/dbgkobj.c b/ntoskrnl/dbgk/dbgkobj.c index 4b480a2cbf9..22403781c27 100644 --- a/ntoskrnl/dbgk/dbgkobj.c +++ b/ntoskrnl/dbgk/dbgkobj.c @@ -1111,8 +1111,8 @@ NTAPI DbgkpCloseObject(IN PEPROCESS OwnerProcess OPTIONAL, IN PVOID ObjectBody, IN ACCESS_MASK GrantedAccess, - IN ULONG HandleCount, - IN ULONG SystemHandleCount) + IN ULONG_PTR HandleCount, + IN ULONG_PTR SystemHandleCount) { PDEBUG_OBJECT DebugObject = ObjectBody; PEPROCESS Process = NULL; diff --git a/ntoskrnl/ex/win32k.c b/ntoskrnl/ex/win32k.c index 7f34cdf3125..6de5231349a 100644 --- a/ntoskrnl/ex/win32k.c +++ b/ntoskrnl/ex/win32k.c @@ -237,8 +237,8 @@ NTAPI ExpDesktopClose(IN PEPROCESS Process OPTIONAL, IN PVOID Object, IN ACCESS_MASK GrantedAccess, - IN ULONG ProcessHandleCount, - IN ULONG SystemHandleCount) + IN ULONG_PTR ProcessHandleCount, + IN ULONG_PTR SystemHandleCount) { WIN32_CLOSEMETHOD_PARAMETERS Parameters; diff --git a/ntoskrnl/include/internal/cm.h b/ntoskrnl/include/internal/cm.h index 7aed5fef6e4..4cc8e34d57c 100644 --- a/ntoskrnl/include/internal/cm.h +++ b/ntoskrnl/include/internal/cm.h @@ -695,8 +695,8 @@ CmpCloseKeyObject( IN PEPROCESS Process OPTIONAL, IN PVOID Object, IN ACCESS_MASK GrantedAccess, - IN ULONG ProcessHandleCount, - IN ULONG SystemHandleCount + IN ULONG_PTR ProcessHandleCount, + IN ULONG_PTR SystemHandleCount ); VOID diff --git a/ntoskrnl/include/internal/io.h b/ntoskrnl/include/internal/io.h index 289e81131c3..f4261416170 100644 --- a/ntoskrnl/include/internal/io.h +++ b/ntoskrnl/include/internal/io.h @@ -1225,8 +1225,8 @@ IopCloseFile( IN PEPROCESS Process OPTIONAL, IN PVOID Object, IN ACCESS_MASK GrantedAccess, - IN ULONG ProcessHandleCount, - IN ULONG SystemHandleCount + IN ULONG_PTR ProcessHandleCount, + IN ULONG_PTR SystemHandleCount ); NTSTATUS diff --git a/ntoskrnl/include/internal/lpc.h b/ntoskrnl/include/internal/lpc.h index f8d8640c1c6..dd1c5cf8bb3 100644 --- a/ntoskrnl/include/internal/lpc.h +++ b/ntoskrnl/include/internal/lpc.h @@ -84,8 +84,8 @@ LpcpClosePort( IN PEPROCESS Process OPTIONAL, IN PVOID Object, IN ACCESS_MASK GrantedAccess, - IN ULONG ProcessHandleCount, - IN ULONG SystemHandleCount + IN ULONG_PTR ProcessHandleCount, + IN ULONG_PTR SystemHandleCount ); VOID diff --git a/ntoskrnl/io/iomgr/file.c b/ntoskrnl/io/iomgr/file.c index c8652b652d6..3dff2c4ded4 100644 --- a/ntoskrnl/io/iomgr/file.c +++ b/ntoskrnl/io/iomgr/file.c @@ -2176,8 +2176,8 @@ NTAPI IopCloseFile(IN PEPROCESS Process OPTIONAL, IN PVOID ObjectBody, IN ACCESS_MASK GrantedAccess, - IN ULONG HandleCount, - IN ULONG SystemHandleCount) + IN ULONG_PTR HandleCount, + IN ULONG_PTR SystemHandleCount) { PFILE_OBJECT FileObject = (PFILE_OBJECT)ObjectBody; KEVENT Event; diff --git a/ntoskrnl/lpc/close.c b/ntoskrnl/lpc/close.c index 6ac3f62e82a..5e6b944a73c 100644 --- a/ntoskrnl/lpc/close.c +++ b/ntoskrnl/lpc/close.c @@ -244,8 +244,8 @@ NTAPI LpcpClosePort(IN PEPROCESS Process OPTIONAL, IN PVOID Object, IN ACCESS_MASK GrantedAccess, - IN ULONG ProcessHandleCount, - IN ULONG SystemHandleCount) + IN ULONG_PTR ProcessHandleCount, + IN ULONG_PTR SystemHandleCount) { PLPCP_PORT_OBJECT Port = (PLPCP_PORT_OBJECT)Object; diff --git a/ntoskrnl/mm/section.c b/ntoskrnl/mm/section.c index 6e5d85013e4..d429b6ac123 100644 --- a/ntoskrnl/mm/section.c +++ b/ntoskrnl/mm/section.c @@ -2227,8 +2227,8 @@ VOID NTAPI MmpCloseSection(IN PEPROCESS Process OPTIONAL, IN PVOID Object, IN ACCESS_MASK GrantedAccess, - IN ULONG ProcessHandleCount, - IN ULONG SystemHandleCount) + IN ULONG_PTR ProcessHandleCount, + IN ULONG_PTR SystemHandleCount) { DPRINT("MmpCloseSection(OB %p, HC %lu)\n", Object, ProcessHandleCount); } diff --git a/ntoskrnl/wmi/guidobj.c b/ntoskrnl/wmi/guidobj.c index 48b8481fd9a..9cdbd1afd62 100644 --- a/ntoskrnl/wmi/guidobj.c +++ b/ntoskrnl/wmi/guidobj.c @@ -102,8 +102,8 @@ WmipCloseMethod( _In_opt_ PEPROCESS Process, _In_ PVOID Object, _In_ ACCESS_MASK GrantedAccess, - _In_ ULONG ProcessHandleCount, - _In_ ULONG SystemHandleCount) + _In_ ULONG_PTR ProcessHandleCount, + _In_ ULONG_PTR SystemHandleCount) { /* For now nothing */ } diff --git a/sdk/include/ndk/obtypes.h b/sdk/include/ndk/obtypes.h index 6a483f6175a..726a3fc9c9c 100644 --- a/sdk/include/ndk/obtypes.h +++ b/sdk/include/ndk/obtypes.h @@ -202,8 +202,8 @@ typedef VOID _In_opt_ PEPROCESS Process, _In_ PVOID Object, _In_ ACCESS_MASK GrantedAccess, - _In_ ULONG ProcessHandleCount, - _In_ ULONG SystemHandleCount + _In_ ULONG_PTR ProcessHandleCount, + _In_ ULONG_PTR SystemHandleCount ); typedef VOID