Add error: parameter to -loadFileAtPath: method. And update each type…

… of IPC communication to send the NSError back to the callers.
OpenEmu · Feb 8, 2014 · e39cbac · e39cbac
1 parent 002ede4
commit e39cbac
Show file tree

Hide file tree

Showing 30 changed files with 58 additions and 39 deletions.
diff --git a/Atari800 b/Atari800
diff --git a/BSNES b/BSNES
diff --git a/CrabEmu b/CrabEmu
diff --git a/FCEU b/FCEU
diff --git a/Gambatte b/Gambatte
diff --git a/GenesisPlus b/GenesisPlus
diff --git a/Higan b/Higan
diff --git a/Mednafen b/Mednafen
diff --git a/Mupen64Plus b/Mupen64Plus
diff --git a/NeoPop b/NeoPop
diff --git a/Nestopia b/Nestopia
diff --git a/OpenEmu-SDK b/OpenEmu-SDK
diff --git a/OpenEmu/OEDOGameCoreHelper.h b/OpenEmu/OEDOGameCoreHelper.h
@@ -67,6 +67,7 @@
 @protocol OEDOGameCoreHelperDelegate <NSObject>
 
 - (oneway void)gameCoreHelperDidSetSystemResponderClient:(byref id)responderClient withMessageIdentifier:(NSString *)identifier;
+- (oneway void)gameCoreHelperFailedToLoadROMWithError:(NSError *)error messageIdentifier:(NSString *)identifier;
 
 - (oneway void)gameCoreHelperDidSetupEmulationWithSurfaceID:(IOSurfaceID)surfaceID screenSize:(OEIntSize)screenSize aspectSize:(OEIntSize)aspectSize messageIdentifier:(NSString *)identifier;;
 - (oneway void)gameCoreHelperDidStartEmulationWithMessageIdentifier:(NSString *)identifier;

diff --git a/OpenEmu/OEDOGameCoreManager.m b/OpenEmu/OEDOGameCoreManager.m
@@ -78,8 +78,15 @@ - (void)loadROMWithCompletionHandler:(void(^)(id systemClient))completionHandler
                  withDelegate:_delegateHelper
                 displayHelper:(id<OEDOGameCoreDisplayHelper>)[self displayHelper]
             messageIdentifier:
-     [self messageIdentifierForResponderClientHandler:^(id responderClient)
+     [self messageIdentifierForResponderClientHandler:
+      ^(id responderClient, NSError *error)
       {
+          if(responderClient == nil)
+          {
+              errorHandler(error);
+              return;
+          }
+
           [(NSDistantObject *)responderClient setProtocolForProxy:[[[self systemController] responderClass] gameSystemResponderClientProtocol]];
 
           completionHandler(responderClient);
@@ -301,7 +308,7 @@ - (NSString *)messageIdentifierForSuccessHandler:(void(^)(BOOL, NSError *))succe
     return identifier;
 }
 
-- (NSString *)messageIdentifierForResponderClientHandler:(void(^)(id))responderClient;
+- (NSString *)messageIdentifierForResponderClientHandler:(void(^)(id, NSError *))responderClient;
 {
     NSString *identifier = [NSString stringWithUUID];
     responderClient = [responderClient copy];
@@ -332,11 +339,11 @@ - (void)performSuccessBlockWithIdentifier:(NSString *)identifier success:(BOOL)s
     block(success, error);
 }
 
-- (void)performResponderClientBlockWithIdentifier:(NSString *)identifier systemClient:(id)systemClient;
+- (void)performResponderClientBlockWithIdentifier:(NSString *)identifier systemClient:(id)systemClient error:(NSError *)error;
 {
-    void(^block)(id) = _pendingBlocks[identifier];
+    void(^block)(id, NSError *) = _pendingBlocks[identifier];
     [_pendingBlocks removeObjectForKey:identifier];
-    block(systemClient);
+    block(systemClient, error);
 }
 
 #pragma mark - TaskWrapper delegate methods
@@ -385,14 +392,19 @@ - (void)callSuccessBlockForIdentifier:(NSString *)identifier withSuccess:(BOOL)s
     [_gameCoreManager performSuccessBlockWithIdentifier:identifier success:success error:error];
 }
 
-- (void)callResponderClientBlockForIdentifier:(NSString *)identifier withClient:(id)client
+- (void)callResponderClientBlockForIdentifier:(NSString *)identifier withClient:(id)client error:(NSError *)error
 {
-    [_gameCoreManager performResponderClientBlockWithIdentifier:identifier systemClient:client];
+    [_gameCoreManager performResponderClientBlockWithIdentifier:identifier systemClient:client error:error];
 }
 
 - (oneway void)gameCoreHelperDidSetSystemResponderClient:(byref id)responderClient withMessageIdentifier:(NSString *)identifier
 {
-    [self callResponderClientBlockForIdentifier:identifier withClient:responderClient];
+    [self callResponderClientBlockForIdentifier:identifier withClient:responderClient error:nil];
+}
+
+- (oneway void)gameCoreHelperFailedToLoadROMWithError:(NSError *)error messageIdentifier:(NSString *)identifier
+{
+    [self callResponderClientBlockForIdentifier:identifier withClient:nil error:error];
 }
 
 - (oneway void)gameCoreHelperDidSetupEmulationWithSurfaceID:(IOSurfaceID)surfaceID screenSize:(OEIntSize)screenSize aspectSize:(OEIntSize)aspectSize messageIdentifier:(NSString *)identifier;

diff --git a/OpenEmu/OEThreadGameCoreManager.m b/OpenEmu/OEThreadGameCoreManager.m
@@ -73,12 +73,14 @@ - (void)_executionThread:(id)object
     {
         [self setGameCoreHelper:(id<OEGameCoreHelper>)_helperProxy];
         [_helper setDisplayHelper:(id<OEGameCoreDisplayHelper>)_displayHelperProxy];
-        if(![_helper loadROMAtPath:[self ROMPath] withCorePluginAtPath:[[self plugin] path] systemIdentifier:[[self systemController] systemIdentifier]])
+
+        NSError *error;
+        if(![_helper loadROMAtPath:[self ROMPath] withCorePluginAtPath:[[self plugin] path] systemIdentifier:[[self systemController] systemIdentifier] error:&error])
         {
             FIXME("Return a proper error object here.");
             if(_errorHandler != nil)
             {
-                _errorHandler(nil);
+                _errorHandler(error);
                 _errorHandler = nil;
             }
             return;

diff --git a/OpenEmu/OpenEmuDOHelperApp.m b/OpenEmu/OpenEmuDOHelperApp.m
@@ -112,8 +112,11 @@ - (oneway void)loadROMAtPath:(bycopy NSString *)romPath usingCorePluginAtPath:(b
     [(NSDistantObject *)delegate setProtocolForProxy:@protocol(OEDOGameCoreDisplayHelper)];
     [self setDisplayHelper:(id<OEGameCoreDisplayHelper>)displayHelper];
 
-    if([self loadROMAtPath:romPath withCorePluginAtPath:corePluginPath systemIdentifier:[[OESystemPlugin systemPluginWithBundleAtPath:systemPluginPath] systemIdentifier]])
+    NSError *error;
+    if([self loadROMAtPath:romPath withCorePluginAtPath:corePluginPath systemIdentifier:[[OESystemPlugin systemPluginWithBundleAtPath:systemPluginPath] systemIdentifier] error:&error])
         [delegate gameCoreHelperDidSetSystemResponderClient:[self gameCore] withMessageIdentifier:identifier];
+    else
+        [delegate gameCoreHelperFailedToLoadROMWithError:error messageIdentifier:identifier];
 }
 
 @end
diff --git a/OpenEmu/OpenEmuHelperApp.h b/OpenEmu/OpenEmuHelperApp.h
@@ -109,7 +109,7 @@ enum _OEHelperAppErrorCodes
 
 - (void)launchApplication;
 
-- (BOOL)loadROMAtPath:(NSString *)aPath withCorePluginAtPath:(NSString *)pluginPath systemIdentifier:(NSString *)systemIdentifier;
+- (BOOL)loadROMAtPath:(NSString *)aPath withCorePluginAtPath:(NSString *)pluginPath systemIdentifier:(NSString *)systemIdentifier error:(NSError **)error;
 - (void)setupProcessPollingTimer;
 - (void)quitHelperTool;
 

diff --git a/OpenEmu/OpenEmuHelperApp.m b/OpenEmu/OpenEmuHelperApp.m
@@ -526,7 +526,7 @@ - (void)destroyGLResources
 
 #pragma mark - Game Core methods
 
-- (BOOL)loadROMAtPath:(NSString *)aPath withCorePluginAtPath:(NSString *)pluginPath systemIdentifier:(NSString *)systemIdentifier
+- (BOOL)loadROMAtPath:(NSString *)aPath withCorePluginAtPath:(NSString *)pluginPath systemIdentifier:(NSString *)systemIdentifier error:(NSError **)error
 {
     if([self loadedRom]) return NO;
 
@@ -559,7 +559,7 @@ - (BOOL)loadROMAtPath:(NSString *)aPath withCorePluginAtPath:(NSString *)pluginP
         if(![systemIdentifier isEqualToString:@"openemu.system.arcade"])
             aPath = [self decompressedPathForRomAtPath:aPath];
 
-        if([_gameCore loadFileAtPath:aPath])
+        if([_gameCore loadFileAtPath:aPath error:error])
         {
             DLog(@"Loaded new Rom: %@", aPath);
             return self.loadedRom = YES;

diff --git a/OpenEmu/OpenEmuXPCHelperApp.m b/OpenEmu/OpenEmuXPCHelperApp.m
@@ -108,9 +108,10 @@ - (void)loadROMAtPath:(NSString *)romPath usingCorePluginAtPath:(NSString *)plug
 {
     OESystemPlugin *plugin = [OESystemPlugin systemPluginWithBundleAtPath:systemPluginPath];
 
-    if(![self loadROMAtPath:romPath withCorePluginAtPath:pluginPath systemIdentifier:[plugin systemIdentifier]])
+    NSError *error;
+    if(![self loadROMAtPath:romPath withCorePluginAtPath:pluginPath systemIdentifier:[plugin systemIdentifier] error:&error])
     {
-        completionHandler(nil, nil);
+        completionHandler(nil, error);
         return;
     }
 

diff --git a/PPSSPP b/PPSSPP
diff --git a/ProSystem b/ProSystem
diff --git a/SNES9x b/SNES9x
diff --git a/Stella b/Stella
diff --git a/TwoMbit b/TwoMbit
diff --git a/UME b/UME
diff --git a/VecXGL b/VecXGL
diff --git a/VisualBoyAdvance b/VisualBoyAdvance
diff --git a/blueMSX b/blueMSX
diff --git a/picodrive b/picodrive
diff --git a/yabause b/yabause