Fix invalid msg_send!

servo · Jun 16, 2022 · 48d510a · 48d510a
1 parent 614d43a
commit 48d510a
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 9 deletions.
diff --git a/cocoa-foundation/src/foundation.rs b/cocoa-foundation/src/foundation.rs
@@ -249,7 +249,8 @@ impl NSProcessInfo for id {
     }
 
     unsafe fn isOperatingSystemAtLeastVersion(self, version: NSOperatingSystemVersion) -> bool {
-        msg_send![self, isOperatingSystemAtLeastVersion: version]
+        let res: BOOL = msg_send![self, isOperatingSystemAtLeastVersion: version];
+        res != NO
     }
 }
 
@@ -628,9 +629,9 @@ impl NSString for id {
 
     unsafe fn init_str(self, string: &str) -> id {
         return msg_send![self,
-                         initWithBytes:string.as_ptr()
+                         initWithBytes:string.as_ptr() as *const c_void
                              length:string.len()
-                             encoding:UTF8_ENCODING as id];
+                             encoding:UTF8_ENCODING];
     }
 
     unsafe fn len(self) -> usize {

diff --git a/cocoa/src/appkit.rs b/cocoa/src/appkit.rs
@@ -2108,7 +2108,7 @@ impl NSOpenGLPixelFormat for id {
     // Creating an NSOpenGLPixelFormat Object
 
     unsafe fn initWithAttributes_(self, attributes: &[u32]) -> id {
-        msg_send![self, initWithAttributes:attributes]
+        msg_send![self, initWithAttributes:attributes.as_ptr()]
     }
 
     // Managing the Pixel Format

diff --git a/cocoa/src/quartzcore.rs b/cocoa/src/quartzcore.rs
@@ -1096,13 +1096,13 @@ impl CALayer {
     #[inline]
     pub fn actions(&self) -> CFDictionary<CFStringRef, CFTypeRef> {
         unsafe {
-            msg_send![self.id(), actions]
+            CFDictionary::wrap_under_get_rule(msg_send![self.id(), actions])
         }
     }
 
     #[inline]
     pub unsafe fn set_actions(&self, actions: CFDictionary<CFStringRef, CFTypeRef>) {
-        msg_send![self.id(), setActions:actions]
+        msg_send![self.id(), setActions: actions.as_concrete_TypeRef()]
     }
 
     // TODO(pcwalton): Wrap `CAAnimation`.
@@ -1531,6 +1531,7 @@ impl CARenderer {
 // really just a module.
 pub mod transaction {
     use block::{Block, ConcreteBlock, IntoConcreteBlock, RcBlock};
+    use core_foundation::base::TCFType;
     use core_foundation::date::CFTimeInterval;
     use core_foundation::string::CFString;
 
@@ -1638,15 +1639,15 @@ pub mod transaction {
     pub fn value_for_key(key: &str) -> id {
         unsafe {
             let key: CFString = CFString::from(key);
-            msg_send![class!(CATransaction), valueForKey:key]
+            msg_send![class!(CATransaction), valueForKey: key.as_concrete_TypeRef()]
         }
     }
 
     #[inline]
     pub fn set_value_for_key(value: id, key: &str) {
         unsafe {
             let key: CFString = CFString::from(key);
-            msg_send![class!(CATransaction), setValue:value forKey:key]
+            msg_send![class!(CATransaction), setValue: value forKey: key.as_concrete_TypeRef()]
         }
     }
 }

diff --git a/core-text/src/font.rs b/core-text/src/font.rs
@@ -193,7 +193,7 @@ pub fn new_from_name(name: &str, pt_size: f64) -> Result<CTFont, ()> {
 }
 
 pub fn new_ui_font_for_language(ui_type: CTFontUIFontType,
-                                size: f64,
+                                size: CGFloat,
                                 language: Option<CFString>)
                                 -> CTFont {
     unsafe {