From 79d8d9f78c2223bafc57b6e4743c8c219e1358c6 Mon Sep 17 00:00:00 2001 From: Graham Date: Sun, 9 Aug 2020 10:29:35 +0100 Subject: [PATCH] Refactor the SignLink and PrivilegedRequest classes Signed-off-by: Graham --- share/deob/map/signlink.yaml | 445 +++++++++++++++++------------------ 1 file changed, 222 insertions(+), 223 deletions(-) diff --git a/share/deob/map/signlink.yaml b/share/deob/map/signlink.yaml index 828dab1cc2..264f5df134 100644 --- a/share/deob/map/signlink.yaml +++ b/share/deob/map/signlink.yaml @@ -5,8 +5,8 @@ classes: signlink!ha: "Class194" signlink!kd: "Class195" signlink!le: "Interface5" - signlink!pm: "Class196" - signlink!vk: "Class197" + signlink!pm: "SignLink" + signlink!vk: "PrivilegedRequest" fields: signlink!c.a Ljava/awt/GraphicsDevice;: owner: "Class192" @@ -39,107 +39,107 @@ fields: owner: "Class195" name: "aFile1" signlink!pm.A Ljava/util/Hashtable;: - owner: "Class196" - name: "aHashtable2" + owner: "SignLink" + name: "fileCache" signlink!pm.a I: - owner: "Class196" + owner: "SignLink" name: "anInt6106" signlink!pm.b Lsignlink!kd;: - owner: "Class196" - name: "aClass195_4" + owner: "SignLink" + name: "cacheMasterIndex" signlink!pm.c Z: - owner: "Class196" - name: "aBoolean427" + owner: "SignLink" + name: "stop" signlink!pm.d Ljava/lang/String;: - owner: "Class196" - name: "aString376" + owner: "SignLink" + name: "osArch" signlink!pm.e Ljava/lang/String;: - owner: "Class196" - name: "aString379" + owner: "SignLink" + name: "homeDir" signlink!pm.f Ljava/lang/String;: - owner: "Class196" - name: "aString381" + owner: "SignLink" + name: "osNameRaw" signlink!pm.g Ljava/lang/String;: - owner: "Class196" - name: "aString378" + owner: "SignLink" + name: "javaVersion" signlink!pm.h Lsignlink!e;: - owner: "Class196" - name: "aClass193_1" + owner: "SignLink" + name: "cursorManager" signlink!pm.i Lsignlink!kd;: - owner: "Class196" - name: "aClass195_2" + owner: "SignLink" + name: "cacheData" signlink!pm.j Lsignlink!kd;: - owner: "Class196" - name: "aClass195_3" + owner: "SignLink" + name: "uid" signlink!pm.k Lsignlink!vk;: - owner: "Class196" - name: "aClass197_6" + owner: "SignLink" + name: "requestQueueHead" signlink!pm.l Ljava/lang/String;: - owner: "Class196" - name: "aString383" + owner: "SignLink" + name: "osName" signlink!pm.m Ljava/applet/Applet;: - owner: "Class196" - name: "anApplet2" + owner: "SignLink" + name: "applet" signlink!pm.n Ljava/lang/String;: - owner: "Class196" - name: "aString382" + owner: "SignLink" + name: "osVersion" signlink!pm.o Ljava/lang/String;: - owner: "Class196" - name: "aString377" + owner: "SignLink" + name: "javaVendor" signlink!pm.p Lsignlink!le;: - owner: "Class196" - name: "anInterface5_2" + owner: "SignLink" + name: "audioSource" signlink!pm.q Ljava/lang/Thread;: - owner: "Class196" - name: "aThread3" + owner: "SignLink" + name: "thread" signlink!pm.r Ljava/lang/reflect/Method;: - owner: "Class196" - name: "aMethod1" + owner: "SignLink" + name: "setFocusCycleRoot" signlink!pm.s J: - owner: "Class196" - name: "aLong218" + owner: "SignLink" + name: "breakConnectionsUntil" signlink!pm.t Ljava/lang/reflect/Method;: - owner: "Class196" - name: "aMethod2" + owner: "SignLink" + name: "setFocusTraversalKeysEnabled" signlink!pm.u [Lsignlink!kd;: - owner: "Class196" - name: "aClass195Array1" + owner: "SignLink" + name: "cacheIndexes" signlink!pm.v Ljava/awt/EventQueue;: - owner: "Class196" - name: "anEventQueue1" + owner: "SignLink" + name: "eventQueue" signlink!pm.w Ljava/lang/String;: - owner: "Class196" - name: "aString380" + owner: "SignLink" + name: "cacheSubDir" signlink!pm.x I: - owner: "Class196" - name: "anInt6105" + owner: "SignLink" + name: "cacheId" signlink!pm.y Lsignlink!vk;: - owner: "Class196" - name: "aClass197_7" + owner: "SignLink" + name: "requestQueueTail" signlink!pm.z Lsignlink!c;: - owner: "Class196" - name: "aClass192_1" + owner: "SignLink" + name: "fullScreenManager" signlink!vk.a Ljava/lang/Object;: - owner: "Class197" - name: "anObject7" + owner: "PrivilegedRequest" + name: "objectArg" signlink!vk.b I: - owner: "Class197" - name: "anInt6109" + owner: "PrivilegedRequest" + name: "intArg1" signlink!vk.c Ljava/lang/Object;: - owner: "Class197" - name: "anObject6" + owner: "PrivilegedRequest" + name: "result" signlink!vk.d Lsignlink!vk;: - owner: "Class197" - name: "aClass197_8" + owner: "PrivilegedRequest" + name: "next" signlink!vk.e I: - owner: "Class197" - name: "anInt6107" + owner: "PrivilegedRequest" + name: "status" signlink!vk.f I: - owner: "Class197" - name: "anInt6108" + owner: "PrivilegedRequest" + name: "type" signlink!vk.g I: - owner: "Class197" - name: "anInt6110" + owner: "PrivilegedRequest" + name: "intArg2" methods: signlink!c. ()V: owner: "Class192" @@ -319,238 +319,237 @@ methods: 0: "arg0" locals: {} signlink!pm. (Ljava/applet/Applet;ILjava/lang/String;I)V: - owner: "Class196" + owner: "SignLink" name: "" arguments: - 0: "arg0" - 1: "arg1" - 2: "arg2" - 3: "arg3" + 0: "applet" + 1: "cacheId" + 2: "cacheSubDir" + 3: "archiveCount" locals: - 43: "local43" - 48: "local48" - 59: "local59" - 67: "local67" - 85: "local85" - 95: "local95" - 123: "local123" - 151: "local151" - 198: "local198" - 237: "local237" - 244: "local244" - 247: "local247" - 250: "local250" - 262: "local262" - 268: "local268" + 43: "ex" + 48: "ex" + 59: "ex" + 67: "ex" + 85: "ex" + 95: "ex" + 123: "ex" + 151: "ex" + 198: "i" + 237: "ex" + 244: "ex" + 247: "rootGroup" + 250: "group" + 262: "threads" + 268: "i" signlink!pm.a (B)V: - owner: "Class196" - name: "method4882" + owner: "SignLink" + name: "stop" arguments: {} locals: - 21: "local21" - 31: "local31" - 49: "local49" - 56: "local56" - 80: "local80" - 91: "local91" + 21: "ex" + 31: "ex" + 49: "ex" + 56: "i" + 80: "ex" + 91: "ex" signlink!pm.a (BI)Lsignlink!vk;: - owner: "Class196" - name: "method4863" + owner: "SignLink" + name: "getReverseDns" arguments: - 1: "arg0" + 1: "ip" locals: {} signlink!pm.a (BLjava/awt/Point;I[IILjava/awt/Component;)Lsignlink!vk;: - owner: "Class196" - name: "method4862" + owner: "SignLink" + name: "setCursor" arguments: - 1: "arg0" - 2: "arg1" - 3: "arg2" - 4: "arg3" - 5: "arg4" + 5: "component" + 4: "width" + 2: "height" + 3: "pixels" + 1: "hotPoint" locals: {} signlink!pm.a (I)Lsignlink!vk;: - owner: "Class196" - name: "method4872" + owner: "SignLink" + name: "getDisplayModes" arguments: {} locals: {} signlink!pm.a (IIIBI)Lsignlink!vk;: - owner: "Class196" - name: "method4884" + owner: "SignLink" + name: "enterFullScreen" arguments: 1: "arg0" 2: "arg1" 4: "arg2" locals: {} signlink!pm.a (IILjava/lang/Object;IB)Lsignlink!vk;: - owner: "Class196" - name: "method4866" + owner: "SignLink" + name: "enqueue" arguments: - 0: "arg0" - 1: "arg1" - 2: "arg2" - 3: "arg3" + 0: "type" + 3: "intArg1" + 1: "intArg2" + 2: "objectArg" locals: - 3: "local3" + 3: "request" signlink!pm.a (ILjava/lang/Class;)Lsignlink!vk;: - owner: "Class196" - name: "method4878" + owner: "SignLink" + name: "loadGlNatives" arguments: - 1: "arg0" + 1: "clazz" locals: {} signlink!pm.a (ILjava/lang/String;I)Lsignlink!vk;: - owner: "Class196" - name: "method4887" + owner: "SignLink" + name: "openSocket" arguments: - 1: "arg0" - 2: "arg1" + 1: "hostname" + 2: "port" locals: {} signlink!pm.a (IZLjava/lang/Runnable;)Lsignlink!vk;: - owner: "Class196" - name: "method4883" + owner: "SignLink" + name: "startThread" arguments: - 0: "arg0" - 2: "arg1" + 2: "runnable" + 0: "priority" locals: {} signlink!pm.a (Ljava/awt/Frame;Z)Lsignlink!vk;: - owner: "Class196" - name: "method4871" + owner: "SignLink" + name: "exitFullScreen" arguments: - 0: "arg0" + 0: "frame" locals: {} signlink!pm.a (Ljava/lang/Class;I)Lsignlink!vk;: - owner: "Class196" - name: "method4867" + owner: "SignLink" + name: "unloadNatives" arguments: - 0: "arg0" + 0: "clazz" locals: {} signlink!pm.a (Ljava/lang/String;B)Lsignlink!vk;: - owner: "Class196" - name: "method4864" + owner: "SignLink" + name: "openUrl" arguments: - 0: "arg0" + 0: "url" locals: {} signlink!pm.a (Ljava/lang/String;BLjava/lang/Class;[Ljava/lang/Class;)Lsignlink!vk;: - owner: "Class196" - name: "method4875" + owner: "SignLink" + name: "getDeclaredMethod" arguments: - 0: "arg0" - 2: "arg1" - 3: "arg2" + 2: "clazz" + 0: "name" + 3: "parameterTypes" locals: {} signlink!pm.a (Ljava/lang/String;ILjava/lang/String;Z)Ljava/io/File;: - owner: "Class196" - name: "method4873" + owner: "SignLink" + name: "getFile" arguments: - 0: "arg0" - 1: "arg1" - 2: "arg2" + 0: "name" + 1: "storeId" + 2: "cacheSubDir" locals: - 10: "local10" - 49: "local49" - 74: "local74" - 76: "local76" - 83: "local83" - 93: "local93" - 131: "local131" - 133: "local133" - 138: "local138" - 151: "local151" - 215: "local215" - 218: "local218" - 237: "local237" - 246: "local246" + 10: "cachedFile" + 49: "cacheLocations" + 74: "cacheDirs" + 76: "attempt" + 83: "i" + 93: "j" + 131: "path" + 133: "randomAccessFile" + 138: "file" + 151: "cacheLocation" + 218: "firstByte" + 237: "ex" + 246: "closeEx" signlink!pm.a (Ljava/net/URL;I)Lsignlink!vk;: - owner: "Class196" - name: "method4880" + owner: "SignLink" + name: "openUrlStream" arguments: - 0: "arg0" + 0: "url" locals: {} signlink!pm.a (ZLjava/lang/String;Ljava/lang/Class;)Lsignlink!vk;: - owner: "Class196" - name: "method4885" + owner: "SignLink" + name: "getDeclaredField" arguments: - 1: "arg0" - 2: "arg1" + 2: "clazz" + 1: "name" locals: {} signlink!pm.b (I)V: - owner: "Class196" - name: "method4874" + owner: "SignLink" + name: "breakConnection" arguments: {} locals: {} signlink!pm.b (Ljava/lang/Class;I)Lsignlink!vk;: - owner: "Class196" - name: "method4865" + owner: "SignLink" + name: "loadMiscNatives" arguments: - 0: "arg0" + 0: "clazz" locals: {} signlink!pm.b (Ljava/lang/String;B)Lsignlink!vk;: - owner: "Class196" - name: "method4881" + owner: "SignLink" + name: "openPreferences" arguments: - 0: "arg0" + 0: "cacheSubDir" locals: {} signlink!pm.c (B)Z: - owner: "Class196" - name: "method4879" + owner: "SignLink" + name: "isFullScreenSupported" arguments: {} locals: {} signlink!pm.c (Ljava/lang/String;B)Lsignlink!kd;: - owner: "Class196" - name: "method4870" + owner: "SignLink" + name: "openPreferencesInternal" arguments: - 0: "arg0" + 0: "cacheSubDir" locals: - 34: "local34" - 41: "local41" - 49: "local49" - 82: "local82" + 34: "cacheLocations" + 41: "i" + 49: "cacheLocation" + 82: "ex" signlink!pm.d (B)Lsignlink!le;: - owner: "Class196" - name: "method4877" + owner: "SignLink" + name: "getAudioSource" arguments: {} locals: {} signlink!pm.run ()V: - owner: "Class196" + owner: "SignLink" name: "run" arguments: {} locals: - 16: "local16" - 34: "local34" - 46: "local46" - 93: "local93" - 126: "local126" - 129: "local129" - 188: "local188" - 214: "local214" + 16: "request" + 34: "ex" + 46: "type" + 93: "args" + 126: "transferable" + 129: "clipboard" + 188: "ip" + 214: "frame" 273: "local273" 276: "local276" - 308: "local308" - 323: "local323" - 325: "local325" - 362: "local362" - 386: "local386" - 388: "local388" - 394: "local394" - 460: "local460" + 308: "url" + 323: "safeChars" + 325: "i" + 362: "ex" + 386: "loadParameters" + 388: "runtime" + 394: "load0" + 460: "ex" 469: "local469" 495: "local495" 505: "local505" - 516: "local516" - 520: "local520" - 529: "local529" - 540: "local540" - 542: "local542" - 554: "local554" - 561: "local561" - 578: "local578" - 610: "local610" - 612: "local612" - 623: "local623" - 650: "local650" - 690: "local690" - 797: "local797" - 808: "local808" - 843: "local843" - 881: "local881" - 884: "local884" + 516: "cacheSubDir" + 520: "preferences" + 529: "nativeLibraries" + 540: "vector" + 542: "i" + 554: "library" + 561: "finalize" + 578: "handle" + 610: "loadParameters" + 612: "runtime" + 623: "loadLibrary0" + 650: "load0" + 690: "driHack" + 797: "clipboard" + 808: "args" + 843: "thread" + 881: "ex" + 884: "ex"