feat(PE): sync to core changes

Author: Dax89

mz/pe/pe.c

@@ -6,6 +6,7 @@
 #include "pe/dirs/exports.h"
 #include "pe/dirs/imports.h"
 #include "pe/dirs/resources.h"
+#include "pe/vb/decompiler.h"
 #include <string.h>
 
 static bool pe_parse(RDLoader* ldr, const RDLoaderRequest* req) {
@@ -176,6 +177,16 @@ static bool pe_load(RDLoader* ldr, RDContext* ctx) {
         rd_set_entry_point(ctx, pe_norm(ctx, pe, ep), NULL);
 
     pe->classification = pe_classify(pe, ctx);
+
+    switch(pe->classification) {
+        case PE_CLASS_VISUAL_BASIC_5:
+        case PE_CLASS_VISUAL_BASIC_6:
+            rd_analyzer_enable(ctx, PE_VB_DECOMPILER_ID);
+            break;
+
+        default: break;
+    }
+
     pe_classify_print(pe->classification);
     return true;
 }

mz/pe/vb/decompiler.c

@@ -1,5 +1,4 @@
 #include "decompiler.h"
-#include "pe/format.h"
 #include "pe/vb/components.h"
 #include "pe/vb/format.h"
 #include <string.h>
@@ -163,19 +162,6 @@ static bool _pe_vb_decompiler_obj(RDAddress address, RDReader* r,
     return !rd_reader_has_error(r);
 }
 
-static bool pe_vb_decompiler_is_enabled(RDContext* ctx,
-                                        const struct RDAnalyzerPlugin* plugin) {
-    RD_UNUSED(plugin);
-
-    const RDLoaderPlugin* lplugin = rd_get_loader_plugin(ctx);
-    if(strcmp(lplugin->id, PE_PLUGIN_ID) != 0) return false;
-
-    PEFormat* pe = (PEFormat*)rd_get_loader(ctx);
-
-    return pe && (pe->classification == PE_CLASS_VISUAL_BASIC_5 ||
-                  pe->classification == PE_CLASS_VISUAL_BASIC_6);
-}
-
 static void pe_vb_decompiler_execute(RDContext* ctx) {
     RDAddress ep;
     if(!rd_get_entry_point(ctx, &ep)) return;
@@ -260,10 +246,9 @@ static void pe_vb_decompiler_execute(RDContext* ctx) {
 
 const RDAnalyzerPlugin PE_VB_DECOMPILER = {
     .level = RD_API_LEVEL,
-    .id = "win_pe_vb",
+    .id = PE_VB_DECOMPILER_ID,
     .name = "Decompile VB5/6",
     .flags = RD_AF_SELECTED | RD_AF_RUNONCE,
     .order = 1000,
-    .is_enabled = pe_vb_decompiler_is_enabled,
     .execute = pe_vb_decompiler_execute,
 };

mz/pe/vb/decompiler.h

@@ -2,4 +2,6 @@
 
 #include <redasm/redasm.h>
 
+#define PE_VB_DECOMPILER_ID "win_pe_vb"
+
 extern const RDAnalyzerPlugin PE_VB_DECOMPILER;