few changes, launch game option in installer

Author: InvoxiPlayGames

.gitignore

@@ -2,6 +2,7 @@
 *.dSYM
 assets
 release
+staging
 launcherv2
 natives
 AppBundleExe

installer/Makefile

@@ -17,7 +17,7 @@ LDFLAGS =
 
 FRAMEWORKS = -framework CoreFoundation -framework Foundation
 
-SOURCES = installer.c utilities.c
+SOURCES = installer.c utilities.c native.m
 
 all: $(TARGET)
 

installer/installer.c

@@ -23,13 +23,16 @@ typedef enum _nextaction_t {
     A_StartVerify,
     A_StartUninstall,
     A_ClearNavmesh,
+    A_LaunchGame,
 } nextaction_t;
 
+int launch_game_native(const char *path);
+
 void StartTerminalWindow() {
     printf(TmTitle "BO3MacFix Installer" TmEnd);
     printf(TmClear TmStartPos);
 
-    printf(TmBold TmUnderline "BO3MacFix Installer v1.0\n\n" TmReset);
+    printf(TmBold TmUnderline "BO3MacFix Installer v1.2\n\n" TmReset);
 }
 
 nextaction_t Error_NotInRightDirectory() {
@@ -50,13 +53,16 @@ nextaction_t MainMenuUninstalled() {
     StartTerminalWindow();
 
     printf("1) Install BO3MacFix\n\n");
+    printf("9) Launch game with fix\n\n");
     printf("0) Exit\n\n");
 
     printf("Select an option: ");
 
     char c = (char)getchar();
     if (c == '1')
         return A_StartInstall;
+    if (c == '9')
+        return A_LaunchGame;
     if (c == '0')
         return A_Exit;
     return A_ShowMainMenuUninstalled;
@@ -66,19 +72,20 @@ nextaction_t MainMenuInstalled() {
     StartTerminalWindow();
 
     //printf("1) Verify BO3MacFix Install\n");
-    printf("1) Uninstall BO3MacFix\n\n");
-    //printf("3) Clear Workshop Navmeshes\n\n");
+    printf("1) Update/reinstall BO3MacFix\n");
+    printf("2) Uninstall BO3MacFix\n\n");
+    printf("9) Launch game with fix\n\n");
     printf("0) Exit\n\n");
 
     printf("Select an option: ");
 
     char c = (char)getchar();
-    //if (c == '1')
-    //    return A_StartVerify;
     if (c == '1')
+        return A_StartVerify;
+    if (c == '2')
         return A_StartUninstall;
-    //if (c == '3')
-    //    return A_ClearNavmesh;
+    if (c == '9')
+        return A_LaunchGame;
     if (c == '0')
         return A_Exit;
     return A_ShowMainMenuInstalled;
@@ -170,6 +177,86 @@ nextaction_t StartInstall() {
     return A_ShowMainMenuInstalled;
 }
 
+nextaction_t StartVerify() {
+    char sourcePath[PATH_MAX] = {0};
+    char targetPath[PATH_MAX] = {0};
+
+    StartTerminalWindow();
+
+    printf("Reinstalling BO3MacFix...\n\n");
+
+    printf("Copying new launcher...");
+    memset(sourcePath, 0, PATH_MAX);
+    strncat(sourcePath, baseDirPath, PATH_MAX);
+    strncat(sourcePath, "AppBundleExe", PATH_MAX);
+    memset(targetPath, 0, PATH_MAX);
+    strncat(targetPath, baseDirPath, PATH_MAX);
+    strncat(targetPath, "../CoDBlkOps3.app/Contents/MacOS/AppBundleExe", PATH_MAX);
+    int r = copyfile(sourcePath, targetPath, 0, COPYFILE_ALL);
+    if (r != 0) {
+        printf("failed (%i, %i).\n\n", r, errno);
+        printf("Press ENTER to continue.\n");
+        printf("You might have to repair game files in Steam...\n");
+        getchar();
+        return A_ShowMainMenuUninstalled;
+    }
+    printf("done!\n");
+
+    printf("Fixing permissions on launcher...");
+    memset(sourcePath, 0, PATH_MAX);
+    strncat(sourcePath, baseDirPath, PATH_MAX);
+    strncat(sourcePath, "../CoDBlkOps3.app/Contents/MacOS/AppBundleExe", PATH_MAX);
+    if (chmod(sourcePath, 0755) != 0) { // rwxr-xr-x
+        printf("failed (chmod: %i).\n\n", errno);
+        printf("Press ENTER to continue.\n");
+        printf("You might have to repair game files in Steam...\n");
+        getchar();
+        return A_ShowMainMenuUninstalled;
+    }
+    if (removexattr(sourcePath, "com.apple.quarantine", 0) != 0 && errno != ENOATTR) {
+        printf("failed (xattr: %i).\n\n", errno);
+        printf("Press ENTER to continue.\n");
+        printf("You might have to repair game files in Steam...\n");
+        getchar();
+        return A_ShowMainMenuUninstalled;
+    }
+    printf("done!\n");
+
+    printf("Fixing permissions on BO3MacFix...");
+    memset(sourcePath, 0, PATH_MAX);
+    strncat(sourcePath, baseDirPath, PATH_MAX);
+    strncat(sourcePath, "BO3MacFix.dylib", PATH_MAX);
+    if (chmod(sourcePath, 0644) != 0) { // rwxr-xr-x
+        printf("failed (chmod: %i).\n\n", errno);
+        printf("Press ENTER to continue.\n");
+        getchar();
+        return A_ShowMainMenuUninstalled;
+    }
+    if (removexattr(sourcePath, "com.apple.quarantine", 0) != 0 && errno != ENOATTR) {
+        printf("failed (xattr: %i).\n\n", errno);
+        printf("Press ENTER to continue.\n");
+        getchar();
+        return A_ShowMainMenuUninstalled;
+    }
+    printf("done!\n");
+
+    printf("Installation complete!\n\n");
+
+    printf("Press ENTER to continue.\n");
+    getchar();
+    return A_ShowMainMenuInstalled;
+}
+
+nextaction_t LaunchGame() {
+    StartTerminalWindow();
+
+    printf("Launching game with fix...\n\n");
+
+    launch_game_native(baseDirPath);
+
+    return A_Exit;
+}
+
 nextaction_t StartUninstall() {
     char sourcePath[PATH_MAX] = {0};
     char targetPath[PATH_MAX] = {0};
@@ -262,8 +349,7 @@ int main(int argc, char **argv) {
                 act = StartInstall();
                 break;
             case A_StartVerify:
-                printf("A_StartVerify\n");
-                act = A_Exit;
+                act = StartVerify();
                 break;
             case A_StartUninstall:
                 act = StartUninstall();
@@ -272,6 +358,9 @@ int main(int argc, char **argv) {
                 printf("A_ClearNavmesh\n");
                 act = A_Exit;
                 break;
+            case A_LaunchGame:
+                act = LaunchGame();
+                break;
             default:
                 act = A_Exit;
                 break;

installer/native.m

@@ -0,0 +1,43 @@
+#include <string.h>
+#include <strings.h>
+#include <stdio.h>
+#include <Foundation/Foundation.h>
+
+int launch_game_native(const char *path) {
+    NSTask *gameProc = [[NSTask alloc] init];
+    // copy our current working directory and pass it onto the child process
+    NSProcessInfo *currentProcess = [NSProcessInfo processInfo];
+    NSString *pwd = [NSString stringWithUTF8String:path];
+    NSLog(@"%@\n", pwd);
+    NSURL *fixDirectoryUrl = [NSURL fileURLWithPath:pwd];
+    NSLog(@"%@\n", fixDirectoryUrl);
+    NSURL *gameDirectoryUrl = [fixDirectoryUrl URLByAppendingPathComponent:@"../CoDBlkOps3.app/Contents/MacOS/"];
+    NSLog(@"%@\n", gameDirectoryUrl);
+    gameProc.currentDirectoryURL = gameDirectoryUrl;
+    // set the game executable path
+    gameProc.executableURL = [gameProc.currentDirectoryURL URLByAppendingPathComponent:@"CoDBlkOps3_Exe"];
+    
+    // add the fix dylib to DYLD_INSERT_LIBRARIES of the new process
+    NSURL *dylibUrl = [gameProc.currentDirectoryURL URLByAppendingPathComponent:@"../../../BO3MacFix/BO3MacFix.dylib"];
+    NSMutableDictionary *newEnvironment = [[currentProcess environment] mutableCopy];
+    // if we already have dyld_insert_libraries set (by Steam), append our dylib to that
+    if ([[currentProcess environment] objectForKey:@"DYLD_INSERT_LIBRARIES"]) {
+        newEnvironment[@"DYLD_INSERT_LIBRARIES"] = [NSString stringWithFormat:@"%@:%@",[dylibUrl path],[currentProcess environment][@"DYLD_INSERT_LIBRARIES"]];
+    } else { // otherwise just set it by itself
+        newEnvironment[@"DYLD_INSERT_LIBRARIES"] = [dylibUrl path];
+    }
+    newEnvironment[@"WINEPREFIX"] = [[gameProc.currentDirectoryURL URLByAppendingPathComponent:@"../../../BO3MacFix/pfx"] path];
+    newEnvironment[@"SteamAppId"] = @"311210";
+    gameProc.environment = newEnvironment;
+
+    NSLog(@"Launching game...\n");
+    NSLog(@"  Executable: %@\n", gameProc.executableURL);
+    NSLog(@"  Working Directory: %@\n", gameProc.currentDirectoryURL);
+    NSLog(@"  DYLD_INSERT_LIBRARIES: %@\n", newEnvironment[@"DYLD_INSERT_LIBRARIES"]);
+    NSLog(@"  WINEPREFIX: %@\n", newEnvironment[@"WINEPREFIX"]);
+
+    // launch the game executable
+    [gameProc launch];
+    [gameProc waitUntilExit];
+    return 0;
+}

scripts/package.sh

@@ -12,7 +12,7 @@ cp BO3MacFix.dylib staging/BO3MacFix/BO3MacFix.dylib
 cp installer/Install_BO3MacFix staging/BO3MacFix/Install_BO3MacFix
 cp launcher/AppBundleExe staging/BO3MacFix/AppBundleExe
 
-# copy the binary assets (c2m)
+# copy the binary assets (c2m, zone)
 echo Copying assets...
 cp -r assets/* staging/BO3MacFix
 

source/bo3macfix.c

@@ -27,7 +27,7 @@
 #ifdef MACFIX_DEBUG
 #define Version_Prefix "[BO3MacFix DEBUG]"
 #else
-#define Version_Prefix "[BO3MacFix v1.1-beta]"
+#define Version_Prefix "[BO3MacFix " MACFIX_VERSION "]"
 #endif
 #define Error_Prefix "^7[^6BO3MacFix^7] "
 
@@ -341,6 +341,11 @@ static void network_version_patch() {
     // set the LPC category version to match PC
     uint32_t newcategory = 0x0528;
     DobbyCodePatch((void *)(game_base_address + ADDR_LPC_GetRemoteManifest_Category_Inst + 6), (uint8_t *)&newcategory, sizeof(uint32_t));
+    // set the CL version to match PC
+    uint8_t mov_eax = 0xB8;
+    int new_cl_version = 0xD3FC12;
+    DobbyCodePatch((void *)(game_base_address + ADDR_LobbyHostMsg_SendJoinRequest_GetChangelistCall), &mov_eax, sizeof(uint8_t));
+    DobbyCodePatch((void *)(game_base_address + ADDR_LobbyHostMsg_SendJoinRequest_GetChangelistCall + 1), (uint8_t *)&new_cl_version, sizeof(int));
 }
 
 void set_network_password(const char *password)
@@ -469,6 +474,7 @@ install_hook_name(hks_load_dll, bool, void *s, const char *filename, const char
 
     // so we can bundle support for workshop mods retroactively where the creator might not be able to / is unwilling to add a dylib
     // we check /BO3MacFix/natives/[dll name]-[dll hash].dylib
+    // NOTE(Emma): might want to change to [dll name]-[workshop id].dylib for workshop mods to avoid updates breaking it if changes are insignificant enough
     char test_native_path[1024];
     uint8_t file_sha1_hash[0x14];
     char file_sha1_hash_str[(0x14 * 2) + 1];

source/offsets.h

@@ -37,4 +37,5 @@
 #define ADDR_Lua_CoD_LuaCall_GetProtocolVersion_Inst 0xE1FCA8 // mid-func
 #define ADDR_LPC_GetRemoteManifest_Category_Inst 0xEA8C04 // mid-func
 #define ADDR_Live_SystemInfo_LarpInstr 0x129dbcc // mid-func
+#define ADDR_LobbyHostMsg_SendJoinRequest_GetChangelistCall 0x1232458 // mid-func
 // -- END OFFSETS

source/utilities.c

@@ -132,8 +132,12 @@ bool is_macos_dylib(const char *path) {
         uint8_t file_magic[4] = {0};
         if (fread(file_magic, 1, 4, fp) == 4) {
             // 0xFEEDFACF - 64-bit Mach-O
-            static const uint8_t macho_header[4] = {0xcf, 0xfa, 0xed, 0xfe};
-            if (memcmp(file_magic, macho_header, 4) == 0)
+            static const uint8_t macho_header_64bit[4] = {0xcf, 0xfa, 0xed, 0xfe};
+            if (memcmp(file_magic, macho_header_64bit, 4) == 0)
+                return true;
+            // 0xCAFEBABE - fat Mach-O
+            static const uint8_t macho_header_fat[4] = {0xca, 0xfe, 0xba, 0xbe};
+            if (memcmp(file_magic, macho_header_fat, 4) == 0)
                 return true;
         }
         fclose(fp);