exclude double protocol

Signed-off-by: Slice <[email protected]>

Author: SergeySlice

rEFIt_UEFI/Platform/Injectors.cpp

@@ -419,23 +419,25 @@ SetPrivateVarProto(void)
 										               &SMCHelperProtocol,
 										               &gAppleSMCStateProtocolGuid,
 										               &SMCStateProtocol,
+										               &gAppleImageCodecProtocolGuid,
+										               &gAppleImageCodec,
                                                        NULL
                                                      );
   if (EFI_ERROR(Status)) {
     DBG("Error installing multiple protocol, Status = %s\n", efiStrError(Status));
   }
 
-
-  Status      = gBS->InstallProtocolInterface (
-                                               &gImageHandle,
-                                               &gAppleImageCodecProtocolGuid,
-                                               EFI_NATIVE_INTERFACE,
-                                               (VOID *)&gAppleImageCodec
-                                               );
-
-  if (EFI_ERROR(Status)) {
-    DBG("AppleImageCodec: error installing protocol, Status = %s\n", efiStrError(Status));
-  }
+//
+//  Status      = gBS->InstallProtocolInterface (
+//                                               &gImageHandle,
+//                                               &gAppleImageCodecProtocolGuid,
+//                                               EFI_NATIVE_INTERFACE,
+//                                               (VOID *)&gAppleImageCodec
+//                                               );
+//
+//  if (EFI_ERROR(Status)) {
+//    DBG("AppleImageCodec: error installing protocol, Status = %s\n", efiStrError(Status));
+//  }
 
   Status = InstallAggregator();
   if (EFI_ERROR(Status)) {

rEFIt_UEFI/gui/REFIT_MENU_SCREEN.cpp

@@ -1021,7 +1021,7 @@ UINTN REFIT_MENU_SCREEN::RunGenericMenu(IN OUT INTN *DefaultEntryIndex, OUT REFI
         break;
       case SCAN_F8:
  //       testSVG();
- //       testBMP();
+        testBMP();
         testEfires();
         break;
 

rEFIt_UEFI/libeg/AppleImageCodec.cpp

@@ -210,31 +210,31 @@ APPLE_IMAGE_CODEC_PROTOCOL gAppleImageCodec = {
 };
 
 /** Driver's entry point. Installs our StartImage to detect boot loader start. */
-EFI_STATUS
-EFIAPI
-AppleImageCodecEntrypoint (
-  IN EFI_HANDLE           ImageHandle,
-  IN EFI_SYSTEM_TABLE     *SystemTable
-)
-{
-  EFI_STATUS              Status;
-//  EFI_HANDLE              NewHandle;
-  
-  //
-  // Install instance of Apple image codec protocol for
-  // PNG files
-  //
-//  NewHandle = NULL;  // install to a new handle
-//  Status = gBS->InstallMultipleProtocolInterfaces(&NewHandle, &gAppleImageCodecProtocolGuid, &gAppleImageCodec, NULL);
-  Status      = gBS->InstallProtocolInterface (
-                                               &ImageHandle,
-                                               &gAppleImageCodecProtocolGuid,
-                                               EFI_NATIVE_INTERFACE,
-                                               (VOID *)&gAppleImageCodec
-                                               );
-
-  if (EFI_ERROR(Status)) {
-    DBG("AppleImageCodec: error installing protocol, Status = %s\n", efiStrError(Status));
-  }
-  return Status;
-}
+//EFI_STATUS
+//EFIAPI
+//AppleImageCodecEntrypoint (
+//  IN EFI_HANDLE           ImageHandle,
+//  IN EFI_SYSTEM_TABLE     *SystemTable
+//)
+//{
+//  EFI_STATUS              Status;
+////  EFI_HANDLE              NewHandle;
+//
+//  //
+//  // Install instance of Apple image codec protocol for
+//  // PNG files
+//  //
+////  NewHandle = NULL;  // install to a new handle
+////  Status = gBS->InstallMultipleProtocolInterfaces(&NewHandle, &gAppleImageCodecProtocolGuid, &gAppleImageCodec, NULL);
+//  Status      = gBS->InstallProtocolInterface (
+//                                               &ImageHandle,
+//                                               &gAppleImageCodecProtocolGuid,
+//                                               EFI_NATIVE_INTERFACE,
+//                                               (VOID *)&gAppleImageCodec
+//                                               );
+//
+//  if (EFI_ERROR(Status)) {
+//    DBG("AppleImageCodec: error installing protocol, Status = %s\n", efiStrError(Status));
+//  }
+//  return Status;
+//}