May 2019 - Wine-Commits - list.winehq.org

Alexandre Julliard : msvcp60: Use the standard -mno-cygwin build flag.
by Alexandre Julliard May 16, 2019

May 16, 2019

Module: wine Branch: master Commit: a5077ec49ae7b24afa87ba7385d285ce23b37b9b URL: https://source.winehq.org/git/wine.git/?a=commit;h=a5077ec49ae7b24afa87ba73… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu May 16 14:52:38 2019 +0200 msvcp60: Use the standard -mno-cygwin build flag. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp60/Makefile.in | 3 ++- dlls/msvcp60/ios.c | 1 - dlls/msvcp60/main.c | 1 - dlls/msvcp60/string.c | 1 - 4 files changed, 2 insertions(+), 4 deletions(-) diff --git a/dlls/msvcp60/Makefile.in b/dlls/msvcp60/Makefile.in index fcd149b..bb73e7b 100644 --- a/dlls/msvcp60/Makefile.in +++ b/dlls/msvcp60/Makefile.in @@ -1,8 +1,9 @@ MODULE = msvcp60.dll -IMPORTS = msvcrt EXTRADEFS = -D_MSVCP_VER=60 PARENTSRC = ../msvcp90 +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ exception.c \ ios.c \ diff --git a/dlls/msvcp60/ios.c b/dlls/msvcp60/ios.c index f439339..ed1be5b 100644 --- a/dlls/msvcp60/ios.c +++ b/dlls/msvcp60/ios.c @@ -16,7 +16,6 @@ * 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/msvcp60/main.c b/dlls/msvcp60/main.c index a30f13c..fbfd38c 100644 --- a/dlls/msvcp60/main.c +++ b/dlls/msvcp60/main.c @@ -16,7 +16,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" #include <stdarg.h> diff --git a/dlls/msvcp60/string.c b/dlls/msvcp60/string.c index 09f9854..6e5e5da 100644 --- a/dlls/msvcp60/string.c +++ b/dlls/msvcp60/string.c @@ -16,7 +16,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" #include <stdarg.h>

1 0

Alexandre Julliard : include: Pass function name directly to the __ASM_STDCALL macro.
by Alexandre Julliard May 16, 2019

May 16, 2019

Module: wine Branch: master Commit: 170bd8f361e62b4622fb93898793be896586d8fa URL: https://source.winehq.org/git/wine.git/?a=commit;h=170bd8f361e62b4622fb9389… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu May 16 18:13:45 2019 +0200 include: Pass function name directly to the __ASM_STDCALL macro. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/process.c | 2 +- dlls/krnl386.exe16/kernel16_private.h | 6 +++--- dlls/krnl386.exe16/ne_module.c | 8 +++---- dlls/krnl386.exe16/selector.c | 40 +++++++++++++++++------------------ dlls/krnl386.exe16/thunk.c | 2 +- dlls/ntdll/relay.c | 2 +- dlls/ntdll/signal_i386.c | 6 +++--- dlls/winecrt0/exception.c | 2 +- include/wine/asm.h | 12 +++++------ 9 files changed, 40 insertions(+), 40 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=170bd8f361e62b4622fb…

1 0

Alexandre Julliard : winebuild: Support Windows-style name mangling for fastcall functions.
by Alexandre Julliard May 16, 2019

May 16, 2019

Module: wine Branch: master Commit: e755ea2374e6bdaad344165201c2d2ccb443a07f URL: https://source.winehq.org/git/wine.git/?a=commit;h=e755ea2374e6bdaad3441652… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu May 16 10:12:42 2019 +0200 winebuild: Support Windows-style name mangling for fastcall functions. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winebuild/parser.c | 7 ------- tools/winebuild/spec32.c | 3 +++ tools/winebuild/utils.c | 26 ++++++++++++++++++++------ 3 files changed, 23 insertions(+), 13 deletions(-) diff --git a/tools/winebuild/parser.c b/tools/winebuild/parser.c index ea9e939..bec9f52 100644 --- a/tools/winebuild/parser.c +++ b/tools/winebuild/parser.c @@ -374,13 +374,6 @@ static int parse_spec_export( ORDDEF *odp, DLLSPEC *spec ) odp->flags |= FLAG_FORWARD; } } - if ((odp->flags & (FLAG_THISCALL | FLAG_FASTCALL)) && !(odp->flags & FLAG_FORWARD)) - { - char *link_name = strmake( "__%s_%s", (odp->flags & FLAG_THISCALL) ? "thiscall" : "fastcall", - odp->link_name ); - free( odp->link_name ); - odp->link_name = link_name; - } return 1; } diff --git a/tools/winebuild/spec32.c b/tools/winebuild/spec32.c index 04af291..68b50f9 100644 --- a/tools/winebuild/spec32.c +++ b/tools/winebuild/spec32.c @@ -970,6 +970,9 @@ void output_def_file( DLLSPEC *spec, int include_stubs ) if (!is_private) total++; if (!include_stubs && odp->type == TYPE_STUB) continue; + if ((odp->flags & FLAG_FASTCALL) && target_platform == PLATFORM_WINDOWS) + name = strmake( "@%s", name ); + output( " %s", name ); switch(odp->type) diff --git a/tools/winebuild/utils.c b/tools/winebuild/utils.c index d4f8845..851a4a7 100644 --- a/tools/winebuild/utils.c +++ b/tools/winebuild/utils.c @@ -893,15 +893,28 @@ const char *get_stub_name( const ORDDEF *odp, const DLLSPEC *spec ) const char *get_link_name( const ORDDEF *odp ) { static char *buffer; + char *ret; - if (!kill_at && target_platform == PLATFORM_WINDOWS && target_cpu == CPU_x86 && - odp->type == TYPE_STDCALL && !(odp->flags & FLAG_THISCALL)) + if (target_cpu != CPU_x86) return odp->link_name; + if (odp->type != TYPE_STDCALL) return odp->link_name; + + if (target_platform == PLATFORM_WINDOWS) { - free( buffer ); - buffer = strmake( "%s@%u", odp->link_name, get_args_size( odp )); - return buffer; + if (odp->flags & FLAG_THISCALL) ret = strmake( "__thiscall_%s", odp->link_name ); + else if (odp->flags & FLAG_FASTCALL) ret = strmake( "@%s@%u", odp->link_name, get_args_size( odp )); + else if (!kill_at) ret = strmake( "%s@%u", odp->link_name, get_args_size( odp )); + else return odp->link_name; } - return odp->link_name; + else + { + if (odp->flags & FLAG_THISCALL) ret = strmake( "__thiscall_%s", odp->link_name ); + else if (odp->flags & FLAG_FASTCALL) ret = strmake( "__fastcall_%s", odp->link_name ); + else return odp->link_name; + } + + free( buffer ); + buffer = ret; + return ret; } /* parse a cpu name and return the corresponding value */ @@ -1036,6 +1049,7 @@ const char *asm_name( const char *sym ) { case PLATFORM_WINDOWS: if (target_cpu != CPU_x86) return sym; + if (sym[0] == '@') return sym; /* fastcall */ /* fall through */ case PLATFORM_APPLE: if (sym[0] == '.' && sym[1] == 'L') return sym;

1 0

Zebediah Figura : setupapi: Implement SetupDiSetDeviceInstallParams().
by Alexandre Julliard May 16, 2019

May 16, 2019

Module: wine Branch: master Commit: 14a354e5756c3c25cf6d8402d1458d5182102451 URL: https://source.winehq.org/git/wine.git/?a=commit;h=14a354e5756c3c25cf6d8402… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed May 15 22:56:07 2019 -0500 setupapi: Implement SetupDiSetDeviceInstallParams(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/setupapi/devinst.c | 48 +++++++++++++++++++++++++++++++++++++----------- 1 file changed, 37 insertions(+), 11 deletions(-) diff --git a/dlls/setupapi/devinst.c b/dlls/setupapi/devinst.c index 8c91960..48b6ca3 100644 --- a/dlls/setupapi/devinst.c +++ b/dlls/setupapi/devinst.c @@ -3559,25 +3559,51 @@ BOOL WINAPI SetupDiGetDeviceInstallParamsA(HDEVINFO devinfo, /*********************************************************************** * SetupDiSetDeviceInstallParamsA (SETUPAPI.@) */ -BOOL WINAPI SetupDiSetDeviceInstallParamsA( - HDEVINFO DeviceInfoSet, - PSP_DEVINFO_DATA DeviceInfoData, - PSP_DEVINSTALL_PARAMS_A DeviceInstallParams) +BOOL WINAPI SetupDiSetDeviceInstallParamsA(HDEVINFO devinfo, + SP_DEVINFO_DATA *device_data, SP_DEVINSTALL_PARAMS_A *params) { - FIXME("(%p, %p, %p) stub\n", DeviceInfoSet, DeviceInfoData, DeviceInstallParams); + SP_DEVINSTALL_PARAMS_W paramsW; - return TRUE; + if (params->cbSize != sizeof(SP_DEVINSTALL_PARAMS_A)) + { + SetLastError(ERROR_INVALID_USER_BUFFER); + return FALSE; + } + + paramsW.cbSize = sizeof(paramsW); + paramsW.Flags = params->Flags; + paramsW.FlagsEx = params->FlagsEx; + paramsW.hwndParent = params->hwndParent; + paramsW.InstallMsgHandler = params->InstallMsgHandler; + paramsW.InstallMsgHandlerContext = params->InstallMsgHandlerContext; + paramsW.FileQueue = params->FileQueue; + paramsW.ClassInstallReserved = params->ClassInstallReserved; + paramsW.Reserved = params->Reserved; + MultiByteToWideChar(CP_ACP, 0, params->DriverPath, -1, paramsW.DriverPath, sizeof(paramsW.DriverPath)); + + return SetupDiSetDeviceInstallParamsW(devinfo, device_data, &paramsW); } /*********************************************************************** * SetupDiSetDeviceInstallParamsW (SETUPAPI.@) */ -BOOL WINAPI SetupDiSetDeviceInstallParamsW( - HDEVINFO DeviceInfoSet, - PSP_DEVINFO_DATA DeviceInfoData, - PSP_DEVINSTALL_PARAMS_W DeviceInstallParams) +BOOL WINAPI SetupDiSetDeviceInstallParamsW(HDEVINFO devinfo, + SP_DEVINFO_DATA *device_data, SP_DEVINSTALL_PARAMS_W *params) { - FIXME("(%p, %p, %p) stub\n", DeviceInfoSet, DeviceInfoData, DeviceInstallParams); + struct device *device; + + TRACE("devinfo %p, device_data %p, params %p.\n", devinfo, device_data, params); + + if (params->cbSize != sizeof(SP_DEVINSTALL_PARAMS_W)) + { + SetLastError(ERROR_INVALID_USER_BUFFER); + return FALSE; + } + + if (!(device = get_device(devinfo, device_data))) + return FALSE; + + device->params = *params; return TRUE; }

1 0

Zebediah Figura : setupapi: Implement SetupDiGetDeviceInstallParams().
by Alexandre Julliard May 16, 2019

May 16, 2019

Module: wine Branch: master Commit: 41701254715b72901aee09595a43698447e29103 URL: https://source.winehq.org/git/wine.git/?a=commit;h=41701254715b72901aee0959… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed May 15 22:56:06 2019 -0500 setupapi: Implement SetupDiGetDeviceInstallParams(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/setupapi/devinst.c | 62 +++++++++++++++++++++++++++++++++++++------------ 1 file changed, 47 insertions(+), 15 deletions(-) diff --git a/dlls/setupapi/devinst.c b/dlls/setupapi/devinst.c index 7440465..8c91960 100644 --- a/dlls/setupapi/devinst.c +++ b/dlls/setupapi/devinst.c @@ -118,6 +118,7 @@ struct device DEVINST devnode; struct list entry; BOOL removed; + SP_DEVINSTALL_PARAMS_W params; }; struct device_iface @@ -730,7 +731,7 @@ static struct device *SETUPDI_CreateDeviceInfo(struct DeviceInfoSet *set, TRACE("%p, %s, %s, %d\n", set, debugstr_guid(class), debugstr_w(instanceid), phantom); - if (!(device = heap_alloc(sizeof(*device)))) + if (!(device = heap_alloc_zero(sizeof(*device)))) { SetLastError(ERROR_OUTOFMEMORY); return NULL; @@ -752,6 +753,7 @@ static struct device *SETUPDI_CreateDeviceInfo(struct DeviceInfoSet *set, device->devnode = alloc_devnode(device); device->removed = FALSE; list_add_tail(&set->devices, &device->entry); + device->params.cbSize = sizeof(SP_DEVINSTALL_PARAMS_W); if (phantom) RegSetValueExW(device->key, Phantom, 0, REG_DWORD, (const BYTE *)&one, sizeof(one)); @@ -3501,27 +3503,57 @@ BOOL WINAPI SetupDiCallClassInstaller( } /*********************************************************************** - * SetupDiGetDeviceInstallParamsW (SETUPAPI.@) + * SetupDiGetDeviceInstallParamsW (SETUPAPI.@) */ -BOOL WINAPI SetupDiGetDeviceInstallParamsW( - HDEVINFO DeviceInfoSet, - PSP_DEVINFO_DATA DeviceInfoData, - PSP_DEVINSTALL_PARAMS_W DeviceInstallParams) +BOOL WINAPI SetupDiGetDeviceInstallParamsW(HDEVINFO devinfo, + SP_DEVINFO_DATA *device_data, SP_DEVINSTALL_PARAMS_W *params) { - FIXME("%p %p %p\n", DeviceInfoSet, DeviceInfoData, DeviceInstallParams); - return FALSE; + struct device *device; + + TRACE("devinfo %p, device_data %p, params %p.\n", devinfo, device_data, params); + + if (params->cbSize != sizeof(SP_DEVINSTALL_PARAMS_W)) + { + SetLastError(ERROR_INVALID_USER_BUFFER); + return FALSE; + } + + if (!(device = get_device(devinfo, device_data))) + return FALSE; + + *params = device->params; + + return TRUE; } /*********************************************************************** - * SetupDiGetDeviceInstallParamsA (SETUPAPI.@) + * SetupDiGetDeviceInstallParamsA (SETUPAPI.@) */ -BOOL WINAPI SetupDiGetDeviceInstallParamsA( - HDEVINFO DeviceInfoSet, - PSP_DEVINFO_DATA DeviceInfoData, - PSP_DEVINSTALL_PARAMS_A DeviceInstallParams) +BOOL WINAPI SetupDiGetDeviceInstallParamsA(HDEVINFO devinfo, + SP_DEVINFO_DATA *device_data, SP_DEVINSTALL_PARAMS_A *params) { - FIXME("%p %p %p\n", DeviceInfoSet, DeviceInfoData, DeviceInstallParams); - return FALSE; + SP_DEVINSTALL_PARAMS_W paramsW; + BOOL ret; + + if (params->cbSize != sizeof(SP_DEVINSTALL_PARAMS_A)) + { + SetLastError(ERROR_INVALID_USER_BUFFER); + return FALSE; + } + + paramsW.cbSize = sizeof(paramsW); + ret = SetupDiGetDeviceInstallParamsW(devinfo, device_data, &paramsW); + params->Flags = paramsW.Flags; + params->FlagsEx = paramsW.FlagsEx; + params->hwndParent = paramsW.hwndParent; + params->InstallMsgHandler = paramsW.InstallMsgHandler; + params->InstallMsgHandlerContext = paramsW.InstallMsgHandlerContext; + params->FileQueue = paramsW.FileQueue; + params->ClassInstallReserved = paramsW.ClassInstallReserved; + params->Reserved = paramsW.Reserved; + WideCharToMultiByte(CP_ACP, 0, paramsW.DriverPath, -1, params->DriverPath, sizeof(params->DriverPath), NULL, NULL); + + return ret; } /***********************************************************************

1 0

Alexandre Julliard : msvcp80: Use the standard -mno-cygwin build flag.
by Alexandre Julliard May 16, 2019

May 16, 2019

Module: wine Branch: master Commit: d8769caee01a123eed03e5adbba9b0ca61b04466 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d8769caee01a123eed03e5ad… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu May 16 14:52:56 2019 +0200 msvcp80: Use the standard -mno-cygwin build flag. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp80/Makefile.in | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/msvcp80/Makefile.in b/dlls/msvcp80/Makefile.in index c541c1b..22a18fc 100644 --- a/dlls/msvcp80/Makefile.in +++ b/dlls/msvcp80/Makefile.in @@ -3,6 +3,8 @@ IMPORTS = msvcr80 EXTRADEFS = -D_MSVCP_VER=80 PARENTSRC = ../msvcp90 +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ exception.c \ ios.c \

1 0

Alexandre Julliard : msvcp71: Use the standard -mno-cygwin build flag.
by Alexandre Julliard May 16, 2019

May 16, 2019

Module: wine Branch: master Commit: 1af6790fced0ba6415a5eee7d80d031aeb37f9f1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1af6790fced0ba6415a5eee7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu May 16 14:52:51 2019 +0200 msvcp71: Use the standard -mno-cygwin build flag. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp71/Makefile.in | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/msvcp71/Makefile.in b/dlls/msvcp71/Makefile.in index dfa0a2b..6713ab4 100644 --- a/dlls/msvcp71/Makefile.in +++ b/dlls/msvcp71/Makefile.in @@ -3,6 +3,8 @@ IMPORTS = msvcr71 EXTRADEFS = -D_MSVCP_VER=71 PARENTSRC = ../msvcp90 +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ exception.c \ ios.c \

1 0

Alexandre Julliard : msvcp100: Use the standard -mno-cygwin build flag.
by Alexandre Julliard May 16, 2019

May 16, 2019

Module: wine Branch: master Commit: d21f14d8132cbb850dee4beda7abd2360ced2328 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d21f14d8132cbb850dee4bed… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu May 16 14:52:12 2019 +0200 msvcp100: Use the standard -mno-cygwin build flag. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp100/Makefile.in | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/msvcp100/Makefile.in b/dlls/msvcp100/Makefile.in index 07da903..258aff4 100644 --- a/dlls/msvcp100/Makefile.in +++ b/dlls/msvcp100/Makefile.in @@ -3,6 +3,8 @@ IMPORTS = msvcr100 EXTRADEFS = -D_MSVCP_VER=100 PARENTSRC = ../msvcp90 +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ exception.c \ ios.c \

1 0

Alexandre Julliard : msvcp90: Use the standard -mno-cygwin build flag.
by Alexandre Julliard May 16, 2019

May 16, 2019

Module: wine Branch: master Commit: 651179469c085b50c00084b0e1a5797189fa629b URL: https://source.winehq.org/git/wine.git/?a=commit;h=651179469c085b50c00084b0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu May 16 14:51:47 2019 +0200 msvcp90: Use the standard -mno-cygwin build flag. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp90/Makefile.in | 2 ++ dlls/msvcp90/exception.c | 2 -- dlls/msvcp90/ios.c | 2 -- dlls/msvcp90/locale.c | 2 -- dlls/msvcp90/math.c | 2 -- dlls/msvcp90/memory.c | 2 -- dlls/msvcp90/misc.c | 2 -- dlls/msvcp90/msvcp_main.c | 2 -- dlls/msvcp90/string.c | 2 -- 9 files changed, 2 insertions(+), 16 deletions(-) diff --git a/dlls/msvcp90/Makefile.in b/dlls/msvcp90/Makefile.in index 502b981..b7e7b73 100644 --- a/dlls/msvcp90/Makefile.in +++ b/dlls/msvcp90/Makefile.in @@ -2,6 +2,8 @@ MODULE = msvcp90.dll IMPORTS = msvcr90 EXTRADEFS = -D_MSVCP_VER=90 +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ exception.c \ ios.c \ diff --git a/dlls/msvcp90/exception.c b/dlls/msvcp90/exception.c index 76ea893..bf75949 100644 --- a/dlls/msvcp90/exception.c +++ b/dlls/msvcp90/exception.c @@ -16,8 +16,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" - #include <stdarg.h> #include "msvcp90.h" diff --git a/dlls/msvcp90/ios.c b/dlls/msvcp90/ios.c index 94d43cb..8e6884c 100644 --- a/dlls/msvcp90/ios.c +++ b/dlls/msvcp90/ios.c @@ -16,8 +16,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" - #include <stdarg.h> #include <stdio.h> #include <limits.h> diff --git a/dlls/msvcp90/locale.c b/dlls/msvcp90/locale.c index 08d8737..ee14640 100644 --- a/dlls/msvcp90/locale.c +++ b/dlls/msvcp90/locale.c @@ -16,8 +16,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" - #include <stdarg.h> #include "assert.h" diff --git a/dlls/msvcp90/math.c b/dlls/msvcp90/math.c index 99f6727..9bc7c08 100644 --- a/dlls/msvcp90/math.c +++ b/dlls/msvcp90/math.c @@ -16,8 +16,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" - #include <stdarg.h> #include <limits.h> #include <float.h> diff --git a/dlls/msvcp90/memory.c b/dlls/msvcp90/memory.c index 5d43910..ea4637a 100644 --- a/dlls/msvcp90/memory.c +++ b/dlls/msvcp90/memory.c @@ -16,8 +16,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" - #include <stdarg.h> #include <limits.h> diff --git a/dlls/msvcp90/misc.c b/dlls/msvcp90/misc.c index 07cfcd8..2e72690 100644 --- a/dlls/msvcp90/misc.c +++ b/dlls/msvcp90/misc.c @@ -16,8 +16,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" - #include <stdarg.h> #include <limits.h> #include <errno.h> diff --git a/dlls/msvcp90/msvcp_main.c b/dlls/msvcp90/msvcp_main.c index ebf67be..6d78ce3 100644 --- a/dlls/msvcp90/msvcp_main.c +++ b/dlls/msvcp90/msvcp_main.c @@ -16,8 +16,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" - #include <stdarg.h> #include "msvcp90.h" diff --git a/dlls/msvcp90/string.c b/dlls/msvcp90/string.c index 317373b..a25e418 100644 --- a/dlls/msvcp90/string.c +++ b/dlls/msvcp90/string.c @@ -16,8 +16,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" - #include <stdarg.h> #include "msvcp90.h"

1 0

Alexandre Julliard : winegcc: Use -static-libgcc for the Windows build.
by Alexandre Julliard May 16, 2019

May 16, 2019

Module: wine Branch: master Commit: 0d175fe861826d4cf756291bd43404aba065cec6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0d175fe861826d4cf756291b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu May 16 16:04:00 2019 +0200 winegcc: Use -static-libgcc for the Windows build. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winegcc/winegcc.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/tools/winegcc/winegcc.c b/tools/winegcc/winegcc.c index d339139..33f838f 100644 --- a/tools/winegcc/winegcc.c +++ b/tools/winegcc/winegcc.c @@ -455,6 +455,9 @@ static strarray *get_link_args( struct options *opts, const char *output_name ) if (opts->large_address_aware && opts->target_cpu == CPU_x86) strarray_add( flags, "-Wl,--large-address-aware" ); + /* make sure we don't need a libgcc_s dll on Windows */ + strarray_add( flags, "-static-libgcc" ); + return flags; default:

1 0