X-Git-Url: https://git.proxmox.com/?a=blobdiff_plain;f=MdeModulePkg%2FUniversal%2FSetupBrowserDxe%2FExpression.c;h=e717196dd4a29b33218cc0dac43c75640680bcfe;hb=07d7dbaeba98b0f1b567cdb7d26de12aeae49b9a;hp=27be635e9c7c1b6e21b0c07e530c044564585a8b;hpb=33efdf51b0f123259dec0bfcff49af189b46c411;p=mirror_edk2.git

diff --git a/MdeModulePkg/Universal/SetupBrowserDxe/Expression.c b/MdeModulePkg/Universal/SetupBrowserDxe/Expression.c
index 27be635e9c..e717196dd4 100644
--- a/MdeModulePkg/Universal/SetupBrowserDxe/Expression.c
+++ b/MdeModulePkg/Universal/SetupBrowserDxe/Expression.c
@@ -1,7 +1,7 @@
 /** @file
 Utility functions for expression evaluation.
 
-Copyright (c) 2007 - 2012, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2007 - 2013, Intel Corporation. All rights reserved.<BR>
 This program and the accompanying materials
 are licensed and made available under the terms and conditions of the BSD License
 which accompanies this distribution.  The full text of the license may be found at
@@ -787,7 +787,7 @@ FORM_BROWSER_FORM *
 IdToForm (
   IN FORM_BROWSER_FORMSET  *FormSet,
   IN UINT16                FormId
-)
+  )
 {
   LIST_ENTRY         *Link;
   FORM_BROWSER_FORM  *Form;
@@ -1071,7 +1071,7 @@ IfrToString (
       CopyMem (TmpBuf, Value.Buffer, Value.BufferLen * sizeof (CHAR16));
       PrintFormat = L"%s";  
     }
-    UnicodeSPrint (Buffer, MAXIMUM_VALUE_CHARACTERS, PrintFormat, Value.Buffer);  
+    UnicodeSPrint (Buffer, sizeof (Buffer), PrintFormat, Value.Buffer);  
     String = Buffer; 
     FreePool (TmpBuf);
     FreePool (Value.Buffer);
@@ -1446,7 +1446,6 @@ IfrMid (
   UINTN          Base;
   UINTN          Length;
   CHAR16         *SubString;
-  UINT8          *Buffer;
   UINT16         BufferLen;
 
   ZeroMem (Value, sizeof (Value));
@@ -1502,7 +1501,6 @@ IfrMid (
 
     FreePool (String);
   } else {
-    Buffer    = Value[2].Buffer;
     BufferLen = Value[2].BufferLen;
     
     Result->Type = EFI_IFR_TYPE_BUFFER;
@@ -2038,11 +2036,7 @@ GetQuestionValueFromForm (
   )
 {
   EFI_STATUS                   Status;
-  EFI_HANDLE                   DriverHandle;
-  EFI_HANDLE                   Handle;
-  EFI_HII_HANDLE               *HiiHandles;
   EFI_HII_HANDLE               HiiHandle;
-  UINTN                        Index;
   FORM_BROWSER_STATEMENT       *Question;
   FORM_BROWSER_FORMSET         *FormSet;
   FORM_BROWSER_FORM            *Form;
@@ -2056,7 +2050,6 @@ GetQuestionValueFromForm (
           (DevicePath == NULL && InputHiiHandle != NULL) );
 
   GetTheVal    = TRUE;
-  DriverHandle = NULL;
   HiiHandle    = NULL;
   Question     = NULL;
   Form         = NULL;
@@ -2065,38 +2058,10 @@ GetQuestionValueFromForm (
   // Get HiiHandle.
   //
   if (DevicePath != NULL) {
-    //
-    // 1. Get Driver handle.
-    //
-    Status = gBS->LocateDevicePath (
-                    &gEfiDevicePathProtocolGuid,
-                    &DevicePath,
-                    &DriverHandle
-                    );
-    if (EFI_ERROR (Status) || (DriverHandle == NULL)) {
+    HiiHandle = DevicePathToHiiHandle (DevicePath, FormSetGuid);
+    if (HiiHandle == NULL) {
       return FALSE;
     }
-
-    //
-    // 2. Get Hii handle
-    //
-    HiiHandles = HiiGetHiiHandles (NULL);
-    if (HiiHandles == NULL) {
-      return FALSE;
-    }
-
-    for (Index = 0; HiiHandles[Index] != NULL; Index++) {
-      Status = mHiiDatabase->GetPackageListHandle (
-                               mHiiDatabase,
-                               HiiHandles[Index],
-                               &Handle
-                               );
-      if (!EFI_ERROR (Status) && (Handle == DriverHandle)) {
-        HiiHandle = HiiHandles[Index];
-        break;
-      }
-    }
-    FreePool (HiiHandles);
   } else {
     HiiHandle = InputHiiHandle;
   } 
@@ -2107,7 +2072,7 @@ GetQuestionValueFromForm (
   //
   FormSet = AllocateZeroPool (sizeof (FORM_BROWSER_FORMSET));
   ASSERT (FormSet != NULL);
-  Status = InitializeFormSet(HiiHandle, FormSetGuid, FormSet, FALSE);
+  Status = InitializeFormSet(HiiHandle, FormSetGuid, FormSet);
   if (EFI_ERROR (Status)) {
     GetTheVal = FALSE;
     goto Done;
@@ -2470,22 +2435,21 @@ EvaluateExpression (
       }
 
       if (OpCode->DevicePath != 0) {
-        StrPtr = GetToken (OpCode->DevicePath, FormSet->HiiHandle);
-        if (StrPtr == NULL) {
-          Value->Type = EFI_IFR_TYPE_UNDEFINED;
-          break;
-        }
-
-        DevicePath = ConvertDevicePathFromText(StrPtr);
+        Value->Type = EFI_IFR_TYPE_UNDEFINED;
 
-        if (!GetQuestionValueFromForm(DevicePath, NULL, &OpCode->Guid, Value->Value.u16, &QuestionVal)){
-          Value->Type = EFI_IFR_TYPE_UNDEFINED;
-        } else {
-          Value = &QuestionVal;
+        StrPtr = GetToken (OpCode->DevicePath, FormSet->HiiHandle);
+        if (StrPtr != NULL && mPathFromText != NULL) {
+          DevicePath = mPathFromText->ConvertTextToDevicePath(StrPtr);
+          if (DevicePath != NULL && GetQuestionValueFromForm(DevicePath, NULL, &OpCode->Guid, Value->Value.u16, &QuestionVal)) {
+            Value = &QuestionVal;
+          }
+          if (DevicePath != NULL) {
+            FreePool (DevicePath);
+          }
         }
 
-        if (DevicePath != NULL) {
-          FreePool (DevicePath);
+        if (StrPtr != NULL) {
+          FreePool (StrPtr);
         }
       } else if (CompareGuid (&OpCode->Guid, &gZeroGuid) != 0) {
         if (!GetQuestionValueFromForm(NULL, FormSet->HiiHandle, &OpCode->Guid, Value->Value.u16, &QuestionVal)){
@@ -2803,7 +2767,7 @@ EvaluateExpression (
             for (Index = 0; Index < OpCode->ValueWidth; Index ++, TempBuffer --) {
               StrPtr += UnicodeValueToString (StrPtr, PREFIX_ZERO | RADIX_HEX, *TempBuffer, 2);
             }
-            Status = SetValueByName (OpCode->VarStorage, OpCode->ValueName, NameValue, GetSetValueWithEditBuffer);
+            Status = SetValueByName (OpCode->VarStorage, OpCode->ValueName, NameValue, GetSetValueWithEditBuffer, NULL);
             FreePool (NameValue);
             if (!EFI_ERROR (Status)) {
               Data1.Value.b = TRUE;