Rebase against 28b916b26eceb35a071e9aad76da1fbbaa857ba1.

patches/gdi32-MultiMonitor/0004-winemac-Make-GetMonitorInfo-give-a-different-device-.patch

@@ -1,26 +1,18 @@
-From 2e0137d4d9706af5cc208171358b74ef614770de Mon Sep 17 00:00:00 2001
+From 804021e621413998b319f887eed3f754df784fcd Mon Sep 17 00:00:00 2001
 From: Ken Thomases <ken@codeweavers.com>
 Date: Thu, 27 Mar 2014 18:18:46 -0500
 Subject: winemac: Make GetMonitorInfo() give a different device name
  (\\.\DISPLAY<n>) to each monitor.
 
 ---
- dlls/winemac.drv/display.c | 11 +++++++----
- 1 file changed, 7 insertions(+), 4 deletions(-)
+ dlls/winemac.drv/display.c | 10 ++++++----
+ 1 file changed, 6 insertions(+), 4 deletions(-)
 
 diff --git a/dlls/winemac.drv/display.c b/dlls/winemac.drv/display.c
-index 10ecf67..c708481 100644
+index e1357d8..f82289d 100644
 --- a/dlls/winemac.drv/display.c
 +++ b/dlls/winemac.drv/display.c
-@@ -25,6 +25,7 @@
- #include "winuser.h"
- #include "winreg.h"
- #include "ddrawi.h"
-+#include "wine/unicode.h"
- 
- WINE_DEFAULT_DEBUG_CHANNEL(display);
- 
-@@ -935,7 +936,7 @@ done:
+@@ -1210,7 +1210,7 @@ done:
   */
  BOOL CDECL macdrv_GetMonitorInfo(HMONITOR monitor, LPMONITORINFO info)
  {
@@ -29,7 +21,7 @@ index 10ecf67..c708481 100644
      struct macdrv_display *displays;
      int num_displays;
      CGDirectDisplayID display_id;
-@@ -965,10 +966,12 @@ BOOL CDECL macdrv_GetMonitorInfo(HMONITOR monitor, LPMONITORINFO info)
+@@ -1240,10 +1240,12 @@ BOOL CDECL macdrv_GetMonitorInfo(HMONITOR monitor, LPMONITORINFO info)
          info->dwFlags = (i == 0) ? MONITORINFOF_PRIMARY : 0;
  
          if (info->cbSize >= sizeof(MONITORINFOEXW))
@@ -46,5 +38,5 @@ index 10ecf67..c708481 100644
      else
      {
 -- 
-2.5.1
+2.6.1