Rebase against e804e9a5bc9fde9ad8b84dfd121d44afbe177752.

patches/msvfw32-ICGetDisplayFormat/0005-iccvid-Fix-calculation-of-stride-and-size.patch

@@ -1,4 +1,4 @@
-From 855c99952103f3f76d2c38e1471570dee8dbf2c3 Mon Sep 17 00:00:00 2001
+From f6967e9045f8bfed79aa6b995c5d1dc96a44c17b Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
 Date: Sun, 3 Apr 2016 18:22:29 +0200
 Subject: iccvid: Fix calculation of stride and size.
@@ -9,11 +9,11 @@ Subject: iccvid: Fix calculation of stride and size.
  2 files changed, 47 insertions(+), 3 deletions(-)
 
 diff --git a/dlls/iccvid/iccvid.c b/dlls/iccvid/iccvid.c
-index 1ef2db6..0531f31 100644
+index e5d514703ee..bf9e48883d3 100644
 --- a/dlls/iccvid/iccvid.c
 +++ b/dlls/iccvid/iccvid.c
-@@ -91,6 +91,10 @@ static inline BOOL heap_free( LPVOID ptr )
-     return HeapFree( GetProcessHeap(), 0, ptr );
+@@ -91,6 +91,10 @@ static inline BOOL heap_free(void *mem)
+     return HeapFree(GetProcessHeap(), 0, mem);
  }
  
 +static inline int get_stride(int width, int depth)
@@ -45,7 +45,7 @@ index 1ef2db6..0531f31 100644
      }
      return size;
 diff --git a/dlls/msvfw32/tests/msvfw.c b/dlls/msvfw32/tests/msvfw.c
-index 91628e2..7943184 100644
+index 000e615ad0f..6f32034954a 100644
 --- a/dlls/msvfw32/tests/msvfw.c
 +++ b/dlls/msvfw32/tests/msvfw.c
 @@ -93,6 +93,7 @@ static void test_Locate(void)
@@ -103,5 +103,5 @@ index 91628e2..7943184 100644
  
          bo.biBitCount = bi.biBitCount = 8;
 -- 
-2.7.1
+2.11.0