November 2017 - Wine-Devel - list.winehq.org

[PATCH 1/5] makedep: Add build framework for building DLLs in test directories.
by Zebediah Figura Nov. 24, 2017

Nov. 24, 2017

From: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- Changes from staging version: * use .cross.res extension for cross-compiled resource * use replace_extension() instead of defining a new function * use phony targets in the tests makefile so that the custom DLL is always built * enforce directory name the same way we do for other targets aclocal.m4 | 25 +++++++++ tools/make_makefiles | 11 +++- tools/makedep.c | 142 ++++++++++++++++++++++++++++++++++++++++++++++++++- 3 files changed, 175 insertions(+), 3 deletions(-) diff --git a/aclocal.m4 b/aclocal.m4 index 9364188..a711b20 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -540,6 +540,22 @@ $ac_dir/crosstest: __builddeps__ dummy fi } +wine_fn_config_resource () +{ + ac_dir=$[1] + ac_name=$[2] + ac_flags=$[3] + + ac_clean= + test -n "$CROSSTARGET" && ac_clean=`expr $ac_dir/$ac_name : "\$.*\$\\."`_crossres.`expr $ac_name : ".*\\.\$.*\$"` + test -n "$DLLEXT" || ac_clean="$ac_dir/$ac_name" + + AS_VAR_IF([enable_tests],[no],[wine_fn_disabled_rules $ac_clean; return]) + + wine_fn_append_file SUBDIRS $ac_dir + wine_fn_clean_rules $ac_clean +} + wine_fn_config_tool () { ac_dir=$[1] @@ -643,6 +659,15 @@ wine_fn_config_test $1 ac_name[]ac_suffix [$2]dnl m4_popdef([ac_suffix])dnl m4_popdef([ac_name])]) +dnl **** Create a test resource makefile from config.status **** +dnl +dnl Usage: WINE_CONFIG_RESOURCE(dir,flags) +dnl +AC_DEFUN([WINE_CONFIG_RESOURCE],[AC_REQUIRE([WINE_CONFIG_HELPERS])dnl +m4_pushdef([ac_name],[m4_bpatsubst([$1],[.*/$[^/\]*$$],[\1])])dnl +wine_fn_config_resource $1 ac_name [$2]dnl +m4_popdef([ac_name])]) + dnl **** Create a static lib makefile from config.status **** dnl dnl Usage: WINE_CONFIG_LIB(name,flags) diff --git a/tools/make_makefiles b/tools/make_makefiles index f57a7e2..44f0fc2 100755 --- a/tools/make_makefiles +++ b/tools/make_makefiles @@ -224,7 +224,7 @@ sub parse_makefile($) { die "Configure substitution is not allowed in $file" unless $file eq "Makefile"; } - if (/^\s*(MODULE|IMPORTLIB|TESTDLL|PARENTSRC|APPMODE)\s*=\s*(.*)/) + if (/^\s*(MODULE|IMPORTLIB|TESTDLL|RESOURCE|PARENTSRC|APPMODE)\s*=\s*(.*)/) { my $var = $1; $make{$var} = $2; @@ -466,6 +466,15 @@ sub update_makefiles(@) (my $dir = $file) =~ s/^(.*)\/Makefile/$1/; push @lines, "WINE_CONFIG_TEST($dir$flag_args)\n"; } + elsif (defined($make{"RESOURCE"})) # test resource + { + die "MODULE should not be defined in $file" if defined $make{"MODULE"}; + die "STATICLIB should not be defined in $file" if defined $make{"STATICLIB"}; + (my $dir = $file) =~ s/^(.*)\/Makefile/$1/; + (my $name = $dir) =~ s/^.*\/(.*)$/$1/; + die "Invalid RESOURCE in $file" unless $make{"RESOURCE"} eq $name; + push @lines, "WINE_CONFIG_RESOURCE($dir$flag_args)\n"; + } elsif (defined($make{"MODULE"}) && $make{"MODULE"} =~ /\.a$/) # import lib { die "MODULE should not be defined as static lib in $file" unless $file =~ /^dlls\//; diff --git a/tools/makedep.c b/tools/makedep.c index ec339e0..afa061a 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -174,6 +174,7 @@ struct makefile const char *parent_dir; const char *module; const char *testdll; + const char *resource; const char *sharedlib; const char *staticlib; const char *staticimplib; @@ -2345,6 +2346,7 @@ static struct strarray output_sources( const struct makefile *make ) struct strarray includes = empty_strarray; struct strarray phony_targets = empty_strarray; struct strarray all_targets = empty_strarray; + struct strarray resource_dlls = get_expanded_make_var_array( make, "RC_DLLS" ); struct strarray install_rules[NB_INSTALL_RULES]; char *ldrpath_local = get_expanded_make_variable( make, "LDRPATH_LOCAL" ); char *ldrpath_install = get_expanded_make_variable( make, "LDRPATH_INSTALL" ); @@ -2642,7 +2644,7 @@ static struct strarray output_sources( const struct makefile *make ) } else { - int need_cross = make->testdll || + int need_cross = make->testdll || make->resource || (source->file->flags & FLAG_C_IMPLIB) || (make->module && make->staticlib); @@ -2656,7 +2658,7 @@ static struct strarray output_sources( const struct makefile *make ) output_filenames( includes ); output_filenames( make->define_args ); output_filenames( extradefs ); - if (make->module || make->staticlib || make->sharedlib || make->testdll) + if (make->module || make->staticlib || make->sharedlib || make->testdll || make->resource) { output_filenames( dll_flags ); if (make->use_msvcrt) output_filenames( msvcrt_flags ); @@ -2710,6 +2712,66 @@ static struct strarray output_sources( const struct makefile *make ) output( "\n" ); } + /* rules for resource dlls, call Makefile in subdirectory */ + + if (resource_dlls.count) + { + for (i = 0; i < resource_dlls.count; i++) + { + output( ".PHONY: %s\n", resource_dlls.str[i] ); + output( "%s:\n", resource_dlls.str[i] ); + output( "\t(a)cd %s && $(MAKE) %s%s\n", resource_dlls.str[i], + resource_dlls.str[i], dll_ext ); + } + + output( "%s:", obj_dir_path( make, "resource_dlls.res" )); + for (i = 0; i < resource_dlls.count; i++) + output( " %s", resource_dlls.str[i] ); + output( "\n" ); + output( "\t(" ); + for (i = 0; i < resource_dlls.count; i++) + { + if (i != 0) output( "; \\\n " ); + output( "echo \"%s RCDATA %s/%s%s\"", resource_dlls.str[i], + resource_dlls.str[i], resource_dlls.str[i], dll_ext ); + } + output( ") | %s -o $@\n", tools_path( make, "wrc" ) ); + strarray_add( &clean_files, "resource_dlls.res" ); + strarray_add( &object_files, "resource_dlls.res" ); + + if (crosstarget && (make->testdll || (make->module && make->staticlib))) + { + for (i = 0; i < resource_dlls.count; i++) + { + char *name = replace_extension( resource_dlls.str[i], ".dll", "_crossres.dll" ); + output( ".PHONY: %s/crossres\n", resource_dlls.str[i] ); + output( "%s/crossres:\n", resource_dlls.str[i] ); + output( "\t(a)cd %s && $(MAKE) %s\n", resource_dlls.str[i], name ); + free( name ); + } + + output( "%s:", obj_dir_path( make, "resource_dlls.cross.res" )); + for (i = 0; i < resource_dlls.count; i++) + { + char *name = replace_extension( resource_dlls.str[i], ".dll", "_crossres.dll" ); + output( " %s/crossres", resource_dlls.str[i] ); + free( name ); + } + output( "\n" ); + output( "\t(" ); + for (i = 0; i < resource_dlls.count; i++) + { + char *name = replace_extension( resource_dlls.str[i], ".dll", "_crossres.dll" ); + if (i != 0) output( "; \\\n " ); + output( "echo \"%s RCDATA %s/%s\"", resource_dlls.str[i], resource_dlls.str[i], name ); + free( name ); + } + output( ") | %s -o $@\n", tools_path( make, "wrc" ) ); + strarray_add( &clean_files, "resource_dlls.cross.res" ); + strarray_add( &crossobj_files, "resource_dlls.cross.res" ); + } + } + if (make->module && !make->staticlib) { struct strarray all_libs = empty_strarray; @@ -3101,6 +3163,81 @@ static struct strarray output_sources( const struct makefile *make ) add_install_rule( make, install_rules, make->scripts.str[i], make->scripts.str[i], strmake( "S$(bindir)/%s", make->scripts.str[i] )); + if (make->resource) + { + char *extra_wine_flags = get_expanded_make_variable( make, "WINEFLAGS" ); + char *extra_cross_flags = get_expanded_make_variable( make, "CROSSFLAGS" ); + struct strarray all_libs = empty_strarray; + char *module_path = obj_dir_path( make, make->resource ); + char *spec_file = NULL; + + if (!make->appmode.count) + spec_file = src_dir_path( make, replace_extension( make->resource, ".dll", ".spec" )); + for (i = 0; i < make->imports.count; i++) + strarray_add( &all_libs, strmake( "-l%s", make->imports.str[i] )); + strarray_addall( &all_libs, get_expanded_make_var_array( make, "LIBS" )); + + if (*dll_ext) + { + strarray_add( &all_targets, strmake( "%s%s", make->resource, dll_ext )); + strarray_add( &all_targets, strmake( "%s.fake", make->resource )); + output( "%s%s %s.fake:", module_path, dll_ext, module_path ); + } + else + { + strarray_add( &all_targets, make->resource ); + output( "%s:", module_path ); + } + if (spec_file) output_filename( spec_file ); + output_filenames_obj_dir( make, object_files ); + output_filenames_obj_dir( make, res_files ); + output( "\n" ); + output( "\t%s -o $@", tools_path( make, "winegcc" )); + output_filename( strmake( "-B%s", tools_dir_path( make, "winebuild" ))); + if (tools_dir) output_filename( strmake( "--sysroot=%s", top_obj_dir_path( make, "" ))); + output_filenames( target_flags ); + output_filenames( unwind_flags ); + if (spec_file) + { + output( " -shared %s", spec_file ); + output_filenames( make->extradllflags ); + } + else output_filenames( make->appmode ); + if (extra_wine_flags) output( " %s", extra_wine_flags ); + output_filenames_obj_dir( make, object_files ); + output_filenames_obj_dir( make, res_files ); + output_filenames( all_libs ); + output_filename( "$(LDFLAGS)" ); + output( "\n" ); + + if (crosstarget) + { + char *crossres = replace_extension( make->resource, ".dll", "_crossres.dll" ); + + strarray_add( &clean_files, crossres ); + output( "%s:", obj_dir_path( make, crossres )); + output_filenames_obj_dir( make, crossobj_files ); + output_filenames_obj_dir( make, res_files ); + output( "\n" ); + output( "\t%s -o $@ -b %s", tools_path( make, "winegcc" ), crosstarget ); + output_filename( strmake( "-B%s", tools_dir_path( make, "winebuild" ))); + if (tools_dir) output_filename( strmake( "--sysroot=%s", top_obj_dir_path( make, "" ))); + output_filename( "--lib-suffix=.cross.a" ); + if (spec_file) + { + output( " -shared %s", spec_file ); + output_filenames( make->extradllflags ); + } + else output_filenames( make->appmode ); + if (extra_cross_flags) output( " %s", extra_cross_flags ); + output_filenames_obj_dir( make, crossobj_files ); + output_filenames_obj_dir( make, res_files ); + output_filenames( all_libs ); + output_filename( "$(LDFLAGS)" ); + output( "\n" ); + } + } + if (!make->disabled) { if (all_targets.count) @@ -3476,6 +3613,7 @@ static void load_sources( struct makefile *make ) make->parent_dir = get_expanded_make_variable( make, "PARENTSRC" ); make->module = get_expanded_make_variable( make, "MODULE" ); make->testdll = get_expanded_make_variable( make, "TESTDLL" ); + make->resource = get_expanded_make_variable( make, "RESOURCE" ); make->sharedlib = get_expanded_make_variable( make, "SHAREDLIB" ); make->staticlib = get_expanded_make_variable( make, "STATICLIB" ); make->importlib = get_expanded_make_variable( make, "IMPORTLIB" ); -- 2.7.4

3 10

[PATCH] mshtml: Hook addEventListener InvokeEx calls to allow capture default value.
by Jacek Caban Nov. 24, 2017

Nov. 24, 2017

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/mshtml/dispex.c | 33 +++++++++++++++++++++++---------- dlls/mshtml/htmlelem.c | 7 +++++-- dlls/mshtml/htmlevent.c | 33 ++++++++++++++++++++++++++++++++- dlls/mshtml/mshtml_private.h | 10 +++++++++- dlls/mshtml/tests/events.js | 13 +++++++------ 5 files changed, 76 insertions(+), 20 deletions(-)

1 0

Re: [PATCH 1/1] rasapi32: Add stub for RasGetConnectionStatistics
by Станислав Мотыльков Nov. 24, 2017

Nov. 24, 2017

Hello! Any build logs available? Regards, Stas'M. On 11/23/17, Marvin <testbot(a)winehq.org> wrote: > Thank you for your contribution to Wine! > > This is an automated notification to let you know that your patch has > been reviewed and its status set to "Build failure". > > This means that the patched code doesn't compile. It could also be > because you forgot to include some changes or new files required for > compilation, or that the patch causes compiler warnings (maintainer > mode implies -Werror). You need to resend a fixed patch. > > If you do not understand the reason for this status, disagree with our > assessment, or are simply not sure how to proceed next, please ask for > clarification by replying to this email. >

2 2

[PATCH 1/1] rasapi32: Add stub for RasGetConnectionStatistics
by Станислав Мотыльков Nov. 24, 2017

Nov. 24, 2017

Hello! I attached a patch for consideration. Regards, Stas'M.

2 7

[PATCH 3/3] advapi32: Fix size returned from ConvertStringSecurityDescriptorToSecurityDescriptor on 64-bit.
by Hans Leidekker Nov. 24, 2017

Nov. 24, 2017

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- Fixes these failures: http://test.winehq.org/data/664e861cdafbf3e6b34a1dab9428d2c234a9eb80/linux_… Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/advapi32/security.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/advapi32/security.c b/dlls/advapi32/security.c index 7281e01d79..f0c133ebb0 100644 --- a/dlls/advapi32/security.c +++ b/dlls/advapi32/security.c @@ -4652,7 +4652,7 @@ static BOOL ParseStringSecurityDescriptorToSecurityDescriptor( LPBYTE lpNext = NULL; DWORD len; - *cBytes = sizeof(SECURITY_DESCRIPTOR); + *cBytes = sizeof(SECURITY_DESCRIPTOR_RELATIVE); tok = heap_alloc( (lstrlenW(StringSecurityDescriptor) + 1) * sizeof(WCHAR)); -- 2.11.0

1 0

[PATCH 2/3] advapi32/tests: Add tests for MakeSelfRelativeSD.
by Hans Leidekker Nov. 24, 2017

Nov. 24, 2017

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/advapi32/tests/security.c | 48 ++++++++++++++++++++++++++++++++++++++---- 1 file changed, 44 insertions(+), 4 deletions(-) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index e86fe21fed..51dcf90851 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -2731,12 +2731,12 @@ static void test_LookupAccountName(void) static void test_security_descriptor(void) { - SECURITY_DESCRIPTOR sd; + SECURITY_DESCRIPTOR sd, *sd_rel, *sd_rel2, *sd_abs; char buf[8192]; - DWORD size; + DWORD size, size_dacl, size_sacl, size_owner, size_group; BOOL isDefault, isPresent, ret; - PACL pacl; - PSID psid; + PACL pacl, dacl, sacl; + PSID psid, owner, group; SetLastError(0xdeadbeef); ret = InitializeSecurityDescriptor(&sd, SECURITY_DESCRIPTOR_REVISION); @@ -2774,6 +2774,46 @@ static void test_security_descriptor(void) expect_eq(psid, NULL, PSID, "%p"); expect_eq(isDefault, FALSE, BOOL, "%d"); } + + ret = pConvertStringSecurityDescriptorToSecurityDescriptorA( + "O:SYG:S-1-5-21-93476-23408-4576D:(A;NP;GAGXGWGR;;;SU)(A;IOID;CCDC;;;SU)" + "(D;OICI;0xffffffff;;;S-1-5-21-93476-23408-4576)S:(AU;OICINPIOIDSAFA;CCDCLCSWRPRC;;;SU)" + "(AU;NPSA;0x12019f;;;SU)", SDDL_REVISION_1, (void **)&sd_rel, NULL); + ok(ret, "got %u\n", GetLastError()); + + size = 0; + ret = MakeSelfRelativeSD(sd_rel, NULL, &size); + todo_wine ok(!ret && GetLastError() == ERROR_BAD_DESCRIPTOR_FORMAT, "got %u\n", GetLastError()); + + /* convert to absolute form */ + size = size_dacl = size_sacl = size_owner = size_group = 0; + ret = MakeAbsoluteSD(sd_rel, NULL, &size, NULL, &size_dacl, NULL, &size_sacl, NULL, &size_owner, NULL, + &size_group); + ok(!ret && GetLastError() == ERROR_INSUFFICIENT_BUFFER, "got %u\n", GetLastError()); + + sd_abs = HeapAlloc(GetProcessHeap(), 0, size + size_dacl + size_sacl + size_owner + size_group); + dacl = (PACL)(sd_abs + 1); + sacl = (PACL)((char *)dacl + size_dacl); + owner = (PSID)((char *)sacl + size_sacl); + group = (PSID)((char *)owner + size_owner); + ret = MakeAbsoluteSD(sd_rel, sd_abs, &size, dacl, &size_dacl, sacl, &size_sacl, owner, &size_owner, + group, &size_group); + ok(ret, "got %u\n", GetLastError()); + + size = 0; + ret = MakeSelfRelativeSD(sd_abs, NULL, &size); + ok(!ret && GetLastError() == ERROR_INSUFFICIENT_BUFFER, "got %u\n", GetLastError()); + ok(size == 184, "got %u\n", size); + + size += 4; + sd_rel2 = HeapAlloc(GetProcessHeap(), 0, size); + ret = MakeSelfRelativeSD(sd_abs, sd_rel2, &size); + ok(ret, "got %u\n", GetLastError()); + ok(size == 188, "got %u\n", size); + + HeapFree(GetProcessHeap(), 0, sd_abs); + HeapFree(GetProcessHeap(), 0, sd_rel2); + LocalFree(sd_rel); } #define TEST_GRANTED_ACCESS(a,b) test_granted_access(a,b,0,__LINE__) -- 2.11.0

1 0

[PATCH 1/3] ntdll: Fix size returned from RtlMakeSelfRelativeSD on 64-bit.
by Hans Leidekker Nov. 24, 2017

Nov. 24, 2017

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/ntdll/sec.c | 1 + dlls/ntdll/tests/rtl.c | 51 ++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 52 insertions(+) diff --git a/dlls/ntdll/sec.c b/dlls/ntdll/sec.c index 5c858b5bcb..02fc77dc1c 100644 --- a/dlls/ntdll/sec.c +++ b/dlls/ntdll/sec.c @@ -860,6 +860,7 @@ NTSTATUS WINAPI RtlMakeSelfRelativeSD( return STATUS_INVALID_PARAMETER; length = RtlLengthSecurityDescriptor(pAbs); + if (!(pAbs->Control & SE_SELF_RELATIVE)) length -= (sizeof(*pAbs) - sizeof(*pRel)); if (*lpdwBufferLength < length) { *lpdwBufferLength = length; diff --git a/dlls/ntdll/tests/rtl.c b/dlls/ntdll/tests/rtl.c index 7333ab8935..2e3a7de75d 100644 --- a/dlls/ntdll/tests/rtl.c +++ b/dlls/ntdll/tests/rtl.c @@ -99,6 +99,8 @@ static BOOL (WINAPI *pRtlIsCriticalSectionLocked)(CRITICAL_SECTION *); static BOOL (WINAPI *pRtlIsCriticalSectionLockedByThread)(CRITICAL_SECTION *); static NTSTATUS (WINAPI *pRtlInitializeCriticalSectionEx)(CRITICAL_SECTION *, ULONG, ULONG); static NTSTATUS (WINAPI *pLdrEnumerateLoadedModules)(void *, void *, void *); +static NTSTATUS (WINAPI *pRtlMakeSelfRelativeSD)(PSECURITY_DESCRIPTOR,PSECURITY_DESCRIPTOR,LPDWORD); +static NTSTATUS (WINAPI *pRtlAbsoluteToSelfRelativeSD)(PSECURITY_DESCRIPTOR,PSECURITY_DESCRIPTOR,PULONG); static HMODULE hkernel32 = 0; static BOOL (WINAPI *pIsWow64Process)(HANDLE, PBOOL); @@ -153,6 +155,8 @@ static void InitFunctionPtrs(void) pRtlIsCriticalSectionLockedByThread = (void *)GetProcAddress(hntdll, "RtlIsCriticalSectionLockedByThread"); pRtlInitializeCriticalSectionEx = (void *)GetProcAddress(hntdll, "RtlInitializeCriticalSectionEx"); pLdrEnumerateLoadedModules = (void *)GetProcAddress(hntdll, "LdrEnumerateLoadedModules"); + pRtlMakeSelfRelativeSD = (void *)GetProcAddress(hntdll, "RtlMakeSelfRelativeSD"); + pRtlAbsoluteToSelfRelativeSD = (void *)GetProcAddress(hntdll, "RtlAbsoluteToSelfRelativeSD"); } hkernel32 = LoadLibraryA("kernel32.dll"); ok(hkernel32 != 0, "LoadLibrary failed\n"); @@ -2209,6 +2213,52 @@ static void test_LdrEnumerateLoadedModules(void) ok(status == STATUS_INVALID_PARAMETER, "expected STATUS_INVALID_PARAMETER, got 0x%08x\n", status); } +static void test_RtlMakeSelfRelativeSD(void) +{ + char buf[sizeof(SECURITY_DESCRIPTOR_RELATIVE) + 4]; + SECURITY_DESCRIPTOR_RELATIVE *sd_rel = (SECURITY_DESCRIPTOR_RELATIVE *)buf; + SECURITY_DESCRIPTOR sd; + NTSTATUS status; + DWORD len; + + if (!pRtlMakeSelfRelativeSD || !pRtlAbsoluteToSelfRelativeSD) + { + win_skip( "RtlMakeSelfRelativeSD/RtlAbsoluteToSelfRelativeSD not available\n" ); + return; + } + + memset( &sd, 0, sizeof(sd) ); + sd.Revision = SECURITY_DESCRIPTOR_REVISION; + + len = 0; + status = pRtlMakeSelfRelativeSD( &sd, NULL, &len ); + ok( status == STATUS_BUFFER_TOO_SMALL, "got %08x\n", status ); + ok( len == sizeof(*sd_rel), "got %u\n", len ); + + len += 4; + status = pRtlMakeSelfRelativeSD( &sd, sd_rel, &len ); + ok( status == STATUS_SUCCESS, "got %08x\n", status ); + ok( len == sizeof(*sd_rel) + 4, "got %u\n", len ); + + len = 0; + status = pRtlAbsoluteToSelfRelativeSD( &sd, NULL, &len ); + ok( status == STATUS_BUFFER_TOO_SMALL, "got %08x\n", status ); + ok( len == sizeof(*sd_rel), "got %u\n", len ); + + len += 4; + status = pRtlAbsoluteToSelfRelativeSD( &sd, sd_rel, &len ); + ok( status == STATUS_SUCCESS, "got %08x\n", status ); + ok( len == sizeof(*sd_rel) + 4, "got %u\n", len ); + + sd.Control = SE_SELF_RELATIVE; + status = pRtlMakeSelfRelativeSD( &sd, sd_rel, &len ); + ok( status == STATUS_SUCCESS, "got %08x\n", status ); + ok( len == sizeof(*sd_rel) + 4, "got %u\n", len ); + + status = pRtlAbsoluteToSelfRelativeSD( &sd, sd_rel, &len ); + ok( status == STATUS_BAD_DESCRIPTOR_FORMAT, "got %08x\n", status ); +} + START_TEST(rtl) { InitFunctionPtrs(); @@ -2242,4 +2292,5 @@ START_TEST(rtl) test_RtlInitializeCriticalSectionEx(); test_RtlLeaveCriticalSection(); test_LdrEnumerateLoadedModules(); + test_RtlMakeSelfRelativeSD(); } -- 2.11.0

1 0

[Tools] testbot: Improve the $VM::GetHost() documentation.
by Francois Gouget Nov. 24, 2017

Nov. 24, 2017

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/WineTestBot/VMs.pm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/testbot/lib/WineTestBot/VMs.pm b/testbot/lib/WineTestBot/VMs.pm index 7bd6d64b..b9313429 100644 --- a/testbot/lib/WineTestBot/VMs.pm +++ b/testbot/lib/WineTestBot/VMs.pm @@ -179,7 +179,9 @@ sub GetHost($) { my ($self) = @_; - # The URI is of the form protocol://user(a)hostname/hypervisor-specific-data + # VirtURI is of the form proto://user(a)hostname:port/hypervisor-specific-data + # This returns the 'hostname:port' part. Note that the port can be used to + # tunnel connections to different VM hosts and thus must be included. return $1 if ($self->VirtURI =~ m%^[^:]+://(?:[^/@]*@)?([^/]+)/%); return "localhost"; } -- 2.15.0

1 0

[Tools] testbot: Fix the $Tunnel configuration setting prefix.
by Francois Gouget Nov. 24, 2017

Nov. 24, 2017

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/WineTestBot/ConfigLocalTemplate.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/lib/WineTestBot/ConfigLocalTemplate.pl b/testbot/lib/WineTestBot/ConfigLocalTemplate.pl index 1b1a62ef..6ac6b44c 100644 --- a/testbot/lib/WineTestBot/ConfigLocalTemplate.pl +++ b/testbot/lib/WineTestBot/ConfigLocalTemplate.pl @@ -90,7 +90,7 @@ $WineTestBot::Config::AgentPort = undef; # - If set to an SSH URI, then tunneling is performed using these parameters. # - Any other setting disables SSH tunneling. In particular to disable # tunneling for SSH VirtURIs it is recommended to set this to 'never'. -$Tunnel = undef; +$WineTestBot::Config::Tunnel = undef; # If set this specifies the SSH tunnel parameters to be used for the # TestAgent connection. This is mostly useful for parameters that cannot be -- 2.15.0

1 0

[Tools] testbot: Don't check idle and off VMs on the Engine shutdown.
by Francois Gouget Nov. 24, 2017

Nov. 24, 2017

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/bin/Engine.pl | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/testbot/bin/Engine.pl b/testbot/bin/Engine.pl index 598d2bd7..ad492f61 100755 --- a/testbot/bin/Engine.pl +++ b/testbot/bin/Engine.pl @@ -96,9 +96,9 @@ In all other cases the VM is powered off and marked as such. =back =cut -sub Cleanup(;$$) +sub Cleanup($;$$) { - my ($KillTasks, $KillVMs) = @_; + my ($Starting, $KillTasks, $KillVMs) = @_; # Verify that the running tasks are still alive and requeue them if not. # Ignore the Job and Step status fields because they may be a bit out of date. @@ -128,7 +128,7 @@ sub Cleanup(;$$) } elsif ($KillTasks) { - # We will kill the Task's process so requeue the Task. + # We will kill the child process so requeue the Task. $Requeue = 1; } else @@ -193,7 +193,7 @@ sub Cleanup(;$$) } # else let the process finish its work } - else + elsif ($Starting) { if ($VM->Status eq "idle") { @@ -241,7 +241,7 @@ sub HandleShutdown($$) return "0Invalid KillVMs shutdown parameter\n"; } - Cleanup($KillTasks, $KillVMs); + Cleanup(0, $KillTasks, $KillVMs); $RunEngine = 0; LogMsg "Waiting for the last clients to disconnect...\n"; @@ -715,7 +715,7 @@ sub main() LogMsg "Capping MaxRevertsWhileRunningVMs to MaxRevertingVMs ($MaxRevertsWhileRunningVMs)\n"; } $MaxVMsWhenIdle ||= $MaxActiveVMs; - Cleanup(); + Cleanup(1); # Check for patches that arrived while the server was off. HandleWinePatchMLSubmission(); -- 2.15.0

1 0