November 2019 - Wine-Commits

Zebediah Figura : setupapi: Fix setting filepart in SetupCopyOEMInfW().
by Alexandre Julliard Nov. 8, 2019

Nov. 8, 2019

Module: wine Branch: master Commit: 161a0c259acc97064cdf9d71f86f982506b01538 URL: https://source.winehq.org/git/wine.git/?a=commit;h=161a0c259acc97064cdf9d71… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Nov 7 23:37:52 2019 -0600 setupapi: Fix setting filepart in SetupCopyOEMInfW(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/setupapi/misc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/setupapi/misc.c b/dlls/setupapi/misc.c index 3fadb6827b..3b5d62b682 100644 --- a/dlls/setupapi/misc.c +++ b/dlls/setupapi/misc.c @@ -1073,6 +1073,7 @@ done: if (buffer_size >= size) { lstrcpyW( dest, target ); + if (filepart) *filepart = wcsrchr( dest, '\\' ) + 1; } else { @@ -1081,7 +1082,6 @@ done: } } - if (filepart) *filepart = wcsrchr( target, '\\' ) + 1; if (required_size) *required_size = size; if (ret) SetLastError(ERROR_SUCCESS);

1 0

Francois Gouget : testbot/web: Trace how long it takes to generate the JobDetails page.
by Alexandre Julliard Nov. 8, 2019

Nov. 8, 2019

Module: tools Branch: master Commit: a1b547a37ce2cb7fac89e76344f1a4841738e09d URL: https://source.winehq.org/git/tools.git/?a=commit;h=a1b547a37ce2cb7fac89e76… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Nov 8 10:52:41 2019 +0100 testbot/web: Trace how long it takes to generate the JobDetails page. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/web/JobDetails.pl | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/testbot/web/JobDetails.pl b/testbot/web/JobDetails.pl index fc98e14..a59fa00 100644 --- a/testbot/web/JobDetails.pl +++ b/testbot/web/JobDetails.pl @@ -31,6 +31,7 @@ use URI::Escape; use WineTestBot::Config; use WineTestBot::Jobs; +use WineTestBot::Log; # For Elapsed() use WineTestBot::LogUtils; use WineTestBot::Missions; use WineTestBot::StepsTasks; @@ -41,6 +42,7 @@ use WineTestBot::Engine::Notify; sub _initialize($$$) { my ($self, $Request, $RequiredRole) = @_; + $self->{start} = Time(); my $JobId = $self->GetParam("Key"); if (! defined($JobId)) @@ -645,6 +647,12 @@ sub GenerateDataCell($$$$$) } } +sub GenerateFooter($) +{ + my ($self) = @_; + print "<p class='GeneralFooterText'>Generated in ", Elapsed($self->{start}), " s</p>\n"; +} + package main;

1 0

Francois Gouget : testbot/web: Document why WineTestBot::Log is used.
by Alexandre Julliard Nov. 8, 2019

Nov. 8, 2019

Module: tools Branch: master Commit: 44cd463125c6d6079b2a15db3992bb75c3bfd572 URL: https://source.winehq.org/git/tools.git/?a=commit;h=44cd463125c6d6079b2a15d… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Nov 8 10:53:10 2019 +0100 testbot/web: Document why WineTestBot::Log is used. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/web/Activity.pl | 2 +- testbot/web/Stats.pl | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/testbot/web/Activity.pl b/testbot/web/Activity.pl index fe056aa..d616a7c 100644 --- a/testbot/web/Activity.pl +++ b/testbot/web/Activity.pl @@ -29,7 +29,7 @@ use URI::Escape; use WineTestBot::Config; use WineTestBot::Activity; -use WineTestBot::Log; +use WineTestBot::Log; # For Elapsed() use WineTestBot::Utils; use WineTestBot::VMs; diff --git a/testbot/web/Stats.pl b/testbot/web/Stats.pl index 43f1494..f453891 100644 --- a/testbot/web/Stats.pl +++ b/testbot/web/Stats.pl @@ -28,7 +28,7 @@ use ObjectModel::BasicPropertyDescriptor; use ObjectModel::Collection; use WineTestBot::Config; use WineTestBot::Activity; -use WineTestBot::Log; +use WineTestBot::Log; # For Elapsed() use WineTestBot::Utils; use WineTestBot::VMs;

1 0

Francois Gouget : testbot: All but a few winediag messages are errors.
by Alexandre Julliard Nov. 8, 2019

Nov. 8, 2019

Module: tools Branch: master Commit: 4fdeed539ca798fe1b669da0835f6aff2b81a363 URL: https://source.winehq.org/git/tools.git/?a=commit;h=4fdeed539ca798fe1b669da… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Nov 8 10:53:37 2019 +0100 testbot: All but a few winediag messages are errors. Only a few winediag messages may legitimately occur when running the tests. The presence of other winediag messages indicates an error. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/LogUtils.pm | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/testbot/lib/WineTestBot/LogUtils.pm b/testbot/lib/WineTestBot/LogUtils.pm index 2849d60..ea1ad89 100644 --- a/testbot/lib/WineTestBot/LogUtils.pm +++ b/testbot/lib/WineTestBot/LogUtils.pm @@ -167,7 +167,19 @@ sub GetLogLineCategory($) } if ($Line =~ /:winediag:/) { - return "diag"; + if (# Normally CorIsLatestSvc() would not be called but mscoree:mscoree + # calls it as a test. + $Line =~ /CorIsLatestSvc If this function is called,/ or + # VMs and most test machines don't have a midi port. + $Line =~ /No software synthesizer midi port found / or + # Most VMs have limited OpenGL support. + $Line =~ /None of the requested D3D feature levels is supported / or + # The tests are not run as root. + $Line =~ /this requires special permissions/) + { + return "diag"; + } + return "error"; } if (# TestBot script error messages $Line =~ /^[a-zA-Z.]+:error: / or

1 0

Francois Gouget : testbot: Trace the chunks in _DumpDiff().
by Alexandre Julliard Nov. 8, 2019

Nov. 8, 2019

Module: tools Branch: master Commit: 5d7bfea1c743825d92cb87e77235306b57a03247 URL: https://source.winehq.org/git/tools.git/?a=commit;h=5d7bfea1c743825d92cb87e… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Nov 8 10:53:01 2019 +0100 testbot: Trace the chunks in _DumpDiff(). Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/LogUtils.pm | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/testbot/lib/WineTestBot/LogUtils.pm b/testbot/lib/WineTestBot/LogUtils.pm index acb87a4..2849d60 100644 --- a/testbot/lib/WineTestBot/LogUtils.pm +++ b/testbot/lib/WineTestBot/LogUtils.pm @@ -809,17 +809,19 @@ sub _DumpDiff($$) print STDERR "$Label:\n"; $Diff = $Diff->Copy(); + my $Chunk = 0; while ($Diff->Next()) { if ($Diff->Same()) { - print STDERR " $_\n" for ($Diff->Same()); + print STDERR "$Chunk $_\n" for ($Diff->Same()); } else { - print STDERR "-$_\n" for ($Diff->Items(1)); - print STDERR "+$_\n" for ($Diff->Items(2)); + print STDERR "$Chunk -$_\n" for ($Diff->Items(1)); + print STDERR "$Chunk +$_\n" for ($Diff->Items(2)); } + $Chunk++; } }

1 0

Piotr Caban : ntdll: Work around futimens weak linking problem in set_file_times.
by Alexandre Julliard Nov. 7, 2019

Nov. 7, 2019

Module: wine Branch: master Commit: b4ec4028597c06bbdbf283b4a5f5957dd2c1b809 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b4ec4028597c06bbdbf283b4… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Nov 7 16:24:34 2019 +0100 ntdll: Work around futimens weak linking problem in set_file_times. Newer XCode versions are weak linking to futimens function. Because of that Wine will crash trying to execute the function on Mac OS <= 10.12. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/file.c | 26 +++++++++++++++++++++----- 1 file changed, 21 insertions(+), 5 deletions(-) diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c index 655dcb2eaf..dd6d1341b0 100644 --- a/dlls/ntdll/file.c +++ b/dlls/ntdll/file.c @@ -1907,10 +1907,9 @@ static int futimens( int fd, const struct timespec spec[2] ) #define UTIME_OMIT ((1 << 30) - 2) #endif -static NTSTATUS set_file_times( int fd, const LARGE_INTEGER *mtime, const LARGE_INTEGER *atime ) +static BOOL set_file_times_precise( int fd, const LARGE_INTEGER *mtime, + const LARGE_INTEGER *atime, NTSTATUS *status ) { - NTSTATUS status = STATUS_SUCCESS; - #ifdef HAVE_FUTIMENS struct timespec tv[2]; @@ -1926,12 +1925,29 @@ static NTSTATUS set_file_times( int fd, const LARGE_INTEGER *mtime, const LARGE_ tv[1].tv_sec = mtime->QuadPart / 10000000 - SECS_1601_TO_1970; tv[1].tv_nsec = (mtime->QuadPart % 10000000) * 100; } - if (futimens( fd, tv ) == -1) status = FILE_GetNtStatus(); +#ifdef __APPLE__ + if (!&futimens) return FALSE; +#endif + if (futimens( fd, tv ) == -1) *status = FILE_GetNtStatus(); + else *status = STATUS_SUCCESS; + return TRUE; +#else + return FALSE; +#endif +} -#elif defined(HAVE_FUTIMES) || defined(HAVE_FUTIMESAT) +static NTSTATUS set_file_times( int fd, const LARGE_INTEGER *mtime, const LARGE_INTEGER *atime ) +{ + NTSTATUS status = STATUS_SUCCESS; +#if defined(HAVE_FUTIMES) || defined(HAVE_FUTIMESAT) struct timeval tv[2]; struct stat st; +#endif + + if (set_file_times_precise( fd, mtime, atime, &status )) + return status; +#if defined(HAVE_FUTIMES) || defined(HAVE_FUTIMESAT) if (!atime->QuadPart || !mtime->QuadPart) {

1 0

Paul Gofman : kernel32: Output a message in GetVolumeInformationW() when device has no read access.
by Alexandre Julliard Nov. 7, 2019

Nov. 7, 2019

Module: wine Branch: master Commit: 4907f2626c56d42f6e8c98832e4f801e06ba3c2d URL: https://source.winehq.org/git/wine.git/?a=commit;h=4907f2626c56d42f6e8c9883… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Thu Nov 7 13:44:35 2019 +0300 kernel32: Output a message in GetVolumeInformationW() when device has no read access. A lot of applications fail to install from CDs or mounted ISO images when Wine does not return correct volume label from GetVolumeInformation() repeatedly asking to insert correct disk. Most of the time it happens because the block device is read only for user (which is typical default behaviour) and FS info cannot be read. It looks like the hint about what went wrong will simplify things in this common case. Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/volume.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/volume.c b/dlls/kernel32/volume.c index 2c8a668b73..02d14cdcc9 100644 --- a/dlls/kernel32/volume.c +++ b/dlls/kernel32/volume.c @@ -772,8 +772,12 @@ BOOL WINAPI GetVolumeInformationW( LPCWSTR root, LPWSTR label, DWORD label_len, CloseHandle( handle ); goto fill_fs_info; } - else TRACE( "cannot open device %s: %x\n", debugstr_w(nt_name.Buffer), status ); - + else + { + TRACE( "cannot open device %s: %x\n", debugstr_w(nt_name.Buffer), status ); + if (status == STATUS_ACCESS_DENIED) + MESSAGE( "wine: Read access denied for device %s, FS volume label and serial are not available.\n", debugstr_w(nt_name.Buffer) ); + } /* we couldn't open the device, fallback to default strategy */ if (!set_ntstatus( NtOpenFile( &handle, SYNCHRONIZE, &attr, &io, 0,

1 0

Piotr Caban : user32: Include png.h only if SONAME_LIBPNG is defined.
by Alexandre Julliard Nov. 7, 2019

Nov. 7, 2019

Module: wine Branch: master Commit: cfa9334125f6a4ae7296b3931af5f1af93fc1029 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cfa9334125f6a4ae7296b393… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Nov 7 22:02:36 2019 +0100 user32: Include png.h only if SONAME_LIBPNG is defined. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/cursoricon.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/user32/cursoricon.c b/dlls/user32/cursoricon.c index 9c61d7ff30..6413d22d03 100644 --- a/dlls/user32/cursoricon.c +++ b/dlls/user32/cursoricon.c @@ -31,7 +31,7 @@ #include <stdarg.h> #include <string.h> #include <stdlib.h> -#ifdef HAVE_PNG_H +#ifdef SONAME_LIBPNG #include <png.h> #endif

1 0

Alistair Leslie-Hughes : dsdmo: Added dll.
by Alexandre Julliard Nov. 7, 2019

Nov. 7, 2019

Module: wine Branch: master Commit: 43a4439068ef375930fb87f379960a93275afb4a URL: https://source.winehq.org/git/wine.git/?a=commit;h=43a4439068ef375930fb87f3… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Nov 6 21:29:28 2019 +0000 dsdmo: Added dll. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 ++ configure.ac | 1 + dlls/dsdmo/Makefile.in | 6 ++++ dlls/dsdmo/dsdmo.spec | 4 +++ dlls/dsdmo/main.c | 82 ++++++++++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 95 insertions(+) diff --git a/configure b/configure index 8ddfb4ecdd..d69d1ac4a3 100755 --- a/configure +++ b/configure @@ -1257,6 +1257,7 @@ enable_dpnlobby enable_dpvoice enable_dpwsockx enable_drmclien +enable_dsdmo enable_dsound enable_dsquery enable_dssenh @@ -20384,6 +20385,7 @@ wine_fn_config_makefile dlls/dpvoice enable_dpvoice wine_fn_config_makefile dlls/dpvoice/tests enable_tests wine_fn_config_makefile dlls/dpwsockx enable_dpwsockx wine_fn_config_makefile dlls/drmclien enable_drmclien +wine_fn_config_makefile dlls/dsdmo enable_dsdmo wine_fn_config_makefile dlls/dsound enable_dsound wine_fn_config_makefile dlls/dsound/tests enable_tests wine_fn_config_makefile dlls/dsquery enable_dsquery diff --git a/configure.ac b/configure.ac index 31aac11d31..c99db6984b 100644 --- a/configure.ac +++ b/configure.ac @@ -3237,6 +3237,7 @@ WINE_CONFIG_MAKEFILE(dlls/dpvoice) WINE_CONFIG_MAKEFILE(dlls/dpvoice/tests) WINE_CONFIG_MAKEFILE(dlls/dpwsockx) WINE_CONFIG_MAKEFILE(dlls/drmclien) +WINE_CONFIG_MAKEFILE(dlls/dsdmo) WINE_CONFIG_MAKEFILE(dlls/dsound) WINE_CONFIG_MAKEFILE(dlls/dsound/tests) WINE_CONFIG_MAKEFILE(dlls/dsquery) diff --git a/dlls/dsdmo/Makefile.in b/dlls/dsdmo/Makefile.in new file mode 100644 index 0000000000..99816ae0c0 --- /dev/null +++ b/dlls/dsdmo/Makefile.in @@ -0,0 +1,6 @@ +MODULE = dsdmo.dll + +EXTRADLLFLAGS = -mno-cygwin + +C_SRCS = \ + main.c diff --git a/dlls/dsdmo/dsdmo.spec b/dlls/dsdmo/dsdmo.spec new file mode 100644 index 0000000000..b16365d0c9 --- /dev/null +++ b/dlls/dsdmo/dsdmo.spec @@ -0,0 +1,4 @@ +@ stdcall -private DllCanUnloadNow() +@ stdcall -private DllGetClassObject(ptr ptr ptr) +@ stdcall -private DllRegisterServer() +@ stdcall -private DllUnregisterServer() diff --git a/dlls/dsdmo/main.c b/dlls/dsdmo/main.c new file mode 100644 index 0000000000..788381b7a4 --- /dev/null +++ b/dlls/dsdmo/main.c @@ -0,0 +1,82 @@ +/* + * Copyright 2019 Alistair Leslie-Hughes + * + * 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 + */ +#define COBJMACROS + +#include "ole2.h" +#include "rpcproxy.h" + +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(dsdmo); + +static HINSTANCE dsdmo_instance; + +/****************************************************************** + * DllMain + */ +BOOL WINAPI DllMain(HINSTANCE inst, DWORD reason, void *reserved) +{ + TRACE("(%p %d %p)\n", inst, reason, reserved); + + switch(reason) + { + case DLL_WINE_PREATTACH: + return FALSE; /* prefer native version */ + case DLL_PROCESS_ATTACH: + dsdmo_instance = inst; + DisableThreadLibraryCalls(dsdmo_instance); + break; + } + + return TRUE; +} + +/*********************************************************************** + * DllGetClassObject + */ +HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *ppv) +{ + FIXME("%s %s %p\n", debugstr_guid(rclsid), debugstr_guid(riid), ppv); + return CLASS_E_CLASSNOTAVAILABLE; +} + +/*********************************************************************** + * DllCanUnloadNow + */ +HRESULT WINAPI DllCanUnloadNow(void) +{ + return S_FALSE; +} + +/*********************************************************************** + * DllRegisterServer + */ +HRESULT WINAPI DllRegisterServer(void) +{ + TRACE("()\n"); + return __wine_register_resources(dsdmo_instance); +} + +/*********************************************************************** + * DllUnregisterServer + */ +HRESULT WINAPI DllUnregisterServer(void) +{ + TRACE("()\n"); + return __wine_unregister_resources(dsdmo_instance); +}

1 0

Piotr Caban : windowscodecs: Include png.h only if SONAME_LIBPNG is defined.
by Alexandre Julliard Nov. 7, 2019

Nov. 7, 2019

Module: wine Branch: master Commit: 88d30985ddd534e8bafed531e619846bc8d10839 URL: https://source.winehq.org/git/wine.git/?a=commit;h=88d30985ddd534e8bafed531… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Nov 7 22:02:43 2019 +0100 windowscodecs: Include png.h only if SONAME_LIBPNG is defined. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/pngformat.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/windowscodecs/pngformat.c b/dlls/windowscodecs/pngformat.c index c0e272e86f..a79df632ef 100644 --- a/dlls/windowscodecs/pngformat.c +++ b/dlls/windowscodecs/pngformat.c @@ -22,7 +22,7 @@ #include <stdarg.h> -#ifdef HAVE_PNG_H +#ifdef SONAME_LIBPNG #include <png.h> #endif @@ -2183,7 +2183,7 @@ HRESULT PngEncoder_CreateInstance(REFIID iid, void** ppv) return ret; } -#else /* !HAVE_PNG_H */ +#else /* !SONAME_LIBPNG */ HRESULT PngDecoder_CreateInstance(REFIID iid, void** ppv) {

1 0