winemac: Interpret Windows bitmap data, especially window surfaces, as sRGB.

This makes the display match that of native apps. For example, the UI of Mac Steam vs. Windows Steam or a PNG shown in iexplore.exe vs. Preview. Signed-off-by: Ken Thomases <ken@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

winemac: Interpret Windows bitmap data, especially window surfaces, as sRGB.
650997d7 · Ken Thomases · Alexandre Julliard · ed7e0573 · 650997d7 · 650997d7
Commit 650997d7 authored Jul 15, 2018 by Ken Thomases Committed by Alexandre Julliard Jul 16, 2018
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 3 deletions

image.c dlls/winemac.drv/image.c +1 -1

mouse.c dlls/winemac.drv/mouse.c +1 -1

surface.c dlls/winemac.drv/surface.c +1 -1

No files found.
--- a/dlls/winemac.drv/image.c
+++ b/dlls/winemac.drv/image.c
@@ -85,7 +85,7 @@ CGImageRef create_cgimage_from_icon_bitmaps(HDC hdc, HANDLE icon, HBITMAP hbmCol
    else
        alpha_format = kCGImageAlphaNoneSkipFirst;

-    colorspace = CGColorSpaceCreateWithName(kCGColorSpaceGenericRGB);
+    colorspace = CGColorSpaceCreateWithName(kCGColorSpaceSRGB);
    if (!colorspace)
    {
        WARN("failed to create colorspace\n");

--- a/dlls/winemac.drv/mouse.c
+++ b/dlls/winemac.drv/mouse.c
@@ -357,7 +357,7 @@ CFArrayRef create_monochrome_cursor(HDC hdc, const ICONINFOEXW *icon, int width,
    for (i = 0; i < count; i++)
        data_bits[i] ^= xor_bits[i];

-    colorspace = CGColorSpaceCreateWithName(kCGColorSpaceGenericGray);
+    colorspace = CGColorSpaceCreateWithName(kCGColorSpaceGenericGrayGamma2_2);
    if (!colorspace)
    {
        WARN("failed to create colorspace\n");

--- a/dlls/winemac.drv/surface.c
+++ b/dlls/winemac.drv/surface.c
@@ -384,7 +384,7 @@ CGImageRef create_surface_image(void *window_surface, CGRect *rect, int copy_dat

        visrect = CGRectOffset(*rect, -surface->header.rect.left, -surface->header.rect.top);

-        colorspace = CGColorSpaceCreateWithName(kCGColorSpaceGenericRGB);
+        colorspace = CGColorSpaceCreateWithName(kCGColorSpaceSRGB);
        bytes_per_row = get_dib_stride(width, 32);
        offset = CGRectGetMinX(visrect) * 4 + (height - CGRectGetMaxY(visrect)) * bytes_per_row;
        size = min(CGRectGetHeight(visrect) * bytes_per_row,