September 2019 - Wine-commits

Francois Gouget : testbot/TestAgent: Don' t wait for the ssh process if there is none.
by Alexandre Julliard 09 Sep '19

09 Sep '19

Module: tools Branch: master Commit: 45f09b1fdeb3b905bc877f394f529c059421f06c URL: https://source.winehq.org/git/tools.git/?a=commit;h=45f09b1fdeb3b905bc877f3… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Sun Sep 8 06:05:16 2019 +0200 testbot/TestAgent: Don't wait for the ssh process if there is none. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/TestAgent.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/lib/WineTestBot/TestAgent.pm b/testbot/lib/WineTestBot/TestAgent.pm index a0a5efe..9d33f0a 100644 --- a/testbot/lib/WineTestBot/TestAgent.pm +++ b/testbot/lib/WineTestBot/TestAgent.pm @@ -129,7 +129,7 @@ sub Disconnect($) # This may close the SSH channel ($self->{fd}) as a side-effect, # which will avoid undue delays. $self->{ssh} = undef; - waitpid($self->{sshpid}, 0); + waitpid($self->{sshpid}, 0) if ($self->{sshpid}); $self->{sshpid} = undef; } if ($self->{fd})

1 0

Francois Gouget : testbot/TestAgent: Remove a redundant $Step declaration in _Connect().
by Alexandre Julliard 09 Sep '19

09 Sep '19

Module: tools Branch: master Commit: 9bfc0e695b8c0eebc8a4b77c14f5134f24c660b0 URL: https://source.winehq.org/git/tools.git/?a=commit;h=9bfc0e695b8c0eebc8a4b77… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Sun Sep 8 06:05:12 2019 +0200 testbot/TestAgent: Remove a redundant $Step declaration in _Connect(). Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/TestAgent.pm | 1 - 1 file changed, 1 deletion(-) diff --git a/testbot/lib/WineTestBot/TestAgent.pm b/testbot/lib/WineTestBot/TestAgent.pm index 9d33f0a..ca81283 100644 --- a/testbot/lib/WineTestBot/TestAgent.pm +++ b/testbot/lib/WineTestBot/TestAgent.pm @@ -857,7 +857,6 @@ sub _Connect($) my $OldRPC = $self->{rpc}; $self->{rpc} = ($self->{rpc} ? "$self->{rpc}/" : "") ."connect"; - my $Step; my $Start = time(); foreach my $Attempt (1..$self->{cattempts}) {

1 0

Francois Gouget : testbot/WineReconfig: Use the PE TestLauncher executable.
by Alexandre Julliard 09 Sep '19

09 Sep '19

Module: tools Branch: master Commit: f08b3efc68d502ffa02e5825c20a4e9b9b766d6b URL: https://source.winehq.org/git/tools.git/?a=commit;h=f08b3efc68d502ffa02e582… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Sun Sep 8 06:06:29 2019 +0200 testbot/WineReconfig: Use the PE TestLauncher executable. Wine VMs now should have MinGW to compile Wine so they can use it to produce the PE TestLauncher executable as well. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/build/WineReconfig.pl | 13 +------------ testbot/bin/build/WineTest.pl | 2 +- testbot/lib/Build/Utils.pm | 10 +++++++++- 3 files changed, 11 insertions(+), 14 deletions(-) diff --git a/testbot/bin/build/WineReconfig.pl b/testbot/bin/build/WineReconfig.pl index 9f0544e..ff0c11c 100755 --- a/testbot/bin/build/WineReconfig.pl +++ b/testbot/bin/build/WineReconfig.pl @@ -71,18 +71,6 @@ sub BuildWine($$$$;$) return !1; } - # Compile TestLauncher - my $Bits = ($Build =~ /64/) ? "64" : "32"; - $WithWine ||= "."; - system("cd '$DataDir/wine-$Build' && set -x && ". - "gcc -m$Bits -c -o TestLauncher.o ../../src/TestLauncher/TestLauncher.c -fPIC -Iinclude -I../wine/include && ". - "'$WithWine/tools/winegcc/winegcc' -B'$WithWine/tools/winebuild' --sysroot=. -m$Bits -o TestLauncher.exe.so TestLauncher.o"); - if ($? != 0) - { - LogMsg "The $Build TestLauncher build failed\n"; - return !1; - } - return 1; } @@ -266,6 +254,7 @@ if ($DataDir =~ /'/) # exit(1) if (!BuildNativeTestAgentd()); +exit(1) if (!BuildTestLauncher()); exit(1) if ($OptUpdate and !GitPull("wine")); exit(1) if ($OptAddOns and !UpdateAddOns()); exit(1) if ($OptBuild and !UpdateWineBuilds($TaskMissions, $OptNoRm)); diff --git a/testbot/bin/build/WineTest.pl b/testbot/bin/build/WineTest.pl index a399736..4b9a4b9 100755 --- a/testbot/bin/build/WineTest.pl +++ b/testbot/bin/build/WineTest.pl @@ -197,7 +197,7 @@ sub TestExe($$$) } # Run the test executable - RunWine($Mission, "TestLauncher.exe.so", + RunWine($Mission, GetTestLauncher($Mission), "-t 120 ". ShArgv2Cmd($FileName, @$Args) ." >'$DataDir/$BaseName.report'"); diff --git a/testbot/lib/Build/Utils.pm b/testbot/lib/Build/Utils.pm index d31db82..0225392 100644 --- a/testbot/lib/Build/Utils.pm +++ b/testbot/lib/Build/Utils.pm @@ -29,7 +29,7 @@ use Exporter 'import'; our @EXPORT = qw(GetToolName InfoMsg LogMsg Error GitPull ApplyPatch GetCPUCount BuildNativeTestAgentd BuildWindowsTestAgentd - BuildTestLauncher UpdateAddOns + GetTestLauncher BuildTestLauncher UpdateAddOns SetupWineEnvironment RunWine CreateWinePrefix); use Digest::SHA; @@ -219,6 +219,14 @@ sub BuildWindowsTestAgentd() return 1; } +sub GetTestLauncher($) +{ + my ($Mission) = @_; + + my $Bits = ($Mission->{Build} =~ /64/) ? "64" : "32"; + return "$::RootDir/src/TestLauncher/TestLauncher$Bits.exe"; +} + sub BuildTestLauncher() { InfoMsg "\nRebuilding TestLauncher\n";

1 0

Francois Gouget : testbot: Only build testagentd and TestLauncher if given --build.
by Alexandre Julliard 09 Sep '19

09 Sep '19

Module: tools Branch: master Commit: ac5f20c9ad1ef6b4d1131a7969023c5127f82d73 URL: https://source.winehq.org/git/tools.git/?a=commit;h=ac5f20c9ad1ef6b4d1131a7… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Sun Sep 8 06:06:39 2019 +0200 testbot: Only build testagentd and TestLauncher if given --build. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/build/Reconfig.pl | 5 +++-- testbot/bin/build/WineReconfig.pl | 4 ++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/testbot/bin/build/Reconfig.pl b/testbot/bin/build/Reconfig.pl index 72725bf..f0ed128 100755 --- a/testbot/bin/build/Reconfig.pl +++ b/testbot/bin/build/Reconfig.pl @@ -219,8 +219,9 @@ if (! -d "$DataDir/staging" and ! mkdir "$DataDir/staging") # Run the builds # -exit(1) if (!BuildNativeTestAgentd() or !BuildWindowsTestAgentd()); -exit(1) if (!BuildTestLauncher()); +exit(1) if ($OptBuild and !BuildNativeTestAgentd()); +exit(1) if ($OptBuild and !BuildWindowsTestAgentd()); +exit(1) if ($OptBuild and !BuildTestLauncher()); exit(1) if ($OptUpdate and !GitPull("wine")); exit(1) if ($OptBuild and !UpdateWineBuilds($TaskMissions, $OptNoRm)); diff --git a/testbot/bin/build/WineReconfig.pl b/testbot/bin/build/WineReconfig.pl index ff0c11c..835be46 100755 --- a/testbot/bin/build/WineReconfig.pl +++ b/testbot/bin/build/WineReconfig.pl @@ -253,8 +253,8 @@ if ($DataDir =~ /'/) # Run the builds and/or tests # -exit(1) if (!BuildNativeTestAgentd()); -exit(1) if (!BuildTestLauncher()); +exit(1) if ($OptBuild and !BuildNativeTestAgentd()); +exit(1) if ($OptBuild and !BuildTestLauncher()); exit(1) if ($OptUpdate and !GitPull("wine")); exit(1) if ($OptAddOns and !UpdateAddOns()); exit(1) if ($OptBuild and !UpdateWineBuilds($TaskMissions, $OptNoRm));

1 0

Rémi Bernon : dnsapi: Add DnsGetCacheDataTable stub.
by Alexandre Julliard 06 Sep '19

06 Sep '19

Module: wine Branch: master Commit: ec716e9ebdd03051844b1f531a9fe986b2cbb220 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ec716e9ebdd03051844b1f53… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Aug 30 14:59:07 2019 +0200 dnsapi: Add DnsGetCacheDataTable stub. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=40606 Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dnsapi/dnsapi.spec | 2 +- dlls/dnsapi/main.c | 10 +++++++++ dlls/dnsapi/tests/Makefile.in | 1 + dlls/dnsapi/tests/cache.c | 49 +++++++++++++++++++++++++++++++++++++++++++ include/windns.h | 10 +++++++++ 5 files changed, 71 insertions(+), 1 deletion(-) diff --git a/dlls/dnsapi/dnsapi.spec b/dlls/dnsapi/dnsapi.spec index de0ed1d..0d50c56 100644 --- a/dlls/dnsapi/dnsapi.spec +++ b/dlls/dnsapi/dnsapi.spec @@ -40,7 +40,7 @@ @ stub DnsFreeNetworkInformation @ stub DnsFreeSearchInformation @ stub DnsGetBufferLengthForStringCopy -@ stub DnsGetCacheDataTable +@ stdcall DnsGetCacheDataTable(ptr) @ stub DnsGetDnsServerList @ stub DnsGetDomainName @ stub DnsGetHostName_A diff --git a/dlls/dnsapi/main.c b/dlls/dnsapi/main.c index 6cb3b49..4ab294c 100644 --- a/dlls/dnsapi/main.c +++ b/dlls/dnsapi/main.c @@ -112,6 +112,16 @@ BOOL WINAPI DnsFlushResolverCacheEntry_W( PCWSTR entry ) } /****************************************************************************** + * DnsGetCacheDataTable [DNSAPI.@] + * + */ +BOOL WINAPI DnsGetCacheDataTable( PDNS_CACHE_ENTRY* entry ) +{ + FIXME( "(%p) stub\n", entry ); + return FALSE; +} + +/****************************************************************************** * DnsReleaseContextHandle [DNSAPI.@] * */ diff --git a/dlls/dnsapi/tests/Makefile.in b/dlls/dnsapi/tests/Makefile.in index 20412e8..14c8f30 100644 --- a/dlls/dnsapi/tests/Makefile.in +++ b/dlls/dnsapi/tests/Makefile.in @@ -2,5 +2,6 @@ TESTDLL = dnsapi.dll IMPORTS = dnsapi C_SRCS = \ + cache.c \ name.c \ record.c diff --git a/dlls/dnsapi/tests/cache.c b/dlls/dnsapi/tests/cache.c new file mode 100644 index 0000000..cb41b9a --- /dev/null +++ b/dlls/dnsapi/tests/cache.c @@ -0,0 +1,49 @@ +/* + * Tests for dns cache functions + * + * Copyright 2019 Remi Bernon for CodeWeavers + * + * 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 + */ + +#include <stdarg.h> +#include <stdio.h> + +#include "windef.h" +#include "winbase.h" +#include "winnls.h" +#include "windns.h" + +#include "wine/test.h" + +static void test_DnsGetCacheDataTable( void ) +{ + BOOL ret; + PDNS_CACHE_ENTRY entry = NULL; + + ret = DnsGetCacheDataTable( NULL ); + ok( !ret, "DnsGetCacheDataTable succeeded\n" ); + + ret = DnsGetCacheDataTable( &entry ); + todo_wine + ok( ret, "DnsGetCacheDataTable failed\n" ); + todo_wine + ok( entry != NULL, "DnsGetCacheDataTable returned NULL\n" ); +} + +START_TEST(cache) +{ + test_DnsGetCacheDataTable(); +} diff --git a/include/windns.h b/include/windns.h index 9a31fac..26d3716 100644 --- a/include/windns.h +++ b/include/windns.h @@ -698,6 +698,15 @@ typedef struct _DNS_QUERY_CANCEL char Reserved[32]; } DNS_QUERY_CANCEL, *PDNS_QUERY_CANCEL; +typedef struct _DNS_CACHE_ENTRY +{ + struct _DNS_CACHE_ENTRY* Next; + const WCHAR *Name; + WORD Type; + WORD DataLength; + ULONG Flags; +} DNS_CACHE_ENTRY, *PDNS_CACHE_ENTRY; + DNS_STATUS WINAPI DnsAcquireContextHandle_A(DWORD,PVOID,PHANDLE); DNS_STATUS WINAPI DnsAcquireContextHandle_W(DWORD,PVOID,PHANDLE); #define DnsAcquireContextHandle WINELIB_NAME_AW(DnsAcquireContextHandle_) @@ -735,6 +744,7 @@ DNS_STATUS WINAPI DnsValidateName_UTF8(PCSTR,DNS_NAME_FORMAT); #define DnsValidateName WINELIB_NAME_AW(DnsValidateName_) BOOL WINAPI DnsWriteQuestionToBuffer_W(PDNS_MESSAGE_BUFFER,PDWORD,PCWSTR,WORD,WORD,BOOL); BOOL WINAPI DnsWriteQuestionToBuffer_UTF8(PDNS_MESSAGE_BUFFER,PDWORD,PCSTR,WORD,WORD,BOOL); +BOOL WINAPI DnsGetCacheDataTable(PDNS_CACHE_ENTRY*); #ifdef __cplusplus }

1 0

Evgeny Litvinenko : aclocal.m4: Allow nesting WINE_TRY_SHLIB_FLAGS.
by Alexandre Julliard 06 Sep '19

06 Sep '19

Module: wine Branch: master Commit: 11b8bbc7b93bce65986e0fd649b2c400aa7718fd URL: https://source.winehq.org/git/wine.git/?a=commit;h=11b8bbc7b93bce65986e0fd6… Author: Evgeny Litvinenko <evgeny.v.litvinenko(a)gmail.com> Date: Thu Sep 5 23:55:49 2019 +0300 aclocal.m4: Allow nesting WINE_TRY_SHLIB_FLAGS. Signed-off-by: Evgeny Litvinenko <evgeny.v.litvinenko(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- aclocal.m4 | 10 +++++++--- configure | 18 ++++++++++++++---- 2 files changed, 21 insertions(+), 7 deletions(-) diff --git a/aclocal.m4 b/aclocal.m4 index ed0c3a8..194b3a9 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -178,10 +178,14 @@ dnl dnl Usage: WINE_TRY_SHLIB_FLAGS(flags,[action-if-yes,[action-if-no]]) dnl AC_DEFUN([WINE_TRY_SHLIB_FLAGS], -[ac_wine_try_cflags_saved=$CFLAGS +[AS_VAR_PUSHDEF([ac_var], ac_cv_cflags_[[$1]])dnl +ac_wine_try_cflags_saved=$CFLAGS CFLAGS="$CFLAGS $1" -AC_LINK_IFELSE([AC_LANG_SOURCE([void myfunc() {}])],[$2],[$3]) -CFLAGS=$ac_wine_try_cflags_saved]) +AC_LINK_IFELSE([AC_LANG_SOURCE([[void myfunc() {}]])], + [AS_VAR_SET(ac_var,yes)], [AS_VAR_SET(ac_var,no)]) +CFLAGS=$ac_wine_try_cflags_saved +AS_VAR_IF([ac_var],[yes], [$2], [$3])dnl +AS_VAR_POPDEF([ac_var])]) dnl **** Check whether we need to define a symbol on the compiler command line **** dnl diff --git a/configure b/configure index 0c54e27..83d8591 100755 --- a/configure +++ b/configure @@ -9318,13 +9318,18 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext void myfunc() {} _ACEOF if ac_fn_c_try_link "$LINENO"; then : - ac_cv_c_dll_gnuelf="yes" + ac_cv_cflags__fPIC__shared__Wl__Bsymbolic=yes else - ac_cv_c_dll_gnuelf="no" + ac_cv_cflags__fPIC__shared__Wl__Bsymbolic=no fi rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext CFLAGS=$ac_wine_try_cflags_saved +if test "x$ac_cv_cflags__fPIC__shared__Wl__Bsymbolic" = xyes; then : + ac_cv_c_dll_gnuelf="yes" +else + ac_cv_c_dll_gnuelf="no" +fi fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_dll_gnuelf" >&5 $as_echo "$ac_cv_c_dll_gnuelf" >&6; } @@ -9667,13 +9672,18 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext void myfunc() {} _ACEOF if ac_fn_c_try_link "$LINENO"; then : - ac_cv_c_dll_unixware="yes" + ac_cv_cflags__fPIC__Wl__G__h_conftest_so_1_0__B_symbolic=yes else - ac_cv_c_dll_unixware="no" + ac_cv_cflags__fPIC__Wl__G__h_conftest_so_1_0__B_symbolic=no fi rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext CFLAGS=$ac_wine_try_cflags_saved +if test "x$ac_cv_cflags__fPIC__Wl__G__h_conftest_so_1_0__B_symbolic" = xyes; then : + ac_cv_c_dll_unixware="yes" +else + ac_cv_c_dll_unixware="no" +fi fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_dll_unixware" >&5 $as_echo "$ac_cv_c_dll_unixware" >&6; }

1 0

Zebediah Figura : http.sys: Use the SOCKET type for Windows sockets.
by Alexandre Julliard 06 Sep '19

06 Sep '19

Module: wine Branch: master Commit: eada1be3a1dc7909a71d1b6eb3420ae736a680fc URL: https://source.winehq.org/git/wine.git/?a=commit;h=eada1be3a1dc7909a71d1b6e… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Sep 6 08:54:25 2019 -0500 http.sys: Use the SOCKET type for Windows sockets. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/http.sys/http.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/dlls/http.sys/http.c b/dlls/http.sys/http.c index b5d5a21..c51ca8a 100644 --- a/dlls/http.sys/http.c +++ b/dlls/http.sys/http.c @@ -209,7 +209,7 @@ struct connection { struct list entry; /* in "connections" below */ - int socket; + SOCKET socket; char *buffer; unsigned int len, size; @@ -246,18 +246,18 @@ struct request_queue LIST_ENTRY irp_queue; HTTP_URL_CONTEXT context; char *url; - int socket; + SOCKET socket; }; static struct list request_queues = LIST_INIT(request_queues); -static void accept_connection(int socket) +static void accept_connection(SOCKET socket) { struct connection *conn; ULONG true = 1; - int peer; + SOCKET peer; - if ((peer = accept(socket, NULL, NULL)) == -1) + if ((peer = accept(socket, NULL, NULL)) == INVALID_SOCKET) return; if (!(conn = heap_alloc_zero(sizeof(*conn)))) @@ -1046,10 +1046,11 @@ static NTSTATUS http_add_url(struct request_queue *queue, IRP *irp) const struct http_add_url_params *params = irp->AssociatedIrp.SystemBuffer; struct sockaddr_in addr; struct connection *conn; + unsigned int count = 0; char *url, *endptr; - int s, count = 0; ULONG true = 1; const char *p; + SOCKET s; TRACE("host %s, context %s.\n", debugstr_a(params->url), wine_dbgstr_longlong(params->context)); @@ -1089,7 +1090,7 @@ static NTSTATUS http_add_url(struct request_queue *queue, IRP *irp) return STATUS_NOT_IMPLEMENTED; } - if ((s = socket(AF_INET, SOCK_STREAM, 0)) == -1) + if ((s = socket(AF_INET, SOCK_STREAM, 0)) == INVALID_SOCKET) { ERR("Failed to create socket, error %u.\n", WSAGetLastError()); LeaveCriticalSection(&http_cs);

1 0

Sven Baars : quartz: Fix some memory leaks (Coverity).
by Alexandre Julliard 06 Sep '19

06 Sep '19

Module: wine Branch: master Commit: 3b9888efa34f15e09e71f80fb6c6b76b98409fd2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3b9888efa34f15e09e71f80f… Author: Sven Baars <sven.wine(a)gmail.com> Date: Fri Sep 6 17:29:49 2019 +0200 quartz: Fix some memory leaks (Coverity). Signed-off-by: Sven Baars <sven.wine(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/filesource.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/quartz/filesource.c b/dlls/quartz/filesource.c index f907401..7738500 100644 --- a/dlls/quartz/filesource.c +++ b/dlls/quartz/filesource.c @@ -149,7 +149,11 @@ static BOOL process_pattern_string(const WCHAR *pattern, HANDLE file) memset(mask, 0xff, size); if (!(pattern = wcschr(pattern, ','))) + { + heap_free(mask); + heap_free(expect); return FALSE; + } pattern++; while (!iswxdigit(*pattern) && (*pattern != ',')) pattern++;

1 0

Sven Baars : quartz/tests: Fix a memory leak (Valgrind).
by Alexandre Julliard 06 Sep '19

06 Sep '19

Module: wine Branch: master Commit: deb26091ef60168caaac33feae88bfa8acb1c87d URL: https://source.winehq.org/git/wine.git/?a=commit;h=deb26091ef60168caaac33fe… Author: Sven Baars <sven.wine(a)gmail.com> Date: Fri Sep 6 17:29:48 2019 +0200 quartz/tests: Fix a memory leak (Valgrind). Signed-off-by: Sven Baars <sven.wine(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/filesource.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/quartz/tests/filesource.c b/dlls/quartz/tests/filesource.c index 18a9bf1..37f8dd9 100644 --- a/dlls/quartz/tests/filesource.c +++ b/dlls/quartz/tests/filesource.c @@ -460,6 +460,7 @@ static void test_file_source_filter(void) hr = IPin_QueryAccept(pin, pmt); ok(hr == S_FALSE, "Got hr %#x.\n", hr); + CoTaskMemFree(pmt); hr = IEnumMediaTypes_Next(enum_mt, 1, &pmt, NULL); ok(hr == S_FALSE, "Got hr %#x.\n", hr);

1 0

Jacek Caban : services: Use threadpool timers for services delay loading.
by Alexandre Julliard 06 Sep '19

06 Sep '19

Module: wine Branch: master Commit: 765815729fc4af2472e60551364e3b29dccfbcff URL: https://source.winehq.org/git/wine.git/?a=commit;h=765815729fc4af2472e60551… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Sep 6 21:33:58 2019 +0200 services: Use threadpool timers for services delay loading. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47675 Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/services/services.c | 39 ++++++++++++++++++--------------------- 1 file changed, 18 insertions(+), 21 deletions(-) diff --git a/programs/services/services.c b/programs/services/services.c index 5eca777..968be35 100644 --- a/programs/services/services.c +++ b/programs/services/services.c @@ -353,37 +353,34 @@ static void CALLBACK delayed_autostart_cancel_callback(void *object, void *userd } static void CALLBACK delayed_autostart_callback(TP_CALLBACK_INSTANCE *instance, void *context, - TP_WAIT *wait, TP_WAIT_RESULT result) + TP_TIMER *timer) { struct delayed_autostart_params *params = context; struct service_entry *service; unsigned int i; DWORD err; - if (result == WAIT_TIMEOUT) - { - scmdatabase_lock_startup(active_database, INFINITE); + scmdatabase_lock_startup(active_database, INFINITE); - for (i = 0; i < params->count; i++) + for (i = 0; i < params->count; i++) + { + service = params->services[i]; + if (service->status.dwCurrentState == SERVICE_STOPPED) { - service = params->services[i]; - if (service->status.dwCurrentState == SERVICE_STOPPED) - { - TRACE("Starting deleyed auto-start service %s\n", debugstr_w(service->name)); - err = service_start(service, 0, NULL); - if (err != ERROR_SUCCESS) - FIXME("Delayed auto-start service %s failed to start: %d\n", - wine_dbgstr_w(service->name), err); - } - release_service(service); + TRACE("Starting delayed auto-start service %s\n", debugstr_w(service->name)); + err = service_start(service, 0, NULL); + if (err != ERROR_SUCCESS) + FIXME("Delayed auto-start service %s failed to start: %d\n", + wine_dbgstr_w(service->name), err); } - - scmdatabase_unlock_startup(active_database); + release_service(service); } + scmdatabase_unlock_startup(active_database); + heap_free(params->services); heap_free(params); - CloseThreadpoolWait(wait); + CloseThreadpoolTimer(timer); } static BOOL schedule_delayed_autostart(struct service_entry **services, unsigned int count) @@ -391,7 +388,7 @@ static BOOL schedule_delayed_autostart(struct service_entry **services, unsigned struct delayed_autostart_params *params; TP_CALLBACK_ENVIRON environment; LARGE_INTEGER timestamp; - TP_WAIT *wait; + TP_TIMER *timer; FILETIME ft; if (!(delayed_autostart_cleanup = CreateThreadpoolCleanupGroup())) @@ -413,14 +410,14 @@ static BOOL schedule_delayed_autostart(struct service_entry **services, unsigned ft.dwLowDateTime = timestamp.u.LowPart; ft.dwHighDateTime = timestamp.u.HighPart; - if (!(wait = CreateThreadpoolWait(delayed_autostart_callback, params, &environment))) + if (!(timer = CreateThreadpoolTimer(delayed_autostart_callback, params, &environment))) { ERR("CreateThreadpoolWait failed: %u\n", GetLastError()); heap_free(params); return FALSE; } - SetThreadpoolWait(wait, params, &ft); + SetThreadpoolTimer(timer, &ft, 0, 0); return TRUE; }

1 0