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

[PATCH 04/18] Update string typedefs


  • To: win-pv-devel@xxxxxxxxxxxxxxxxxxxx
  • From: Césaire Mounah <cesaire.mounah@xxxxxxxxxx>
  • Date: Fri, 16 Oct 2026 15:26:41 +0200
  • Authentication-results: eu.smtp.expurgate.cloud; dkim=pass header.s=selector1 header.d=vates.tech header.i="@vates.tech" header.h="From:Subject:Date:Message-ID:To:Cc:MIME-Version:Content-Type:In-Reply-To:References:Feedback-ID"
  • Cc: Césaire Mounah <cesaire.mounah@xxxxxxxxxx>
  • Delivery-date: Fri, 16 Oct 2026 13:27:11 +0000
  • Feedback-id: default:8631fc262581453bbf619ec5b2062170:Sweego
  • List-id: Developer list for the Windows PV Drivers subproject <win-pv-devel.lists.xenproject.org>

Mechanical pass, no functional change.

Types:
  const CHAR */CHAR * -> PCSTR/PSTR
  const WCHAR /WCHAR -> PCWSTR
  const PCHAR -> PCSTR
  PCHAR -> PSTR

Signed-off-by: Césaire Mounah <cesaire.mounah@xxxxxxxxxx>
---
 src/xencrsh/austere.c    |  8 ++++----
 src/xencrsh/austere.h    |  4 ++--
 src/xencrsh/driver.c     | 10 +++++-----
 src/xencrsh/driver.h     |  2 +-
 src/xencrsh/fdo.c        |  8 ++++----
 src/xencrsh/frontend.c   | 12 ++++++------
 src/xencrsh/frontend.h   |  6 +++---
 src/xencrsh/log.c        | 12 ++++++------
 src/xencrsh/pdo.c        |  4 ++--
 src/xencrsh/pdo.h        |  2 +-
 src/xencrsh/pdoinquiry.c | 12 ++++++------
 src/xencrsh/queue.c      |  2 +-
 src/xencrsh/queue.h      |  2 +-
 src/xencrsh/store.c      | 34 +++++++++++++++++-----------------
 src/xencrsh/store.h      | 24 ++++++++++++------------
 src/xenvbd/adapter.c     | 10 +++++-----
 src/xenvbd/base64.c      |  4 ++--
 src/xenvbd/base64.h      |  2 +-
 src/xenvbd/frontend.c    | 10 +++++-----
 src/xenvbd/frontend.h    |  2 +-
 src/xenvbd/registry.c    | 28 ++++++++++++++--------------
 src/xenvbd/registry.h    | 22 +++++++++++-----------
 src/xenvbd/target.c      |  8 ++++----
 src/xenvbd/target.h      |  6 +++---
 src/xenvbd/thread.c      |  2 +-
 src/xenvbd/thread.h      |  2 +-
 26 files changed, 119 insertions(+), 119 deletions(-)

diff --git a/src/xencrsh/austere.c b/src/xencrsh/austere.c
index 631a930..052e4f6 100644
--- a/src/xencrsh/austere.c
+++ b/src/xencrsh/austere.c
@@ -99,7 +99,7 @@ __CompactBigHeap()
 }
 static PVOID
 __AllocBig(
-    _In_ PCHAR  Caller,
+    _In_ PSTR   Caller,
     _In_ ULONG  Size
     )
 {
@@ -226,7 +226,7 @@ __NewSubHeap(
 }
 static PVOID
 __AllocSmall(
-    _In_ PCHAR          Caller,
+    _In_ PSTR           Caller,
     _In_ ULONG          Size
     )
 {
@@ -376,7 +376,7 @@ __SubHeapSize()
 }
 PVOID
 __AustereAllocate(
-    _In_ PCHAR  Caller,
+    _In_ PSTR   Caller,
     _In_ ULONG  Size
     )
 {
@@ -406,7 +406,7 @@ __AustereAllocate(
 
 VOID
 __AustereFree(
-    _In_ PCHAR      Caller,
+    _In_ PSTR       Caller,
     _In_ PVOID      Buffer
     )
 {   
diff --git a/src/xencrsh/austere.h b/src/xencrsh/austere.h
index b5b8f8c..4248644 100644
--- a/src/xencrsh/austere.h
+++ b/src/xencrsh/austere.h
@@ -43,13 +43,13 @@ AustereInitialize();
 
 PVOID
 __AustereAllocate(
-    _In_ PCHAR  Caller,
+    _In_ PSTR   Caller,
     _In_ ULONG  Size
     );
 
 VOID
 __AustereFree(
-    _In_ PCHAR  Caller,
+    _In_ PSTR   Caller,
     _In_ PVOID  Buffer
     );
 
diff --git a/src/xencrsh/driver.c b/src/xencrsh/driver.c
index 1bf6950..70589b1 100644
--- a/src/xencrsh/driver.c
+++ b/src/xencrsh/driver.c
@@ -91,7 +91,7 @@ DriverUnlinkFdo(
 // Global Functions
 static FORCEINLINE PCHAR
 __DriverFormatV(
-    _In_ PCHAR      Fmt,
+    _In_ PSTR       Fmt,
     _In_ va_list    Args
     )
 {
@@ -124,7 +124,7 @@ __DriverFormatV(
 
 PCHAR
 DriverFormat(
-    _In_ PCHAR  Format,
+    _In_ PSTR   Format,
     ...
     )
 {
@@ -196,7 +196,7 @@ HwFindAdapter(
     _In_ PVOID                              HwDeviceExtension,
     _In_ PVOID                              Context,
     _In_ PVOID                              BusInformation,
-    _In_ PCHAR                              ArgumentString,
+    _In_ PSTR                               ArgumentString,
     _Inout_ PPORT_CONFIGURATION_INFORMATION ConfigInfo,
     _Out_ PBOOLEAN                          Again
     )
@@ -302,8 +302,8 @@ __ToUpper(
 
 static FORCEINLINE BOOLEAN
 __StrStarts(
-    _In_ PWCHAR Str,
-    _In_ PWCHAR Starts
+    _In_ PWSTR  Str,
+    _In_ PWSTR  Starts
     )
 {
     while (*Str != L'\0' && *Starts != L'\0') {
diff --git a/src/xencrsh/driver.h b/src/xencrsh/driver.h
index a0043ca..2c02551 100644
--- a/src/xencrsh/driver.h
+++ b/src/xencrsh/driver.h
@@ -82,7 +82,7 @@ DriverUnlinkFdo(
 // Global Functions
 PCHAR
 DriverFormat(
-    _In_ PCHAR  Format,
+    _In_ PSTR   Format,
     ...
     );
 
diff --git a/src/xencrsh/fdo.c b/src/xencrsh/fdo.c
index 79b57d1..68d5263 100644
--- a/src/xencrsh/fdo.c
+++ b/src/xencrsh/fdo.c
@@ -61,7 +61,7 @@ struct _XENVBD_FDO {
 // Initialize, Start, Stop
 static FORCEINLINE PCHAR
 __Next(
-    _In_ PCHAR  Ptr
+    _In_ PSTR   Ptr
     )
 {
     if (Ptr == NULL)
@@ -117,8 +117,8 @@ fail1:
 }
 static BOOLEAN
 FdoGetFeatureFlag(
-    _In_ PCHAR  Path,
-    _In_ PCHAR  Feature
+    _In_ PSTR   Path,
+    _In_ PSTR   Feature
     )
 {
     BOOLEAN     Ret = FALSE;
@@ -139,7 +139,7 @@ FdoGetFeatureFlag(
 static FORCEINLINE NTSTATUS
 FdoCreateTarget(
     _In_ PXENVBD_FDO    Fdo,
-    _In_ PCHAR          DeviceId,
+    _In_ PSTR           DeviceId,
     _In_ ULONG          TargetId
     )
 {
diff --git a/src/xencrsh/frontend.c b/src/xencrsh/frontend.c
index 3a269a1..00dfcd3 100644
--- a/src/xencrsh/frontend.c
+++ b/src/xencrsh/frontend.c
@@ -359,7 +359,7 @@ __UpdateBackendPath(
 static FORCEINLINE NTSTATUS
 __ReadState(
     _In_ PXENVBD_FRONTEND   Frontend,
-    _In_ PCHAR              Path,
+    _In_ PSTR               Path,
     _Out_ PXENBUS_STATE     State
     )
 {
@@ -914,7 +914,7 @@ FrontendDisable(
 NTSTATUS
 FrontendCreate(
     _In_ PXENVBD_FRONTEND   Frontend,
-    _In_ PCHAR              DeviceId,
+    _In_ PSTR               DeviceId,
     _In_ ULONG              TargetId,
     _In_ PXENVBD_PDO        Pdo
     )
@@ -1115,7 +1115,7 @@ FrontendSetState(
 
 static FORCEINLINE NTSTATUS
 __WaitState2(
-    _In_ PCHAR              BackendPath,
+    _In_ PSTR               BackendPath,
     _Inout_ PXENBUS_STATE   State
     )
 {
@@ -1142,7 +1142,7 @@ fail:
 }
 static FORCEINLINE NTSTATUS
 ___SetState2(
-    _In_ PCHAR          FrontendPath,
+    _In_ PSTR           FrontendPath,
     _In_ XENBUS_STATE   State
     )
 {
@@ -1158,8 +1158,8 @@ ___SetState2(
 }
 NTSTATUS
 FrontendCloseTarget(
-    _In_ PCHAR      FrontendPath,
-    _In_ PCHAR      BackendPath
+    _In_ PSTR       FrontendPath,
+    _In_ PSTR       BackendPath
     )
 {
     NTSTATUS        Status;
diff --git a/src/xencrsh/frontend.h b/src/xencrsh/frontend.h
index af2c71a..80ee861 100644
--- a/src/xencrsh/frontend.h
+++ b/src/xencrsh/frontend.h
@@ -95,7 +95,7 @@ typedef struct _XENVBD_FRONTEND {
 extern NTSTATUS
 FrontendCreate(
     _In_ PXENVBD_FRONTEND   Frontend,
-    _In_ PCHAR              DeviceId,
+    _In_ PSTR               DeviceId,
     _In_ ULONG              TargetId,
     _In_ PXENVBD_PDO        Pdo
     );
@@ -113,8 +113,8 @@ FrontendSetState(
 
 extern NTSTATUS
 FrontendCloseTarget(
-    _In_ PCHAR  FrontendPath,
-    _In_ PCHAR  BackendPath
+    _In_ PSTR   FrontendPath,
+    _In_ PSTR   BackendPath
     );
 
 // Ring Slots
diff --git a/src/xencrsh/log.c b/src/xencrsh/log.c
index 43d5b0b..a2da155 100644
--- a/src/xencrsh/log.c
+++ b/src/xencrsh/log.c
@@ -48,7 +48,7 @@ LogQemuPut(
 
 static DECLSPEC_NOINLINE PCHAR
 LogFormatNumber(
-    _In_ PCHAR      Buffer,
+    _In_ PSTR       Buffer,
     _In_ ULONGLONG  Value,
     _In_ UCHAR      Base,
     _In_ BOOLEAN    UpperCase
@@ -109,7 +109,7 @@ LogFormatNumber(
 static DECLSPEC_NOINLINE VOID
 LogVPrintf(
     _In_ VOID       (*Put)(CHAR),
-    _In_ const CHAR *Format,
+    _In_ PCSTR      Format,
     _In_ va_list    Arguments
     )
 {
@@ -222,7 +222,7 @@ LogVPrintf(
 static DECLSPEC_NOINLINE VOID
 LogPrintf(
     _In_ VOID       (*Put)(CHAR),
-    _In_ const CHAR *Format,
+    _In_ PCSTR      Format,
     ...
     )
 {
@@ -247,9 +247,9 @@ __Mode()
 static FORCEINLINE VOID
 LogVDebug(
     _In_ ULONG      Level,
-    _In_ const CHAR *Module,
-    _In_ const CHAR *Function,
-    _In_ const CHAR *Format,
+    _In_ PCSTR      Module,
+    _In_ PCSTR      Function,
+    _In_ PCSTR      Format,
     _In_ va_list    Args
     )
 {
diff --git a/src/xencrsh/pdo.c b/src/xencrsh/pdo.c
index 14eca16..3ab4ba0 100644
--- a/src/xencrsh/pdo.c
+++ b/src/xencrsh/pdo.c
@@ -106,7 +106,7 @@ __PdoFree(
 NTSTATUS
 PdoCreate(
     _In_ PXENVBD_FDO        Fdo,
-    _In_ PCHAR              DeviceId,
+    _In_ PSTR               DeviceId,
     _In_ ULONG              TargetId,
     _Outptr_ PXENVBD_PDO    *_Pdo
     )
@@ -1053,7 +1053,7 @@ __AbortSrbQueue(
     _In_ PSRB_QUEUE     Queue,
     _In_ PXENVBD_PDO    Pdo,
     _In_ BOOLEAN        Free,
-    _In_ PCHAR          Name
+    _In_ PSTR           Name
     )
 {
     PSCSI_REQUEST_BLOCK Srb;
diff --git a/src/xencrsh/pdo.h b/src/xencrsh/pdo.h
index 03fc84f..d0f2f3a 100644
--- a/src/xencrsh/pdo.h
+++ b/src/xencrsh/pdo.h
@@ -46,7 +46,7 @@ typedef struct _XENVBD_PDO XENVBD_PDO, *PXENVBD_PDO;
 extern NTSTATUS
 PdoCreate(
     _In_ PXENVBD_FDO        Fdo,
-    _In_ PCHAR              DeviceId,
+    _In_ PSTR               DeviceId,
     _In_ ULONG              TargetId,
     _Outptr_ PXENVBD_PDO    *_Pdo
     );
diff --git a/src/xencrsh/pdoinquiry.c b/src/xencrsh/pdoinquiry.c
index 7d4c5d6..f889ffd 100644
--- a/src/xencrsh/pdoinquiry.c
+++ b/src/xencrsh/pdoinquiry.c
@@ -200,7 +200,7 @@ __FreeInquiryData(
 
 static FORCEINLINE UCHAR
 __PageCode(
-    _In_ PCHAR  PageCode
+    _In_ PSTR   PageCode
     )
 {
     ULONG       Ret;
@@ -234,7 +234,7 @@ __DecodeChar(
 static FORCEINLINE UCHAR
 __Decode(
     _In_ PUCHAR Dest,
-    _In_ PCHAR  Src,
+    _In_ PSTR   Src,
     _In_ ULONG  RemainingChars
     )
 {
@@ -267,7 +267,7 @@ __Decode(
 }
 static NTSTATUS
 __DecodeBase64(
-    _In_ PCHAR      Base64,
+    _In_ PSTR       Base64,
     _In_ ULONG      Base64Length,
     _Outptr_ PVOID  *_Buffer,
     _Out_ PULONG    BufferLength
@@ -309,8 +309,8 @@ fail1:
 static NTSTATUS
 __ReadPage(
     _In_ PXENVBD_INQUIRY    Inquiry,
-    _In_ PCHAR              BasePath,
-    _In_ PCHAR              PageCode
+    _In_ PSTR               BasePath,
+    _In_ PSTR               PageCode
     )
 {
     NTSTATUS                Status;
@@ -529,7 +529,7 @@ fail1:
 }
 static NTSTATUS
 __ReadInquiry(
-    _In_ PCHAR      Path,
+    _In_ PSTR       Path,
     _Outptr_ PVOID  *_Inquiry
     )
 {
diff --git a/src/xencrsh/queue.c b/src/xencrsh/queue.c
index 4bd3339..d69838d 100644
--- a/src/xencrsh/queue.c
+++ b/src/xencrsh/queue.c
@@ -198,7 +198,7 @@ QueueRemove(
 VOID
 QueueDebugCallback(
     _In_ PSRB_QUEUE Queue,
-    _In_ PCHAR      Name
+    _In_ PSTR       Name
     )
 {
     LogTrace("=====> %s\n", Name);
diff --git a/src/xencrsh/queue.h b/src/xencrsh/queue.h
index c53b3e6..3926995 100644
--- a/src/xencrsh/queue.h
+++ b/src/xencrsh/queue.h
@@ -79,7 +79,7 @@ QueueRemove(
 VOID
 QueueDebugCallback(
     _In_ PSRB_QUEUE Queue,
-    _In_ PCHAR      Name
+    _In_ PSTR       Name
     );
 
 #endif // _XENVBD_QUEUE_H
diff --git a/src/xencrsh/store.c b/src/xencrsh/store.c
index fc945a6..1f64dfd 100644
--- a/src/xencrsh/store.c
+++ b/src/xencrsh/store.c
@@ -176,7 +176,7 @@ StorePrepareRequest(
 
 static FORCEINLINE ULONG
 __StoreCopyToRing(
-    _In_ PCHAR                          Data,
+    _In_ PSTR                           Data,
     _In_ ULONG                          Length
     )
 {
@@ -285,7 +285,7 @@ StoreSendRequests(
 
 static FORCEINLINE ULONG
 __StoreCopyFromRing(
-    _In_ PCHAR                          Data,
+    _In_ PSTR                           Data,
     _In_ ULONG                          Length
     )
 {
@@ -603,8 +603,8 @@ StoreFreeResponse(
 NTSTATUS
 StoreRead(
     _In_opt_ PXENBUS_STORE_TRANSACTION  Transaction,
-    _In_opt_ PCHAR                      Prefix,
-    _In_ PCHAR                          Node,
+    _In_opt_ PSTR                       Prefix,
+    _In_ PSTR                           Node,
     _Outptr_ PCHAR                      *Value
     )
 {
@@ -676,9 +676,9 @@ fail1:
 NTSTATUS
 StoreWrite(
     _In_opt_ PXENBUS_STORE_TRANSACTION  Transaction,
-    _In_opt_ PCHAR                      Prefix,
-    _In_ PCHAR                          Node,
-    _In_ PCHAR                          Value
+    _In_opt_ PSTR                       Prefix,
+    _In_ PSTR                           Node,
+    _In_ PSTR                           Value
     )
 {
     STORE_REQUEST                       Request;
@@ -730,9 +730,9 @@ fail1:
 static FORCEINLINE NTSTATUS
 StoreVPrintf(
     _In_opt_ PXENBUS_STORE_TRANSACTION  Transaction,
-    _In_opt_ PCHAR                      Prefix,
-    _In_ PCHAR                          Node,
-    _In_ const CHAR                     *Format,
+    _In_opt_ PSTR                       Prefix,
+    _In_ PSTR                           Node,
+    _In_ PCSTR                          Format,
     _In_ va_list                        Arguments
     )
 {
@@ -795,9 +795,9 @@ fail1:
 NTSTATUS
 StorePrintf(
     _In_opt_ PXENBUS_STORE_TRANSACTION  Transaction,
-    _In_opt_ PCHAR                      Prefix,
-    _In_ PCHAR                          Node,
-    _In_ const CHAR                     *Format,
+    _In_opt_ PSTR                       Prefix,
+    _In_ PSTR                           Node,
+    _In_ PCSTR                          Format,
     ...
     )
 {
@@ -818,8 +818,8 @@ StorePrintf(
 NTSTATUS
 StoreRemove(
     _In_opt_ PXENBUS_STORE_TRANSACTION  Transaction,
-    _In_opt_ PCHAR                      Prefix,
-    _In_ PCHAR                          Node
+    _In_opt_ PSTR                       Prefix,
+    _In_ PSTR                           Node
     )
 {
     STORE_REQUEST                       Request;
@@ -872,8 +872,8 @@ fail1:
 NTSTATUS
 StoreDirectory(
     _In_opt_ PXENBUS_STORE_TRANSACTION  Transaction,
-    _In_opt_ PCHAR                      Prefix,
-    _In_ PCHAR                          Node,
+    _In_opt_ PSTR                       Prefix,
+    _In_ PSTR                           Node,
     _Outptr_ PCHAR                      *Value
     )
 {
diff --git a/src/xencrsh/store.h b/src/xencrsh/store.h
index fa9b2ec..8722a79 100644
--- a/src/xencrsh/store.h
+++ b/src/xencrsh/store.h
@@ -44,40 +44,40 @@ StoreTerminate();
 NTSTATUS
 StoreRead(
     _In_opt_ PVOID  Transaction,
-    _In_opt_ PCHAR  Prefix,
-    _In_ PCHAR      Node,
+    _In_opt_ PSTR   Prefix,
+    _In_ PSTR       Node,
     _Outptr_ PCHAR  *Value
     );
 
 NTSTATUS
 StoreWrite(
     _In_opt_ PVOID  Transaction,
-    _In_opt_ PCHAR  Prefix,
-    _In_ PCHAR      Node,
-    _In_ PCHAR      Value
+    _In_opt_ PSTR   Prefix,
+    _In_ PSTR       Node,
+    _In_ PSTR       Value
     );
 
 NTSTATUS
 StorePrintf(
     _In_opt_ PVOID  Transaction,
-    _In_opt_ PCHAR  Prefix,
-    _In_ PCHAR      Node,
-    _In_ const CHAR *Format,
+    _In_opt_ PSTR   Prefix,
+    _In_ PSTR       Node,
+    _In_ PCSTR      Format,
     ...                                                   
     );
 
 NTSTATUS
 StoreRemove(                                                     
     _In_opt_ PVOID  Transaction,
-    _In_opt_ PCHAR  Prefix,
-    _In_ PCHAR      Node
+    _In_opt_ PSTR   Prefix,
+    _In_ PSTR       Node
     );
 
 NTSTATUS
 StoreDirectory(                                                     
     _In_opt_ PVOID  Transaction,
-    _In_opt_ PCHAR  Prefix,
-    _In_ PCHAR      Node,
+    _In_opt_ PSTR   Prefix,
+    _In_ PSTR       Node,
     _Outptr_ PCHAR  *Value
     );
 
diff --git a/src/xenvbd/adapter.c b/src/xenvbd/adapter.c
index 360cf50..beffcff 100644
--- a/src/xenvbd/adapter.c
+++ b/src/xenvbd/adapter.c
@@ -118,7 +118,7 @@ __AdapterFree(
 
 static FORCEINLINE PANSI_STRING
 __AdapterMultiSzToAnsi(
-    _In_ PCHAR      Buffer
+    _In_ PSTR       Buffer
     )
 {
     PANSI_STRING    Ansi;
@@ -181,7 +181,7 @@ fail1:
 
 static FORCEINLINE PANSI_STRING
 __AdapterMultiSzToUpcaseAnsi(
-    _In_ PCHAR      Buffer
+    _In_ PSTR       Buffer
     )
 {
     PANSI_STRING    Ansi;
@@ -314,7 +314,7 @@ AdapterGetTarget(
 static FORCEINLINE BOOLEAN
 __AdapterHiddenTarget(
     _In_ PXENVBD_ADAPTER    Adapter,
-    _In_ PCHAR              DeviceId
+    _In_ PSTR               DeviceId
     )
 {
     NTSTATUS                status;
@@ -592,7 +592,7 @@ done:
 static FORCEINLINE BOOLEAN
 __AdapterMatchDistribution(
     _In_ PXENVBD_ADAPTER    Adapter,
-    _In_ PCHAR              Buffer
+    _In_ PSTR               Buffer
     )
 {
     PCHAR                   Vendor;
@@ -2101,7 +2101,7 @@ AdapterHwFindAdapter(
     _In_ PVOID                              DevExt,
     _In_ PVOID                              Context,
     _In_ PVOID                              BusInformation,
-    _In_ PCHAR                              ArgumentString,
+    _In_ PSTR                               ArgumentString,
     _Inout_ PPORT_CONFIGURATION_INFORMATION ConfigInfo,
     _Out_ PBOOLEAN                          Again
     )
diff --git a/src/xenvbd/base64.c b/src/xenvbd/base64.c
index 0d37d22..dd8e87a 100644
--- a/src/xenvbd/base64.c
+++ b/src/xenvbd/base64.c
@@ -75,7 +75,7 @@ __DecodeChar(
 static DECLSPEC_NOINLINE CHAR
 __Decode(
     _In_ PUCHAR Dst,
-    _In_ PCHAR  Src,
+    _In_ PSTR   Src,
     _In_ ULONG  Left
     )
 {
@@ -113,7 +113,7 @@ __Decode(
 
 NTSTATUS
 Base64Decode(
-    _In_ PCHAR      String,
+    _In_ PSTR       String,
     _Outptr_ PVOID  *Binary,
     _Out_ PULONG    Length
     )
diff --git a/src/xenvbd/base64.h b/src/xenvbd/base64.h
index 73159ce..1806813 100644
--- a/src/xenvbd/base64.h
+++ b/src/xenvbd/base64.h
@@ -42,7 +42,7 @@ Base64Free(
 
 extern NTSTATUS
 Base64Decode(
-    _In_ PCHAR      String,
+    _In_ PSTR       String,
     _Outptr_ PVOID  *Binary,
     _Out_ PULONG    Length
     );
diff --git a/src/xenvbd/frontend.c b/src/xenvbd/frontend.c
index 98bedb3..a5e2236 100644
--- a/src/xenvbd/frontend.c
+++ b/src/xenvbd/frontend.c
@@ -365,7 +365,7 @@ static NTSTATUS
 __ReadState(
     _In_ PXENVBD_FRONTEND               Frontend,
     _In_opt_ PXENBUS_STORE_TRANSACTION  Transaction,
-    _In_ PCHAR                          Path,
+    _In_ PSTR                           Path,
     _Out_ XenbusState                   *State
     )
 {
@@ -630,7 +630,7 @@ FrontendReadFeature(
 static FORCEINLINE BOOLEAN
 FrontendReadDiskFeature(
     _In_ PXENVBD_FRONTEND   Frontend,
-    _In_ PCHAR              Name,
+    _In_ PSTR               Name,
     _In_ PBOOLEAN           Value
     )
 {
@@ -702,7 +702,7 @@ FrontendReadValue32(
 static FORCEINLINE BOOLEAN
 FrontendReadDiskValue32(
     _In_ PXENVBD_FRONTEND   Frontend,
-    _In_ PCHAR              Name,
+    _In_ PSTR               Name,
     _In_ PULONG             Value
 )
 {
@@ -731,7 +731,7 @@ FrontendReadDiskValue32(
 static FORCEINLINE BOOLEAN
 FrontendReadValue64(
     _In_ PXENVBD_FRONTEND   Frontend,
-    _In_ PCHAR              Name,
+    _In_ PSTR               Name,
     _Inout_ PULONG64        Value
     )
 {
@@ -1864,7 +1864,7 @@ fail1:
 NTSTATUS
 FrontendCreate(
     _In_ PXENVBD_TARGET         Target,
-    _In_ PCHAR                  DeviceId,
+    _In_ PSTR                   DeviceId,
     _In_ ULONG                  TargetId,
     _Outptr_ PXENVBD_FRONTEND   *_Frontend
     )
diff --git a/src/xenvbd/frontend.h b/src/xenvbd/frontend.h
index a2d8762..1117b8d 100644
--- a/src/xenvbd/frontend.h
+++ b/src/xenvbd/frontend.h
@@ -143,7 +143,7 @@ FrontendReset(
 extern NTSTATUS
 FrontendCreate(
     _In_ PXENVBD_TARGET         Target,
-    _In_ PCHAR                  DeviceId,
+    _In_ PSTR                   DeviceId,
     _In_ ULONG                  TargetId,
     _Outptr_ PXENVBD_FRONTEND   *_Frontend
     );
diff --git a/src/xenvbd/registry.c b/src/xenvbd/registry.c
index 63498ba..080b200 100644
--- a/src/xenvbd/registry.c
+++ b/src/xenvbd/registry.c
@@ -143,7 +143,7 @@ fail1:
 _IRQL_requires_(PASSIVE_LEVEL)
 static NTSTATUS
 RegistryOpenRoot(
-    _In_ PWCHAR         Path,
+    _In_ PWSTR          Path,
     _Out_ PHANDLE       Parent,
     _Outptr_ PWCHAR     *ChildPath
     )
@@ -447,7 +447,7 @@ _IRQL_requires_(PASSIVE_LEVEL)
 NTSTATUS
 RegistryOpenSubKey(
     _In_ PHANDLE        Key,
-    _In_ PCHAR          Name,
+    _In_ PSTR           Name,
     _In_ ACCESS_MASK    DesiredAccess,
     _Out_ PHANDLE       SubKey
     )
@@ -481,7 +481,7 @@ _IRQL_requires_(PASSIVE_LEVEL)
 NTSTATUS
 RegistryCreateSubKey(
     _In_ PHANDLE        Key,
-    _In_ PCHAR          Name,
+    _In_ PSTR           Name,
     _In_ ULONG          Options,
     _Out_ PHANDLE       SubKey
     )
@@ -515,7 +515,7 @@ _IRQL_requires_(PASSIVE_LEVEL)
 NTSTATUS
 RegistryDeleteSubKey(
     _In_ PHANDLE        Key,
-    _In_ PCHAR          Name
+    _In_ PSTR           Name
     )
 {
     ANSI_STRING         Ansi;
@@ -763,7 +763,7 @@ _IRQL_requires_(PASSIVE_LEVEL)
 NTSTATUS
 RegistryDeleteValue(
     _In_ PHANDLE        Key,
-    _In_ PCHAR          Name
+    _In_ PSTR           Name
     )
 {
     ANSI_STRING         Ansi;
@@ -797,7 +797,7 @@ _IRQL_requires_(PASSIVE_LEVEL)
 NTSTATUS
 RegistryQueryDwordValue(
     _In_ HANDLE                     Key,
-    _In_ PCHAR                      Name,
+    _In_ PSTR                       Name,
     _Out_ PULONG                    Value
     )
 {
@@ -868,7 +868,7 @@ _IRQL_requires_(PASSIVE_LEVEL)
 NTSTATUS
 RegistryUpdateDwordValue(
     _In_ HANDLE                     Key,
-    _In_ PCHAR                      Name,
+    _In_ PSTR                       Name,
     _In_ ULONG                      Value
     )
 {
@@ -926,7 +926,7 @@ fail1:
 _IRQL_requires_(PASSIVE_LEVEL)
 static PANSI_STRING
 RegistrySzToAnsi(
-    _In_ PWCHAR     Buffer
+    _In_ PWSTR      Buffer
     )
 {
     PANSI_STRING    Ansi;
@@ -966,7 +966,7 @@ fail1:
 _IRQL_requires_(PASSIVE_LEVEL)
 static PANSI_STRING
 RegistryMultiSzToAnsi(
-    _In_ PWCHAR     Buffer
+    _In_ PWSTR      Buffer
     )
 {
     PANSI_STRING    Ansi;
@@ -1030,7 +1030,7 @@ _IRQL_requires_(PASSIVE_LEVEL)
 NTSTATUS
 RegistryQuerySzValue(
     _In_ HANDLE                     Key,
-    _In_ PCHAR                      Name,
+    _In_ PSTR                       Name,
     _Out_opt_ PULONG                Type,
     _Outptr_ PANSI_STRING           *Array
     )
@@ -1118,7 +1118,7 @@ _IRQL_requires_(PASSIVE_LEVEL)
 NTSTATUS
 RegistryQueryBinaryValue(
     _In_ HANDLE                     Key,
-    _In_ PCHAR                      Name,
+    _In_ PSTR                       Name,
     _Outptr_ PVOID                  *Buffer,
     _Out_ PULONG                    Length
     )
@@ -1204,7 +1204,7 @@ _IRQL_requires_(PASSIVE_LEVEL)
 NTSTATUS
 RegistryUpdateBinaryValue(
     _In_ HANDLE                     Key,
-    _In_ PCHAR                      Name,
+    _In_ PSTR                       Name,
     _In_ PVOID                      Buffer,
     _In_ ULONG                      Length
     )
@@ -1319,7 +1319,7 @@ fail1:
 _IRQL_requires_(PASSIVE_LEVEL)
 NTSTATUS
 RegistryQuerySystemStartOption(
-    _In_ const CHAR                 *Prefix,
+    _In_ PCSTR                      Prefix,
     _Outptr_ PANSI_STRING           *Value
     )
 {
@@ -1506,7 +1506,7 @@ _IRQL_requires_(PASSIVE_LEVEL)
 NTSTATUS
 RegistryUpdateSzValue(
     _In_ HANDLE                     Key,
-    _In_ PCHAR                      Name,
+    _In_ PSTR                       Name,
     _In_ ULONG                      Type,
     _In_ PANSI_STRING               Array
     )
diff --git a/src/xenvbd/registry.h b/src/xenvbd/registry.h
index 3b463c5..b8f80ba 100644
--- a/src/xenvbd/registry.h
+++ b/src/xenvbd/registry.h
@@ -104,7 +104,7 @@ _IRQL_requires_(PASSIVE_LEVEL)
 extern NTSTATUS
 RegistryOpenSubKey(
     _In_ HANDLE         Key,
-    _In_ PCHAR          Name,
+    _In_ PSTR           Name,
     _In_ ACCESS_MASK    DesiredAccess,
     _Out_ PHANDLE       SubKey
     );
@@ -113,7 +113,7 @@ _IRQL_requires_(PASSIVE_LEVEL)
 extern NTSTATUS
 RegistryCreateSubKey(
     _In_ HANDLE     Key,
-    _In_ PCHAR      Name,
+    _In_ PSTR       Name,
     _In_ ULONG      Options,
     _Out_ PHANDLE   SubKey
     );
@@ -122,7 +122,7 @@ _IRQL_requires_(PASSIVE_LEVEL)
 extern NTSTATUS
 RegistryDeleteSubKey(
     _In_ HANDLE Key,
-    _In_ PCHAR  Name
+    _In_ PSTR   Name
     );
 
 _IRQL_requires_(PASSIVE_LEVEL)
@@ -145,14 +145,14 @@ _IRQL_requires_(PASSIVE_LEVEL)
 extern NTSTATUS
 RegistryDeleteValue(
     _In_ HANDLE Key,
-    _In_ PCHAR  Name
+    _In_ PSTR   Name
     );
 
 _IRQL_requires_(PASSIVE_LEVEL)
 extern NTSTATUS
 RegistryQueryDwordValue(
     _In_ HANDLE     Key,
-    _In_ PCHAR      Name,
+    _In_ PSTR       Name,
     _Out_ PULONG    Value
     );
 
@@ -160,7 +160,7 @@ _IRQL_requires_(PASSIVE_LEVEL)
 extern NTSTATUS
 RegistryUpdateDwordValue(
     _In_ HANDLE Key,
-    _In_ PCHAR  Name,
+    _In_ PSTR   Name,
     _In_ ULONG  Value
     );
 
@@ -168,7 +168,7 @@ _IRQL_requires_(PASSIVE_LEVEL)
 extern NTSTATUS
 RegistryQuerySzValue(
     _In_ HANDLE             Key,
-    _In_ PCHAR              Name,
+    _In_ PSTR               Name,
     _Out_opt_ PULONG        Type,
     _Outptr_ PANSI_STRING   *Array
     );
@@ -177,7 +177,7 @@ _IRQL_requires_(PASSIVE_LEVEL)
 extern NTSTATUS
 RegistryQueryBinaryValue(
     _In_ HANDLE     Key,
-    _In_ PCHAR      Name,
+    _In_ PSTR       Name,
     _Outptr_ PVOID  *Buffer,
     _Out_ PULONG    Length
     );
@@ -186,7 +186,7 @@ _IRQL_requires_(PASSIVE_LEVEL)
 extern NTSTATUS
 RegistryUpdateBinaryValue(
     _In_ HANDLE Key,
-    _In_ PCHAR  Name,
+    _In_ PSTR   Name,
     _In_ PVOID  Buffer,
     _In_ ULONG  Length
     );
@@ -201,7 +201,7 @@ RegistryQueryKeyName(
 _IRQL_requires_(PASSIVE_LEVEL)
 extern NTSTATUS
 RegistryQuerySystemStartOption(
-    _In_ const CHAR         *Prefix,
+    _In_ PCSTR              Prefix,
     _Outptr_ PANSI_STRING   *Option
     );
 
@@ -219,7 +219,7 @@ _IRQL_requires_(PASSIVE_LEVEL)
 extern NTSTATUS
 RegistryUpdateSzValue(
     _In_ HANDLE         Key,
-    _In_ PCHAR          Name,
+    _In_ PSTR           Name,
     _In_ ULONG          Type,
     _In_ PANSI_STRING   Array
     );
diff --git a/src/xenvbd/target.c b/src/xenvbd/target.c
index 01b2e32..0051e90 100644
--- a/src/xenvbd/target.c
+++ b/src/xenvbd/target.c
@@ -142,7 +142,7 @@ TargetSetDevicePowerState(
 VOID
 TargetSetMissing(
     _In_ PXENVBD_TARGET Target,
-    _In_ const CHAR     *Reason
+    _In_ PCSTR          Reason
     )
 {
     KIRQL               Irql;
@@ -1156,7 +1156,7 @@ TargetShutdown(
 VOID
 TargetIssueDeviceEject(
     _In_ PXENVBD_TARGET Target,
-    _In_ const CHAR     *Reason
+    _In_ PCSTR          Reason
     )
 {
     KIRQL               Irql;
@@ -1475,7 +1475,7 @@ TargetD0ToD3(
 
 static FORCEINLINE ULONG
 __ParseVbd(
-    _In_ PCHAR  DeviceIdStr
+    _In_ PSTR   DeviceIdStr
     )
 {
     ULONG       DeviceId = strtoul(DeviceIdStr, NULL, 10);
@@ -1503,7 +1503,7 @@ __ParseVbd(
 NTSTATUS
 TargetCreate(
     _In_ PXENVBD_ADAPTER    Adapter,
-    _In_ PCHAR              DeviceId,
+    _In_ PSTR               DeviceId,
     _Outptr_ PXENVBD_TARGET *_Target
     )
 {
diff --git a/src/xenvbd/target.h b/src/xenvbd/target.h
index 8843367..ee24736 100644
--- a/src/xenvbd/target.h
+++ b/src/xenvbd/target.h
@@ -44,7 +44,7 @@ typedef struct _XENVBD_TARGET XENVBD_TARGET, *PXENVBD_TARGET;
 extern NTSTATUS
 TargetCreate(
     _In_ PXENVBD_ADAPTER    Adapter,
-    _In_ PCHAR              DeviceId,
+    _In_ PSTR               DeviceId,
     _Outptr_ PXENVBD_TARGET *_Target
     );
 
@@ -73,13 +73,13 @@ TargetDispatchPnp(
 extern VOID
 TargetIssueDeviceEject(
     _In_ PXENVBD_TARGET Target,
-    _In_ const CHAR     *Reason
+    _In_ PCSTR          Reason
     );
 
 extern VOID
 TargetSetMissing(
     _In_ PXENVBD_TARGET Target,
-    _In_ const CHAR     *Reason
+    _In_ PCSTR          Reason
     );
 
 extern VOID
diff --git a/src/xenvbd/thread.c b/src/xenvbd/thread.c
index b8924b9..8eded16 100644
--- a/src/xenvbd/thread.c
+++ b/src/xenvbd/thread.c
@@ -149,7 +149,7 @@ ThreadFunction(
 _IRQL_requires_(PASSIVE_LEVEL)
 NTSTATUS
 _ThreadCreate(
-    _In_ PCHAR                  Name,
+    _In_ PSTR                   Name,
     _In_ XENVBD_THREAD_FUNCTION Function,
     _In_opt_ PVOID              Context,
     _Outptr_ PXENVBD_THREAD     *_Thread
diff --git a/src/xenvbd/thread.h b/src/xenvbd/thread.h
index e6aba66..eaa3cab 100644
--- a/src/xenvbd/thread.h
+++ b/src/xenvbd/thread.h
@@ -42,7 +42,7 @@ typedef NTSTATUS (*XENVBD_THREAD_FUNCTION)(PXENVBD_THREAD, 
PVOID);
 _IRQL_requires_(PASSIVE_LEVEL)
 extern NTSTATUS
 _ThreadCreate(
-    _In_ PCHAR                  Name,
+    _In_ PSTR                   Name,
     _In_ XENVBD_THREAD_FUNCTION Function,
     _In_opt_ PVOID              Context,
     _Outptr_ PXENVBD_THREAD     *Thread
-- 
2.55.0.windows.5



--
Césaire Mounah | Vates Windows Guest Tools Engineer

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®.