[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[XENBUS PATCH 04/13] Set _Outptr_ on output pointers



For double pointers, the annotation checks that the pointed-to result is
valid.

Signed-off-by: Tu Dinh <ngoc-tu.dinh@xxxxxxxxxx>
---
 include/cache_interface.h     |  4 +--
 include/console_interface.h   |  2 +-
 include/debug_interface.h     |  2 +-
 include/gnttab_interface.h    |  6 ++--
 include/range_set_interface.h |  6 ++--
 include/store_interface.h     | 14 ++++----
 include/suspend_interface.h   |  2 +-
 include/xen.h                 | 12 +++----
 src/common/registry.c         |  8 ++---
 src/common/registry.h         | 16 +++++-----
 src/xen/config.c              |  4 +--
 src/xen/log.c                 | 16 +++++-----
 src/xen/system.c              |  2 +-
 src/xenbus/balloon.c          |  8 ++---
 src/xenbus/balloon.h          |  4 +--
 src/xenbus/cache.c            | 10 +++---
 src/xenbus/cache.h            |  4 +--
 src/xenbus/console.c          |  8 ++---
 src/xenbus/console.h          |  4 +--
 src/xenbus/debug.c            |  8 ++---
 src/xenbus/debug.h            |  4 +--
 src/xenbus/evtchn.c           |  2 +-
 src/xenbus/evtchn.h           |  2 +-
 src/xenbus/evtchn_2l.c        |  2 +-
 src/xenbus/evtchn_2l.h        |  2 +-
 src/xenbus/evtchn_fifo.c      |  4 +--
 src/xenbus/evtchn_fifo.h      |  2 +-
 src/xenbus/fdo.c              | 16 +++++-----
 src/xenbus/gnttab.c           | 60 +++++++++++++++++------------------
 src/xenbus/gnttab.h           |  2 +-
 src/xenbus/hash_table.c       |  2 +-
 src/xenbus/hash_table.h       |  2 +-
 src/xenbus/range_set.c        |  8 ++---
 src/xenbus/range_set.h        |  4 +--
 src/xenbus/shared_info.c      |  6 ++--
 src/xenbus/shared_info.h      |  4 +--
 src/xenbus/store.c            | 50 ++++++++++++++---------------
 src/xenbus/store.h            |  4 +--
 src/xenbus/suspend.c          |  8 ++---
 src/xenbus/suspend.h          |  4 +--
 src/xenbus/thread.c           |  2 +-
 src/xenbus/thread.h           |  2 +-
 src/xenbus/unplug.c           |  2 +-
 src/xenbus/unplug.h           |  2 +-
 src/xenfilt/emulated.c        |  6 ++--
 src/xenfilt/emulated.h        |  4 +--
 src/xenfilt/thread.c          |  2 +-
 src/xenfilt/thread.h          |  2 +-
 48 files changed, 175 insertions(+), 175 deletions(-)

diff --git a/include/cache_interface.h b/include/cache_interface.h
index a43e9cc..e5f4ce9 100644
--- a/include/cache_interface.h
+++ b/include/cache_interface.h
@@ -135,7 +135,7 @@ typedef NTSTATUS
     _In_ XENBUS_CACHE_ACQUIRE_LOCK  AcquireLock,
     _In_ XENBUS_CACHE_RELEASE_LOCK  ReleaseLock,
     _In_opt_ PVOID                  Argument,
-    _Out_ PXENBUS_CACHE             *Cache
+    _Outptr_ PXENBUS_CACHE          *Cache
     );
 
 /*! \typedef XENBUS_CACHE_CREATE
@@ -168,7 +168,7 @@ typedef NTSTATUS
     _In_ XENBUS_CACHE_ACQUIRE_LOCK  AcquireLock,
     _In_ XENBUS_CACHE_RELEASE_LOCK  ReleaseLock,
     _In_opt_ PVOID                  Argument,
-    _Out_ PXENBUS_CACHE             *Cache
+    _Outptr_ PXENBUS_CACHE          *Cache
     );
 
 /*! \typedef XENBUS_CACHE_GET
diff --git a/include/console_interface.h b/include/console_interface.h
index 0d5a2da..7ed7790 100644
--- a/include/console_interface.h
+++ b/include/console_interface.h
@@ -134,7 +134,7 @@ typedef NTSTATUS
 (*XENBUS_CONSOLE_WAKEUP_ADD)(
     _In_ PINTERFACE                 Interface,
     _In_ PKEVENT                    Event,
-    _Out_ PXENBUS_CONSOLE_WAKEUP    *Wakeup
+    _Outptr_ PXENBUS_CONSOLE_WAKEUP *Wakeup
     );
 
 /*! \typedef XENBUS_CONSOLE_WAKEUP_REMOVE
diff --git a/include/debug_interface.h b/include/debug_interface.h
index 05fcc3e..251902c 100644
--- a/include/debug_interface.h
+++ b/include/debug_interface.h
@@ -96,7 +96,7 @@ typedef NTSTATUS
     _In_ PSTR                       Prefix,
     _In_ XENBUS_DEBUG_FUNCTION      Function,
     _In_opt_ PVOID                  Argument,
-    _Out_ PXENBUS_DEBUG_CALLBACK    *Callback
+    _Outptr_ PXENBUS_DEBUG_CALLBACK *Callback
     );
 
 /*! \typedef XENBUS_DEBUG_PRINTF
diff --git a/include/gnttab_interface.h b/include/gnttab_interface.h
index 6574e97..92a95a7 100644
--- a/include/gnttab_interface.h
+++ b/include/gnttab_interface.h
@@ -81,7 +81,7 @@ typedef NTSTATUS
     _In_ XENBUS_CACHE_ACQUIRE_LOCK  AcquireLock,
     _In_ XENBUS_CACHE_RELEASE_LOCK  ReleaseLock,
     _In_opt_ PVOID                  Argument,
-    _Out_ PXENBUS_GNTTAB_CACHE      *Cache
+    _Outptr_ PXENBUS_GNTTAB_CACHE   *Cache
     );
 
 /*! \typedef XENBUS_GNTTAB_CREATE_CACHE
@@ -105,7 +105,7 @@ typedef NTSTATUS
     _In_ XENBUS_CACHE_ACQUIRE_LOCK  AcquireLock,
     _In_ XENBUS_CACHE_RELEASE_LOCK  ReleaseLock,
     _In_opt_ PVOID                  Argument,
-    _Out_ PXENBUS_GNTTAB_CACHE      *Cache
+    _Outptr_ PXENBUS_GNTTAB_CACHE   *Cache
     );
 
 /*! \typedef XENBUS_GNTTAB_PERMIT_FOREIGN_ACCESS
@@ -129,7 +129,7 @@ typedef NTSTATUS
     _In_ USHORT                     Domain,
     _In_ PFN_NUMBER                 Pfn,
     _In_ BOOLEAN                    ReadOnly,
-    _Out_ PXENBUS_GNTTAB_ENTRY      *Entry
+    _Outptr_ PXENBUS_GNTTAB_ENTRY   *Entry
     );
 
 /*! \typedef XENBUS_GNTTAB_REVOKE_FOREIGN_ACCESS
diff --git a/include/range_set_interface.h b/include/range_set_interface.h
index dc19a45..cebe42e 100644
--- a/include/range_set_interface.h
+++ b/include/range_set_interface.h
@@ -76,9 +76,9 @@ typedef VOID
 */
 typedef NTSTATUS
 (*XENBUS_RANGE_SET_CREATE)(
-    _In_ PINTERFACE         Interface,
-    _In_ PCSTR              Name,
-    _Out_ PXENBUS_RANGE_SET *RangeSet
+    _In_ PINTERFACE             Interface,
+    _In_ PCSTR                  Name,
+    _Outptr_ PXENBUS_RANGE_SET  *RangeSet
     );
 
 /*! \typedef XENBUS_RANGE_SET_PUT
diff --git a/include/store_interface.h b/include/store_interface.h
index dbc383d..208be0e 100644
--- a/include/store_interface.h
+++ b/include/store_interface.h
@@ -196,8 +196,8 @@ typedef NTSTATUS
 */
 typedef NTSTATUS
 (*XENBUS_STORE_TRANSACTION_START)(
-    _In_ PINTERFACE                 Interface,
-    _Out_ PXENBUS_STORE_TRANSACTION *Transaction
+    _In_ PINTERFACE                     Interface,
+    _Outptr_ PXENBUS_STORE_TRANSACTION  *Transaction
     );
 
 /*! \typedef XENBUS_STORE_TRANSACTION_END
@@ -231,11 +231,11 @@ typedef NTSTATUS
 */
 typedef NTSTATUS
 (*XENBUS_STORE_WATCH_ADD)(
-    _In_ PINTERFACE             Interface,
-    _In_opt_ PSTR               Prefix,
-    _In_ PSTR                   Node,
-    _In_ PKEVENT                Event,
-    _Out_ PXENBUS_STORE_WATCH   *Watch
+    _In_ PINTERFACE                 Interface,
+    _In_opt_ PSTR                   Prefix,
+    _In_ PSTR                       Node,
+    _In_ PKEVENT                    Event,
+    _Outptr_ PXENBUS_STORE_WATCH    *Watch
     );
 
 /*! \typedef XENBUS_STORE_WATCH_REMOVE
diff --git a/include/suspend_interface.h b/include/suspend_interface.h
index 1444373..a20f616 100644
--- a/include/suspend_interface.h
+++ b/include/suspend_interface.h
@@ -105,7 +105,7 @@ typedef NTSTATUS
     _In_ XENBUS_SUSPEND_CALLBACK_TYPE   Type,
     _In_ XENBUS_SUSPEND_FUNCTION        Function,
     _In_opt_ PVOID                      Argument,
-    _Out_ PXENBUS_SUSPEND_CALLBACK      *Callback
+    _Outptr_ PXENBUS_SUSPEND_CALLBACK   *Callback
     );
 
 /*! \typedef XENBUS_SUSPEND_DEREGISTER
diff --git a/include/xen.h b/include/xen.h
index ce78f86..7f46990 100644
--- a/include/xen.h
+++ b/include/xen.h
@@ -447,10 +447,10 @@ typedef struct _LOG_DISPOSITION LOG_DISPOSITION, 
*PLOG_DISPOSITION;
 XEN_API
 NTSTATUS
 LogAddDisposition(
-    _In_ LOG_LEVEL          Mask,
-    _In_ VOID               (*Function)(PVOID, PSTR, ULONG),
-    _In_opt_ PVOID          Argument,
-    _Out_ PLOG_DISPOSITION  *Disposition
+    _In_ LOG_LEVEL              Mask,
+    _In_ VOID                   (*Function)(PVOID, PSTR, ULONG),
+    _In_opt_ PVOID              Argument,
+    _Outptr_ PLOG_DISPOSITION   *Disposition
     );
 
 XEN_API
@@ -581,8 +581,8 @@ ConfigRequestReboot(
 XEN_API
 NTSTATUS
 ConfigQuerySystemStartOption(
-    _In_ PSTR           Key,
-    _Out_ PANSI_STRING  *Option
+    _In_ PSTR               Key,
+    _Outptr_ PANSI_STRING   *Option
     );
 
 #endif  // _XEN_H
diff --git a/src/common/registry.c b/src/common/registry.c
index 51a98bb..61dae0e 100644
--- a/src/common/registry.c
+++ b/src/common/registry.c
@@ -1016,7 +1016,7 @@ RegistryQuerySzValue(
     _In_ HANDLE                     Key,
     _In_ PSTR                       Name,
     _Out_opt_ PULONG                Type,
-    _Out_ PANSI_STRING              *Array
+    _Outptr_ PANSI_STRING           *Array
     )
 {
     ANSI_STRING                     Ansi;
@@ -1102,7 +1102,7 @@ NTSTATUS
 RegistryQueryBinaryValue(
     _In_ HANDLE                     Key,
     _In_ PSTR                       Name,
-    _Out_ PVOID                     *Buffer,
+    _Outptr_ PVOID                  *Buffer,
     _Out_ PULONG                    Length
     )
 {
@@ -1243,7 +1243,7 @@ fail1:
 NTSTATUS
 RegistryQueryKeyName(
     _In_ HANDLE             Key,
-    _Out_ PANSI_STRING      *Array
+    _Outptr_ PANSI_STRING   *Array
     )
 {
     PKEY_NAME_INFORMATION   Value;
@@ -1298,7 +1298,7 @@ fail1:
 NTSTATUS
 RegistryQuerySystemStartOption(
     _In_ PSTR                       Prefix,
-    _Out_ PANSI_STRING              *Value
+    _Outptr_ PANSI_STRING           *Value
     )
 {
     UNICODE_STRING                  Unicode;
diff --git a/src/common/registry.h b/src/common/registry.h
index a65081f..e70a6ed 100644
--- a/src/common/registry.h
+++ b/src/common/registry.h
@@ -151,17 +151,17 @@ RegistryUpdateDwordValue(
 
 extern NTSTATUS
 RegistryQuerySzValue(
-    _In_ HANDLE         Key,
-    _In_ PSTR           Name,
-    _Out_opt_ PULONG    Type,
-    _Out_ PANSI_STRING  *Array
+    _In_ HANDLE             Key,
+    _In_ PSTR               Name,
+    _Out_opt_ PULONG        Type,
+    _Outptr_ PANSI_STRING   *Array
     );
 
 extern NTSTATUS
 RegistryQueryBinaryValue(
     _In_ HANDLE         Key,
     _In_ PSTR           Name,
-    _Out_ PVOID         *Buffer,
+    _Outptr_ PVOID      *Buffer,
     _Out_ PULONG        Length
     );
 
@@ -176,13 +176,13 @@ RegistryUpdateBinaryValue(
 extern NTSTATUS
 RegistryQueryKeyName(
     _In_ HANDLE             Key,
-    _Out_ PANSI_STRING      *Array
+    _Outptr_ PANSI_STRING   *Array
     );
 
 extern NTSTATUS
 RegistryQuerySystemStartOption(
-    _In_ PSTR           Name,
-    _Out_ PANSI_STRING  *Option
+    _In_ PSTR               Name,
+    _Outptr_ PANSI_STRING   *Option
     );
 
 extern VOID
diff --git a/src/xen/config.c b/src/xen/config.c
index c170d3a..a74f95b 100644
--- a/src/xen/config.c
+++ b/src/xen/config.c
@@ -489,8 +489,8 @@ fail1:
 XEN_API
 NTSTATUS
 ConfigQuerySystemStartOption(
-    _In_ PSTR           Key,
-    _Out_ PANSI_STRING  *Option
+    _In_ PSTR               Key,
+    _Outptr_ PANSI_STRING   *Option
     )
 {
     return RegistryQuerySystemStartOption(Key, Option);
diff --git a/src/xen/log.c b/src/xen/log.c
index 5687801..7bf8cdb 100644
--- a/src/xen/log.c
+++ b/src/xen/log.c
@@ -602,16 +602,16 @@ LogTeardown(
 
 NTSTATUS
 LogAddDisposition(
-    _In_ LOG_LEVEL          Mask,
-    _In_ VOID               (*Function)(PVOID, PSTR, ULONG),
-    _In_opt_ PVOID          Argument,
-    _Out_ PLOG_DISPOSITION  *Disposition
+    _In_ LOG_LEVEL              Mask,
+    _In_ VOID                   (*Function)(PVOID, PSTR, ULONG),
+    _In_opt_ PVOID              Argument,
+    _Outptr_ PLOG_DISPOSITION   *Disposition
     )
 {
-    PLOG_CONTEXT            Context = &LogContext;
-    KIRQL                   Irql;
-    ULONG                   Index;
-    NTSTATUS                status;
+    PLOG_CONTEXT                Context = &LogContext;
+    KIRQL                       Irql;
+    ULONG                       Index;
+    NTSTATUS                    status;
 
     *Disposition = NULL;
     if (Mask == LOG_LEVEL_NONE)
diff --git a/src/xen/system.c b/src/xen/system.c
index 6618b67..48f9af0 100644
--- a/src/xen/system.c
+++ b/src/xen/system.c
@@ -1074,7 +1074,7 @@ SystemRegisterCallback(
     _In_ PWSTR              Name,
     _In_ PCALLBACK_FUNCTION Function,
     _In_opt_ PVOID          Argument,
-    _Out_ PVOID             *Handle
+    _Outptr_ PVOID          *Handle
     )
 {
     UNICODE_STRING          Unicode;
diff --git a/src/xenbus/balloon.c b/src/xenbus/balloon.c
index 544628a..4affef5 100644
--- a/src/xenbus/balloon.c
+++ b/src/xenbus/balloon.c
@@ -960,12 +960,12 @@ static struct _XENBUS_BALLOON_INTERFACE_V1 
BalloonInterfaceVersion1 = {
 
 NTSTATUS
 BalloonInitialize(
-    _In_ PXENBUS_FDO                Fdo,
-    _Out_ PXENBUS_BALLOON_CONTEXT   *Context
+    _In_ PXENBUS_FDO                    Fdo,
+    _Outptr_ PXENBUS_BALLOON_CONTEXT    *Context
     )
 {
-    UNICODE_STRING                  Unicode;
-    NTSTATUS                        status;
+    UNICODE_STRING                      Unicode;
+    NTSTATUS                            status;
 
     Trace("====>\n");
 
diff --git a/src/xenbus/balloon.h b/src/xenbus/balloon.h
index 8a45d3c..0269d88 100644
--- a/src/xenbus/balloon.h
+++ b/src/xenbus/balloon.h
@@ -43,8 +43,8 @@ typedef struct _XENBUS_BALLOON_CONTEXT  
XENBUS_BALLOON_CONTEXT, *PXENBUS_BALLOON
 
 extern NTSTATUS
 BalloonInitialize(
-    _In_ PXENBUS_FDO                Fdo,
-    _Out_ PXENBUS_BALLOON_CONTEXT   *Context
+    _In_ PXENBUS_FDO                    Fdo,
+    _Outptr_ PXENBUS_BALLOON_CONTEXT    *Context
     );
 
 extern NTSTATUS
diff --git a/src/xenbus/cache.c b/src/xenbus/cache.c
index 24fc029..d60ae29 100644
--- a/src/xenbus/cache.c
+++ b/src/xenbus/cache.c
@@ -833,7 +833,7 @@ CacheCreate(
     _In_ VOID               (*AcquireLock)(PVOID),
     _In_ VOID               (*ReleaseLock)(PVOID),
     _In_ PVOID              Argument,
-    _Out_ PXENBUS_CACHE     *Cache
+    _Outptr_ PXENBUS_CACHE  *Cache
     )
 {
     PXENBUS_CACHE_CONTEXT   Context = Interface->Context;
@@ -954,7 +954,7 @@ CacheCreateVersion1(
     _In_ VOID               (*AcquireLock)(PVOID),
     _In_ VOID               (*ReleaseLock)(PVOID),
     _In_ PVOID              Argument,
-    _Out_ PXENBUS_CACHE     *Cache
+    _Outptr_ PXENBUS_CACHE  *Cache
     )
 {
     return CacheCreate(Interface,
@@ -1232,11 +1232,11 @@ static struct _XENBUS_CACHE_INTERFACE_V2 
CacheInterfaceVersion2 = {
 
 NTSTATUS
 CacheInitialize(
-    _In_ PXENBUS_FDO            Fdo,
-    _Out_ PXENBUS_CACHE_CONTEXT *Context
+    _In_ PXENBUS_FDO                Fdo,
+    _Outptr_ PXENBUS_CACHE_CONTEXT  *Context
     )
 {
-    NTSTATUS                    status;
+    NTSTATUS                        status;
 
     Trace("====>\n");
 
diff --git a/src/xenbus/cache.h b/src/xenbus/cache.h
index 8714bc7..0d7feb1 100644
--- a/src/xenbus/cache.h
+++ b/src/xenbus/cache.h
@@ -43,8 +43,8 @@ typedef struct _XENBUS_CACHE_CONTEXT  XENBUS_CACHE_CONTEXT, 
*PXENBUS_CACHE_CONTE
 
 extern NTSTATUS
 CacheInitialize(
-    _In_ PXENBUS_FDO            Fdo,
-    _Out_ PXENBUS_CACHE_CONTEXT *Context
+    _In_ PXENBUS_FDO                Fdo,
+    _Outptr_ PXENBUS_CACHE_CONTEXT  *Context
     );
 
 extern NTSTATUS
diff --git a/src/xenbus/console.c b/src/xenbus/console.c
index 24f9d27..80e8b69 100644
--- a/src/xenbus/console.c
+++ b/src/xenbus/console.c
@@ -621,7 +621,7 @@ static NTSTATUS
 ConsoleWakeupAdd(
     _In_ PINTERFACE                 Interface,
     _In_ PKEVENT                    Event,
-    _Out_ PXENBUS_CONSOLE_WAKEUP    *Wakeup
+    _Outptr_ PXENBUS_CONSOLE_WAKEUP *Wakeup
     )
 {
     PXENBUS_CONSOLE_CONTEXT         Context = Interface->Context;
@@ -868,11 +868,11 @@ static struct _XENBUS_CONSOLE_INTERFACE_V1 
ConsoleInterfaceVersion1 = {
 
 NTSTATUS
 ConsoleInitialize(
-    _In_ PXENBUS_FDO                Fdo,
-    _Out_ PXENBUS_CONSOLE_CONTEXT   *Context
+    _In_ PXENBUS_FDO                    Fdo,
+    _Outptr_ PXENBUS_CONSOLE_CONTEXT    *Context
     )
 {
-    NTSTATUS                        status;
+    NTSTATUS                            status;
 
     Trace("====>\n");
 
diff --git a/src/xenbus/console.h b/src/xenbus/console.h
index f4fb3d5..1a4dabe 100644
--- a/src/xenbus/console.h
+++ b/src/xenbus/console.h
@@ -43,8 +43,8 @@ typedef struct _XENBUS_CONSOLE_CONTEXT  
XENBUS_CONSOLE_CONTEXT, *PXENBUS_CONSOLE
 
 extern NTSTATUS
 ConsoleInitialize(
-    _In_ PXENBUS_FDO                Fdo,
-    _Out_ PXENBUS_CONSOLE_CONTEXT   *Context
+    _In_ PXENBUS_FDO                    Fdo,
+    _Outptr_ PXENBUS_CONSOLE_CONTEXT    *Context
     );
 
 extern NTSTATUS
diff --git a/src/xenbus/debug.c b/src/xenbus/debug.c
index 7fc1430..ca09759 100644
--- a/src/xenbus/debug.c
+++ b/src/xenbus/debug.c
@@ -95,7 +95,7 @@ DebugRegister(
     _In_ PSTR                       Prefix,
     _In_ XENBUS_DEBUG_FUNCTION      Function,
     _In_opt_ PVOID                  Argument,
-    _Out_ PXENBUS_DEBUG_CALLBACK    *Callback
+    _Outptr_ PXENBUS_DEBUG_CALLBACK *Callback
     )
 {
     PXENBUS_DEBUG_CONTEXT           Context = Interface->Context;
@@ -361,11 +361,11 @@ static struct _XENBUS_DEBUG_INTERFACE_V1 
DebugInterfaceVersion1 = {
 
 NTSTATUS
 DebugInitialize(
-    _In_ PXENBUS_FDO            Fdo,
-    _Out_ PXENBUS_DEBUG_CONTEXT *Context
+    _In_ PXENBUS_FDO                Fdo,
+    _Outptr_ PXENBUS_DEBUG_CONTEXT  *Context
     )
 {
-    NTSTATUS                    status;
+    NTSTATUS                        status;
 
     Trace("====>\n");
 
diff --git a/src/xenbus/debug.h b/src/xenbus/debug.h
index 18230e5..6b706d2 100644
--- a/src/xenbus/debug.h
+++ b/src/xenbus/debug.h
@@ -43,8 +43,8 @@ typedef struct _XENBUS_DEBUG_CONTEXT  XENBUS_DEBUG_CONTEXT, 
*PXENBUS_DEBUG_CONTE
 
 extern NTSTATUS
 DebugInitialize(
-    _In_ PXENBUS_FDO            Fdo,
-    _Out_ PXENBUS_DEBUG_CONTEXT *Context
+    _In_ PXENBUS_FDO                Fdo,
+    _Outptr_ PXENBUS_DEBUG_CONTEXT  *Context
     );
 
 extern NTSTATUS
diff --git a/src/xenbus/evtchn.c b/src/xenbus/evtchn.c
index 4344bae..7d6d69e 100644
--- a/src/xenbus/evtchn.c
+++ b/src/xenbus/evtchn.c
@@ -1892,7 +1892,7 @@ static struct _XENBUS_EVTCHN_INTERFACE_V9 
EvtchnInterfaceVersion9 = {
 NTSTATUS
 EvtchnInitialize(
     _In_ PXENBUS_FDO                Fdo,
-    _Out_ PXENBUS_EVTCHN_CONTEXT    *Context
+    _Outptr_ PXENBUS_EVTCHN_CONTEXT *Context
     )
 {
     HANDLE                          ParametersKey;
diff --git a/src/xenbus/evtchn.h b/src/xenbus/evtchn.h
index d3ddd89..c429a8f 100644
--- a/src/xenbus/evtchn.h
+++ b/src/xenbus/evtchn.h
@@ -44,7 +44,7 @@ typedef struct _XENBUS_EVTCHN_CONTEXT  XENBUS_EVTCHN_CONTEXT, 
*PXENBUS_EVTCHN_CO
 extern NTSTATUS
 EvtchnInitialize(
     _In_ PXENBUS_FDO                Fdo,
-    _Out_ PXENBUS_EVTCHN_CONTEXT    *Context
+    _Outptr_ PXENBUS_EVTCHN_CONTEXT *Context
     );
 
 extern NTSTATUS
diff --git a/src/xenbus/evtchn_2l.c b/src/xenbus/evtchn_2l.c
index b2abead..21b48f0 100644
--- a/src/xenbus/evtchn_2l.c
+++ b/src/xenbus/evtchn_2l.c
@@ -242,7 +242,7 @@ static XENBUS_EVTCHN_ABI EvtchnAbiTwoLevel = {
 NTSTATUS
 EvtchnTwoLevelInitialize(
     _In_ PXENBUS_FDO                    Fdo,
-    _Out_ PXENBUS_EVTCHN_ABI_CONTEXT    *_Context
+    _Outptr_ PXENBUS_EVTCHN_ABI_CONTEXT *_Context
     )
 {
     PXENBUS_EVTCHN_TWO_LEVEL_CONTEXT    Context;
diff --git a/src/xenbus/evtchn_2l.h b/src/xenbus/evtchn_2l.h
index 41ed65c..f122fce 100644
--- a/src/xenbus/evtchn_2l.h
+++ b/src/xenbus/evtchn_2l.h
@@ -42,7 +42,7 @@
 extern NTSTATUS
 EvtchnTwoLevelInitialize(
     _In_ PXENBUS_FDO                    Fdo,
-    _Out_ PXENBUS_EVTCHN_ABI_CONTEXT    *Context
+    _Outptr_ PXENBUS_EVTCHN_ABI_CONTEXT *Context
     );
 
 extern VOID
diff --git a/src/xenbus/evtchn_fifo.c b/src/xenbus/evtchn_fifo.c
index 0f4b44e..1137dea 100644
--- a/src/xenbus/evtchn_fifo.c
+++ b/src/xenbus/evtchn_fifo.c
@@ -638,10 +638,10 @@ static XENBUS_EVTCHN_ABI EvtchnAbiFifo = {
 NTSTATUS
 EvtchnFifoInitialize(
     _In_ PXENBUS_FDO                    Fdo,
-    _Out_ PXENBUS_EVTCHN_ABI_CONTEXT    *_Context
+    _Outptr_ PXENBUS_EVTCHN_ABI_CONTEXT *_Context
     )
 {
-    PXENBUS_EVTCHN_FIFO_CONTEXT    Context;
+    PXENBUS_EVTCHN_FIFO_CONTEXT         Context;
     NTSTATUS                            status;
 
     Trace("====>\n");
diff --git a/src/xenbus/evtchn_fifo.h b/src/xenbus/evtchn_fifo.h
index c8a8fdf..28e43c1 100644
--- a/src/xenbus/evtchn_fifo.h
+++ b/src/xenbus/evtchn_fifo.h
@@ -42,7 +42,7 @@
 extern NTSTATUS
 EvtchnFifoInitialize(
     _In_ PXENBUS_FDO                    Fdo,
-    _Out_ PXENBUS_EVTCHN_ABI_CONTEXT    *Context
+    _Outptr_ PXENBUS_EVTCHN_ABI_CONTEXT *Context
     );
 
 extern VOID
diff --git a/src/xenbus/fdo.c b/src/xenbus/fdo.c
index 89595ed..4d3282d 100644
--- a/src/xenbus/fdo.c
+++ b/src/xenbus/fdo.c
@@ -2158,7 +2158,7 @@ FdoConnectInterrupt(
     _In_ PXENBUS_FDO                        Fdo,
     _In_ PCM_PARTIAL_RESOURCE_DESCRIPTOR    Raw,
     _In_ PCM_PARTIAL_RESOURCE_DESCRIPTOR    Translated,
-    _Out_ PXENBUS_INTERRUPT                 *Interrupt
+    _Outptr_ PXENBUS_INTERRUPT              *Interrupt
     )
 {
     IO_CONNECT_INTERRUPT_PARAMETERS         Connect;
@@ -2803,15 +2803,15 @@ __FdoVirqDestroy(
 
 static FORCEINLINE NTSTATUS
 __FdoVirqCreate(
-    _In_ PXENBUS_FDO    Fdo,
-    _In_ ULONG          Type,
-    _In_ ULONG          Cpu,
-    _Out_ PXENBUS_VIRQ  *Virq
+    _In_ PXENBUS_FDO        Fdo,
+    _In_ ULONG              Type,
+    _In_ ULONG              Cpu,
+    _Outptr_ PXENBUS_VIRQ   *Virq
     )
 {
-    PROCESSOR_NUMBER    ProcNumber;
-    unsigned int        vcpu_id;
-    NTSTATUS            status;
+    PROCESSOR_NUMBER        ProcNumber;
+    unsigned int            vcpu_id;
+    NTSTATUS                status;
 
     *Virq = __FdoAllocate(sizeof (XENBUS_VIRQ));
 
diff --git a/src/xenbus/gnttab.c b/src/xenbus/gnttab.c
index 1ee0cd1..693e9b3 100644
--- a/src/xenbus/gnttab.c
+++ b/src/xenbus/gnttab.c
@@ -366,19 +366,19 @@ GnttabReleaseLock(
 
 static NTSTATUS
 GnttabCreateCache(
-    _In_ PINTERFACE             Interface,
-    _In_ PCSTR                  Name,
-    _In_ ULONG                  Reservation,
-    _In_ ULONG                  Cap,
-    _In_ VOID                   (*AcquireLock)(PVOID),
-    _In_ VOID                   (*ReleaseLock)(PVOID),
-    _In_ PVOID                  Argument,
-    _Out_ PXENBUS_GNTTAB_CACHE  *Cache
+    _In_ PINTERFACE                 Interface,
+    _In_ PCSTR                      Name,
+    _In_ ULONG                      Reservation,
+    _In_ ULONG                      Cap,
+    _In_ VOID                       (*AcquireLock)(PVOID),
+    _In_ VOID                       (*ReleaseLock)(PVOID),
+    _In_ PVOID                      Argument,
+    _Outptr_ PXENBUS_GNTTAB_CACHE   *Cache
     )
 {
-    PXENBUS_GNTTAB_CONTEXT      Context = Interface->Context;
-    KIRQL                       Irql;
-    NTSTATUS                    status;
+    PXENBUS_GNTTAB_CONTEXT          Context = Interface->Context;
+    KIRQL                           Irql;
+    NTSTATUS                        status;
 
     *Cache = __GnttabAllocate(sizeof (XENBUS_GNTTAB_CACHE));
 
@@ -445,13 +445,13 @@ fail1:
 
 static NTSTATUS
 GnttabCreateCacheVersion1(
-    _In_ PINTERFACE             Interface,
-    _In_ PCSTR                  Name,
-    _In_ ULONG                  Reservation,
-    _In_ VOID                   (*AcquireLock)(PVOID),
-    _In_ VOID                   (*ReleaseLock)(PVOID),
-    _In_ PVOID                  Argument,
-    _Out_ PXENBUS_GNTTAB_CACHE  *Cache
+    _In_ PINTERFACE                 Interface,
+    _In_ PCSTR                      Name,
+    _In_ ULONG                      Reservation,
+    _In_ VOID                       (*AcquireLock)(PVOID),
+    _In_ VOID                       (*ReleaseLock)(PVOID),
+    _In_ PVOID                      Argument,
+    _Outptr_ PXENBUS_GNTTAB_CACHE   *Cache
     )
 {
     return GnttabCreateCache(Interface,
@@ -498,19 +498,19 @@ GnttabDestroyCache(
 
 static NTSTATUS
 GnttabPermitForeignAccess(
-    _In_ PINTERFACE             Interface,
-    _In_ PXENBUS_GNTTAB_CACHE   Cache,
-    _In_ BOOLEAN                Locked,
-    _In_ USHORT                 Domain,
-    _In_ PFN_NUMBER             Pfn,
-    _In_ BOOLEAN                ReadOnly,
-    _Out_ PXENBUS_GNTTAB_ENTRY  *Entry
+    _In_ PINTERFACE                 Interface,
+    _In_ PXENBUS_GNTTAB_CACHE       Cache,
+    _In_ BOOLEAN                    Locked,
+    _In_ USHORT                     Domain,
+    _In_ PFN_NUMBER                 Pfn,
+    _In_ BOOLEAN                    ReadOnly,
+    _Outptr_ PXENBUS_GNTTAB_ENTRY   *Entry
     )
 {
-    PXENBUS_GNTTAB_CONTEXT      Context = Interface->Context;
-    PXENBUS_GNTTAB_FRAME        Frame;
-    ULONG                       Index;
-    NTSTATUS                    status;
+    PXENBUS_GNTTAB_CONTEXT          Context = Interface->Context;
+    PXENBUS_GNTTAB_FRAME            Frame;
+    ULONG                           Index;
+    NTSTATUS                        status;
 
     *Entry = XENBUS_CACHE(Get,
                           &Context->CacheInterface,
@@ -1082,7 +1082,7 @@ static struct _XENBUS_GNTTAB_INTERFACE_V4   
GnttabInterfaceVersion4 = {
 NTSTATUS
 GnttabInitialize(
     _In_ PXENBUS_FDO                Fdo,
-    _Out_ PXENBUS_GNTTAB_CONTEXT    *Context
+    _Outptr_ PXENBUS_GNTTAB_CONTEXT *Context
     )
 {
     NTSTATUS                        status;
diff --git a/src/xenbus/gnttab.h b/src/xenbus/gnttab.h
index ecd41f7..9a69a2e 100644
--- a/src/xenbus/gnttab.h
+++ b/src/xenbus/gnttab.h
@@ -44,7 +44,7 @@ typedef struct _XENBUS_GNTTAB_CONTEXT  XENBUS_GNTTAB_CONTEXT, 
*PXENBUS_GNTTAB_CO
 extern NTSTATUS
 GnttabInitialize(
     _In_ PXENBUS_FDO                Fdo,
-    _Out_ PXENBUS_GNTTAB_CONTEXT    *Context
+    _Outptr_ PXENBUS_GNTTAB_CONTEXT *Context
     );
 
 extern NTSTATUS
diff --git a/src/xenbus/hash_table.c b/src/xenbus/hash_table.c
index 061db08..538ba2c 100644
--- a/src/xenbus/hash_table.c
+++ b/src/xenbus/hash_table.c
@@ -383,7 +383,7 @@ HashTableDpc(
 
 NTSTATUS
 HashTableCreate(
-    _Out_ PXENBUS_HASH_TABLE    *Table
+    _Outptr_ PXENBUS_HASH_TABLE *Table
     )
 {
     ULONG                       Index;
diff --git a/src/xenbus/hash_table.h b/src/xenbus/hash_table.h
index 033b7c1..80d4801 100644
--- a/src/xenbus/hash_table.h
+++ b/src/xenbus/hash_table.h
@@ -59,7 +59,7 @@ HashTableLookup(
 
 extern NTSTATUS
 HashTableCreate(
-    _Out_ PXENBUS_HASH_TABLE    *Table
+    _Outptr_ PXENBUS_HASH_TABLE *Table
     );
 
 extern VOID
diff --git a/src/xenbus/range_set.c b/src/xenbus/range_set.c
index 354b3ca..76d04c4 100644
--- a/src/xenbus/range_set.c
+++ b/src/xenbus/range_set.c
@@ -569,7 +569,7 @@ NTSTATUS
 RangeSetCreate(
     _In_ PINTERFACE             Interface,
     _In_ PCSTR                  Name,
-    _Out_ PXENBUS_RANGE_SET     *RangeSet
+    _Outptr_ PXENBUS_RANGE_SET  *RangeSet
     )
 {
     PXENBUS_RANGE_SET_CONTEXT   Context = Interface->Context;
@@ -822,11 +822,11 @@ static struct _XENBUS_RANGE_SET_INTERFACE_V1 
RangeSetInterfaceVersion1 = {
 
 NTSTATUS
 RangeSetInitialize(
-    _In_ PXENBUS_FDO                Fdo,
-    _Out_ PXENBUS_RANGE_SET_CONTEXT *Context
+    _In_ PXENBUS_FDO                    Fdo,
+    _Outptr_ PXENBUS_RANGE_SET_CONTEXT  *Context
     )
 {
-    NTSTATUS                        status;
+    NTSTATUS                            status;
 
     Trace("====>\n");
 
diff --git a/src/xenbus/range_set.h b/src/xenbus/range_set.h
index 678afd7..63cd98e 100644
--- a/src/xenbus/range_set.h
+++ b/src/xenbus/range_set.h
@@ -43,8 +43,8 @@ typedef struct _XENBUS_RANGE_SET_CONTEXT  
XENBUS_RANGE_SET_CONTEXT, *PXENBUS_RAN
 
 extern NTSTATUS
 RangeSetInitialize(
-    _In_ PXENBUS_FDO                Fdo,
-    _Out_ PXENBUS_RANGE_SET_CONTEXT *Context
+    _In_ PXENBUS_FDO                    Fdo,
+    _Outptr_ PXENBUS_RANGE_SET_CONTEXT  *Context
     );
 
 extern NTSTATUS
diff --git a/src/xenbus/shared_info.c b/src/xenbus/shared_info.c
index e85f4c1..06e0aec 100644
--- a/src/xenbus/shared_info.c
+++ b/src/xenbus/shared_info.c
@@ -844,11 +844,11 @@ static struct _XENBUS_SHARED_INFO_INTERFACE_V4 
SharedInfoInterfaceVersion4 = {
 
 NTSTATUS
 SharedInfoInitialize(
-    _In_ PXENBUS_FDO                    Fdo,
-    _Out_ PXENBUS_SHARED_INFO_CONTEXT   *Context
+    _In_ PXENBUS_FDO                        Fdo,
+    _Outptr_ PXENBUS_SHARED_INFO_CONTEXT    *Context
     )
 {
-    NTSTATUS                            status;
+    NTSTATUS                                status;
 
     Trace("====>\n");
 
diff --git a/src/xenbus/shared_info.h b/src/xenbus/shared_info.h
index af4221c..8023c6f 100644
--- a/src/xenbus/shared_info.h
+++ b/src/xenbus/shared_info.h
@@ -43,8 +43,8 @@ typedef struct _XENBUS_SHARED_INFO_CONTEXT  
XENBUS_SHARED_INFO_CONTEXT, *PXENBUS
 
 extern NTSTATUS
 SharedInfoInitialize(
-    _In_ PXENBUS_FDO                    Fdo,
-    _Out_ PXENBUS_SHARED_INFO_CONTEXT   *Context
+    _In_ PXENBUS_FDO                        Fdo,
+    _Outptr_ PXENBUS_SHARED_INFO_CONTEXT    *Context
     );
 
 extern NTSTATUS
diff --git a/src/xenbus/store.c b/src/xenbus/store.c
index 688e22f..0685feb 100644
--- a/src/xenbus/store.c
+++ b/src/xenbus/store.c
@@ -1497,15 +1497,15 @@ fail1:
 
 static NTSTATUS
 StoreTransactionStart(
-    _In_ PINTERFACE                 Interface,
-    _Out_ PXENBUS_STORE_TRANSACTION *Transaction
+    _In_ PINTERFACE                     Interface,
+    _Outptr_ PXENBUS_STORE_TRANSACTION  *Transaction
     )
 {
-    PXENBUS_STORE_CONTEXT           Context = Interface->Context;
-    XENBUS_STORE_REQUEST            Request;
-    PXENBUS_STORE_RESPONSE          Response;
-    KIRQL                           Irql;
-    NTSTATUS                        status;
+    PXENBUS_STORE_CONTEXT               Context = Interface->Context;
+    XENBUS_STORE_REQUEST                Request;
+    PXENBUS_STORE_RESPONSE              Response;
+    KIRQL                               Irql;
+    NTSTATUS                            status;
 
     *Transaction = __StoreAllocate(sizeof (XENBUS_STORE_TRANSACTION));
 
@@ -1656,21 +1656,21 @@ fail1:
 
 static NTSTATUS
 StoreWatchAdd(
-    _In_ PINTERFACE             Interface,
-    _In_opt_ PSTR               Prefix,
-    _In_ PSTR                   Node,
-    _In_ PKEVENT                Event,
-    _Out_ PXENBUS_STORE_WATCH   *Watch
+    _In_ PINTERFACE                 Interface,
+    _In_opt_ PSTR                   Prefix,
+    _In_ PSTR                       Node,
+    _In_ PKEVENT                    Event,
+    _Outptr_ PXENBUS_STORE_WATCH    *Watch
     )
 {
-    PXENBUS_STORE_CONTEXT       Context = Interface->Context;
-    ULONG                       Length;
-    PSTR                        Path;
-    CHAR                        Token[TOKEN_LENGTH];
-    XENBUS_STORE_REQUEST        Request;
-    PXENBUS_STORE_RESPONSE      Response;
-    KIRQL                       Irql;
-    NTSTATUS                    status;
+    PXENBUS_STORE_CONTEXT           Context = Interface->Context;
+    ULONG                           Length;
+    PSTR                            Path;
+    CHAR                            Token[TOKEN_LENGTH];
+    XENBUS_STORE_REQUEST            Request;
+    PXENBUS_STORE_RESPONSE          Response;
+    KIRQL                           Irql;
+    NTSTATUS                        status;
 
     *Watch = __StoreAllocate(sizeof (XENBUS_STORE_WATCH));
 
@@ -2706,13 +2706,13 @@ static struct _XENBUS_STORE_INTERFACE_V2 
StoreInterfaceVersion2 = {
 
 NTSTATUS
 StoreInitialize(
-    _In_ PXENBUS_FDO            Fdo,
-    _Out_ PXENBUS_STORE_CONTEXT *Context
+    _In_ PXENBUS_FDO                Fdo,
+    _Outptr_ PXENBUS_STORE_CONTEXT  *Context
     )
 {
-    LARGE_INTEGER               Now;
-    ULONG                       Seed;
-    NTSTATUS                    status;
+    LARGE_INTEGER                   Now;
+    ULONG                           Seed;
+    NTSTATUS                        status;
 
     Trace("====>\n");
 
diff --git a/src/xenbus/store.h b/src/xenbus/store.h
index 7f75d1e..6348df5 100644
--- a/src/xenbus/store.h
+++ b/src/xenbus/store.h
@@ -43,8 +43,8 @@ typedef struct _XENBUS_STORE_CONTEXT  XENBUS_STORE_CONTEXT, 
*PXENBUS_STORE_CONTE
 
 extern NTSTATUS
 StoreInitialize(
-    _In_ PXENBUS_FDO            Fdo,
-    _Out_ PXENBUS_STORE_CONTEXT *Context
+    _In_ PXENBUS_FDO                Fdo,
+    _Outptr_ PXENBUS_STORE_CONTEXT  *Context
     );
 
 extern NTSTATUS
diff --git a/src/xenbus/suspend.c b/src/xenbus/suspend.c
index 55c00a2..510973b 100644
--- a/src/xenbus/suspend.c
+++ b/src/xenbus/suspend.c
@@ -83,7 +83,7 @@ SuspendRegister(
     _In_ XENBUS_SUSPEND_CALLBACK_TYPE   Type,
     _In_ VOID                           (*Function)(PVOID),
     _In_opt_ PVOID                      Argument,
-    _Out_ PXENBUS_SUSPEND_CALLBACK      *Callback
+    _Outptr_ PXENBUS_SUSPEND_CALLBACK   *Callback
     )
 {
     PXENBUS_SUSPEND_CONTEXT             Context = Interface->Context;
@@ -479,11 +479,11 @@ static struct _XENBUS_SUSPEND_INTERFACE_V1 
SuspendInterfaceVersion1 = {
 
 NTSTATUS
 SuspendInitialize(
-    _In_ PXENBUS_FDO                Fdo,
-    _Out_ PXENBUS_SUSPEND_CONTEXT   *Context
+    _In_ PXENBUS_FDO                    Fdo,
+    _Outptr_ PXENBUS_SUSPEND_CONTEXT    *Context
     )
 {
-    NTSTATUS                        status;
+    NTSTATUS                            status;
 
     Trace("====>\n");
 
diff --git a/src/xenbus/suspend.h b/src/xenbus/suspend.h
index 4cfd107..0deb54d 100644
--- a/src/xenbus/suspend.h
+++ b/src/xenbus/suspend.h
@@ -43,8 +43,8 @@ typedef struct _XENBUS_SUSPEND_CONTEXT  
XENBUS_SUSPEND_CONTEXT, *PXENBUS_SUSPEND
 
 extern NTSTATUS
 SuspendInitialize(
-    _In_ PXENBUS_FDO                Fdo,
-    _Out_ PXENBUS_SUSPEND_CONTEXT   *Context
+    _In_ PXENBUS_FDO                    Fdo,
+    _Outptr_ PXENBUS_SUSPEND_CONTEXT    *Context
     );
 
 extern NTSTATUS
diff --git a/src/xenbus/thread.c b/src/xenbus/thread.c
index 91b4057..2a3c190 100644
--- a/src/xenbus/thread.c
+++ b/src/xenbus/thread.c
@@ -121,7 +121,7 @@ NTSTATUS
 ThreadCreate(
     _In_ XENBUS_THREAD_FUNCTION Function,
     _In_ PVOID                  Context,
-    _Out_ PXENBUS_THREAD        *Thread
+    _Outptr_ PXENBUS_THREAD     *Thread
     )
 {
     HANDLE                      Handle;
diff --git a/src/xenbus/thread.h b/src/xenbus/thread.h
index 9e24f65..28d6f9d 100644
--- a/src/xenbus/thread.h
+++ b/src/xenbus/thread.h
@@ -44,7 +44,7 @@ extern NTSTATUS
 ThreadCreate(
     _In_ XENBUS_THREAD_FUNCTION Function,
     _In_ PVOID                  Context,
-    _Out_ PXENBUS_THREAD        *Thread
+    _Outptr_ PXENBUS_THREAD     *Thread
     );
 
 extern PKEVENT
diff --git a/src/xenbus/unplug.c b/src/xenbus/unplug.c
index 21cc122..ca58c31 100644
--- a/src/xenbus/unplug.c
+++ b/src/xenbus/unplug.c
@@ -271,7 +271,7 @@ static struct _XENBUS_UNPLUG_INTERFACE_V3 
UnplugInterfaceVersion3 = {
 NTSTATUS
 UnplugInitialize(
     _In_ PXENBUS_FDO                Fdo,
-    _Out_ PXENBUS_UNPLUG_CONTEXT    *Context
+    _Outptr_ PXENBUS_UNPLUG_CONTEXT *Context
     )
 {
     NTSTATUS                        status;
diff --git a/src/xenbus/unplug.h b/src/xenbus/unplug.h
index 1cc6251..9af1e36 100644
--- a/src/xenbus/unplug.h
+++ b/src/xenbus/unplug.h
@@ -44,7 +44,7 @@ typedef struct _XENBUS_UNPLUG_CONTEXT  XENBUS_UNPLUG_CONTEXT, 
*PXENBUS_UNPLUG_CO
 extern NTSTATUS
 UnplugInitialize(
     _In_ PXENBUS_FDO                Fdo,
-    _Out_ PXENBUS_UNPLUG_CONTEXT    *Context
+    _Outptr_ PXENBUS_UNPLUG_CONTEXT *Context
     );
 
 extern NTSTATUS
diff --git a/src/xenfilt/emulated.c b/src/xenfilt/emulated.c
index f5e1cc4..9065364 100644
--- a/src/xenfilt/emulated.c
+++ b/src/xenfilt/emulated.c
@@ -227,7 +227,7 @@ EmulatedAddObject(
     _In_ PSTR                           InstanceID,
     _In_opt_ PSTR                       CompatibleIDs,
     _In_ XENFILT_EMULATED_OBJECT_TYPE   Type,
-    _Out_ PXENFILT_EMULATED_OBJECT      *EmulatedObject
+    _Outptr_ PXENFILT_EMULATED_OBJECT   *EmulatedObject
     )
 {
     KIRQL                               Irql;
@@ -468,10 +468,10 @@ static struct _XENFILT_EMULATED_INTERFACE_V2 
EmulatedInterfaceVersion2 = {
 
 NTSTATUS
 EmulatedInitialize(
-    _Out_ PXENFILT_EMULATED_CONTEXT *Context
+    _Outptr_ PXENFILT_EMULATED_CONTEXT  *Context
     )
 {
-    NTSTATUS                        status;
+    NTSTATUS                            status;
 
     Trace("====>\n");
 
diff --git a/src/xenfilt/emulated.h b/src/xenfilt/emulated.h
index 686d542..9b02268 100644
--- a/src/xenfilt/emulated.h
+++ b/src/xenfilt/emulated.h
@@ -49,7 +49,7 @@ typedef struct _XENFILT_EMULATED_OBJECT 
XENFILT_EMULATED_OBJECT, *PXENFILT_EMULA
 
 extern NTSTATUS
 EmulatedInitialize(
-    _Out_ PXENFILT_EMULATED_CONTEXT *Context
+    _Outptr_ PXENFILT_EMULATED_CONTEXT  *Context
     );
 
 extern NTSTATUS
@@ -72,7 +72,7 @@ EmulatedAddObject(
     _In_ PSTR                           InstanceID,
     _In_opt_ PSTR                       CompatibleIDs,
     _In_ XENFILT_EMULATED_OBJECT_TYPE   Type,
-    _Out_ PXENFILT_EMULATED_OBJECT      *EmulatedObject
+    _Outptr_ PXENFILT_EMULATED_OBJECT   *EmulatedObject
     );
 
 extern VOID
diff --git a/src/xenfilt/thread.c b/src/xenfilt/thread.c
index 34bac05..3f3b008 100644
--- a/src/xenfilt/thread.c
+++ b/src/xenfilt/thread.c
@@ -121,7 +121,7 @@ NTSTATUS
 ThreadCreate(
     _In_ XENFILT_THREAD_FUNCTION    Function,
     _In_ PVOID                      Context,
-    _Out_ PXENFILT_THREAD           *Thread
+    _Outptr_ PXENFILT_THREAD        *Thread
     )
 {
     HANDLE                          Handle;
diff --git a/src/xenfilt/thread.h b/src/xenfilt/thread.h
index 2d6d784..9cc35a0 100644
--- a/src/xenfilt/thread.h
+++ b/src/xenfilt/thread.h
@@ -44,7 +44,7 @@ extern NTSTATUS
 ThreadCreate(
     _In_ XENFILT_THREAD_FUNCTION    Function,
     _In_ PVOID                      Context,
-    _Out_ PXENFILT_THREAD           *Thread
+    _Outptr_ PXENFILT_THREAD        *Thread
     );
 
 extern PKEVENT
-- 
2.50.0.windows.1



Ngoc Tu Dinh | Vates XCP-ng Developer

XCP-ng & Xen Orchestra - Vates solutions

web: https://vates.tech




 


Rackspace

Lists.xenproject.org is hosted with RackSpace, monitoring our
servers 24x7x365 and backed by RackSpace's Fanatical Support®.