diff --git a/EdkNt32Pkg/Library/DxeNt32OemHookStatusCodeLib/DxeNt32OemHookStatusCodeLib.msa b/EdkNt32Pkg/Library/DxeNt32OemHookStatusCodeLib/DxeNt32OemHookStatusCodeLib.msa
index 463c607375..394fc24654 100644
--- a/EdkNt32Pkg/Library/DxeNt32OemHookStatusCodeLib/DxeNt32OemHookStatusCodeLib.msa
+++ b/EdkNt32Pkg/Library/DxeNt32OemHookStatusCodeLib/DxeNt32OemHookStatusCodeLib.msa
@@ -51,11 +51,11 @@
-
-
- gEfiWinNtThunkProtocolGuid
-
-
+
+
+ GUID_EXTENSION
+
+
gEfiStatusCodeSpecificDataGuid
diff --git a/EdkNt32Pkg/Library/DxeWinNtLib/DxeWinNtLib.msa b/EdkNt32Pkg/Library/DxeWinNtLib/DxeWinNtLib.msa
index 4ae0d0c10c..562616c1d1 100644
--- a/EdkNt32Pkg/Library/DxeWinNtLib/DxeWinNtLib.msa
+++ b/EdkNt32Pkg/Library/DxeWinNtLib/DxeWinNtLib.msa
@@ -39,11 +39,11 @@
-
-
- gEfiWinNtThunkProtocolGuid
-
-
+
+
+ GUID_EXTENSION
+
+
EFI_SPECIFICATION_VERSION 0x00020000
EDK_RELEASE_VERSION 0x00020000
diff --git a/EdkNt32Pkg/Library/EdkGenericBdsLib/BdsMisc.c b/EdkNt32Pkg/Library/EdkGenericBdsLib/BdsMisc.c
index e0b5d08c96..b8be94e74d 100644
--- a/EdkNt32Pkg/Library/EdkGenericBdsLib/BdsMisc.c
+++ b/EdkNt32Pkg/Library/EdkGenericBdsLib/BdsMisc.c
@@ -1012,6 +1012,8 @@ Returns:
&Browser
);
+ ASSERT (Status != EFI_SUCCESS);
+
StringBuffer1 = AllocateZeroPool (MAX_STRING_LEN * sizeof (CHAR16));
ASSERT (StringBuffer1 != NULL);
StringBuffer2 = AllocateZeroPool (MAX_STRING_LEN * sizeof (CHAR16));
diff --git a/EdkNt32Pkg/Library/EdkGenericBdsLib/EdkGenericBdsLib.msa b/EdkNt32Pkg/Library/EdkGenericBdsLib/EdkGenericBdsLib.msa
index d9420e4385..062660218a 100644
--- a/EdkNt32Pkg/Library/EdkGenericBdsLib/EdkGenericBdsLib.msa
+++ b/EdkNt32Pkg/Library/EdkGenericBdsLib/EdkGenericBdsLib.msa
@@ -86,19 +86,19 @@
gEfiLoadedImageProtocolGuid
-
+
gEfiFirmwareVolumeProtocolGuid
-
+
gEfiAcpiS3SaveProtocolGuid
-
+
gEfiSimpleTextOutProtocolGuid
-
+
gEfiSimpleTextInProtocolGuid
-
+
gEfiSimpleNetworkProtocolGuid
@@ -113,16 +113,16 @@
gEfiBlockIoProtocolGuid
-
+
gEfiDriverBindingProtocolGuid
gEfiFormBrowserProtocolGuid
-
+
gEfiLoadFileProtocolGuid
-
+
gEfiSimpleFileSystemProtocolGuid
diff --git a/EdkNt32Pkg/Library/Nt32PeCoffLoaderLib/Nt32PeCoffLoaderLib.msa b/EdkNt32Pkg/Library/Nt32PeCoffLoaderLib/Nt32PeCoffLoaderLib.msa
index 1a76e04341..1759b4b89c 100644
--- a/EdkNt32Pkg/Library/Nt32PeCoffLoaderLib/Nt32PeCoffLoaderLib.msa
+++ b/EdkNt32Pkg/Library/Nt32PeCoffLoaderLib/Nt32PeCoffLoaderLib.msa
@@ -33,11 +33,11 @@
-
-
- gEfiPeiPeCoffLoaderGuid
-
-
+
+
+ gEfiPeiPeCoffLoaderGuid
+
+
EFI_SPECIFICATION_VERSION 0x00020000
EDK_RELEASE_VERSION 0x00020000
diff --git a/EdkNt32Pkg/Library/PeiNt32OemHookStatusCodeLib/PeiNt32OemHookStatusCodeLib.msa b/EdkNt32Pkg/Library/PeiNt32OemHookStatusCodeLib/PeiNt32OemHookStatusCodeLib.msa
index 3fd99ae784..b9c3a56fe2 100644
--- a/EdkNt32Pkg/Library/PeiNt32OemHookStatusCodeLib/PeiNt32OemHookStatusCodeLib.msa
+++ b/EdkNt32Pkg/Library/PeiNt32OemHookStatusCodeLib/PeiNt32OemHookStatusCodeLib.msa
@@ -57,7 +57,7 @@
-
+
gEfiStatusCodeSpecificDataGuid