Changeset 217 for trunk/Cocoa/F-Script Anywhere/Source/SCPatch

Timestamp:

05/09/06 05:56:05 (18 years ago)

Author:

rchin

Message:

• Updated to new mach_inject with support for x86
• Updated nib files to 10.2+ format so that future updates to the f-script framework won't break fsa
• Adjusted some code to work with the new x86 mach_inject (sends an additional argument)
• Updates code to work with newer defines in cctools

Location:

trunk/Cocoa/F-Script Anywhere/Source/SCPatch

Files:

• SCPatchClient/SCPatchClient.cpp (modified) (2 diffs)
• SCPatchController/SCPatchController.cpp (modified) (4 diffs)
• SCPatchController/SCPatchLoader.c (modified) (2 diffs)

trunk/Cocoa/F-Script Anywhere/Source/SCPatch/SCPatchClient/SCPatchClient.cpp

@@ -37 +37 @@
 
         if(client->Initialize(client->mClientBundleID, client->mControllerBundleID, getpid()) != noErr)
-                return err_threadEntry_init_failed;
+                return err_threadEntry_image_not_found;
         
         // Create a port to receive messages from our patch controller
         if((err = client->StartListening(client->mClientBundleID, true, true)) != noErr)
-                return err_threadEntry_init_failed;
+                return err_threadEntry_image_not_found;
         
         if((err = GetCurrentProcess(&psn)) != noErr ||
@@ -48 +48 @@
                                                                   CFStringGetCStringPtr(client->mClientBundleID, kCFStringEncodingMacRoman),
                                                                   sizeof(ProcessSerialNumber), &psn)) != noErr)
-                return err_threadEntry_init_failed;
+                return err_threadEntry_image_not_found;
 
         return noErr; 

trunk/Cocoa/F-Script Anywhere/Source/SCPatch/SCPatchController/SCPatchController.cpp

@@ -17 +17 @@
 //-------------------------------------------------------------------------------------------------------------
 OSErr                           SCOSErrFrom_mac_err(mach_error_t error) {
-        return (error & err_mac) ? (err & ^err_mac) : noErr;
+        return (error & err_mac) ? (err_mac) : noErr;
 }
 
@@ -323 +323 @@
                         if(err == noErr)
                                 error = InjectPatches(psn, params);
-                        
                         free(params);
                 }
                 CFRelease(str);
         }
+
         if (error != err_none) return error;
         else return mac_err(err);
@@ -436 +436 @@
         // Find the loader
         CFURLRef loaderURL = NULL;
+#if defined(__ppc__) || defined(__ppc64__)
         if(!err)
                 if((loaderURL = CFBundleCopyResourceURL(mBundle, CFSTR("SCPatchLoader"), CFSTR("bundle"), NULL)) == NULL)
                         err = err_couldnt_find_injection_bundle;
+#else
+        if(!err)
+                if((loaderURL = CFBundleCopyResourceURL(mBundle, CFSTR("SCPatchLoader-intel"), CFSTR("bundle"), NULL)) == NULL)
+                        err = err_couldnt_find_injection_bundle;
+#endif  
 
 #if 0
@@ -483 +489 @@
                 fprintf(stderr, "Patcher got error %d\n", err);
         }
-        
+
         //      Clean up.
         if(loaderURL)

trunk/Cocoa/F-Script Anywhere/Source/SCPatch/SCPatchController/SCPatchLoader.c

@@ -199 +199 @@
 
 //-------------------------------------------------------------------------------------------------------------
-mach_error_t INJECT_ENTRY( ptrdiff_t codeOffset, void *paramBlock, size_t paramSize )
+mach_error_t INJECT_ENTRY( ptrdiff_t codeOffset, void *paramBlock, size_t paramSize, char *dummy_pthread_struct  )
 {
         pthread_t                       thread;
@@ -205 +205 @@
         struct sched_param      sched;
         int                                     policy;
-        
+#if defined (__i386__)
+        // On intel, per-pthread data is a zone of data that must be allocated.
+        // if not, all function trying to access per-pthread data (all mig functions for instance)
+        // will crash. 
+        extern void __pthread_set_self(char*);
+        __pthread_set_self(dummy_pthread_struct);
+#endif
     // We need to fix up function addresses in gcc code, but not for code generated by CW.
-#ifdef __MWERKS__
+        // It turns out that this is not needed for gcc 4.0
+//#ifdef __MWERKS__
     codeOffset = 0;
-#endif
+//#endif
     // Stash the code offset where we can get at it later.
     ((SCPatchLoaderParams *)paramBlock)->codeOffset = codeOffset;