monocul.us/de4dot-cex
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix problem where some WinForm property names weren't restored

Browse Source
This commit is contained in:
de4dot 2012-03-18 12:52:55 +01:00
parent 4b81854ea5
commit 353673811b
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
de4dot.code/renamer/TypeInfo.cs
View File

@ -469,8 +469,6 @@ namespace de4dot.code.renamer {
if (calledMethodDef == null)
continue;
fieldRef = getFieldReference(calledMethodDef.MethodDefinition);
if (fieldRef == null)
continue;
var propDef = calledMethodDef.Property;
if (propDef == null)
@ -510,6 +508,17 @@ namespace de4dot.code.renamer {
if (ldfld == null || ldfld.OpCode.Code != Code.Ldfld)
return null;
var ret = DotNetUtils.getInstruction(instructions, ref index);
if (ret == null)
return null;
if (DotNetUtils.isStloc(ret)) {
var local = DotNetUtils.getLocalVar(method.Body.Variables, ret);
ret = DotNetUtils.getInstruction(instructions, ref index);
if (ret == null || !DotNetUtils.isLdloc(ret))
return null;
if (DotNetUtils.getLocalVar(method.Body.Variables, ret) != local)
return null;
ret = DotNetUtils.getInstruction(instructions, ref index);
}
if (ret == null || ret.OpCode.Code != Code.Ret)
return null;
return ldfld.Operand as FieldReference;