April 2020 - Wine-commits - list.winehq.org

Alexandre Julliard : winegcc: No longer use a constructor for module initialization.
by Alexandre Julliard 21 Apr '20

21 Apr '20

Module: wine Branch: master Commit: 1ccd638b1aa85fb3c43b49d69d279cd509ebdc21 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1ccd638b1aa85fb3c43b49d6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Apr 21 11:27:53 2020 +0200 winegcc: No longer use a constructor for module initialization. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winegcc/winegcc.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/tools/winegcc/winegcc.c b/tools/winegcc/winegcc.c index 0682e9aa9a..5ea99d3cf0 100644 --- a/tools/winegcc/winegcc.c +++ b/tools/winegcc/winegcc.c @@ -534,8 +534,6 @@ static strarray *get_link_args( struct options *opts, const char *output_name ) strarray_add( flags, "-Wl,--no-wchar-size-warning" ); if (!try_link( opts->prefix, link_args, "-Wl,-z,defs" )) strarray_add( flags, "-Wl,-z,defs" ); - if (opts->shared && !try_link( opts->prefix, link_args, "-Wl,-init,__wine_spec_init" )) - strarray_add( flags, "-Wl,-init,__wine_spec_init" ); strarray_addall( link_args, flags ); return link_args; @@ -1379,8 +1377,8 @@ static void build(struct options* opts) } } - if (!is_pe && !opts->shared) fixup_constructors( opts, output_path ); - if (is_pe && opts->wine_builtin) make_wine_builtin( opts, output_path ); + if (!is_pe) fixup_constructors( opts, output_path ); + else if (opts->wine_builtin) make_wine_builtin( opts, output_path ); /* create the loader script */ if (generate_app_loader)

1 0

Alexandre Julliard : winecrt0: Get rid of constructor support.
by Alexandre Julliard 21 Apr '20

21 Apr '20

Module: wine Branch: master Commit: f6a363bc4108f3d45b7a5bac706d10579f4d2772 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f6a363bc4108f3d45b7a5bac… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Apr 21 11:28:03 2020 +0200 winecrt0: Get rid of constructor support. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winecrt0/Makefile.in | 2 -- dlls/winecrt0/crt0_private.h | 41 ------------------------------------ dlls/winecrt0/dll_entry.c | 49 -------------------------------------------- dlls/winecrt0/init.c | 46 ----------------------------------------- 4 files changed, 138 deletions(-) diff --git a/dlls/winecrt0/Makefile.in b/dlls/winecrt0/Makefile.in index 909959dcb6..bcbd4e3b55 100644 --- a/dlls/winecrt0/Makefile.in +++ b/dlls/winecrt0/Makefile.in @@ -4,7 +4,6 @@ C_SRCS = \ crt_dllmain.c \ debug.c \ delay_load.c \ - dll_entry.c \ dll_main.c \ exception.c \ exe16_entry.c \ @@ -12,6 +11,5 @@ C_SRCS = \ exe_main.c \ exe_wentry.c \ exe_wmain.c \ - init.c \ register.c \ stub.c diff --git a/dlls/winecrt0/crt0_private.h b/dlls/winecrt0/crt0_private.h deleted file mode 100644 index b2c902e6bb..0000000000 --- a/dlls/winecrt0/crt0_private.h +++ /dev/null @@ -1,41 +0,0 @@ -/* - * crt0 library private definitions - * - * Copyright 2005 Alexandre Julliard - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - */ - -#ifndef __WINE_CRT0_PRIVATE_H__ -#define __WINE_CRT0_PRIVATE_H__ - -#if defined(__APPLE__) || defined(__ANDROID__) -static inline void _init(int argc, char **argv, char **envp ) { /* nothing */ } -static inline void _fini(void) { /* nothing */ } -#else -extern void _init(int argc, char **argv, char **envp ) DECLSPEC_HIDDEN; -extern void _fini(void) DECLSPEC_HIDDEN; -#endif - -enum init_state -{ - NO_INIT_DONE, /* no initialization done yet */ - DLL_REGISTERED, /* the dll has been registered */ - CONSTRUCTORS_DONE /* the constructors have been run (implies dll registered too) */ -}; - -extern enum init_state __wine_spec_init_state DECLSPEC_HIDDEN; - -#endif /* __WINE_CRT0_PRIVATE_H__ */ diff --git a/dlls/winecrt0/dll_entry.c b/dlls/winecrt0/dll_entry.c deleted file mode 100644 index 92bd069529..0000000000 --- a/dlls/winecrt0/dll_entry.c +++ /dev/null @@ -1,49 +0,0 @@ -/* - * Default entry point for a dll - * - * Copyright 2005 Alexandre Julliard - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - */ - -#if 0 -#pragma makedep unix -#endif - -#include <stdarg.h> -#include "windef.h" -#include "winbase.h" -#include "wine/library.h" -#include "crt0_private.h" - -extern BOOL WINAPI DECLSPEC_HIDDEN DllMain( HINSTANCE inst, DWORD reason, LPVOID reserved ); - -BOOL WINAPI DECLSPEC_HIDDEN __wine_spec_dll_entry( HINSTANCE inst, DWORD reason, LPVOID reserved ) -{ - static BOOL call_fini; - BOOL ret; - - if (reason == DLL_PROCESS_ATTACH && __wine_spec_init_state != CONSTRUCTORS_DONE) - { - call_fini = TRUE; - _init( 0, NULL, NULL ); - } - - ret = DllMain( inst, reason, reserved ); - - if (reason == DLL_PROCESS_DETACH && call_fini) _fini(); - - return ret; -} diff --git a/dlls/winecrt0/init.c b/dlls/winecrt0/init.c deleted file mode 100644 index 2ffe8e564c..0000000000 --- a/dlls/winecrt0/init.c +++ /dev/null @@ -1,46 +0,0 @@ -/* - * Initialization code for spec files - * - * Copyright 2005 Alexandre Julliard - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - */ - -#if 0 -#pragma makedep unix -#endif - -#include <stdarg.h> -#include "windef.h" -#include "winbase.h" -#include "wine/library.h" -#include "crt0_private.h" - -enum init_state __wine_spec_init_state = NO_INIT_DONE; - -extern const IMAGE_NT_HEADERS __wine_spec_nt_header; -extern const char __wine_spec_file_name[]; - -void DECLSPEC_HIDDEN __wine_spec_init(void) -{ - __wine_spec_init_state = DLL_REGISTERED; - __wine_dll_register( &__wine_spec_nt_header, __wine_spec_file_name ); -} - -void DECLSPEC_HIDDEN __wine_spec_init_ctor(void) -{ - if (__wine_spec_init_state == NO_INIT_DONE) __wine_spec_init(); - __wine_spec_init_state = CONSTRUCTORS_DONE; -}

1 0

Alexandre Julliard : makefiles: Explicitly import libwine where necessary.
by Alexandre Julliard 21 Apr '20

21 Apr '20

Module: wine Branch: master Commit: 62807be8c9a7620e7198b203f5d56046a87584ae URL: https://source.winehq.org/git/wine.git/?a=commit;h=62807be8c9a7620e7198b203… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Apr 21 12:00:08 2020 +0200 makefiles: Explicitly import libwine where necessary. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/Makefile.in | 2 +- dlls/wineandroid.drv/Makefile.in | 1 + tools/winegcc/winegcc.c | 1 - 3 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/Makefile.in b/dlls/ntdll/Makefile.in index 491cf5a707..a67809a6c2 100644 --- a/dlls/ntdll/Makefile.in +++ b/dlls/ntdll/Makefile.in @@ -3,7 +3,7 @@ MODULE = ntdll.dll IMPORTLIB = ntdll IMPORTS = winecrt0 EXTRAINCL = $(UNWIND_CFLAGS) -EXTRALIBS = $(IOKIT_LIBS) $(RT_LIBS) $(PTHREAD_LIBS) $(UNWIND_LIBS) +EXTRALIBS = -lwine $(IOKIT_LIBS) $(RT_LIBS) $(PTHREAD_LIBS) $(UNWIND_LIBS) EXTRADLLFLAGS = -nodefaultlibs -Wl,--image-base,0x7bc00000 C_SRCS = \ diff --git a/dlls/wineandroid.drv/Makefile.in b/dlls/wineandroid.drv/Makefile.in index 40ab495e35..e35f85ac89 100644 --- a/dlls/wineandroid.drv/Makefile.in +++ b/dlls/wineandroid.drv/Makefile.in @@ -1,5 +1,6 @@ MODULE = wineandroid.drv IMPORTS = uuid ole32 user32 gdi32 advapi32 ntoskrnl +EXTRALIBS = -lwine C_SRCS = \ device.c \ diff --git a/tools/winegcc/winegcc.c b/tools/winegcc/winegcc.c index 5ea99d3cf0..d38ca97488 100644 --- a/tools/winegcc/winegcc.c +++ b/tools/winegcc/winegcc.c @@ -1180,7 +1180,6 @@ static void build(struct options* opts) add_library(opts, lib_dirs, files, "kernel32"); add_library(opts, lib_dirs, files, "ntdll"); } - if (!opts->nostdlib && !is_pe) add_library(opts, lib_dirs, files, "wine"); /* set default entry point, if needed */ if (!opts->entry_point)

1 0

Francois Gouget : dwrite: Include config.h for HAVE___BUILTIN_POPCOUNT.
by Alexandre Julliard 21 Apr '20

21 Apr '20

Module: wine Branch: master Commit: e24bd0b9d365a2204baeacc774451cb521becffa URL: https://source.winehq.org/git/wine.git/?a=commit;h=e24bd0b9d365a2204baeacc7… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Apr 20 03:56:53 2020 +0200 dwrite: Include config.h for HAVE___BUILTIN_POPCOUNT. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/opentype.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/dwrite/opentype.c b/dlls/dwrite/opentype.c index 9813676ab0..0307cd5981 100644 --- a/dlls/dwrite/opentype.c +++ b/dlls/dwrite/opentype.c @@ -21,6 +21,7 @@ #define COBJMACROS #define NONAMELESSUNION +#include "config.h" #include "dwrite_private.h" #include "winternl.h"

1 0

Francois Gouget : testbot/build: Add support for Wine Mono 5.0.0.
by Alexandre Julliard 21 Apr '20

21 Apr '20

Module: tools Branch: master Commit: 825a4ecabd8747d6c636c514bab23a9ab9004bfd URL: https://source.winehq.org/git/tools.git/?a=commit;h=825a4ecabd8747d6c636c51… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Apr 21 19:09:43 2020 +0200 testbot/build: Add support for Wine Mono 5.0.0. The MSI filename now contains an architecture suffix and the checksum is per-architecture (so support for other architectures like arm64 can be added one day). Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/Build/Utils.pm | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/testbot/lib/Build/Utils.pm b/testbot/lib/Build/Utils.pm index df236fa..8c26327 100644 --- a/testbot/lib/Build/Utils.pm +++ b/testbot/lib/Build/Utils.pm @@ -425,6 +425,10 @@ sub UpdateAddOns() { $Arch = $1; } + elsif ($Line =~ /^\s*#\s*define\s+(?:GECKO|MONO)_ARCH\s+"([^"]+)"/) + { + $Arch = $1; + } elsif ($Line =~ /^\s*#\s*define\s*(GECKO|MONO)_VERSION\s*"([^"]+)"/) { my ($AddOn, $Version) = ($1, $2); @@ -450,7 +454,7 @@ sub UpdateAddOns() return _UpdateAddOn($AddOns{gecko}, "gecko", "x86") && _UpdateAddOn($AddOns{gecko}, "gecko", "x86_64") && - _UpdateAddOn($AddOns{mono}, "mono", ""); + _UpdateAddOn($AddOns{mono}, "mono", "x86"); }

1 0

Jeremy Newman : add note about mailman password, cleanup a bit
by Jeremy Newman 21 Apr '20

21 Apr '20

Module: website Branch: master Commit: 6564ad37523ef5fb70365afe5be29872c7a02977 URL: https://source.winehq.org/git/website.git/?a=commit;h=6564ad37523ef5fb70365… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Tue Apr 21 14:34:02 2020 -0500 add note about mailman password, cleanup a bit --- templates/en/forums.template | 75 ++++++++++++++++++++------------------------ 1 file changed, 34 insertions(+), 41 deletions(-) diff --git a/templates/en/forums.template b/templates/en/forums.template index 66e08d35..08b268ae 100644 --- a/templates/en/forums.template +++ b/templates/en/forums.template @@ -27,98 +27,91 @@ a Wine area in a popular distro's main forum). WineHQ has mailing lists for submitting patches, tracking Git commits, and discussing Wine. They feature a very customizable user subscription config, and can be subscribed to <a href="//www.winehq.org/mailman/listinfo">via -WWW</a> or by sending mail to listname-request(a)winehq.org with a -subject line of "subscribe". To unsubscribe, use a subject line of -"unsubscribe password" using the password you got when you subscribed, +WWW</a> or by sending mail to <code><listname>-request(a)winehq.org</code> with a +subject line of <code>"subscribe"</code>. To unsubscribe, use a subject line of +<code>"unsubscribe <password>"</code> using the password you got when you subscribed, or just use <a href="//www.winehq.org/mailman/listinfo">the Mailman web interface</a>. +<div class="alert alert-warning"> + <h3 class="nomargin-top"> Web Interface is password protected</h3> + + Due to an increase in bot traffic attempting to subscribe to our lists, the URL to access the Mailman web interface is password protected. + + + Username: <code>mailman</code> + Password: <code>getalist</code> + + This password may change from time to time, so check back here for changes. +</div> + Note: You should be subscribed to the lists before you post to them, otherwise your posting will be treated as possible spam by the mailing list software. <ul class="roomy"> <li> + <a href="mailto:wine-announce(a)winehq.org">wine-announce(a)winehq.org</a> [<a href="//www.winehq.org/mailman/listinfo/wine-announce">(Un-)Subscribe</a>] [<a href="//www.winehq.org/pipermail/wine-announce/">Archive 1</a>] - [<a href="http://news.gmane.org/gmane.comp.emulators.wine.announce">Archive 2</a>] - [<a href="news://news.gmane.org/gmane.comp.emulators.wine.announce">via newsreader</a>] - <a href="mailto:wine-announce(a)winehq.org">wine-announce(a)winehq.org</a> + [<a href="http://news.gmane.org/gmane.comp.emulators.wine.announce">Archive 2</a>] A low traffic (2/month) read-only list for announcing releases and other major Wine or WineHQ news. </li> <li> - [<a href="http://news.gmane.org/gmane.comp.emulators.wine.announce">Archive 1</a>] - [<a href="//www.winehq.org/pipermail/wine-users/">Archive 2</a>] - A list for end-user discussions. Now closed. Use the <a href="//forums.winehq.org/">forums</a> instead. - </li> - - <li> + <a href="mailto:wine-zh(a)freelists.org">wine-zh(a)freelists.org</a> [<a href="http://www.freelists.org/list/wine-zh">(Un-)Subscribe</a>] - [<a href="http://www.freelists.org/archive/wine-zh/">Archive</a>] - <a href="mailto:wine-zh(a)freelists.org">wine-zh(a)freelists.org</a> + [<a href="http://www.freelists.org/archive/wine-zh/">Archive</a>] A low traffic (10/day) open list for end-user discussions in Chinese. </li> <li> + <a href="mailto:wine-devel(a)winehq.org">wine-devel(a)winehq.org</a> [<a href="//www.winehq.org/mailman/listinfo/wine-devel">(Un-)Subscribe</a>] [<a href="//www.winehq.org/pipermail/wine-devel/">Archive 1</a>] - [<a href="http://news.gmane.org/gmane.comp.emulators.wine.devel">Archive 2</a>] - [<a href="news://news.gmane.org/gmane.comp.emulators.wine.devel">via newsreader</a>] - <a href="mailto:wine-devel(a)winehq.org">wine-devel(a)winehq.org</a> + [<a href="http://news.gmane.org/gmane.comp.emulators.wine.devel">Archive 2</a>] A medium traffic (50/day) open list for discussing Wine development, WineHQ, patches or anything else of interest to Wine developers. </li> <li> - [<a href="//www.winehq.org/mailman/listinfo/wine-patches">(Un-)Subscribe</a>] - [<a href="//www.winehq.org/pipermail/wine-patches/">Archive 1</a>] - [<a href="http://news.gmane.org/gmane.comp.emulators.wine.patches">Archive 2</a>] - [<a href="news://news.gmane.org/gmane.comp.emulators.wine.patches">via newsreader</a>] - <a href="mailto:wine-patches(a)winehq.org">wine-patches(a)winehq.org</a> - A deprecated list for submitting patches. Use <a href="mailto:wine-devel(a)winehq.org">wine-devel(a)winehq.org</a> instead. + <a href="mailto:wine-patches(a)winehq.org">wine-patches(a)winehq.org</a> + [<a href="//www.winehq.org/mailman/listinfo/wine-patches">(Un-)Subscribe</a>] + [<a href="//www.winehq.org/pipermail/wine-patches/">Archive 1</a>] + [<a href="http://news.gmane.org/gmane.comp.emulators.wine.patches">Archive 2</a>] + A deprecated list for submitting patches. Use <a href="mailto:wine-devel(a)winehq.org">wine-devel(a)winehq.org</a> instead. </li> <li> + <a href="mailto:wine-cvs(a)winehq.org">wine-cvs(a)winehq.org</a> [<a href="//www.winehq.org/mailman/listinfo/wine-cvs">(Un-)Subscribe</a>] [<a href="//www.winehq.org/pipermail/wine-cvs/">Archive 1</a>] - [<a href="http://news.gmane.org/gmane.comp.emulators.wine.cvs">Archive 2</a>] - [<a href="news://news.gmane.org/gmane.comp.emulators.wine.cvs">via newsreader</a>] - <a href="mailto:wine-cvs(a)winehq.org">wine-cvs(a)winehq.org</a> + [<a href="http://news.gmane.org/gmane.comp.emulators.wine.cvs">Archive 2</a>] A medium traffic (25/day) read only list which tracks commits to the Git tree. </li> <li> + <a href="mailto:wine-releases(a)winehq.org">wine-releases(a)winehq.org</a> [<a href="//www.winehq.org/mailman/listinfo/wine-releases">(Un-)Subscribe</a>] - [<a href="//www.winehq.org/pipermail/wine-releases/">Archive 1</a>] - <a href="mailto:wine-releases(a)winehq.org">wine-releases(a)winehq.org</a> + [<a href="//www.winehq.org/pipermail/wine-releases/">Archive 1</a>] A low traffic (2/month) read only list for receiving a large diff file at every Wine official release. </li> <li> - [<a href="http://news.gmane.org/gmane.comp.emulators.wine.license">Archive 1</a>] - [<a href="news://news.gmane.org/gmane.comp.emulators.wine.license">via newsreader</a>] - - Closed list that was for discussing legal issues - related to Wine, including license issues. (Closed 2004-12-16) - </li> - - <li> + <a href="mailto:wine-bugs(a)winehq.org">wine-bugs(a)winehq.org</a> [<a href="//www.winehq.org/mailman/listinfo/wine-bugs">(Un-)Subscribe</a>] [<a href="//www.winehq.org/pipermail/wine-bugs/">Archive 1</a>] - [<a href="http://news.gmane.org/gmane.comp.emulators.wine.bugs">Archive 2</a>] - [<a href="news://news.gmane.org/gmane.comp.emulators.wine.bugs">via newsreader</a>] - <a href="mailto:wine-bugs(a)winehq.org">wine-bugs(a)winehq.org</a> + [<a href="http://news.gmane.org/gmane.comp.emulators.wine.bugs">Archive 2</a>] A high traffic (100/day) read-only list for monitoring activity on the <a href="//bugs.winehq.org/">Bug Tracking Database</a>. </li> <li> + <a href="mailto:wine-tests-results(a)winehq.org">wine-tests-results(a)winehq.org</a> [<a href="//www.winehq.org/mailman/listinfo/wine-tests-results">(Un-)Subscribe</a>] - [<a href="//www.winehq.org/pipermail/wine-tests-results/">Archive</a>] - <a href="mailto:wine-tests-results(a)winehq.org">wine-tests-results(a)winehq.org</a> + [<a href="//www.winehq.org/pipermail/wine-tests-results/">Archive</a>] A medium traffic (10/day) open list for submitting test results. </li>

1 0

Henri Verbeet : wined3d: Introduce a slab allocator for small buffers.
by Alexandre Julliard 20 Apr '20

20 Apr '20

Module: wine Branch: master Commit: f31a29b8d1ea478af28f14cdaf3db1515a932853 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f31a29b8d1ea478af28f14cd… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Apr 20 23:48:26 2020 +0430 wined3d: Introduce a slab allocator for small buffers. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/adapter_vk.c | 29 ++++++- dlls/wined3d/context_vk.c | 192 +++++++++++++++++++++++++++++++++++++++++ dlls/wined3d/texture.c | 4 +- dlls/wined3d/wined3d_private.h | 29 +++++++ include/wine/rbtree.h | 16 ++++ 5 files changed, 264 insertions(+), 6 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=f31a29b8d1ea478af28f…

1 0

Liam Middlebrook : winevulkan: Respect sortorder extension attribute.
by Alexandre Julliard 20 Apr '20

20 Apr '20

Module: wine Branch: master Commit: 63ea53decb56bd8e41e449c622ba99c844f0da0f URL: https://source.winehq.org/git/wine.git/?a=commit;h=63ea53decb56bd8e41e449c6… Author: Liam Middlebrook <lmiddlebrook(a)nvidia.com> Date: Mon Apr 20 08:35:01 2020 -0700 winevulkan: Respect sortorder extension attribute. Signed-off-by: Liam Middlebrook <lmiddlebrook(a)nvidia.com> Signed-off-by: Daniel Koch <dkoch(a)nvidia.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winevulkan/make_vulkan | 31 +++++++++++++++++++++++++------ 1 file changed, 25 insertions(+), 6 deletions(-) diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan index 482d9805cb..bbfec495ba 100755 --- a/dlls/winevulkan/make_vulkan +++ b/dlls/winevulkan/make_vulkan @@ -2779,7 +2779,9 @@ class VkRegistry(object): """ Parse extensions section and pull in any types and commands for this extension. """ extensions = [] exts = root.findall("./extensions/extension") - for ext in exts: + deferred_exts = [] + + def process_ext(ext, deferred=False): ext_name = ext.attrib["name"] # Set extension name on any functions calls part of this extension as we @@ -2792,29 +2794,34 @@ class VkRegistry(object): # Some extensions are not ready or have numbers reserved as a place holder. if ext.attrib["supported"] == "disabled": LOGGER.debug("Skipping disabled extension: {0}".format(ext_name)) - continue + return + + # Defer extensions with 'sortorder' as they are order-dependent for spec-parsing. + if not deferred and "sortorder" in ext.attrib: + deferred_exts.append(ext) + return # Disable highly experimental extensions as the APIs are unstable and can # change between minor Vulkan revisions until API is final and becomes KHR # or NV. if "KHX" in ext_name or "NVX" in ext_name: LOGGER.debug("Skipping experimental extension: {0}".format(ext_name)) - continue + return platform = ext.attrib.get("platform") if platform and platform != "win32": LOGGER.debug("Skipping extensions {0} for platform {1}".format(ext_name, platform)) - continue; + return if not self._is_extension_supported(ext_name): LOGGER.debug("Skipping blacklisted extension: {0}".format(ext_name)) - continue + return elif "requires" in ext.attrib: # Check if this extension builds on top of another blacklisted # extension. requires = ext.attrib["requires"].split(",") if len(set(requires).intersection(BLACKLISTED_EXTENSIONS)) > 0: - continue + return LOGGER.debug("Loading extension: {0}".format(ext_name)) @@ -2843,10 +2850,22 @@ class VkRegistry(object): cmd_name = command.attrib["name"] self._mark_command_required(cmd_name) + # Store a list with extensions. ext_info = {"name" : ext_name, "type" : ext.attrib["type"]} extensions.append(ext_info) + + # Process extensions, allowing for sortorder to defer extension processing + for ext in exts: + process_ext(ext) + + deferred_exts.sort(key=lambda ext: ext.attrib["sortorder"]) + + # Respect sortorder + for ext in deferred_exts: + process_ext(ext, deferred=True) + # Sort in alphabetical order. self.extensions = sorted(extensions, key=lambda ext: ext["name"])

1 0

Jacek Caban : widl: Use DECLSPEC_ALIGN in MSVC compatible way.
by Alexandre Julliard 20 Apr '20

20 Apr '20

Module: wine Branch: master Commit: 4fd8190ef1ba37c22904ccb499aea32cc6c0c0a3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4fd8190ef1ba37c22904ccb4… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Apr 20 20:19:59 2020 +0200 widl: Use DECLSPEC_ALIGN in MSVC compatible way. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/widl/typegen.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index 9b8aa1a322..a1db88a7c0 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -4816,7 +4816,7 @@ void write_func_param_struct( FILE *file, const type_t *iface, const type_t *fun if (align >= pointer_size) fprintf( file, "%s;\n", arg->name ); else - fprintf( file, "%s DECLSPEC_ALIGN(%u);\n", arg->name, pointer_size ); + fprintf( file, "DECLSPEC_ALIGN(%u) %s;\n", pointer_size, arg->name ); } if (add_retval && !is_void( retval->declspec.type )) {

1 0

Liam Middlebrook : winevulkan: Handle VkEnumValue aliases to provisional exts.
by Alexandre Julliard 20 Apr '20

20 Apr '20

Module: wine Branch: master Commit: 39191aa9060efc454c0b708bdd15c4d0e1f5743c URL: https://source.winehq.org/git/wine.git/?a=commit;h=39191aa9060efc454c0b708b… Author: Liam Middlebrook <lmiddlebrook(a)nvidia.com> Date: Mon Apr 20 08:35:02 2020 -0700 winevulkan: Handle VkEnumValue aliases to provisional exts. Signed-off-by: Liam Middlebrook <lmiddlebrook(a)nvidia.com> Signed-off-by: Daniel Koch <dkoch(a)nvidia.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winevulkan/make_vulkan | 30 +++++++++++++++++++++++++++++- 1 file changed, 29 insertions(+), 1 deletion(-) diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan index bbfec495ba..d855057072 100755 --- a/dlls/winevulkan/make_vulkan +++ b/dlls/winevulkan/make_vulkan @@ -2731,10 +2731,27 @@ class VkRegistry(object): self.enums = OrderedDict(sorted(enums.items())) - def _process_require_enum(self, enum_elem, ext=None): + def _process_require_enum(self, enum_elem, ext=None, only_aliased=False): if "extends" in enum_elem.keys(): enum = self.types[enum_elem.attrib["extends"]]["data"] + # Need to define VkEnumValues which were aliased to by another value. This is necessary + # from VK spec version 1.2.135 where the provisional VK_KHR_ray_tracing extension was + # added which altered VK_NV_ray_tracing's VkEnumValues to alias to the provisional + # extension. + aliased = False + for _, t in self.types.items(): + if t["category"] != "enum": + continue + if not t["data"]: + continue + for value in t["data"].values: + if value.alias == enum_elem.attrib["name"]: + aliased = True + + if only_aliased and not aliased: + return + if "bitpos" in enum_elem.keys(): # We need to add an extra value to an existing enum type. # E.g. VK_FORMAT_FEATURE_SAMPLED_IMAGE_FILTER_CUBIC_BIT_IMG to VkFormatFeatureFlagBits. @@ -2763,6 +2780,10 @@ class VkRegistry(object): enum.add(VkEnumValue(enum_elem.attrib["name"], alias=enum_elem.attrib["alias"])) elif "value" in enum_elem.keys(): + # Constants are not aliased, no need to add them here, they'll get added later on. + if only_aliased: + return + self.consts.append(VkConstant(enum_elem.attrib["name"], enum_elem.attrib["value"])) @staticmethod @@ -2808,6 +2829,13 @@ class VkRegistry(object): LOGGER.debug("Skipping experimental extension: {0}".format(ext_name)) return + # Extensions can define VkEnumValues which alias to provisional extensions. Pre-process + # extensions to define any required VkEnumValues before the platform check below. + for require in ext.findall("require"): + # Extensions can add enum values to Core / extension enums, so add these. + for enum_elem in require.findall("enum"): + self._process_require_enum(enum_elem, ext, only_aliased=True) + platform = ext.attrib.get("platform") if platform and platform != "win32": LOGGER.debug("Skipping extensions {0} for platform {1}".format(ext_name, platform))

1 0