Correct locking and Surface{Unl,L}ock prototypes.

diff --git a/Tweak.mm b/Tweak.mm
index c997fdca8ada8b5c6b68af42560c82f5f8bd9d0f..30a592f92570d47b5e454ea3f4e6ea01a4895230 100644 (file)
--- a/Tweak.mm
+++ b/Tweak.mm
@@ -130,9 +130,12 @@ extern CFStringRef kIOSurfaceHeight;
 extern CFStringRef kIOSurfacePixelFormat;
 extern CFStringRef kIOSurfaceAllocSize;
 
+#define kIOSurfaceLockReadOnly 1
+#define kIOSurfaceLockAvoidSync 2
+
 extern "C" IOSurfaceRef IOSurfaceCreate(CFDictionaryRef dict);
-extern "C" int IOSurfaceLock(IOSurfaceRef surface, unsigned int lockType);
-extern "C" int IOSurfaceUnlock(IOSurfaceRef surface);
+extern "C" int IOSurfaceLock(IOSurfaceRef surface, uint32_t options, uint32_t *seed);
+extern "C" int IOSurfaceUnlock(IOSurfaceRef surface, uint32_t options, uint32_t *seed);
 extern "C" void *IOSurfaceGetBaseAddress(IOSurfaceRef surface);
 
 extern "C" void IOSurfaceFlushProcessorCaches(IOSurfaceRef buffer);
@@ -142,6 +145,13 @@ typedef void *IOSurfaceAcceleratorRef;
 extern "C" int IOSurfaceAcceleratorCreate(CFAllocatorRef allocator, void *type, IOSurfaceAcceleratorRef *accel);
 extern "C" unsigned int IOSurfaceAcceleratorTransferSurface(IOSurfaceAcceleratorRef accelerator, IOSurfaceRef dest, IOSurfaceRef src, void *, void *, void *, void *);
 
+#if defined(_ARM_ARCH_6) && !defined(_ARM_ARCH_7)
+#define CoreSurfaceBufferLock(surface, options, seed) \
+    CoreSurfaceBufferLock(surface, 3, NULL)
+#define CoreSurfaceBufferUnlock(surface, options, seed) \
+    CoreSurfaceBufferUnlock(surface, 3, NULL)
+#endif
+
 typedef void *IOMobileFramebufferRef;
 
 extern "C" kern_return_t IOMobileFramebufferSwapSetLayer(
@@ -918,9 +928,7 @@ static void VNCSetup() {
             [NSNumber numberWithInt:(width_ * height_ * BytesPerPixel)], kIOSurfaceAllocSize,
         nil]);
 
-        IOSurfaceLock(buffer_, 3);
         screen_->frameBuffer = reinterpret_cast<char *>(IOSurfaceGetBaseAddress(buffer_));
-        IOSurfaceUnlock(buffer_);
     }
 
     screen_->kbdAddEvent = &VNCKeyboard;
@@ -995,15 +1003,17 @@ static void OnLayer(IOMobileFramebufferRef fb, IOSurfaceRef layer) {
         [thread start];
     } else if (_unlikely(clients_ != 0)) {
         if (layer == NULL) {
-            if (accelerator_ != NULL)
+            if (accelerator_ != NULL) {
+                IOSurfaceLock(layer, 0, NULL);
                 memset(screen_->frameBuffer, 0, sizeof(rfbPixel) * width_ * height_);
-            else
+                IOSurfaceUnlock(layer, 0, NULL);
+            } else
                 VNCBlack();
         } else {
             if (accelerator_ != NULL)
                 IOSurfaceAcceleratorTransferSurface(accelerator_, layer, buffer_, NULL, NULL, NULL, NULL);
             else {
-                IOSurfaceLock(layer, 2);
+                IOSurfaceLock(layer, kIOSurfaceLockReadOnly, NULL);
                 rfbPixel *data(reinterpret_cast<rfbPixel *>(IOSurfaceGetBaseAddress(layer)));
 
                 IOSurfaceFlushProcessorCaches(layer);
@@ -1013,7 +1023,7 @@ static void OnLayer(IOMobileFramebufferRef fb, IOSurfaceRef layer) {
                 data[0] = corner;*/
 
                 screen_->frameBuffer = const_cast<char *>(reinterpret_cast<volatile char *>(data));
-                IOSurfaceUnlock(layer);
+                IOSurfaceUnlock(layer, kIOSurfaceLockReadOnly, NULL);
             }
         }