diff options
Diffstat (limited to 'Nt32Pkg')
| -rw-r--r-- | Nt32Pkg/WinNtGopDxe/WinNtGop.h | 1 | ||||
| -rw-r--r-- | Nt32Pkg/WinNtGopDxe/WinNtGopDxe.inf | 1 | ||||
| -rw-r--r-- | Nt32Pkg/WinNtGopDxe/WinNtGopInput.c | 34 |
3 files changed, 2 insertions, 34 deletions
diff --git a/Nt32Pkg/WinNtGopDxe/WinNtGop.h b/Nt32Pkg/WinNtGopDxe/WinNtGop.h index e83f9ad86a..a13b48c88e 100644 --- a/Nt32Pkg/WinNtGopDxe/WinNtGop.h +++ b/Nt32Pkg/WinNtGopDxe/WinNtGop.h @@ -34,7 +34,6 @@ Abstract: #include <Protocol/SimpleTextInEx.h>
#include <Protocol/DriverBinding.h>
#include <Protocol/GraphicsOutput.h>
-#include <Protocol/SimpleTextInExNotify.h>
#include <Library/DebugLib.h>
#include <Library/BaseLib.h>
diff --git a/Nt32Pkg/WinNtGopDxe/WinNtGopDxe.inf b/Nt32Pkg/WinNtGopDxe/WinNtGopDxe.inf index 7f8c537b37..6581ad69ca 100644 --- a/Nt32Pkg/WinNtGopDxe/WinNtGopDxe.inf +++ b/Nt32Pkg/WinNtGopDxe/WinNtGopDxe.inf @@ -69,4 +69,3 @@ gEfiSimpleTextInProtocolGuid # PROTOCOL BY_START
gEfiSimpleTextInputExProtocolGuid # PROTOCOL BY_START
gEfiWinNtIoProtocolGuid # PROTOCOL TO_START
- gSimpleTextInExNotifyGuid # PROTOCOL ALWAYS_CONSUMED
diff --git a/Nt32Pkg/WinNtGopDxe/WinNtGopInput.c b/Nt32Pkg/WinNtGopDxe/WinNtGopInput.c index ff768cb998..be41a8e854 100644 --- a/Nt32Pkg/WinNtGopDxe/WinNtGopInput.c +++ b/Nt32Pkg/WinNtGopDxe/WinNtGopInput.c @@ -719,7 +719,6 @@ WinNtGopSimpleTextInExRegisterKeyNotify ( --*/
{
- EFI_STATUS Status;
GOP_PRIVATE_DATA *Private;
WIN_NT_GOP_SIMPLE_TEXTIN_EX_NOTIFY *CurrentNotify;
LIST_ENTRY *Link;
@@ -759,20 +758,10 @@ WinNtGopSimpleTextInExRegisterKeyNotify ( NewNotify->Signature = WIN_NT_GOP_SIMPLE_TEXTIN_EX_NOTIFY_SIGNATURE;
NewNotify->KeyNotificationFn = KeyNotificationFunction;
+ NewNotify->NotifyHandle = (EFI_HANDLE) NewNotify;
CopyMem (&NewNotify->KeyData, KeyData, sizeof (KeyData));
InsertTailList (&Private->NotifyList, &NewNotify->NotifyEntry);
- //
- // Use gSimpleTextInExNotifyGuid to get a valid EFI_HANDLE
- //
- Status = gBS->InstallMultipleProtocolInterfaces (
- &NewNotify->NotifyHandle,
- &gSimpleTextInExNotifyGuid,
- NULL,
- NULL
- );
- ASSERT_EFI_ERROR (Status);
-
*NotifyHandle = NewNotify->NotifyHandle;
return EFI_SUCCESS;
@@ -801,7 +790,6 @@ WinNtGopSimpleTextInExUnregisterKeyNotify ( --*/
{
- EFI_STATUS Status;
GOP_PRIVATE_DATA *Private;
LIST_ENTRY *Link;
WIN_NT_GOP_SIMPLE_TEXTIN_EX_NOTIFY *CurrentNotify;
@@ -810,18 +798,6 @@ WinNtGopSimpleTextInExUnregisterKeyNotify ( return EFI_INVALID_PARAMETER;
}
- Status = gBS->OpenProtocol (
- NotificationHandle,
- &gSimpleTextInExNotifyGuid,
- (VOID **) NULL,
- NULL,
- NULL,
- EFI_OPEN_PROTOCOL_TEST_PROTOCOL
- );
- if (EFI_ERROR (Status)) {
- return EFI_INVALID_PARAMETER;
- }
-
Private = GOP_PRIVATE_DATA_FROM_TEXT_IN_EX_THIS (This);
for (Link = Private->NotifyList.ForwardLink; Link != &Private->NotifyList; Link = Link->ForwardLink) {
@@ -836,13 +812,7 @@ WinNtGopSimpleTextInExUnregisterKeyNotify ( // Remove the notification function from NotifyList and free resources
//
RemoveEntryList (&CurrentNotify->NotifyEntry);
- Status = gBS->UninstallMultipleProtocolInterfaces (
- CurrentNotify->NotifyHandle,
- &gSimpleTextInExNotifyGuid,
- NULL,
- NULL
- );
- ASSERT_EFI_ERROR (Status);
+
gBS->FreePool (CurrentNotify);
return EFI_SUCCESS;
}
|