December 2020 - Wine-commits

Michael Stefaniuc : xmllite: Use a string literal for an empty string.
by Alexandre Julliard 04 Dec '20

04 Dec '20

Module: wine Branch: master Commit: c3aa9defbb4223a0115ec1315e42628bb5c613f8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c3aa9defbb4223a0115ec131… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Thu Dec 3 00:32:47 2020 +0100 xmllite: Use a string literal for an empty string. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xmllite/reader.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/xmllite/reader.c b/dlls/xmllite/reader.c index a463934202a..4793b128bae 100644 --- a/dlls/xmllite/reader.c +++ b/dlls/xmllite/reader.c @@ -210,7 +210,7 @@ typedef struct UINT start; /* input position where value starts */ } strval; -static WCHAR emptyW[] = {0}; +static WCHAR emptyW[] = L""; static WCHAR xmlW[] = L"xml"; static WCHAR xmlnsW[] = L"xmlns"; static const strval strval_empty = { (WCHAR *)emptyW, 0 };

1 0

Francois Gouget : testbot: Tweak the VMs default status and snapshot name.
by Alexandre Julliard 04 Dec '20

04 Dec '20

Module: tools Branch: master Commit: 27a033d5374d9e97b177ae94ae51ce4dec4d6a23 URL: https://source.winehq.org/git/tools.git/?a=commit;h=27a033d5374d9e97b177ae9… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Dec 2 19:03:20 2020 +0100 testbot: Tweak the VMs default status and snapshot name. These are only relevant when creating a new VM so provide more appropriate defaults. In particular new VMs are normally off and the TestBot deals with powering them up and setting up the live snapshot. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/VMs.pm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/testbot/lib/WineTestBot/VMs.pm b/testbot/lib/WineTestBot/VMs.pm index 6dd1ff2..53f4394 100644 --- a/testbot/lib/WineTestBot/VMs.pm +++ b/testbot/lib/WineTestBot/VMs.pm @@ -170,8 +170,8 @@ sub InitializeNew($$) { my ($self, $Collection) = @_; - $self->Status("idle"); - $self->IdleSnapshot("wtb"); + $self->Status("off"); + $self->IdleSnapshot("base-live"); $self->SUPER::InitializeNew($Collection); }

1 0

Piotr Caban : msvcrt: Remove MSVCRT_ prefix from wcs.c functions.
by Alexandre Julliard 03 Dec '20

03 Dec '20

Module: wine Branch: master Commit: 6ad42ee7f4df2a3a731e404f090abe383d40dd1c URL: https://source.winehq.org/git/wine.git/?a=commit;h=6ad42ee7f4df2a3a731e404f… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Dec 3 19:10:54 2020 +0100 msvcrt: Remove MSVCRT_ prefix from wcs.c functions. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/crtdll/crtdll.spec | 102 +++--- dlls/msvcr100/msvcr100.spec | 334 +++++++++---------- dlls/msvcr110/msvcr110.spec | 334 +++++++++---------- dlls/msvcr120/msvcr120.spec | 358 ++++++++++---------- dlls/msvcr70/msvcr70.spec | 122 +++---- dlls/msvcr71/msvcr71.spec | 130 ++++---- dlls/msvcr80/msvcr80.spec | 334 +++++++++---------- dlls/msvcr90/msvcr90.spec | 334 +++++++++---------- dlls/msvcrt/console.c | 2 +- dlls/msvcrt/data.c | 16 +- dlls/msvcrt/dir.c | 36 +-- dlls/msvcrt/environ.c | 16 +- dlls/msvcrt/errno.c | 12 +- dlls/msvcrt/exit.c | 6 +- dlls/msvcrt/file.c | 28 +- dlls/msvcrt/locale.c | 28 +- dlls/msvcrt/main.c | 2 +- dlls/msvcrt/math.c | 14 +- dlls/msvcrt/mbcs.c | 20 +- dlls/msvcrt/msvcrt.h | 32 -- dlls/msvcrt/msvcrt.spec | 316 +++++++++--------- dlls/msvcrt/printf.h | 6 +- dlls/msvcrt/process.c | 36 +-- dlls/msvcrt/scanf.h | 2 +- dlls/msvcrt/string.c | 4 +- dlls/msvcrt/time.c | 14 +- dlls/msvcrt/undname.c | 2 +- dlls/msvcrt/wcs.c | 684 +++++++++++++++++++-------------------- dlls/msvcrtd/msvcrtd.spec | 108 +++---- dlls/ucrtbase/ucrtbase.spec | 452 +++++++++++++------------- include/msvcrt/corecrt_wctype.h | 9 + include/msvcrt/corecrt_wstdio.h | 5 +- include/msvcrt/corecrt_wstdlib.h | 2 + include/msvcrt/stdio.h | 10 + 34 files changed, 1949 insertions(+), 1961 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=6ad42ee7f4df2a3a731e…

1 0

Piotr Caban : msvcrt: Remove MSVCRT_ prefix from math.c functions.
by Alexandre Julliard 03 Dec '20

03 Dec '20

Module: wine Branch: master Commit: 4f2f3545e59c00aac92448aebe7484467a8cedce URL: https://source.winehq.org/git/wine.git/?a=commit;h=4f2f3545e59c00aac92448ae… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Dec 3 19:10:57 2020 +0100 msvcrt: Remove MSVCRT_ prefix from math.c functions. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/crtdll/crtdll.spec | 96 +++--- dlls/msvcr100/msvcr100.spec | 206 ++++++------ dlls/msvcr110/msvcr110.spec | 230 +++++++------- dlls/msvcr120/msvcr120.spec | 420 ++++++++++++------------- dlls/msvcr70/msvcr70.spec | 98 +++--- dlls/msvcr71/msvcr71.spec | 98 +++--- dlls/msvcr80/msvcr80.spec | 202 ++++++------ dlls/msvcr90/msvcr90.spec | 200 ++++++------ dlls/msvcrt/math.c | 634 ++++++++++++++++++------------------- dlls/msvcrt/msvcrt.h | 3 - dlls/msvcrt/msvcrt.spec | 214 ++++++------- dlls/msvcrt/printf.h | 6 +- dlls/msvcrt/string.c | 2 +- dlls/msvcrtd/msvcrtd.spec | 96 +++--- dlls/ucrtbase/ucrtbase.spec | 750 ++++++++++++++++++++++---------------------- include/msvcrt/math.h | 31 +- 16 files changed, 1649 insertions(+), 1637 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=4f2f3545e59c00aac924…

1 0

Piotr Caban : msvcrt: Remove MSVCRT_ prefix from dir.c functions.
by Alexandre Julliard 03 Dec '20

03 Dec '20

Module: wine Branch: master Commit: 41fa6e4b6f0e64bfe8be35c215a3c01d8290700c URL: https://source.winehq.org/git/wine.git/?a=commit;h=41fa6e4b6f0e64bfe8be35c2… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Dec 3 19:11:02 2020 +0100 msvcrt: Remove MSVCRT_ prefix from dir.c functions. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/crtdll/crtdll.spec | 30 ++++----- dlls/msvcr100/msvcr100.spec | 80 +++++++++++----------- dlls/msvcr110/msvcr110.spec | 80 +++++++++++----------- dlls/msvcr120/msvcr120.spec | 80 +++++++++++----------- dlls/msvcr70/msvcr70.spec | 68 +++++++++---------- dlls/msvcr71/msvcr71.spec | 68 +++++++++---------- dlls/msvcr80/msvcr80.spec | 80 +++++++++++----------- dlls/msvcr90/msvcr90.spec | 80 +++++++++++----------- dlls/msvcrt/dir.c | 141 ++++++++++++++++++++------------------ dlls/msvcrt/file.c | 6 +- dlls/msvcrt/msvcrt.h | 1 - dlls/msvcrt/msvcrt.spec | 94 +++++++++++++------------- dlls/msvcrtd/msvcrtd.spec | 60 ++++++++--------- dlls/ucrtbase/ucrtbase.spec | 160 ++++++++++++++++++++++---------------------- 14 files changed, 519 insertions(+), 509 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=41fa6e4b6f0e64bfe8be…

1 0

Piotr Caban : msvcrt: Remove MSVCRT_ prefix from file.c functions.
by Alexandre Julliard 03 Dec '20

03 Dec '20

Module: wine Branch: master Commit: 1913affb7b4ee57740a0322e6962d588ae62aca0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1913affb7b4ee57740a0322e… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Dec 3 19:11:20 2020 +0100 msvcrt: Remove MSVCRT_ prefix from file.c functions. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/crtdll/crtdll.spec | 168 ++++---- dlls/msvcr100/msvcr100.spec | 372 +++++++++--------- dlls/msvcr110/msvcr110.spec | 372 +++++++++--------- dlls/msvcr120/msvcr120.spec | 372 +++++++++--------- dlls/msvcr70/msvcr70.spec | 236 +++++------ dlls/msvcr71/msvcr71.spec | 236 +++++------ dlls/msvcr80/msvcr80.spec | 372 +++++++++--------- dlls/msvcr90/msvcr90.spec | 372 +++++++++--------- dlls/msvcrt/errno.c | 9 +- dlls/msvcrt/exit.c | 2 +- dlls/msvcrt/file.c | 932 ++++++++++++++++++++++---------------------- dlls/msvcrt/msvcrt.h | 14 - dlls/msvcrt/msvcrt.spec | 308 +++++++-------- dlls/msvcrt/process.c | 27 +- dlls/msvcrt/scanf.h | 24 +- dlls/msvcrtd/msvcrtd.spec | 230 +++++------ dlls/ucrtbase/ucrtbase.spec | 616 ++++++++++++++--------------- include/msvcrt/io.h | 2 +- include/msvcrt/stdio.h | 2 + 19 files changed, 2336 insertions(+), 2330 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=1913affb7b4ee57740a0…

1 0

Jacek Caban : makedep: Use -fno-builtin for crt modules.
by Alexandre Julliard 03 Dec '20

03 Dec '20

Module: wine Branch: master Commit: 727168a9e116a43f851df2673a9169ad280a9ec8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=727168a9e116a43f851df267… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Dec 3 19:11:35 2020 +0100 makedep: Use -fno-builtin for crt modules. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/makedep.c | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/tools/makedep.c b/tools/makedep.c index f769713a8cf..d892b7e9541 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -2276,6 +2276,15 @@ static struct strarray get_default_imports( const struct makefile *make ) } +/******************************************************************* + * is_crt_module + */ +static int is_crt_module( const char *file ) +{ + return !strncmp( file, "msvcr", 5 ) || !strncmp( file, "ucrt", 4 ) || !strcmp( file, "crtdll.dll" ); +} + + /******************************************************************* * add_crt_import */ @@ -2286,16 +2295,13 @@ static void add_crt_import( const struct makefile *make, struct strarray *import for (i = 0; i < imports->count; i++) { - if (strncmp( imports->str[i], "msvcr", 5 ) && strncmp( imports->str[i], "ucrt", 4 )) continue; + if (!is_crt_module( imports->str[i])) continue; if (crt_dll) fatal_error( "More than one C runtime DLL imported: %s and %s\n", crt_dll, imports->str[i] ); crt_dll = imports->str[i]; } if (!crt_dll && !strarray_exists( &make->extradllflags, "-nodefaultlibs" )) { - if (make->module && - (!strncmp( make->module, "msvcr", 5 ) || - !strncmp( make->module, "ucrt", 4 ) || - !strcmp( make->module, "crtdll.dll" ))) + if (make->module && is_crt_module( make->module )) { crt_dll = make->module; } @@ -3147,7 +3153,8 @@ static void output_source_default( struct makefile *make, struct incl_file *sour output( "\t$(CROSSCC) -c -o $@ %s", source->filename ); output_filenames( defines ); output_filenames( extra_cross_cflags ); - if (source->file->flags & FLAG_C_IMPLIB) output_filename( "-fno-builtin" ); + if (source->file->flags & FLAG_C_IMPLIB || (make->module && is_crt_module( make->module ))) + output_filename( "-fno-builtin" ); output_filenames( cpp_flags ); output_filename( "$(CROSSCFLAGS)" ); output( "\n" );

1 0

Gabriel Ivăncescu : iphlpapi: Move the ICMP reply retrieval to a helper function.
by Alexandre Julliard 03 Dec '20

03 Dec '20

Module: wine Branch: master Commit: b23039fa43b58c50e2075214cf2d369919ab4e9b URL: https://source.winehq.org/git/wine.git/?a=commit;h=b23039fa43b58c50e2075214… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Mon Nov 23 15:47:41 2020 +0200 iphlpapi: Move the ICMP reply retrieval to a helper function. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/iphlpapi/icmp.c | 351 ++++++++++++++++++++++++++------------------------- 1 file changed, 178 insertions(+), 173 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=b23039fa43b58c50e207…

1 0

Gabriel Ivăncescu : iphlpapi: Implement IcmpSendEcho and IcmpSendEcho2 via IcmpSendEcho2Ex.
by Alexandre Julliard 03 Dec '20

03 Dec '20

Module: wine Branch: master Commit: 7eafc71416d5b5b9e0302e0859f988dfe534b937 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7eafc71416d5b5b9e0302e08… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Mon Nov 23 15:47:42 2020 +0200 iphlpapi: Implement IcmpSendEcho and IcmpSendEcho2 via IcmpSendEcho2Ex. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/iphlpapi/icmp.c | 141 +++++++++++++++++++++++---------------------------- 1 file changed, 64 insertions(+), 77 deletions(-) diff --git a/dlls/iphlpapi/icmp.c b/dlls/iphlpapi/icmp.c index 1aeba1c463d..b6d2ffdbc13 100644 --- a/dlls/iphlpapi/icmp.c +++ b/dlls/iphlpapi/icmp.c @@ -442,6 +442,50 @@ DWORD WINAPI IcmpSendEcho( DWORD ReplySize, DWORD Timeout ) +{ + return IcmpSendEcho2Ex(IcmpHandle, NULL, NULL, NULL, 0, DestinationAddress, + RequestData, RequestSize, RequestOptions, ReplyBuffer, ReplySize, Timeout); +} + +/*********************************************************************** + * IcmpSendEcho2 (IPHLPAPI.@) + */ +DWORD WINAPI IcmpSendEcho2( + HANDLE IcmpHandle, + HANDLE Event, + PIO_APC_ROUTINE ApcRoutine, + PVOID ApcContext, + IPAddr DestinationAddress, + LPVOID RequestData, + WORD RequestSize, + PIP_OPTION_INFORMATION RequestOptions, + LPVOID ReplyBuffer, + DWORD ReplySize, + DWORD Timeout + ) +{ + return IcmpSendEcho2Ex(IcmpHandle, Event, ApcRoutine, ApcContext, 0, + DestinationAddress, RequestData, RequestSize, RequestOptions, + ReplyBuffer, ReplySize, Timeout); +} + +/*********************************************************************** + * IcmpSendEcho2Ex (IPHLPAPI.@) + */ +DWORD WINAPI IcmpSendEcho2Ex( + HANDLE IcmpHandle, + HANDLE Event, + PIO_APC_ROUTINE ApcRoutine, + PVOID ApcContext, + IPAddr SourceAddress, + IPAddr DestinationAddress, + LPVOID RequestData, + WORD RequestSize, + PIP_OPTION_INFORMATION RequestOptions, + LPVOID ReplyBuffer, + DWORD ReplySize, + DWORD Timeout + ) { icmp_t* icp=(icmp_t*)IcmpHandle; struct icmp* icmp_header; @@ -451,6 +495,10 @@ DWORD WINAPI IcmpSendEcho( int reqsize, repsize; DWORD send_time; + TRACE("(%p, %p, %p, %p, %08x, %08x, %p, %d, %p, %p, %d, %d)\n", IcmpHandle, + Event, ApcRoutine, ApcContext, SourceAddress, DestinationAddress, RequestData, + RequestSize, RequestOptions, ReplyBuffer, ReplySize, Timeout); + if (IcmpHandle==INVALID_HANDLE_VALUE) { /* FIXME: in fact win98 seems to ignore the handle value !!! */ SetLastError(ERROR_INVALID_PARAMETER); @@ -473,6 +521,22 @@ DWORD WINAPI IcmpSendEcho( return 0; } + if (Event) + { + FIXME("unsupported for events\n"); + return 0; + } + if (ApcRoutine) + { + FIXME("unsupported for APCs\n"); + return 0; + } + if (SourceAddress) + { + FIXME("unsupported for source addresses\n"); + return 0; + } + /* Prepare the request */ id=getpid() & 0xFFFF; seq=InterlockedIncrement(&icmp_sequence) & 0xFFFF; @@ -571,83 +635,6 @@ DWORD WINAPI IcmpSendEcho( return icmp_get_reply(icp->sid, buffer, send_time, ReplyBuffer, ReplySize, Timeout); } -/*********************************************************************** - * IcmpSendEcho2 (IPHLPAPI.@) - */ -DWORD WINAPI IcmpSendEcho2( - HANDLE IcmpHandle, - HANDLE Event, - PIO_APC_ROUTINE ApcRoutine, - PVOID ApcContext, - IPAddr DestinationAddress, - LPVOID RequestData, - WORD RequestSize, - PIP_OPTION_INFORMATION RequestOptions, - LPVOID ReplyBuffer, - DWORD ReplySize, - DWORD Timeout - ) -{ - TRACE("(%p, %p, %p, %p, %08x, %p, %d, %p, %p, %d, %d): stub\n", IcmpHandle, - Event, ApcRoutine, ApcContext, DestinationAddress, RequestData, - RequestSize, RequestOptions, ReplyBuffer, ReplySize, Timeout); - - if (Event) - { - FIXME("unsupported for events\n"); - return 0; - } - if (ApcRoutine) - { - FIXME("unsupported for APCs\n"); - return 0; - } - return IcmpSendEcho(IcmpHandle, DestinationAddress, RequestData, - RequestSize, RequestOptions, ReplyBuffer, ReplySize, Timeout); -} - -/*********************************************************************** - * IcmpSendEcho2Ex (IPHLPAPI.@) - */ -DWORD WINAPI IcmpSendEcho2Ex( - HANDLE IcmpHandle, - HANDLE Event, - PIO_APC_ROUTINE ApcRoutine, - PVOID ApcContext, - IPAddr SourceAddress, - IPAddr DestinationAddress, - LPVOID RequestData, - WORD RequestSize, - PIP_OPTION_INFORMATION RequestOptions, - LPVOID ReplyBuffer, - DWORD ReplySize, - DWORD Timeout - ) -{ - TRACE("(%p, %p, %p, %p, %08x, %08x, %p, %d, %p, %p, %d, %d): stub\n", IcmpHandle, - Event, ApcRoutine, ApcContext, SourceAddress, DestinationAddress, RequestData, - RequestSize, RequestOptions, ReplyBuffer, ReplySize, Timeout); - - if (Event) - { - FIXME("unsupported for events\n"); - return 0; - } - if (ApcRoutine) - { - FIXME("unsupported for APCs\n"); - return 0; - } - if (SourceAddress) - { - FIXME("unsupported for source addresses\n"); - return 0; - } - - return IcmpSendEcho(IcmpHandle, DestinationAddress, RequestData, - RequestSize, RequestOptions, ReplyBuffer, ReplySize, Timeout); -} - /* * Copyright (c) 1989 The Regents of the University of California. * All rights reserved.

1 0

Gabriel Ivăncescu : iphlpapi: Fix adjusting data pointer after an ICMP reply.
by Alexandre Julliard 03 Dec '20

03 Dec '20

Module: wine Branch: master Commit: 9ef55abc9fbd597904e8144eb7e5a53904662b4c URL: https://source.winehq.org/git/wine.git/?a=commit;h=9ef55abc9fbd597904e8144e… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Mon Nov 23 15:47:43 2020 +0200 iphlpapi: Fix adjusting data pointer after an ICMP reply. The code above it already sets endbuf to the beginning of the last data added. On a new reply, endbuf is decremented to make space for the new data. There's no reason to adjust it again for the old data after it has already been set. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/iphlpapi/icmp.c | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/iphlpapi/icmp.c b/dlls/iphlpapi/icmp.c index b6d2ffdbc13..79fd35f524c 100644 --- a/dlls/iphlpapi/icmp.c +++ b/dlls/iphlpapi/icmp.c @@ -299,7 +299,6 @@ static DWORD icmp_get_reply(int sid, unsigned char *buffer, DWORD send_time, voi } /* Prepare for the next packet */ - endbuf-=ier->DataSize; ier++; /* Check out whether there is more but don't wait this time */

1 0