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

Alexandre Julliard : winecrt0: Get rid of constructor support.
by Alexandre Julliard April 21, 2020

April 21, 2020

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 April 21, 2020

April 21, 2020

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 April 21, 2020

April 21, 2020

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

Alexandre Julliard : ntdll: Make sure we don't try to attach the main exe a second time.
by Alexandre Julliard April 21, 2020

April 21, 2020

Module: wine Branch: master Commit: 0a72ec1dacb59c72980c3133fddf316377349048 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0a72ec1dacb59c72980c3133… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Apr 21 11:23:15 2020 +0200 ntdll: Make sure we don't try to attach the main exe a second time. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48961 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/loader.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index b0d5cf46a5..4868919b0b 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -4009,6 +4009,7 @@ void WINAPI LdrInitializeThunk( CONTEXT *context, void **entry, ULONG_PTR unknow NtTerminateProcess( GetCurrentProcess(), status ); } wm->ldr.LoadCount = -1; + wm->ldr.Flags |= LDR_PROCESS_ATTACHED; /* don't try to attach again */ if (wm->ldr.ActivationContext) RtlActivateActivationContext( 0, wm->ldr.ActivationContext, &cookie );

1 0

Francois Gouget : testbot/build: Add support for Wine Mono 5.0.0.
by Alexandre Julliard April 21, 2020

April 21, 2020

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 April 21, 2020

April 21, 2020

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: Create Vulkan images for texture resources.
by Alexandre Julliard April 20, 2020

April 20, 2020

Module: wine Branch: master Commit: 07981fa64f26d3117b20c5318bda684d7d4cb69a URL: https://source.winehq.org/git/wine.git/?a=commit;h=07981fa64f26d3117b20c531… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Apr 20 23:48:23 2020 +0430 wined3d: Create Vulkan images for texture resources. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context_vk.c | 36 +++++++++- dlls/wined3d/texture.c | 160 ++++++++++++++++++++++++++++++++++++++++- dlls/wined3d/wined3d_private.h | 15 ++++ 3 files changed, 205 insertions(+), 6 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=07981fa64f26d3117b20…

1 0

Jacek Caban : httpapi/tests: Use DECLSPEC_ALIGN in MSVC compatible way.
by Alexandre Julliard April 20, 2020

April 20, 2020

Module: wine Branch: master Commit: 58b129ebb0d6db7f61bf6a4e9e066a4eceb00ee7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=58b129ebb0d6db7f61bf6a4e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Apr 20 20:20:22 2020 +0200 httpapi/tests: Use DECLSPEC_ALIGN in MSVC compatible way. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/httpapi/tests/httpapi.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/httpapi/tests/httpapi.c b/dlls/httpapi/tests/httpapi.c index fa39742cb1..b6bfbbccf0 100644 --- a/dlls/httpapi/tests/httpapi.c +++ b/dlls/httpapi/tests/httpapi.c @@ -446,7 +446,8 @@ static void test_v1_completion_port(void) static void test_v1_multiple_requests(void) { - char DECLSPEC_ALIGN(8) req_buffer1[2048], DECLSPEC_ALIGN(8) req_buffer2[2048]; + char DECLSPEC_ALIGN(8) req_buffer1[2048]; + char DECLSPEC_ALIGN(8) req_buffer2[2048]; HTTP_REQUEST_V1 *req1 = (HTTP_REQUEST_V1 *)req_buffer1, *req2 = (HTTP_REQUEST_V1 *)req_buffer2; HTTP_RESPONSE_V1 response = {}; struct sockaddr_in sockaddr; @@ -552,7 +553,8 @@ static void test_v1_multiple_requests(void) static void test_v1_short_buffer(void) { - char DECLSPEC_ALIGN(8) req_buffer[2048], DECLSPEC_ALIGN(8) req_buffer2[2048]; + char DECLSPEC_ALIGN(8) req_buffer[2048]; + char DECLSPEC_ALIGN(8) req_buffer2[2048]; HTTP_REQUEST_V1 *req = (HTTP_REQUEST_V1 *)req_buffer, *req2 = (HTTP_REQUEST_V1 *)req_buffer2; HTTP_REQUEST_ID req_id; unsigned short port;

1 0

Liam Middlebrook : winevulkan: Update to VK spec version spec 1.2.138.
by Alexandre Julliard April 20, 2020

April 20, 2020

Module: wine Branch: master Commit: 594814c00ab059d9686ed836b1865f8a94859c8a URL: https://source.winehq.org/git/wine.git/?a=commit;h=594814c00ab059d9686ed836… Author: Liam Middlebrook <lmiddlebrook(a)nvidia.com> Date: Mon Apr 20 08:35:03 2020 -0700 winevulkan: Update to VK spec version spec 1.2.138. 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 | 2 +- dlls/winevulkan/vulkan_thunks.c | 296 +++- dlls/winevulkan/vulkan_thunks.h | 126 +- dlls/winevulkan/winevulkan.json | 2 +- include/wine/vulkan.h | 3513 +++++++++++++++++++++------------------ 5 files changed, 2318 insertions(+), 1621 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=594814c00ab059d9686e…

1 0

Jacek Caban : kernel32/tests: Use DECLSPEC_ALIGN in MSVC compatible way.
by Alexandre Julliard April 20, 2020

April 20, 2020

Module: wine Branch: master Commit: bffd57d1d271cd439a250b85841eb31be0d71433 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bffd57d1d271cd439a250b85… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Apr 20 20:20:30 2020 +0200 kernel32/tests: 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> --- dlls/kernel32/tests/volume.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/kernel32/tests/volume.c b/dlls/kernel32/tests/volume.c index 126df5b8a0..6f09be154e 100644 --- a/dlls/kernel32/tests/volume.c +++ b/dlls/kernel32/tests/volume.c @@ -1523,7 +1523,7 @@ static void test_mounted_folder(void) static void test_GetVolumeInformationByHandle(void) { - char buffer[50] DECLSPEC_ALIGN(8); + char DECLSPEC_ALIGN(8) buffer[50]; FILE_FS_ATTRIBUTE_INFORMATION *attr_info = (void *)buffer; FILE_FS_VOLUME_INFORMATION *volume_info = (void *)buffer; DWORD serial, filename_len, flags;

1 0