Merge pull request #137 from mpoindexter/fix-invalid-handle-main

Fix for arm
Code-Hex · Sep 3, 2023 · 3c9c884 · 3c9c884
2 parents cf2fc7a + a554b7d
commit 3c9c884
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/virtualization_12_arm64.h b/virtualization_12_arm64.h
@@ -70,7 +70,7 @@ VZMacHardwareModelStruct convertVZMacHardwareModel2Struct(void *hardwareModelPtr
 
 void *newVZMacOSInstaller(void *virtualMachine, void *vmQueue, const char *restoreImageFilePath);
 void *newProgressObserverVZMacOSInstaller();
-void installByVZMacOSInstaller(void *installerPtr, void *vmQueue, void *progressObserverPtr, void *completionHandler, void *fractionCompletedHandler);
+void installByVZMacOSInstaller(void *installerPtr, void *vmQueue, void *progressObserverPtr, uintptr_t completionHandler, uintptr_t fractionCompletedHandler);
 void cancelInstallVZMacOSInstaller(void *installerPtr);
 
 #endif
diff --git a/virtualization_12_arm64.m b/virtualization_12_arm64.m
@@ -12,7 +12,7 @@ - (void)observeValueForKeyPath:(NSString *)keyPath ofObject:(id)object change:(N
 {
     if ([keyPath isEqualToString:@"fractionCompleted"] && [object isKindOfClass:[NSProgress class]]) {
         NSProgress *progress = (NSProgress *)object;
-        macOSInstallFractionCompletedHandler(context, progress.fractionCompleted);
+        macOSInstallFractionCompletedHandler((uintptr_t)context, progress.fractionCompleted);
         if (progress.finished) {
             [progress removeObserver:self forKeyPath:@"fractionCompleted"];
         }
@@ -423,7 +423,7 @@ VZMacHardwareModelStruct convertVZMacHardwareModel2Struct(void *hardwareModelPtr
     return [[ProgressObserver alloc] init];
 }
 
-void installByVZMacOSInstaller(void *installerPtr, void *vmQueue, void *progressObserverPtr, void *completionHandler, void *fractionCompletedHandler)
+void installByVZMacOSInstaller(void *installerPtr, void *vmQueue, void *progressObserverPtr, uintptr_t completionHandler, uintptr_t fractionCompletedHandler)
 {
     if (@available(macOS 12, *)) {
         VZMacOSInstaller *installer = (VZMacOSInstaller *)installerPtr;
@@ -435,7 +435,7 @@ void installByVZMacOSInstaller(void *installerPtr, void *vmQueue, void *progress
                 addObserver:(ProgressObserver *)progressObserverPtr
                  forKeyPath:@"fractionCompleted"
                     options:NSKeyValueObservingOptionInitial | NSKeyValueObservingOptionNew
-                    context:fractionCompletedHandler];
+                    context:(void*)fractionCompletedHandler];
         });
         return;
     }