[PATCH 3/9] winemac: Have convert_display_rect() return a CGRect.

[Brendan Shanks]

From: Brendan Shanks

---
 dlls/winemac.drv/cocoa_display.m | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/dlls/winemac.drv/cocoa_display.m b/dlls/winemac.drv/cocoa_display.m
index 4e3e65dd69a..56d9b5029a5 100644
--- a/dlls/winemac.drv/cocoa_display.m
+++ b/dlls/winemac.drv/cocoa_display.m
@@ -37,11 +37,11 @@
  * Converts an NSRect in Cocoa's y-goes-up-from-bottom coordinate system
  * to a CGRect in y-goes-down-from-top coordinates.
  */
-static inline void convert_display_rect(CGRect* out_rect, NSRect in_rect,
-                                        NSRect primary_frame)
+static inline CGRect convert_display_rect(NSRect in_rect, NSRect primary_frame)
 {
-    *out_rect = NSRectToCGRect(in_rect);
-    out_rect->origin.y = NSMaxY(primary_frame) - NSMaxY(in_rect);
+    CGRect out_rect = NSRectToCGRect(in_rect);
+    out_rect.origin.y = NSMaxY(primary_frame) - NSMaxY(in_rect);
+    return out_rect;
 }

@@ -83,11 +83,8 @@ int macdrv_get_displays(struct macdrv_display** displays, int* count)
                     primary_frame = frame;

disps[i].displayID = [[screen deviceDescription][@"NSScreenNumber"] unsignedIntValue];
-                convert_display_rect(&disps[i].frame, frame, primary_frame);
-                convert_display_rect(&disps[i].work_frame, visible_frame,
-                                     primary_frame);
-                disps[i].frame = cgrect_win_from_mac(disps[i].frame);
-                disps[i].work_frame = cgrect_win_from_mac(disps[i].work_frame);
+                disps[i].frame = cgrect_win_from_mac(convert_display_rect(frame, primary_frame));
+                disps[i].work_frame = cgrect_win_from_mac(convert_display_rect(visible_frame, primary_frame));
             }

*displays = disps;