3 files changed, 28 insertions, 1 deletions
diff --git a/EdkModulePkg/Universal/UserInterface/DriverSample/DriverSample.c b/EdkModulePkg/Universal/UserInterface/DriverSample/DriverSample.c
index c383d1660a..dd316114bf 100644
--- a/EdkModulePkg/Universal/UserInterface/DriverSample/DriverSample.c
+++ b/EdkModulePkg/Universal/UserInterface/DriverSample/DriverSample.c
@@ -242,7 +242,7 @@ Returns:
     //
     // Allocate space for creation of Buffer
     //
-    QuestionId = (UINT16) ((UINTN) (&NVStruc.DynamicCheck));
+    QuestionId = (UINT16) ((UINTN) (&NVStruc.DynamicCheck) - (UINTN) (&NVStruc));
     Status = gBS->AllocatePool (
                     EfiBootServicesData,
                     0x1000,
diff --git a/EdkModulePkg/Universal/UserInterface/DriverSample/DriverSample.dxs b/EdkModulePkg/Universal/UserInterface/DriverSample/DriverSample.dxs
new file mode 100644
index 0000000000..ae2a1c0a25
--- /dev/null
+++ b/EdkModulePkg/Universal/UserInterface/DriverSample/DriverSample.dxs
@@ -0,0 +1,26 @@
+/*++
+
+Copyright (c) 2007, Intel Corporation                                                         
+All rights reserved. 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        
+http://opensource.org/licenses/bsd-license.php                                            
+                                                                                          
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     
+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.             
+
+Module Name:
+
+  DriverSample.dxs
+
+Abstract:
+
+  Dependency expression source file.
+  
+--*/
+
+#include <DxeDepex.h>
+
+DEPENDENCY_START
+  EFI_SIMPLE_TEXT_OUT_PROTOCOL_GUID
+DEPENDENCY_END
diff --git a/EdkModulePkg/Universal/UserInterface/DriverSample/DriverSample.msa b/EdkModulePkg/Universal/UserInterface/DriverSample/DriverSample.msa
index 3aba03f8e5..cf44d1a8ab 100644
--- a/EdkModulePkg/Universal/UserInterface/DriverSample/DriverSample.msa
+++ b/EdkModulePkg/Universal/UserInterface/DriverSample/DriverSample.msa
@@ -67,6 +67,7 @@
     <Filename>DriverSample.c</Filename>
     <Filename>NVDataStruc.h</Filename>
     <Filename>DriverSample.h</Filename>
+    <Filename>DriverSample.dxs</Filename>
   </SourceFiles>
   <PackageDependencies>
     <Package PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>