2 files changed, 6 insertions, 6 deletions
diff --git a/Nt32Pkg/SnpNt32Dxe/SnpNt32.c b/Nt32Pkg/SnpNt32Dxe/SnpNt32.c
index 29cee4f915..be9eb78fb5 100644
--- a/Nt32Pkg/SnpNt32Dxe/SnpNt32.c
+++ b/Nt32Pkg/SnpNt32Dxe/SnpNt32.c
@@ -42,7 +42,7 @@ SNPNT32_GLOBAL_DATA         gSnpNt32GlobalData = {
   {
     0,
     0,
-    0
+    EfiLockUninitialized
   },                          //  Lock
   //
   //  Private functions
@@ -1083,7 +1083,7 @@ SnpNt32InitializeGlobalData (
   //
   //  Get the WinNT thunk
   //
-  Status = gBS->LocateProtocol (&gEfiWinNtThunkProtocolGuid, NULL, &This->WinNtThunk);
+  Status = gBS->LocateProtocol (&gEfiWinNtThunkProtocolGuid, NULL, (VOID **)&This->WinNtThunk);
 
   if (EFI_ERROR (Status)) {
     return Status;
diff --git a/Nt32Pkg/SnpNt32Dxe/SnpNt32.h b/Nt32Pkg/SnpNt32Dxe/SnpNt32.h
index d0e04ce404..8b84ef9d95 100644
--- a/Nt32Pkg/SnpNt32Dxe/SnpNt32.h
+++ b/Nt32Pkg/SnpNt32Dxe/SnpNt32.h
@@ -139,7 +139,7 @@ EFI_STATUS
 //
 #define SNP_NT32_DRIVER_SIGNATURE SIGNATURE_32 ('W', 'S', 'N', 'P')
 
-typedef struct _SNPNT32_GLOBAL_DATA {
+struct _SNPNT32_GLOBAL_DATA {
   UINT32                            Signature;
 
   //
@@ -160,14 +160,14 @@ typedef struct _SNPNT32_GLOBAL_DATA {
   SNPNT32_INITIALIZE_GLOBAL_DATA    InitializeGlobalData;
   SNPNT32_INITIALIZE_INSTANCE_DATA  InitializeInstanceData;
   SNPNT32_CLOSE_INSTANCE            CloseInstance;
-} SNPNT32_GLOBAL_DATA;
+};
 
 //
 //  Instance data for each fake SNP instance
 //
 #define SNP_NT32_INSTANCE_SIGNATURE SIGNATURE_32 ('w', 'S', 'N', 'P')
 
-typedef struct _SNPNT32_INSTANCE_DATA {
+struct _SNPNT32_INSTANCE_DATA {
   UINT32                      Signature;
 
   //
@@ -188,7 +188,7 @@ typedef struct _SNPNT32_INSTANCE_DATA {
   //
   //  Private functions
   //
-} SNPNT32_INSTANCE_DATA;
+};
 
 #define SNP_NT32_INSTANCE_DATA_FROM_SNP_THIS(a) \
   CR ( \