From 74068f2cab60503bf92db5b1cb0b9dc2a3868bc2 Mon Sep 17 00:00:00 2001 From: Alistair Leslie-Hughes Date: Mon, 19 Aug 2019 10:33:13 +1000 Subject: [PATCH] Updated uxtheme-GTK_Theming patchset Correct warnings this time. --- patches/patchinstall.sh | 2 - .../0006-uxtheme-Dont-build-with-msvcrt.patch | 87 ++++++++++++++++++- .../0007-Added-wine-unicode.patch | 24 ----- 3 files changed, 83 insertions(+), 30 deletions(-) delete mode 100644 patches/uxtheme-GTK_Theming/0007-Added-wine-unicode.patch diff --git a/patches/patchinstall.sh b/patches/patchinstall.sh index b8893901..b381ee1b 100755 --- a/patches/patchinstall.sh +++ b/patches/patchinstall.sh @@ -6508,14 +6508,12 @@ if test "$enable_uxtheme_GTK_Theming" -eq 1; then patch_apply uxtheme-GTK_Theming/0004-uxtheme-Reset-FPU-flags-before-calling-GTK3-function.patch patch_apply uxtheme-GTK_Theming/0005-uxtheme-Fix-some-incorrect-error-codes.patch patch_apply uxtheme-GTK_Theming/0006-uxtheme-Dont-build-with-msvcrt.patch - patch_apply uxtheme-GTK_Theming/0007-Added-wine-unicode.patch ( printf '%s\n' '+ { "Ivan Akulinchev", "uxtheme: Initial implementation of GTK backend.", 1 },'; printf '%s\n' '+ { "Sebastian Lackner", "uxtheme: Correctly render buttons with GTK >= 3.14.0.", 1 },'; printf '%s\n' '+ { "Michael Müller", "uxtheme: Reset FPU flags before calling GTK3 functions.", 1 },'; printf '%s\n' '+ { "Sebastian Lackner", "uxtheme: Fix some incorrect error codes.", 1 },'; printf '%s\n' '+ { "Alistair Leslie-Hughes", "uxtheme: Dont build with msvcrt.", 1 },'; - printf '%s\n' '+ { "Alistair Leslie-Hughes", "Added wine/unicode.", 1 },'; ) >> "$patchlist" fi diff --git a/patches/uxtheme-GTK_Theming/0006-uxtheme-Dont-build-with-msvcrt.patch b/patches/uxtheme-GTK_Theming/0006-uxtheme-Dont-build-with-msvcrt.patch index 7749bb93..9bd60788 100644 --- a/patches/uxtheme-GTK_Theming/0006-uxtheme-Dont-build-with-msvcrt.patch +++ b/patches/uxtheme-GTK_Theming/0006-uxtheme-Dont-build-with-msvcrt.patch @@ -1,11 +1,12 @@ -From 1b00043f71c020e59d28bbc79f78a17bc3b4fd86 Mon Sep 17 00:00:00 2001 +From 04c452501e9c4e25d2ad2abf704bb30be5674719 Mon Sep 17 00:00:00 2001 From: Alistair Leslie-Hughes Date: Wed, 26 Jun 2019 10:38:23 +1000 Subject: [PATCH] uxtheme: Dont build with msvcrt --- - dlls/uxtheme/Makefile.in | 2 -- - 1 file changed, 2 deletions(-) + dlls/uxtheme/Makefile.in | 2 -- + dlls/uxtheme/msstyles.c | 17 ++++++++--------- + 2 files changed, 8 insertions(+), 11 deletions(-) diff --git a/dlls/uxtheme/Makefile.in b/dlls/uxtheme/Makefile.in index d0409300230..e09f891ee48 100644 @@ -20,6 +21,84 @@ index d0409300230..e09f891ee48 100644 C_SRCS = \ buffer.c \ draw.c \ +diff --git a/dlls/uxtheme/msstyles.c b/dlls/uxtheme/msstyles.c +index 5030e52a597..bc898f13453 100644 +--- a/dlls/uxtheme/msstyles.c ++++ b/dlls/uxtheme/msstyles.c +@@ -17,7 +17,6 @@ + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ +- + #include + #include + +@@ -31,7 +30,7 @@ + #include "tmschema.h" + + #include "msstyles.h" +- ++#include "wine/unicode.h" + #include "wine/exception.h" + #include "wine/debug.h" + #include "wine/heap.h" +@@ -353,7 +352,7 @@ static BOOL MSSTYLES_ParseIniSectionName(LPCWSTR lpSection, DWORD dwLen, LPWSTR + *iStateId = 0; + comp = sec; + /* Get the application name */ +- tmp = wcschr(comp, ':'); ++ tmp = strchrW(comp, ':'); + if(tmp) { + *tmp++ = 0; + tmp++; +@@ -361,19 +360,19 @@ static BOOL MSSTYLES_ParseIniSectionName(LPCWSTR lpSection, DWORD dwLen, LPWSTR + comp = tmp; + } + +- tmp = wcschr(comp, '.'); ++ tmp = strchrW(comp, '.'); + if(tmp) { + *tmp++ = 0; + lstrcpynW(szClassName, comp, MAX_THEME_CLASS_NAME); + comp = tmp; + /* now get the part & state */ +- tmp = wcschr(comp, '('); ++ tmp = strchrW(comp, '('); + if(tmp) { + *tmp++ = 0; + lstrcpynW(part, comp, ARRAY_SIZE(part)); + comp = tmp; + /* now get the state */ +- tmp = wcschr(comp, ')'); ++ tmp = strchrW(comp, ')'); + if (!tmp) + return FALSE; + *tmp = 0; +@@ -384,13 +383,13 @@ static BOOL MSSTYLES_ParseIniSectionName(LPCWSTR lpSection, DWORD dwLen, LPWSTR + } + } + else { +- tmp = wcschr(comp, '('); ++ tmp = strchrW(comp, '('); + if(tmp) { + *tmp++ = 0; + lstrcpynW(szClassName, comp, MAX_THEME_CLASS_NAME); + comp = tmp; + /* now get the state */ +- tmp = wcschr(comp, ')'); ++ tmp = strchrW(comp, ')'); + if (!tmp) + return FALSE; + *tmp = 0; +@@ -1014,7 +1013,7 @@ PTHEME_CLASS MSSTYLES_OpenThemeClass(LPCWSTR pszAppName, LPCWSTR pszClassList) + } + + start = pszClassList; +- while((end = wcschr(start, ';'))) { ++ while((end = strchrW(start, ';'))) { + len = end-start; + lstrcpynW(szClassName, start, min(len+1, ARRAY_SIZE(szClassName))); + start = end+1; -- -2.20.1 +2.17.1 diff --git a/patches/uxtheme-GTK_Theming/0007-Added-wine-unicode.patch b/patches/uxtheme-GTK_Theming/0007-Added-wine-unicode.patch deleted file mode 100644 index fdf71efe..00000000 --- a/patches/uxtheme-GTK_Theming/0007-Added-wine-unicode.patch +++ /dev/null @@ -1,24 +0,0 @@ -From c6bb50c511a23de00e0a5975c30e3d01415fc612 Mon Sep 17 00:00:00 2001 -From: Alistair Leslie-Hughes -Date: Mon, 19 Aug 2019 09:35:43 +1000 -Subject: [PATCH] Added wine/unicode - ---- - dlls/uxtheme/msstyles.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/dlls/uxtheme/msstyles.c b/dlls/uxtheme/msstyles.c -index 5030e52a597..456256216a4 100644 ---- a/dlls/uxtheme/msstyles.c -+++ b/dlls/uxtheme/msstyles.c -@@ -32,6 +32,7 @@ - - #include "msstyles.h" - -+#include "wine/unicode.h" - #include "wine/exception.h" - #include "wine/debug.h" - #include "wine/heap.h" --- -2.17.1 -