refactor: consistency

Author: ViRb3

dump.h

@@ -9,27 +9,27 @@
 
 using namespace std;
 
-mutex _mutex;
+mutex dumpMutex;
 
-BOOL FileExists(const wstring &name) {
+bool fileExists(const wstring &name) {
     if (FILE *file = _wfopen(name.c_str(), L"r")) {
         fclose(file);
-        return TRUE;
+        return true;
     } else {
-        return FALSE;
+        return false;
     }
 }
 
-BOOL GetNextFreeFilePath(wstring &path, const char *name) {
+bool getNextFreeFilePath(wstring &path, const char *name) {
     path.resize(MAX_PATH);
     if (!SHGetSpecialFolderPathW(HWND_DESKTOP, path.data(), CSIDL_DESKTOP, FALSE)) {
-        return FALSE;
+        return false;
     }
     path.resize(wcslen(path.data()));
 
     wstring fixedName(MAX_PATH, '\x00');
     mbstowcs(fixedName.data(), name, strlen(name));
-    PathCleanupSpec(NULL, fixedName.data());
+    PathCleanupSpec(nullptr, fixedName.data());
     fixedName.resize(wcslen(fixedName.data()));
 
     int initialLen = path.length();
@@ -43,31 +43,30 @@ BOOL GetNextFreeFilePath(wstring &path, const char *name) {
         }
         path += L".class";
         i++;
-    } while (FileExists(path));
-    return TRUE;
+    } while (fileExists(path));
+    return true;
 }
 
 void DoDump(const char *buf, int len) {
     if (!buf || len < 1) {
         return;
     }
-    unique_lock<mutex> lock(_mutex);
+    lock_guard<mutex> lock(dumpMutex);
     FILE *fp;
     wstring path;
     string className = GetJavaClassName(buf);
-    if (GetNextFreeFilePath(path, className.c_str())) {
+    if (getNextFreeFilePath(path, className.c_str())) {
         fp = _wfopen(path.c_str(), L"wb");
         int written = fwrite(buf, sizeof(char), len, fp);
         if (written == 0) {
-            MessageBox(NULL, "Error 2", "Error", MB_OK);
+            MessageBox(nullptr, "Error 2", "Error", MB_OK);
         } else if (written != sizeof(char) * len) {
-            MessageBox(NULL, "Error 3", "Error", MB_OK);
+            MessageBox(nullptr, "Error 3", "Error", MB_OK);
         }
         fclose(fp);
     } else {
-        MessageBox(NULL, "Error 1", "Error", MB_OK);
+        MessageBox(nullptr, "Error 1", "Error", MB_OK);
     }
-    lock.unlock();
 }
 
 #endif //VERSION_DUMP_H

hook.cpp

@@ -6,18 +6,17 @@
 
 using namespace std;
 
-typedef jclass JNICALL (*JVM_DefineClass)(JNIEnv *env, const char *name, jobject loader,
-                                          const jbyte *buf, jsize len, jobject pd);
+typedef jclass JNICALL (*sig_JVM_DefineClass)(JNIEnv *env, const char *name, jobject loader,
+                                              const jbyte *buf, jsize len, jobject pd);
+typedef jclass JNICALL(*sig_JVM_DefineClassWithSource)(JNIEnv *env, const char *name, jobject loader, const jbyte *buf,
+                                                       jsize len, jobject pd, const char *source);
+typedef jclass JNICALL (*sig_JVM_DefineClassWithSourceCond)(JNIEnv *env, const char *name,
+                                                            jobject loader, const jbyte *buf, jsize len, jobject pd,
+                                                            const char *source, jboolean verify);
 
-typedef jclass JNICALL(*JVM_DefineClassWithSource)(JNIEnv *env, const char *name, jobject loader, const jbyte *buf,
-                                                   jsize len, jobject pd, const char *source);
-
-typedef jclass JNICALL (*JVM_DefineClassWithSourceCond)(JNIEnv *env, const char *name, jobject loader, const jbyte *buf,
-                                                        jsize len, jobject pd, const char *source, jboolean verify);
-
-JVM_DefineClass orig_JVM_DefineClass = NULL;
-JVM_DefineClassWithSource orig_JVM_DefineClassWithSource = NULL;
-JVM_DefineClassWithSourceCond orig_JVM_DefineClassWithSourceCond = NULL;
+sig_JVM_DefineClass orig_JVM_DefineClass = NULL;
+sig_JVM_DefineClassWithSource orig_JVM_DefineClassWithSource = NULL;
+sig_JVM_DefineClassWithSourceCond orig_JVM_DefineClassWithSourceCond = NULL;
 
 jclass JNICALL detour_JVM_DefineClass(JNIEnv *env, const char *name, jobject loader,
                                       const jbyte *buf, jsize len, jobject pd) {
@@ -37,21 +36,21 @@ jclass JNICALL detour_JVM_DefineClassWithSourceCond(JNIEnv *env, const char *nam
     return orig_JVM_DefineClassWithSourceCond(env, name, loader, buf, len, pd, source, verify);
 }
 
-BOOL DoHook() {
+bool doHook() {
     HMODULE hJvm = LoadLibrary("jvm.dll");
     if (!hJvm) {
         return FALSE;
     }
-    orig_JVM_DefineClass = (JVM_DefineClass) GetProcAddress(hJvm, "JVM_DefineClass");
+    orig_JVM_DefineClass = (sig_JVM_DefineClass) GetProcAddress(hJvm, "JVM_DefineClass");
     if (!orig_JVM_DefineClass) {
         return FALSE;
     }
-    orig_JVM_DefineClassWithSource = (JVM_DefineClassWithSource) GetProcAddress(hJvm, "JVM_DefineClassWithSource");
+    orig_JVM_DefineClassWithSource = (sig_JVM_DefineClassWithSource) GetProcAddress(hJvm, "JVM_DefineClassWithSource");
     if (!orig_JVM_DefineClassWithSource) {
         return FALSE;
     }
-    orig_JVM_DefineClassWithSourceCond = (JVM_DefineClassWithSourceCond) GetProcAddress(hJvm,
-                                                                                        "JVM_DefineClassWithSourceCond");
+    orig_JVM_DefineClassWithSourceCond = (sig_JVM_DefineClassWithSourceCond) GetProcAddress(hJvm,
+                                                                                            "JVM_DefineClassWithSourceCond");
     if (!orig_JVM_DefineClassWithSourceCond) {
         return FALSE;
     }
@@ -62,10 +61,10 @@ BOOL DoHook() {
     return Mhook_SetHookEx(hooks, 3) == 3;
 }
 
-BOOL WINAPI DllMain(HMODULE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) {
+bool WINAPI DllMain(HMODULE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) {
     if (fdwReason == DLL_PROCESS_ATTACH) {
         SourceInit();
-        if (DoHook()) {
+        if (doHook()) {
             MessageBox(NULL, "Hooks initialized.", "Success", MB_OK);
         } else {
             MessageBox(NULL, "Something went wrong.", "Error", MB_OK);