December 2020 - Wine-Commits

Michael Stefaniuc : ntdll: Use wide-char string literals in actctx.c.
by Alexandre Julliard Dec. 4, 2020

Dec. 4, 2020

Module: wine Branch: master Commit: 3b4239351a6e6028b8b63246042a68be26bfb7be URL: https://source.winehq.org/git/wine.git/?a=commit;h=3b4239351a6e6028b8b63246… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Fri Dec 4 00:36:30 2020 +0100 ntdll: Use wide-char string literals in actctx.c. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/actctx.c | 532 +++++++++++++++++++--------------------------------- 1 file changed, 194 insertions(+), 338 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=3b4239351a6e6028b8b6…

1 0

Francois Gouget : testbot: Tweak the VMs default status and snapshot name.
by Alexandre Julliard Dec. 4, 2020

Dec. 4, 2020

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 dir.c functions.
by Alexandre Julliard Dec. 3, 2020

Dec. 3, 2020

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 math.c functions.
by Alexandre Julliard Dec. 3, 2020

Dec. 3, 2020

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 file.c functions.
by Alexandre Julliard Dec. 3, 2020

Dec. 3, 2020

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 Dec. 3, 2020

Dec. 3, 2020

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

Piotr Caban : msvcrt: Remove MSVCRT_ prefix from wcs.c functions.
by Alexandre Julliard Dec. 3, 2020

Dec. 3, 2020

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 time.c functions.
by Alexandre Julliard Dec. 3, 2020

Dec. 3, 2020

Module: wine Branch: master Commit: 40b3361c0a3363633a764984a1079a7c9f1af9d3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=40b3361c0a3363633a764984… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Dec 3 19:10:50 2020 +0100 msvcrt: Remove MSVCRT_ prefix from time.c functions. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/crtdll/crtdll.spec | 35 +++--- dlls/msvcr100/msvcr100.spec | 96 +++++++------- dlls/msvcr110/msvcr110.spec | 96 +++++++------- dlls/msvcr120/msvcr120.spec | 96 +++++++------- dlls/msvcr70/msvcr70.spec | 64 +++++----- dlls/msvcr71/msvcr71.spec | 63 +++++----- dlls/msvcr80/msvcr80.spec | 96 +++++++------- dlls/msvcr90/msvcr90.spec | 96 +++++++------- dlls/msvcrt/file.c | 3 +- dlls/msvcrt/msvcrt.spec | 117 +++++++++-------- dlls/msvcrt/time.c | 301 +++++++++++++------------------------------- dlls/msvcrtd/msvcrtd.spec | 50 ++++---- dlls/ucrtbase/ucrtbase.spec | 170 ++++++++++++------------- 13 files changed, 598 insertions(+), 685 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=40b3361c0a3363633a76…

1 0

Derek Lesho : winegstreamer: Implement ::ProcessMessage for audio conversion MFT.
by Alexandre Julliard Dec. 3, 2020

Dec. 3, 2020

Module: wine Branch: master Commit: c7345a51f7eba396741ccd108b19341834a45382 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c7345a51f7eba396741ccd10… Author: Derek Lesho <dlesho(a)codeweavers.com> Date: Wed Dec 2 17:36:35 2020 -0500 winegstreamer: Implement ::ProcessMessage for audio conversion MFT. Signed-off-by: Derek Lesho <dlesho(a)codeweavers.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/audioconvert.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/dlls/winegstreamer/audioconvert.c b/dlls/winegstreamer/audioconvert.c index 8948281fa18..9499920347f 100644 --- a/dlls/winegstreamer/audioconvert.c +++ b/dlls/winegstreamer/audioconvert.c @@ -326,9 +326,16 @@ static HRESULT WINAPI audio_converter_ProcessEvent(IMFTransform *iface, DWORD id static HRESULT WINAPI audio_converter_ProcessMessage(IMFTransform *iface, MFT_MESSAGE_TYPE message, ULONG_PTR param) { - FIXME("%p, %u %lu.\n", iface, message, param); + TRACE("%p, %u %lu.\n", iface, message, param); - return E_NOTIMPL; + switch(message) + { + case MFT_MESSAGE_NOTIFY_START_OF_STREAM: + return S_OK; + default: + FIXME("Unhandled message type %x.\n", message); + return E_NOTIMPL; + } } static HRESULT WINAPI audio_converter_ProcessInput(IMFTransform *iface, DWORD id, IMFSample *sample, DWORD flags)

1 0

Derek Lesho : winegstreamer: Implement ::GetOutputAvailableType for audio conversion transform.
by Alexandre Julliard Dec. 3, 2020

Dec. 3, 2020

Module: wine Branch: master Commit: 8e6a4b239ae17ffad6d78dc17e628565f9a4c931 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8e6a4b239ae17ffad6d78dc1… Author: Derek Lesho <dlesho(a)codeweavers.com> Date: Wed Dec 2 17:36:34 2020 -0500 winegstreamer: Implement ::GetOutputAvailableType for audio conversion transform. Signed-off-by: Derek Lesho <dlesho(a)codeweavers.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/audioconvert.c | 67 +++++++++++++++++++++++++++++++++++++-- 1 file changed, 65 insertions(+), 2 deletions(-) diff --git a/dlls/winegstreamer/audioconvert.c b/dlls/winegstreamer/audioconvert.c index bba7d6f5830..8948281fa18 100644 --- a/dlls/winegstreamer/audioconvert.c +++ b/dlls/winegstreamer/audioconvert.c @@ -200,9 +200,72 @@ static HRESULT WINAPI audio_converter_GetInputAvailableType(IMFTransform *iface, static HRESULT WINAPI audio_converter_GetOutputAvailableType(IMFTransform *iface, DWORD id, DWORD index, IMFMediaType **type) { - FIXME("%p, %u, %u, %p.\n", iface, id, index, type); + IMFMediaType *output_type; + HRESULT hr; - return E_NOTIMPL; + static const struct + { + const GUID *subtype; + DWORD depth; + } + formats[] = + { + {&MFAudioFormat_PCM, 16}, + {&MFAudioFormat_PCM, 24}, + {&MFAudioFormat_PCM, 32}, + {&MFAudioFormat_Float, 32}, + }; + + static const DWORD rates[] = {44100, 48000}; + static const DWORD channel_cnts[] = {1, 2, 6}; + const GUID *subtype; + DWORD rate, channels, bps; + + TRACE("%p, %u, %u, %p.\n", iface, id, index, type); + + if (id != 0) + return MF_E_INVALIDSTREAMNUMBER; + + if (index >= ARRAY_SIZE(formats) * 2/*rates*/ * 3/*layouts*/) + return MF_E_NO_MORE_TYPES; + + if (FAILED(hr = MFCreateMediaType(&output_type))) + return hr; + + subtype = formats[index / 6].subtype; + bps = formats[index / 6].depth; + rate = rates[index % 2]; + channels = channel_cnts[(index / 2) % 3]; + + if (FAILED(hr = IMFMediaType_SetGUID(output_type, &MF_MT_MAJOR_TYPE, &MFMediaType_Audio))) + goto fail; + if (FAILED(hr = IMFMediaType_SetGUID(output_type, &MF_MT_SUBTYPE, subtype))) + goto fail; + if (FAILED(hr = IMFMediaType_SetUINT32(output_type, &MF_MT_AUDIO_SAMPLES_PER_SECOND, rate))) + goto fail; + if (FAILED(hr = IMFMediaType_SetUINT32(output_type, &MF_MT_AUDIO_NUM_CHANNELS, channels))) + goto fail; + if (FAILED(hr = IMFMediaType_SetUINT32(output_type, &MF_MT_AUDIO_BITS_PER_SAMPLE, bps))) + goto fail; + + if (FAILED(hr = IMFMediaType_SetUINT32(output_type, &MF_MT_AUDIO_BLOCK_ALIGNMENT, channels * bps / 8))) + goto fail; + if (FAILED(hr = IMFMediaType_SetUINT32(output_type, &MF_MT_AUDIO_AVG_BYTES_PER_SECOND, rate * channels * bps / 8))) + goto fail; + if (FAILED(hr = IMFMediaType_SetUINT32(output_type, &MF_MT_AUDIO_CHANNEL_MASK, + channels == 1 ? KSAUDIO_SPEAKER_MONO : + channels == 2 ? KSAUDIO_SPEAKER_STEREO : + /*channels == 6*/ KSAUDIO_SPEAKER_5POINT1))) + goto fail; + if (FAILED(hr = IMFMediaType_SetUINT32(output_type, &MF_MT_ALL_SAMPLES_INDEPENDENT, TRUE))) + goto fail; + + *type = output_type; + + return S_OK; +fail: + IMFMediaType_Release(output_type); + return hr; } static HRESULT WINAPI audio_converter_SetInputType(IMFTransform *iface, DWORD id, IMFMediaType *type, DWORD flags)

1 0