[PATCH v7 1/6] winemac: Remove unused macdrv_get_surface_display_image copy_data parameter.

[Rémi Bernon]

From: Rémi Bernon

---
 dlls/winemac.drv/cocoa_window.m |  2 +-
 dlls/winemac.drv/macdrv_cocoa.h |  2 +-
 dlls/winemac.drv/surface.c      | 12 ++----------
 3 files changed, 4 insertions(+), 12 deletions(-)

diff --git a/dlls/winemac.drv/cocoa_window.m b/dlls/winemac.drv/cocoa_window.m
index 61a6ab2cd4e..34c39bb3d76 100644
--- a/dlls/winemac.drv/cocoa_window.m
+++ b/dlls/winemac.drv/cocoa_window.m
@@ -532,7 +532,7 @@ - (void) updateLayer
         imageRect.origin.y *= layer.contentsScale;
         imageRect.size.width *= layer.contentsScale;
         imageRect.size.height *= layer.contentsScale;
-        image = macdrv_get_surface_display_image(window.surface, &imageRect, FALSE, window.colorKeyed,
+        image = macdrv_get_surface_display_image(window.surface, &imageRect, window.colorKeyed,
                                                  window.colorKeyRed, window.colorKeyGreen, window.colorKeyBlue);

if (image)
diff --git a/dlls/winemac.drv/macdrv_cocoa.h b/dlls/winemac.drv/macdrv_cocoa.h
index ba5803f88dc..bdc7d9980e1 100644
--- a/dlls/winemac.drv/macdrv_cocoa.h
+++ b/dlls/winemac.drv/macdrv_cocoa.h
@@ -553,7 +553,7 @@ extern void macdrv_order_cocoa_window(macdrv_window w, macdrv_window prev,
 extern void macdrv_get_cocoa_window_frame(macdrv_window w, CGRect* out_frame);
 extern void macdrv_set_cocoa_parent_window(macdrv_window w, macdrv_window parent);
 extern void macdrv_set_window_surface(macdrv_window w, struct window_surface *window_surface);
-extern CGImageRef macdrv_get_surface_display_image(struct window_surface *window_surface, CGRect *rect, int copy_data, int color_keyed,
+extern CGImageRef macdrv_get_surface_display_image(struct window_surface *window_surface, CGRect *rect, int color_keyed,
         CGFloat key_red, CGFloat key_green, CGFloat key_blue);
 extern void macdrv_window_needs_display(macdrv_window w, CGRect rect);
 extern void macdrv_set_window_shape(macdrv_window w, const CGRect *rects, int count);
diff --git a/dlls/winemac.drv/surface.c b/dlls/winemac.drv/surface.c
index 37e2c466926..4e8b3c4824f 100644
--- a/dlls/winemac.drv/surface.c
+++ b/dlls/winemac.drv/surface.c
@@ -191,7 +191,7 @@ void set_surface_use_alpha(struct window_surface *window_surface, BOOL use_alpha
  *            must not use Win32 or Wine functions, including debug
  *            logging.
  */
-CGImageRef macdrv_get_surface_display_image(struct window_surface *window_surface, CGRect *rect, int copy_data, int color_keyed,
+CGImageRef macdrv_get_surface_display_image(struct window_surface *window_surface, CGRect *rect, int color_keyed,
         CGFloat key_red, CGFloat key_green, CGFloat key_blue)
 {
     CGImageRef cgimage = NULL;
@@ -220,15 +220,7 @@ CGImageRef macdrv_get_surface_display_image(struct window_surface *window_surfac
         offset = CGRectGetMinX(visrect) * 4 + CGRectGetMinY(visrect) * bytes_per_row;
         size = min(CGRectGetHeight(visrect) * bytes_per_row,
                    surface->info.bmiHeader.biSizeImage - offset);
-
-        if (copy_data)
-        {
-            CFDataRef data = CFDataCreate(NULL, (UInt8 *)window_surface->color_bits + offset, size);
-            provider = CGDataProviderCreateWithCFData(data);
-            CFRelease(data);
-        }
-        else
-            provider = CGDataProviderCreateWithData(NULL, (UInt8 *)window_surface->color_bits + offset, size, NULL);
+        provider = CGDataProviderCreateWithData(NULL, (UInt8 *)window_surface->color_bits + offset, size, NULL);

alphaInfo = surface->use_alpha ? kCGImageAlphaPremultipliedFirst : kCGImageAlphaNoneSkipFirst;
         cgimage = CGImageCreate(CGRectGetWidth(visrect), CGRectGetHeight(visrect),