fix fieldsearch and don't lookup field static addresses for generic classes

Author: cheat-engine

Cheat Engine/bin/autorun/dotnetinfo.lua

@@ -182,12 +182,19 @@ local function getClassMethods(Class)
 end
 
 local function getClassFields(Class)
+  if CurrentProcess~=getOpenedProcessID() then return nil end
+  
   local r={}
 
   local i
-  if Class.Image.Domain.Control==CONTROL_MONO then
-    local StaticFieldAddress=mono_class_getStaticFieldAddress(0,Class.Handle)
-  
+  if Class.Image.Domain.Control==CONTROL_MONO then  
+    local isGeneric=mono_class_isgeneric(Class.Handle)
+    local StaticFieldAddress=nil
+    
+    if isGeneric==false then      
+      StaticFieldAddress=mono_class_getStaticFieldAddress(0,Class.Handle)
+    end
+         
     local fields=mono_class_enumFields(Class.Handle, true)
     for i=1,#fields do
       local e={}
@@ -198,8 +205,10 @@ local function getClassFields(Class)
       e.Offset=fields[i].offset
       e.Static=fields[i].isStatic
       e.Const=fields[i].isConst
-      if e.Static and StaticFieldAddress and StaticFieldAddress~=0 then
-        e.Address=StaticFieldAddress+e.Offset        
+      if isGeneric==false then
+        if e.Static and StaticFieldAddress and StaticFieldAddress~=0 then
+          e.Address=StaticFieldAddress+e.Offset        
+        end
       end
 
 
@@ -350,7 +359,7 @@ end
 
 local function getDomains()  
   DataSource.Domains={}
-  
+    
   if monopipe then
     local mr=mono_enumDomains()  
     local i
@@ -1813,12 +1822,14 @@ end
 function miDotNetInfoClick(sender)
   --print("miDotNetInfoClick")
   --in case of a double case scenario where there's both .net and mono, go for net first if the user did not activate mono explicitly 
-  if (DataSource.DotNetDataCollector==nil) or (CurrentProcess~=getOpenedProcessID) then
+  if (DataSource.DotNetDataCollector==nil) or (CurrentProcess~=getOpenedProcessID()) then
     --print("getting getDotNetDataCollector")
     DataSource={}  
     DataSource.DotNetDataCollector=getDotNetDataCollector()    
   end
 
+  CurrentProcess=getOpenedProcessID()
+  
 
   --print("miDotNetInfoClick 2")
   if miMonoTopMenuItem and miMonoTopMenuItem.miMonoActivate.Visible and (monopipe==nil)  then

Cheat Engine/bin/autorun/dotnetsearch.lua

@@ -205,37 +205,42 @@ function spawnDotNetSearchDialog(DataSource, frmDotNetInfo, searchtype)
                     end)
                   end
                 elseif searchtype==1 then
-                  --field search
-                  if DataSource.Domains[i].Images[j].Classes[k].Fields==nil then
-                    getClassFields(DataSource.Domains[i].Images[j].Classes[k])                                        
+                  --field search  
+                  if DataSource.Domains[i].Images[j].Classes[k].Fields==nil then                  
+                    DataSource.getClassFields(DataSource.Domains[i].Images[j].Classes[k])
                   end
 
-                  for l=1,#DataSource.Domains[i].Images[j].Classes[k].Fields do
-                    local name=DataSource.Domains[i].Images[j].Classes[k].Fields[l].Name
-                    if not caseSensitive then 
-                      name=name:upper()
-                    end
-                    
-                    if name:find(searchInput) then
-                      synchronize(function()
-                        if t.Terminated then return end
-                        --add to the list
-                        local li=frmSearch.lvResults.Items.add()
-                        li.Caption=DataSource.Domains[i].Images[j].FileName
-                        li.SubItems.add(DataSource.Domains[i].Images[j].Classes[k].Name)
-                        li.SubItems.add(DataSource.Domains[i].Images[j].Classes[k].Fields[l].Name)
-                        
-                        local e={}
-                        e.DomainIndex=i
-                        e.ImageIndex=j
-                        e.ClassIndex=k
-                        e.FieldIndex=l
-                        searchresults[li.Index+1]=e                      
-                      end)                      
+                  --print("parsing field list")
+                  if DataSource.Domains[i].Images[j].Classes[k].Fields then
+                    for l=1,#DataSource.Domains[i].Images[j].Classes[k].Fields do
+                      local name=DataSource.Domains[i].Images[j].Classes[k].Fields[l].Name
+                      if not caseSensitive then 
+                        name=name:upper()
+                      end
 
+                      if name:find(searchInput) then
+                        synchronize(function()
+                          if t.Terminated then return end
+                          --add to the list
+                          local li=frmSearch.lvResults.Items.add()
+                          li.Caption=DataSource.Domains[i].Images[j].FileName
+                          li.SubItems.add(DataSource.Domains[i].Images[j].Classes[k].Name)
+                          li.SubItems.add(DataSource.Domains[i].Images[j].Classes[k].Fields[l].Name)
+                          
+                          local e={}
+                          e.DomainIndex=i
+                          e.ImageIndex=j
+                          e.ClassIndex=k
+                          e.FieldIndex=l
+                          searchresults[li.Index+1]=e                      
+                        end)                      
+                        
+                      end
                     end
                   end
 
+                  
+                  
                 elseif searchtype==2 then
                   --method search
                   if DataSource.Domains[i].Images[j].Classes[k].Methods==nil then
@@ -270,6 +275,7 @@ function spawnDotNetSearchDialog(DataSource, frmDotNetInfo, searchtype)
                     end 
                   end                  
                 else
+                  print("wtf")
                   return --wtf                
                 end
 

Cheat Engine/bin/autorun/monoscript.lua

@@ -1175,6 +1175,11 @@ function mono_image_enumClasses(image)
 end
 
 function mono_class_isgeneric(class)
+  if class==nil then
+    print("mono_class_isgeneric with null pointer: ")
+    print(debug.traceback())
+    return nil
+  end
   local result=''
   monopipe.lock()
   monopipe.writeByte(MONOCMD_ISCLASSGENERIC)