Rebase against 839f8fc3e0302980772e1d31f5b761446cdf8406.

patches/wintab32-improvements/0002-wintab32-Set-lcSysExtX-Y-for-the-first-index-of-WTI_.patch

@@ -1,4 +1,4 @@
-From 3e2be51876cea141ae48e43341d37d5e676bfbf3 Mon Sep 17 00:00:00 2001
+From 3331092fc0700994e0735efe12f35c2a698623e8 Mon Sep 17 00:00:00 2001
 From: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
 Date: Thu, 31 May 2018 11:45:10 +1000
 Subject: [PATCH] wintab32: Set lcSysExtX/Y for the first index of WTI_DDCTXS
@@ -8,11 +8,11 @@ Subject: [PATCH] wintab32: Set lcSysExtX/Y for the first index of WTI_DDCTXS
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/dlls/wintab32/context.c b/dlls/wintab32/context.c
-index 8db6217..fe666a5 100644
+index 4e19a93cc37..ded6fd9cb65 100644
 --- a/dlls/wintab32/context.c
 +++ b/dlls/wintab32/context.c
-@@ -410,7 +410,7 @@ static UINT WTInfoT(UINT wCategory, UINT nIndex, LPVOID lpOutput, BOOL bUnicode)
-             pWTInfoW(wCategory, nIndex, &buf);
+@@ -413,7 +413,7 @@ static UINT WTInfoT(UINT wCategory, UINT nIndex, LPVOID lpOutput, BOOL bUnicode)
+             DriverInfo(wCategory, nIndex, &buf);
  
              /*  Handle system extents here, as we can use user32.dll code to set them */
 -            if(wCategory == WTI_DEFSYSCTX)
@@ -21,5 +21,5 @@ index 8db6217..fe666a5 100644
                  buf.lcSysExtX = GetSystemMetrics(SM_CXSCREEN);
                  buf.lcSysExtY = GetSystemMetrics(SM_CYSCREEN);
 -- 
-1.9.1
+2.51.0
 

staging/upstream-commit

@@ -1 +1 @@
-82275b13a24613947d1da00cd85209dbfaf5465f
+839f8fc3e0302980772e1d31f5b761446cdf8406