wine/wine-staging
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-staging.git synced 2025-04-13 14:42:51 -07:00
Code Issues Packages Projects Releases Wiki Activity

uxtheme-GTK_Theming: Various build fixes.

Browse Source 
Don't add a new autoconf macro, just use the existing one.
This commit is contained in:
Zebediah Figura 2019-09-18 19:24:49 -05:00
parent b6054fa105
commit 8dc124ce70
4 changed files with 353 additions and 227 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

217
patches/uxtheme-GTK_Theming/0000-Revert-uxtheme-Build-with-msvcrt.patch Normal file
View File

@ -0,0 +1,217 @@
From 8eb7fb60224342ef7efb8b0a7080973a9ade1daf 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."
This reverts commit 21a19fb4e35f4b8c61958ba25b0058c1e090f2b3.
---
dlls/uxtheme/Makefile.in | 2 --
dlls/uxtheme/buffer.c | 2 ++
dlls/uxtheme/draw.c | 2 ++
dlls/uxtheme/main.c | 2 ++
dlls/uxtheme/metric.c | 2 ++
dlls/uxtheme/msstyles.c | 17 ++++++++++-------
dlls/uxtheme/property.c | 2 ++
dlls/uxtheme/stylemap.c | 2 ++
dlls/uxtheme/system.c | 2 ++
dlls/uxtheme/uxini.c | 2 ++
10 files changed, 26 insertions(+), 9 deletions(-)
diff --git a/dlls/uxtheme/Makefile.in b/dlls/uxtheme/Makefile.in
index 61817ee54..c3fff30ba 100644
--- a/dlls/uxtheme/Makefile.in
+++ b/dlls/uxtheme/Makefile.in
@@ -3,8 +3,6 @@ IMPORTLIB = uxtheme
IMPORTS = user32 gdi32 advapi32
DELAYIMPORTS = msimg32
-EXTRADLLFLAGS = -mno-cygwin
-
C_SRCS = \
buffer.c \
draw.c \
diff --git a/dlls/uxtheme/buffer.c b/dlls/uxtheme/buffer.c
index b07284f8e..32d341cb7 100644
--- a/dlls/uxtheme/buffer.c
+++ b/dlls/uxtheme/buffer.c
@@ -19,6 +19,8 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
+#include "config.h"
+
#include <stdlib.h>
#include <stdarg.h>
diff --git a/dlls/uxtheme/draw.c b/dlls/uxtheme/draw.c
index 3dcc58205..69c53b9eb 100644
--- a/dlls/uxtheme/draw.c
+++ b/dlls/uxtheme/draw.c
@@ -18,6 +18,8 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
+#include "config.h"
+
#include <stdlib.h>
#include <stdarg.h>
diff --git a/dlls/uxtheme/main.c b/dlls/uxtheme/main.c
index 5e5610a1f..73894e820 100644
--- a/dlls/uxtheme/main.c
+++ b/dlls/uxtheme/main.c
@@ -18,6 +18,8 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
+#include "config.h"
+
#include <stdarg.h>
#include "windef.h"
diff --git a/dlls/uxtheme/metric.c b/dlls/uxtheme/metric.c
index 2d5a09d02..073422f1c 100644
--- a/dlls/uxtheme/metric.c
+++ b/dlls/uxtheme/metric.c
@@ -18,6 +18,8 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
+#include "config.h"
+
#include <stdarg.h>
#include "windef.h"
diff --git a/dlls/uxtheme/msstyles.c b/dlls/uxtheme/msstyles.c
index cee5aaf05..bc8eca7b3 100644
--- a/dlls/uxtheme/msstyles.c
+++ b/dlls/uxtheme/msstyles.c
@@ -18,6 +18,8 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
+#include "config.h"
+
#include <stdarg.h>
#include <stdlib.h>
@@ -32,6 +34,7 @@
#include "msstyles.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
*iStateId = 0;
comp = sec;
/* Get the application name */
- tmp = wcschr(comp, ':');
+ tmp = strchrW(comp, ':');
if(tmp) {
*tmp++ = 0;
tmp++;
@@ -357,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;
@@ -380,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;
@@ -1009,7 +1012,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;
diff --git a/dlls/uxtheme/property.c b/dlls/uxtheme/property.c
index 93a72ab91..0e077aeec 100644
--- a/dlls/uxtheme/property.c
+++ b/dlls/uxtheme/property.c
@@ -18,6 +18,8 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
+#include "config.h"
+
#include <stdarg.h>
#include "windef.h"
diff --git a/dlls/uxtheme/stylemap.c b/dlls/uxtheme/stylemap.c
index 149ee0eb5..19e3c9322 100644
--- a/dlls/uxtheme/stylemap.c
+++ b/dlls/uxtheme/stylemap.c
@@ -18,6 +18,8 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
+#include "config.h"
+
#include <stdarg.h>
#include "windef.h"
diff --git a/dlls/uxtheme/system.c b/dlls/uxtheme/system.c
index 6e9c0f223..c898ad32e 100644
--- a/dlls/uxtheme/system.c
+++ b/dlls/uxtheme/system.c
@@ -18,6 +18,8 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
+#include "config.h"
+
#include <stdarg.h>
#include <stdio.h>
diff --git a/dlls/uxtheme/uxini.c b/dlls/uxtheme/uxini.c
index 361e7f13f..1581ff469 100644
--- a/dlls/uxtheme/uxini.c
+++ b/dlls/uxtheme/uxini.c
@@ -18,6 +18,8 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
+#include "config.h"
+
#include <stdarg.h>
#include "windef.h"
--
2.23.0

208
patches/uxtheme-GTK_Theming/0001-uxtheme-Initial-implementation-of-GTK-backend.patch
View File

File diff suppressed because it is too large Load Diff

51
patches/uxtheme-GTK_Theming/0002-makefiles-Only-apply-non-include-path-EXTRAINCL-flag.patch Normal file
View File

@ -0,0 +1,51 @@
From 26cdc4c8be3a1377439b5fe937d38dc16cbb4e90 Mon Sep 17 00:00:00 2001
From: Zebediah Figura <z.figura12@gmail.com>
Date: Wed, 18 Sep 2019 19:16:08 -0500
Subject: [PATCH 2/2] makefiles: Only apply non-include-path EXTRAINCL flags to
C sources.
On my system pkg-config generates '-pthread' for gtk-3, which trips up wrc otherwise.
---
tools/makedep.c | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/tools/makedep.c b/tools/makedep.c
index e37bd8d63..ad8de5590 100644
--- a/tools/makedep.c
+++ b/tools/makedep.c
@@ -172,6 +172,7 @@ struct makefile
struct strarray include_paths;
struct strarray include_args;
struct strarray define_args;
+ struct strarray extraincl_args;
struct strarray programs;
struct strarray scripts;
struct strarray imports;
@@ -3036,6 +3037,7 @@ static void output_source_default( struct makefile *make, struct incl_file *sour
if (source->use_msvcrt) output_filenames( msvcrt_flags );
}
output_filenames( extra_cflags );
+ output_filenames( make->extraincl_args );
output_filenames( cpp_flags );
output_filename( "$(CFLAGS)" );
output( "\n" );
@@ -4181,6 +4183,7 @@ static void load_sources( struct makefile *make )
make->include_paths = empty_strarray;
make->include_args = empty_strarray;
make->define_args = empty_strarray;
+ make->extraincl_args = empty_strarray;
strarray_add( &make->define_args, "-D__WINESRC__" );
value = get_expanded_make_var_array( make, "EXTRAINCL" );
@@ -4188,7 +4191,7 @@ static void load_sources( struct makefile *make )
if (!strncmp( value.str[i], "-I", 2 ))
strarray_add_uniq( &make->include_paths, value.str[i] + 2 );
else
- strarray_add_uniq( &make->define_args, value.str[i] );
+ strarray_add_uniq( &make->extraincl_args, value.str[i] );
strarray_addall( &make->define_args, get_expanded_make_var_array( make, "EXTRADEFS" ));
strarray_add( &make->include_args, strmake( "-I%s", obj_dir_path( make, "" )));
--
2.23.0

104
patches/uxtheme-GTK_Theming/0006-uxtheme-Dont-build-with-msvcrt.patch
View File

@ -1,104 +0,0 @@
From 04c452501e9c4e25d2ad2abf704bb30be5674719 Mon Sep 17 00:00:00 2001
From: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
Date: Wed, 26 Jun 2019 10:38:23 +1000
Subject: [PATCH] uxtheme: Dont build with msvcrt
---
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
--- a/dlls/uxtheme/Makefile.in
+++ b/dlls/uxtheme/Makefile.in
@@ -4,8 +4,6 @@ IMPORTS = user32 gdi32 advapi32
DELAYIMPORTS = msimg32
EXTRAINCL = $(GTK3_CFLAGS)
-EXTRADLLFLAGS = -mno-cygwin
-
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 <stdarg.h>
#include <stdlib.h>
@@ -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.17.1