From 0e9d14c4e7c0373272dbbf258aa269886f27852d Mon Sep 17 00:00:00 2001
From: qhuang8 <qhuang8@6f19259b-4bc3-4df7-8a09-765794883524>
Date: Thu, 21 Sep 2006 02:03:47 +0000
Subject: [PATCH 1/1] Add EntryPointLib class once ImageEntryPoint is found in
 inf file. Enhance to recognize function-invocation to not include protocol
 calling.

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@1581 6f19259b-4bc3-4df7-8a09-765794883524
---
 Tools/Source/MigrationTools/org/tianocore/migration/Func.java  | 3 +--
 .../MigrationTools/org/tianocore/migration/ModuleReader.java   | 3 ++-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Tools/Source/MigrationTools/org/tianocore/migration/Func.java b/Tools/Source/MigrationTools/org/tianocore/migration/Func.java
index f00eac4e2a..1858066840 100644
--- a/Tools/Source/MigrationTools/org/tianocore/migration/Func.java
+++ b/Tools/Source/MigrationTools/org/tianocore/migration/Func.java
@@ -33,8 +33,7 @@ public class Func {
     public String r9libname;
 
     public static Pattern ptnbrace = Pattern.compile("\\{[^\\{\\}]*\\}",Pattern.MULTILINE);
-    //public static Pattern ptnfuncc = Pattern.compile("([a-zA-Z_]\\w*)\\s*\\([^\\)\\(]*\\)",Pattern.MULTILINE);
-    public static Pattern ptnfuncc = Pattern.compile("([a-zA-Z_]\\w*)\\s*\\(",Pattern.MULTILINE);
+    public static Pattern ptnfuncc = Pattern.compile("(?<!->)([a-zA-Z_]\\w*)\\s*\\(",Pattern.MULTILINE);
     public static Pattern ptnfuncd = Pattern.compile("([a-zA-Z_]\\w*)\\s*\\([^\\)\\(]*\\)\\s*@",Pattern.MULTILINE);
     public static Pattern ptnlowcase = Pattern.compile("[a-z]");                // must be removed
     
diff --git a/Tools/Source/MigrationTools/org/tianocore/migration/ModuleReader.java b/Tools/Source/MigrationTools/org/tianocore/migration/ModuleReader.java
index 383353c66b..41c27a680f 100644
--- a/Tools/Source/MigrationTools/org/tianocore/migration/ModuleReader.java
+++ b/Tools/Source/MigrationTools/org/tianocore/migration/ModuleReader.java
@@ -102,6 +102,7 @@ public final class ModuleReader implements Common.ForDoAll {
                 while (mtrinfequation.find()) {
                     if (mtrinfequation.group(1).matches("IMAGE_ENTRY_POINT")) {
                         mi.entrypoint = mtrinfequation.group(2);
+                        mi.hashrequiredr9libs.add("EntryPointLib");
                     }
                     if (mtrinfequation.group(1).matches("DPX_SOURCE")) {
                         if (!mi.localmodulesources.contains(mtrinfequation.group(2))) {
@@ -119,7 +120,7 @@ public final class ModuleReader implements Common.ForDoAll {
                     }
                 }
             }
-            if (mtrsection.group(1).matches("includes.common")) {
+            if (mtrsection.group(1).matches("includes.")) {
                 mtrfilename = ptnfilename.matcher(mtrsection.group(2));
                 while (mtrfilename.find()) {
                 	mi.infincludes.add(mtrfilename.group());
-- 
2.39.2