Correct GTK patchset change

patches/uxtheme-GTK_Theming/0000-Revert-uxtheme-Build-with-msvcrt.patch

@@ -1,4 +1,4 @@
-From 8eb7fb60224342ef7efb8b0a7080973a9ade1daf Mon Sep 17 00:00:00 2001
+From 950509a411325066153614e5f51f6804be6be0b5 Mon Sep 17 00:00:00 2001
 From: Zebediah Figura <z.figura12@gmail.com>
 Date: Wed, 18 Sep 2019 18:52:32 -0500
 Subject: [PATCH] Revert "uxtheme: Build with msvcrt."
@@ -18,7 +18,7 @@ This reverts commit 21a19fb4e35f4b8c61958ba25b0058c1e090f2b3.
  10 files changed, 26 insertions(+), 9 deletions(-)
 
 diff --git a/dlls/uxtheme/Makefile.in b/dlls/uxtheme/Makefile.in
-index 61817ee54..c3fff30ba 100644
+index 61817ee5468..c3fff30ba90 100644
 --- a/dlls/uxtheme/Makefile.in
 +++ b/dlls/uxtheme/Makefile.in
 @@ -3,8 +3,6 @@ IMPORTLIB = uxtheme
@@ -31,7 +31,7 @@ index 61817ee54..c3fff30ba 100644
  	buffer.c \
  	draw.c \
 diff --git a/dlls/uxtheme/buffer.c b/dlls/uxtheme/buffer.c
-index b07284f8e..32d341cb7 100644
+index b07284f8e06..32d341cb7f9 100644
 --- a/dlls/uxtheme/buffer.c
 +++ b/dlls/uxtheme/buffer.c
 @@ -19,6 +19,8 @@
@@ -44,7 +44,7 @@ index b07284f8e..32d341cb7 100644
  #include <stdarg.h>
  
 diff --git a/dlls/uxtheme/draw.c b/dlls/uxtheme/draw.c
-index 3dcc58205..69c53b9eb 100644
+index 3dcc58205b0..69c53b9ebc3 100644
 --- a/dlls/uxtheme/draw.c
 +++ b/dlls/uxtheme/draw.c
 @@ -18,6 +18,8 @@
@@ -57,7 +57,7 @@ index 3dcc58205..69c53b9eb 100644
  #include <stdarg.h>
  
 diff --git a/dlls/uxtheme/main.c b/dlls/uxtheme/main.c
-index 5e5610a1f..73894e820 100644
+index 5e5610a1f84..73894e820ab 100644
 --- a/dlls/uxtheme/main.c
 +++ b/dlls/uxtheme/main.c
 @@ -18,6 +18,8 @@
@@ -70,7 +70,7 @@ index 5e5610a1f..73894e820 100644
  
  #include "windef.h"
 diff --git a/dlls/uxtheme/metric.c b/dlls/uxtheme/metric.c
-index 2d5a09d02..073422f1c 100644
+index 2d5a09d0256..073422f1cda 100644
 --- a/dlls/uxtheme/metric.c
 +++ b/dlls/uxtheme/metric.c
 @@ -18,6 +18,8 @@
@@ -83,7 +83,7 @@ index 2d5a09d02..073422f1c 100644
  
  #include "windef.h"
 diff --git a/dlls/uxtheme/msstyles.c b/dlls/uxtheme/msstyles.c
-index cee5aaf05..bc8eca7b3 100644
+index 5030e52a597..9bbfd5e5b53 100644
 --- a/dlls/uxtheme/msstyles.c
 +++ b/dlls/uxtheme/msstyles.c
 @@ -18,6 +18,8 @@
@@ -95,15 +95,15 @@ index cee5aaf05..bc8eca7b3 100644
  #include <stdarg.h>
  #include <stdlib.h>
  
-@@ -32,6 +34,7 @@
- 
+@@ -33,6 +35,7 @@
  #include "msstyles.h"
  
+ #include "wine/exception.h"
 +#include "wine/unicode.h"
  #include "wine/debug.h"
  #include "wine/heap.h"
  
-@@ -349,7 +352,7 @@ static BOOL MSSTYLES_ParseIniSectionName(LPCWSTR lpSection, DWORD dwLen, LPWSTR
+@@ -353,7 +356,7 @@ static BOOL MSSTYLES_ParseIniSectionName(LPCWSTR lpSection, DWORD dwLen, LPWSTR
      *iStateId = 0;
      comp = sec;
      /* Get the application name */
@@ -112,7 +112,7 @@ index cee5aaf05..bc8eca7b3 100644
      if(tmp) {
          *tmp++ = 0;
          tmp++;
-@@ -357,19 +360,19 @@ static BOOL MSSTYLES_ParseIniSectionName(LPCWSTR lpSection, DWORD dwLen, LPWSTR
+@@ -361,19 +364,19 @@ static BOOL MSSTYLES_ParseIniSectionName(LPCWSTR lpSection, DWORD dwLen, LPWSTR
          comp = tmp;
      }
  
@@ -135,7 +135,7 @@ index cee5aaf05..bc8eca7b3 100644
              if (!tmp)
                  return FALSE;
              *tmp = 0;
-@@ -380,13 +383,13 @@ static BOOL MSSTYLES_ParseIniSectionName(LPCWSTR lpSection, DWORD dwLen, LPWSTR
+@@ -384,13 +387,13 @@ static BOOL MSSTYLES_ParseIniSectionName(LPCWSTR lpSection, DWORD dwLen, LPWSTR
          }
      }
      else {
@@ -151,7 +151,7 @@ index cee5aaf05..bc8eca7b3 100644
              if (!tmp)
                  return FALSE;
              *tmp = 0;
-@@ -1009,7 +1012,7 @@ PTHEME_CLASS MSSTYLES_OpenThemeClass(LPCWSTR pszAppName, LPCWSTR pszClassList)
+@@ -1014,7 +1017,7 @@ PTHEME_CLASS MSSTYLES_OpenThemeClass(LPCWSTR pszAppName, LPCWSTR pszClassList)
      }
  
      start = pszClassList;
@@ -161,7 +161,7 @@ index cee5aaf05..bc8eca7b3 100644
          lstrcpynW(szClassName, start, min(len+1, ARRAY_SIZE(szClassName)));
          start = end+1;
 diff --git a/dlls/uxtheme/property.c b/dlls/uxtheme/property.c
-index 93a72ab91..0e077aeec 100644
+index 93a72ab9189..0e077aeec46 100644
 --- a/dlls/uxtheme/property.c
 +++ b/dlls/uxtheme/property.c
 @@ -18,6 +18,8 @@
@@ -174,7 +174,7 @@ index 93a72ab91..0e077aeec 100644
  
  #include "windef.h"
 diff --git a/dlls/uxtheme/stylemap.c b/dlls/uxtheme/stylemap.c
-index 149ee0eb5..19e3c9322 100644
+index 149ee0eb524..19e3c932240 100644
 --- a/dlls/uxtheme/stylemap.c
 +++ b/dlls/uxtheme/stylemap.c
 @@ -18,6 +18,8 @@
@@ -187,7 +187,7 @@ index 149ee0eb5..19e3c9322 100644
  
  #include "windef.h"
 diff --git a/dlls/uxtheme/system.c b/dlls/uxtheme/system.c
-index 6e9c0f223..c898ad32e 100644
+index 6e9c0f22369..c898ad32e2f 100644
 --- a/dlls/uxtheme/system.c
 +++ b/dlls/uxtheme/system.c
 @@ -18,6 +18,8 @@
@@ -200,7 +200,7 @@ index 6e9c0f223..c898ad32e 100644
  #include <stdio.h>
  
 diff --git a/dlls/uxtheme/uxini.c b/dlls/uxtheme/uxini.c
-index 361e7f13f..1581ff469 100644
+index 361e7f13fa5..1581ff469a5 100644
 --- a/dlls/uxtheme/uxini.c
 +++ b/dlls/uxtheme/uxini.c
 @@ -18,6 +18,8 @@
@@ -213,5 +213,5 @@ index 361e7f13f..1581ff469 100644
  
  #include "windef.h"
 -- 
-2.23.0
+2.17.1