Changeset 408 for trunk/Cocoa/F-Script Anywhere/Source

Timestamp:

02/24/08 10:06:18 (17 years ago)

Author:

Nicholas Riley

Message:

More debug logging until we have a GUI error channel.

File:

• trunk/Cocoa/F-Script Anywhere/Source/SCPatch/SCPatchController/SCPatchLoader.c (modified) (4 diffs)

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

@@ -11 +11 @@
 #undef USE_CFRUNLOOP
 #undef CHECK_SYMBOL_REFERENCES
-#undef SCPL_DEBUG_LOG
+#define SCPL_DEBUG_LOG
 
 #ifdef SCPL_DEBUG_LOG
@@ -32 +32 @@
 
         
+        syslog(LOG_ALERT, "SCPL: sending notification of patch loading error %x\n", err);
         if((clientBundleID = CFStringCreateWithCharacters(NULL, uniBundleID->unicode, uniBundleID->length)) != NULL &&
            (controllerBundleID = CFStringCreateWithCharacters(NULL, uniControllerBundleID->unicode, uniControllerBundleID->length)) != NULL &&
@@ -127 +128 @@
                 NSSymbol                                symbol;
 
-                if(NSCreateObjectFileImageFromFile(urlData, &image) == NSObjectFileImageSuccess && CanLoadImage(image) &&
-                   (module = NSLinkModule(image, urlData, NSLINKMODULE_OPTION_BINDNOW | NSLINKMODULE_OPTION_PRIVATE | NSLINKMODULE_OPTION_RETURN_ON_ERROR)) != NULL)
-                {
+                if(NSCreateObjectFileImageFromFile(urlData, &image) != NSObjectFileImageSuccess || !CanLoadImage(image))
+                {
+                        err = err_couldnt_load_injection_bundle;
+                }
+                else if((module = NSLinkModule(image, urlData, NSLINKMODULE_OPTION_BINDNOW | NSLINKMODULE_OPTION_PRIVATE | NSLINKMODULE_OPTION_RETURN_ON_ERROR)) != NULL)
+                {               
                         if((symbol = NSLookupSymbolInModule(module, "_SCPatchInit")) == NULL)
                                 symbol = NSLookupSymbolInModule(module, "__Z11SCPatchInitP13SCPatchParams");
@@ -141 +145 @@
                 else
                 {
+                        NSLinkEditErrors errors;
+                        int errorNumber;
+                        const char *fileName, *errorString;
+                        NSLinkEditError(&errors, &errorNumber, &fileName, &errorString);
+                        // XXX need to pass back to caller
+                        SCPLLog("NSLinkModule: NSLinkEditError %d (%d) loading %s (%s)", errors, errorNumber, fileName, errorString);
                         err = err_couldnt_load_injection_bundle;
                 }