December 2018 - Wine-commits

Jacek Caban : jscript: Add interpreter support for getters and setters in object initializer.
by Alexandre Julliard 03 Dec '18

03 Dec '18

Module: wine Branch: master Commit: 0cc68cf82a0414b019a750999c7ca859ad4cea30 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0cc68cf82a0414b019a75099… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Nov 30 22:44:40 2018 +0100 jscript: Add interpreter support for getters and setters in object initializer. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/compile.c | 9 +++---- dlls/jscript/engine.c | 24 ++++++++++++++++- dlls/jscript/engine.h | 2 +- dlls/mshtml/tests/es5.js | 69 +++++++++++++++++++++++++++++++++++++++++++++++- 4 files changed, 95 insertions(+), 9 deletions(-) diff --git a/dlls/jscript/compile.c b/dlls/jscript/compile.c index a498abd..006386a 100644 --- a/dlls/jscript/compile.c +++ b/dlls/jscript/compile.c @@ -889,7 +889,6 @@ static HRESULT compile_array_literal(compiler_ctx_t *ctx, array_literal_expressi static HRESULT compile_object_literal(compiler_ctx_t *ctx, property_value_expression_t *expr) { property_definition_t *iter; - unsigned instr; BSTR name; HRESULT hres; @@ -905,11 +904,9 @@ static HRESULT compile_object_literal(compiler_ctx_t *ctx, property_value_expres if(FAILED(hres)) return hres; - instr = push_instr(ctx, OP_obj_prop); - if(!instr) - return E_OUTOFMEMORY; - - instr_ptr(ctx, instr)->u.arg->bstr = name; + hres = push_instr_bstr_uint(ctx, OP_obj_prop, name, iter->type); + if(FAILED(hres)) + return hres; } return S_OK; diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index bd4edda..0f9e3a5 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -1445,6 +1445,7 @@ static HRESULT interp_new_obj(script_ctx_t *ctx) static HRESULT interp_obj_prop(script_ctx_t *ctx) { const BSTR name = get_op_bstr(ctx, 0); + unsigned type = get_op_uint(ctx, 1); jsdisp_t *obj; jsval_t val; HRESULT hres; @@ -1456,7 +1457,28 @@ static HRESULT interp_obj_prop(script_ctx_t *ctx) assert(is_object_instance(stack_top(ctx))); obj = as_jsdisp(get_object(stack_top(ctx))); - hres = jsdisp_propput_name(obj, name, val); + if(type == PROPERTY_DEFINITION_VALUE) { + hres = jsdisp_propput_name(obj, name, val); + }else { + property_desc_t desc = {PROPF_ENUMERABLE | PROPF_CONFIGURABLE}; + jsdisp_t *func; + + assert(is_object_instance(val)); + func = iface_to_jsdisp(get_object(val)); + + desc.mask = desc.flags; + if(type == PROPERTY_DEFINITION_GETTER) { + desc.explicit_getter = TRUE; + desc.getter = func; + }else { + desc.explicit_setter = TRUE; + desc.setter = func; + } + + hres = jsdisp_define_property(obj, name, &desc); + jsdisp_release(func); + } + jsval_release(val); return hres; } diff --git a/dlls/jscript/engine.h b/dlls/jscript/engine.h index d0c419a..eb287d5 100644 --- a/dlls/jscript/engine.h +++ b/dlls/jscript/engine.h @@ -66,7 +66,7 @@ X(new, 1, ARG_UINT, 0) \ X(new_obj, 1, 0,0) \ X(null, 1, 0,0) \ - X(obj_prop, 1, ARG_BSTR, 0) \ + X(obj_prop, 1, ARG_BSTR, ARG_UINT) \ X(or, 1, 0,0) \ X(pop, 1, ARG_UINT, 0) \ X(pop_except, 0, ARG_ADDR, 0) \ diff --git a/dlls/mshtml/tests/es5.js b/dlls/mshtml/tests/es5.js index 6097f4c..3e81961 100644 --- a/dlls/mshtml/tests/es5.js +++ b/dlls/mshtml/tests/es5.js @@ -149,7 +149,7 @@ function test_identifier_keywords() { } function test_own_data_prop_desc(obj, prop, expected_writable, expected_enumerable, - expected_configurable) { + expected_configurable) { var desc = Object.getOwnPropertyDescriptor(obj, prop); ok("value" in desc, "value is not in desc"); ok(desc.value === obj[prop], "desc.value = " + desc.value + " expected " + obj[prop]); @@ -427,6 +427,72 @@ function test_defineProperty() { next_test(); } +function test_property_definitions() { + var obj, val, i, arr; + + function test_accessor_prop_desc(obj, prop, have_getter, have_setter) { + var desc = Object.getOwnPropertyDescriptor(obj, prop); + ok(desc.enumerable === true, "desc.enumerable = " + desc.enumerable); + ok(desc.configurable === true, "desc.configurable = " + desc.configurable); + + if(have_getter) { + ok(typeof(desc.get) === "function", "desc.get = " + desc.get); + ok(typeof(desc.get.prototype) === "object", "desc.get.prototype = " + desc.get.prototype); + trace("" + desc.get); + }else { + ok(!("get" in obj), "desc.get = " + desc.get); + } + + if(have_setter) { + ok(typeof(desc.set) === "function", "desc.set = " + desc.set); + ok(typeof(desc.set.prototype) === "object", "desc.set.prototype = " + desc.set.prototype); + }else { + ok(!("set" in obj), "desc.get = " + desc.get); + } + } + + obj = { + get prop() { return val + 1; }, + set prop(v) { val = v; } + }; + test_accessor_prop_desc(obj, "prop", true, true); + val = 0; + ok(obj.prop === 1, "obj.prop = " + obj.prop); + obj.prop = 3; + ok(val === 3, "val = " + val); + ok(obj.prop === 4, "obj.prop = " + obj.prop); + + arr = []; + for(i in obj) + arr.push(i); + ok(arr.join() === "prop", "prop of obj = " + arr.join()); + + obj = { + set prop(v) { val = v; } + }; + test_accessor_prop_desc(obj, "prop", false, true); + val = 1; + ok(obj.prop === undefined, "obj.prop = " + obj.prop); + obj.prop = 2; + ok(val === 2, "val = " + val); + ok(obj.prop === undefined, "obj.prop = " + obj.prop); + + obj = { + get prop() { return val + 1; }, + get 0() { return val + 2; } + }; + test_accessor_prop_desc(obj, "prop", true, false); + val = 5; + ok(obj.prop === 6, "obj.prop = " + obj.prop); + obj.prop = 10; + ok(val === 5, "val = " + val); + ok(obj.prop === 6, "obj.prop = " + obj.prop); + test_accessor_prop_desc(obj, "0", true, false); + ok(obj[0] === 7, "obj.prop = " + obj[0]); + + next_test(); +} + function test_string_trim() { function test_trim(value, expected) { var r = String.prototype.trim.call(value); @@ -513,6 +579,7 @@ var tests = [ test_identifier_keywords, test_getOwnPropertyDescriptor, test_defineProperty, + test_property_definitions, test_string_trim, test_global_properties, test_string_split

1 0

Zebediah Figura : setupapi: Implement SetupDiRemoveDeviceInterface().
by Alexandre Julliard 03 Dec '18

03 Dec '18

Module: wine Branch: master Commit: 3ff98740346e69247b572b0a3e9b71c32b0abcf4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3ff98740346e69247b572b0a… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Nov 30 16:42:10 2018 -0600 setupapi: Implement SetupDiRemoveDeviceInterface(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/setupapi/devinst.c | 28 ++++++++++++++++++++++++---- dlls/setupapi/tests/devinst.c | 2 -- 2 files changed, 24 insertions(+), 6 deletions(-) diff --git a/dlls/setupapi/devinst.c b/dlls/setupapi/devinst.c index b3d7099..cc05623 100644 --- a/dlls/setupapi/devinst.c +++ b/dlls/setupapi/devinst.c @@ -556,6 +556,19 @@ static BOOL SETUPDI_SetDeviceRegistryPropertyW(struct device *device, return FALSE; } +static void remove_device_iface(struct device_iface *iface) +{ + RegDeleteTreeW(iface->refstr_key, NULL); + RegDeleteKeyW(iface->refstr_key, emptyW); + RegCloseKey(iface->refstr_key); + iface->refstr_key = NULL; + /* Also remove the class key if it's empty. */ + RegDeleteKeyW(iface->class_key, emptyW); + RegCloseKey(iface->class_key); + iface->class_key = NULL; + iface->flags |= SPINT_REMOVED; +} + static void SETUPDI_RemoveDevice(struct device *device) { struct device_iface *iface, *next; @@ -1537,11 +1550,18 @@ BOOL WINAPI SetupDiRemoveDevice( /*********************************************************************** * SetupDiRemoveDeviceInterface (SETUPAPI.@) */ -BOOL WINAPI SetupDiRemoveDeviceInterface(HDEVINFO info, PSP_DEVICE_INTERFACE_DATA data) +BOOL WINAPI SetupDiRemoveDeviceInterface(HDEVINFO devinfo, SP_DEVICE_INTERFACE_DATA *iface_data) { - FIXME("(%p, %p): stub\n", info, data); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return FALSE; + struct device_iface *iface; + + TRACE("devinfo %p, iface_data %p.\n", devinfo, iface_data); + + if (!(iface = get_device_iface(devinfo, iface_data))) + return FALSE; + + remove_device_iface(iface); + + return TRUE; } /*********************************************************************** diff --git a/dlls/setupapi/tests/devinst.c b/dlls/setupapi/tests/devinst.c index 338393e..fbc62dc 100644 --- a/dlls/setupapi/tests/devinst.c +++ b/dlls/setupapi/tests/devinst.c @@ -552,7 +552,6 @@ static void check_device_iface_(int line, HDEVINFO set, SP_DEVINFO_DATA *device, ok_(__FILE__, line)(ret, "Failed to enumerate interfaces, error %#x.\n", GetLastError()); ok_(__FILE__, line)(IsEqualGUID(&iface.InterfaceClassGuid, class), "Got unexpected class %s.\n", wine_dbgstr_guid(&iface.InterfaceClassGuid)); -todo_wine_if(flags & SPINT_REMOVED) ok_(__FILE__, line)(iface.Flags == flags, "Got unexpected flags %#x.\n", iface.Flags); ret = SetupDiGetDeviceInterfaceDetailA(set, &iface, detail, sizeof(buffer), NULL, NULL); ok_(__FILE__, line)(ret, "Failed to get interface detail, error %#x.\n", GetLastError()); @@ -656,7 +655,6 @@ static void test_device_iface(void) ret = SetupDiEnumDeviceInterfaces(set, &device, &guid2, 0, &iface); ok(ret, "Failed to enumerate interfaces, error %#x.\n", GetLastError()); ret = SetupDiRemoveDeviceInterface(set, &iface); -todo_wine ok(ret, "Failed to remove interface, error %#x.\n", GetLastError()); check_device_iface(set, &device, &guid2, 0, SPINT_REMOVED, "\\\\?\\ROOT#LEGACY_BOGUS#0000#{6A55B5A5-3F65-11DB-B704-0011955C2BDB}");

1 0

Zebediah Figura : setupapi: Completely remove unregistered device interfaces.
by Alexandre Julliard 03 Dec '18

03 Dec '18

Module: wine Branch: master Commit: fa823476c6939114ec52c50b0e3756de7f936aea URL: https://source.winehq.org/git/wine.git/?a=commit;h=fa823476c6939114ec52c50b… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Nov 30 16:42:11 2018 -0600 setupapi: Completely remove unregistered device interfaces. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/setupapi/devinst.c | 2 +- dlls/setupapi/tests/devinst.c | 7 ------- 2 files changed, 1 insertion(+), 8 deletions(-) diff --git a/dlls/setupapi/devinst.c b/dlls/setupapi/devinst.c index cc05623..4498fdc 100644 --- a/dlls/setupapi/devinst.c +++ b/dlls/setupapi/devinst.c @@ -594,7 +594,7 @@ static void SETUPDI_RemoveDevice(struct device *device) { list_remove(&iface->entry); if (device->phantom) - RegDeleteKeyW(iface->refstr_key, emptyW); + remove_device_iface(iface); RegCloseKey(iface->refstr_key); RegCloseKey(iface->class_key); heap_free(iface->refstr); diff --git a/dlls/setupapi/tests/devinst.c b/dlls/setupapi/tests/devinst.c index fbc62dc..45d145d1 100644 --- a/dlls/setupapi/tests/devinst.c +++ b/dlls/setupapi/tests/devinst.c @@ -670,12 +670,6 @@ static void test_device_iface_detail(void) 'C','u','r','r','e','n','t','C','o','n','t','r','o','l','S','e','t','\\', 'E','n','u','m','\\','R','o','o','t','\\', 'L','E','G','A','C','Y','_','B','O','G','U','S',0}; - static const WCHAR devclass[] = {'S','y','s','t','e','m','\\', - 'C','u','r','r','e','n','t','C','o','n','t','r','o','l','S','e','t','\\', - 'C','o','n','t','r','o','l','\\','D','e','v','i','c','e','C','l','a','s','s','e','s','\\', - '{','6','a','5','5','b','5','a','4','-','3','f','6','5','-', - '1','1','d','b','-','b','7','0','4','-', - '0','0','1','1','9','5','5','c','2','b','d','b','}',0}; static const char path[] = "\\\\?\\root#legacy_bogus#0000#{6a55b5a4-3f65-11db-b704-0011955c2bdb}"; SP_DEVICE_INTERFACE_DETAIL_DATA_A *detail; SP_DEVICE_INTERFACE_DATA iface = {sizeof(iface)}; @@ -750,7 +744,6 @@ static void test_device_iface_detail(void) /* remove once Wine is fixed */ devinst_RegDeleteTreeW(HKEY_LOCAL_MACHINE, bogus); - devinst_RegDeleteTreeW(HKEY_LOCAL_MACHINE, devclass); } static void test_device_key(void)

1 0

Francois Gouget : testbot: Add support for Locale::Codes.
by Alexandre Julliard 03 Dec '18

03 Dec '18

Module: tools Branch: master Commit: 9d655d133f0bc2335eb84936c569f76b939f7376 URL: https://source.winehq.org/git/tools.git/?a=commit;h=9d655d133f0bc2335eb8493… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Dec 3 20:20:01 2018 +0100 testbot: Add support for Locale::Codes. Locale::Country and Locale::Language are deprecated. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/Utils.pm | 78 ++++++++++++++++++++++++++++++++-------- 1 file changed, 64 insertions(+), 14 deletions(-) diff --git a/testbot/lib/WineTestBot/Utils.pm b/testbot/lib/WineTestBot/Utils.pm index 6783c51..e28a34b 100644 --- a/testbot/lib/WineTestBot/Utils.pm +++ b/testbot/lib/WineTestBot/Utils.pm @@ -33,8 +33,6 @@ our @EXPORT = qw(MakeSecureURL SecureConnection GenerateRandomString BuildTag SanitizeTag LocaleName ShQuote ShArgv2Cmd); use Fcntl; -use Locale::Language; -use Locale::Country; use WineTestBot::Config; @@ -106,6 +104,68 @@ sub BuildEMailRecipient($$) return $Recipient; } +my $_LCLang; +my $_LocaleLang; +sub GetLanguageName($) +{ + my ($Code) = @_; + local $@; + + return "Konkani" if ($Code eq "kok"); + + if (!defined $_LCLang) + { + eval + { + require Locale::Codes; + $_LCLang = new Locale::Codes 'language'; + $_LCLang->show_errors(0); + }; + if (!$_LCLang) + { + $_LCLang = 0; + $_LocaleLang = eval { require Locale::Language }; + } + } + my $Name = $_LCLang ? ($_LCLang->code2name($Code) || $Code) : + $_LocaleLang ? eval { Locale::Language::code2language($Code) || $Code } : + $Code; + $Name =~ s/ \(.*$//; + return $Name; +} + +my $_LCCountry; +my $_LocaleCountry; +sub GetCountryName($) +{ + my ($Code) = @_; + local $@; + + return "USA" if ($Code eq "US"); + return "Great Britain" if ($Code eq "GB"); + + if (!defined $_LCCountry) + { + eval + { + require Locale::Codes; + $_LCCountry = new Locale::Codes 'country'; + $_LCCountry->show_errors(0); + }; + if (!$_LCCountry) + { + $_LCCountry = 0; + $_LocaleCountry = eval { require Locale::Country }; + } + } + my $Name = $_LCCountry ? ($_LCCountry->code2name($Code) || $Code) : + $_LocaleCountry ? eval { Locale::Country::code2country($Code) || $Code } : + $Code; + $Name =~ s/(?:, | \().*$//; + return $Name; +} + + sub LocaleName($) { my ($Locale) = @_; @@ -114,18 +174,8 @@ sub LocaleName($) if ($Locale =~ /^([a-z]+)_([A-Z]+)(?:\.[A-Z0-9-]+)?(?:@([a-z]+))?$/) { my ($Lang, $Country, $Modifier) = ($1, $2, $3); - my $Name = $Lang eq "kok" ? "Konkani" : - (code2language($Lang) || $Lang); - $Name =~ s/ \(.*$//; - - if (uc($Lang) ne $Country) - { - my $CountryName = $Country eq "US" ? "USA" : - $Country eq "GB" ? "Great Britain" : - (code2country($Country) || $Country); - $CountryName =~ s/(?:, | \().*$//; - $Name .= ":$CountryName"; - } + my $Name = GetLanguageName($Lang); + $Name .= ":". GetCountryName($Country) if (uc($Lang) ne $Country); $Name .= " ($Modifier)" if ($Modifier); return $Name;

1 0

Francois Gouget : testbot: Add a dir option to specify the directory on Wine missions.
by Alexandre Julliard 03 Dec '18

03 Dec '18

Module: tools Branch: master Commit: 5faf13cb65f80fa3ed3ad42dae6b8b6ab5d043f9 URL: https://source.winehq.org/git/tools.git/?a=commit;h=5faf13cb65f80fa3ed3ad42… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Dec 3 20:19:29 2018 +0100 testbot: Add a dir option to specify the directory on Wine missions. This allows running the tests in a regular directory, in the root of a drive or on a non-c: drive. By default the tests are now run in the root of the wineprefix's c: drive. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/WineRunReconfig.pl | 3 ++- testbot/bin/WineRunWineTest.pl | 6 +++--- testbot/bin/build/WineTest.pl | 20 +++++++++++--------- testbot/lib/Build/Utils.pm | 29 +++++++++++++++++++++++------ testbot/web/admin/VMDetails.pl | 1 + 5 files changed, 40 insertions(+), 19 deletions(-) diff --git a/testbot/bin/WineRunReconfig.pl b/testbot/bin/WineRunReconfig.pl index f61ee65..c903ae3 100755 --- a/testbot/bin/WineRunReconfig.pl +++ b/testbot/bin/WineRunReconfig.pl @@ -47,6 +47,7 @@ use WineTestBot::VMs; use WineTestBot::Log; use WineTestBot::LogUtils; use WineTestBot::Missions; +use WineTestBot::Utils; use WineTestBot::Engine::Notify; @@ -346,7 +347,7 @@ my $Script = $VM->Type eq "wine" ? "WineReconfig.pl" : "Reconfig.pl"; $Script = "#!/bin/sh\n". "( set -x\n". " git pull &&\n". - " ../bin/build/$Script ". MergeMissionStatementTasks($Task->Missions) ."\n". + " ../bin/build/$Script ". ShQuote(MergeMissionStatementTasks($Task->Missions)) ."\n". ") >Reconfig.log 2>&1\n"; my $TA = $VM->GetAgent(); Debug(Elapsed($Start), " Sending the script: [$Script]\n"); diff --git a/testbot/bin/WineRunWineTest.pl b/testbot/bin/WineRunWineTest.pl index 19e3e8f..5ce1448 100755 --- a/testbot/bin/WineRunWineTest.pl +++ b/testbot/bin/WineRunWineTest.pl @@ -439,7 +439,7 @@ $Script .= " ../bin/build/WineTest.pl "; if ($Step->Type eq "suite") { my $BaseTag = BuildTag($VM->Name); - $Script .= "--winetest ". $Task->Missions ." $BaseTag "; + $Script .= "--winetest ". ShQuote($Task->Missions) ." $BaseTag "; if (defined $WebHostName) { my $StepTask = 100 * $StepNo + $TaskNo; @@ -455,11 +455,11 @@ if ($Step->Type eq "suite") } elsif ($Step->FileType eq "patch") { - $Script .= "--testpatch ". $Task->Missions ." patch.diff"; + $Script .= "--testpatch ". ShQuote($Task->Missions) ." patch.diff"; } else { - $Script .= join(" ", "--testexe", $Task->Missions, $FileName, $Task->CmdLineArg); + $Script .= join(" ", "--testexe", ShQuote($Task->Missions), $FileName, $Task->CmdLineArg); } $Script .= "\n) >Task.log 2>&1\n"; Debug(Elapsed($Start), " Sending the script: [$Script]\n"); diff --git a/testbot/bin/build/WineTest.pl b/testbot/bin/build/WineTest.pl index b7389ba..b47a6bf 100755 --- a/testbot/bin/build/WineTest.pl +++ b/testbot/bin/build/WineTest.pl @@ -99,9 +99,9 @@ sub DailyWineTest($$$$) # Run WineTest. Ignore the exit code since it returns non-zero whenever # there are test failures. my $Tag = SanitizeTag("$BaseTag-$BaseName"); - RunWine($Mission, "./programs/winetest/winetest.exe.so", - "-c -o '../$BaseName.report' -t $Tag ". ShArgv2Cmd(@$Args)); - if (!-f "$BaseName.report") + RunWine($Mission, "programs/winetest/winetest.exe.so", + "-c -o '$DataDir/$BaseName.report' -t $Tag ". ShArgv2Cmd(@$Args)); + if (!-f "$DataDir/$BaseName.report") { LogMsg "WineTest did not produce the $BaseName report\n"; return 0; @@ -109,8 +109,8 @@ sub DailyWineTest($$$$) # Send the report to the website if ((!$NoSubmit and !$Mission->{nosubmit}) and - RunWine($Mission, "./programs/winetest/winetest.exe.so", - "-c -s '../$BaseName.report'")) + RunWine($Mission, "programs/winetest/winetest.exe.so", + "-c -s '$DataDir/$BaseName.report'")) { LogMsg "WineTest failed to send the $BaseName report\n"; # Soldier on in case it's just a network issue @@ -168,10 +168,10 @@ sub TestPatch($$) # Run WineTest. Ignore the exit code since it returns non-zero whenever # there are test failures. - RunWine($Mission, "./programs/winetest/winetest.exe.so", - "-c -o '../$BaseName.report' -t do.not.submit ". + RunWine($Mission, "programs/winetest/winetest.exe.so", + "-c -o '$DataDir/$BaseName.report' -t do.not.submit ". join(" ", @TestList)); - if (!-f "$BaseName.report") + if (!-f "$DataDir/$BaseName.report") { LogMsg "WineTest did not produce the $BaseName report\n"; return 0; @@ -197,7 +197,9 @@ sub TestExe($$$) } # Run the test executable - RunWine($Mission, "./TestLauncher.exe.so", "-t 120 ". ShArgv2Cmd($FileName, @$Args) ." >'../$BaseName.report'"); + RunWine($Mission, "TestLauncher.exe.so", + "-t 120 ". ShArgv2Cmd($FileName, @$Args) + ." >'$DataDir/$BaseName.report'"); return 1; } diff --git a/testbot/lib/Build/Utils.pm b/testbot/lib/Build/Utils.pm index c53f609..b204386 100644 --- a/testbot/lib/Build/Utils.pm +++ b/testbot/lib/Build/Utils.pm @@ -348,10 +348,26 @@ sub RunWine($$$) { my ($Mission, $Cmd, $CmdArgs) = @_; - my $Magic = `cd '$DataDir/wine-$Mission->{Build}' && file $Cmd`; - my $Wine = ($Magic =~ /ELF 64/ ? "./wine64" : "./wine"); - return system("cd '$DataDir/wine-$Mission->{Build}' && set -x && ". - "time $Wine $Cmd $CmdArgs"); + my $WineDir = "$DataDir/wine-$Mission->{Build}"; + $Cmd = "$WineDir/$Cmd" if ($Cmd =~ /\.exe\.so$/); + + my $CurDir = "$ENV{WINEPREFIX}/dosdevices"; + if (!-d $CurDir) + { + $CurDir = "."; + } + else + { + my $Dir = $Mission->{dir} || ""; + # We cannot put colons in missions so restore the drive letter + $Dir = "$CurDir/c:/$Dir" if ($Dir !~ s~^([a-z])/~$CurDir/$1:/~); + $CurDir = -d $Dir ? $Dir : "$ENV{WINEPREFIX}/dosdevices/c:"; + } + + my $Magic = `file '$Cmd'`; + my $Wine = ($Magic =~ /ELF 64/ ? "$WineDir/wine64" : "$WineDir/wine"); + return system("set -x && cd '$CurDir' && ". + "time '$Wine' '$Cmd' $CmdArgs"); } @@ -367,7 +383,7 @@ sub CreateWinePrefix($;$) rmtree($ENV{WINEPREFIX}); # Crash dialogs cause delays so disable them - if (RunWine($Mission, "./programs/reg/reg.exe.so", "ADD HKCU\\\\Software\\\\Wine\\\\WineDbg /v ShowCrashDialog /t REG_DWORD /d 0")) + if (RunWine($Mission, "programs/reg/reg.exe.so", "ADD HKCU\\\\Software\\\\Wine\\\\WineDbg /v ShowCrashDialog /t REG_DWORD /d 0")) { return "Failed to disable the crash dialogs: $!"; } @@ -376,7 +392,8 @@ sub CreateWinePrefix($;$) { # Ensure the WinePrefix has been fully created and the registry files # saved before returning. - system("cd '$DataDir/wine-$Mission->{Build}' && ./server/wineserver -w"); + my $WineDir = "$DataDir/wine-$Mission->{Build}"; + system("'$WineDir/server/wineserver' -w"); } return undef; diff --git a/testbot/web/admin/VMDetails.pl b/testbot/web/admin/VMDetails.pl index 4dd9e25..095de3a 100644 --- a/testbot/web/admin/VMDetails.pl +++ b/testbot/web/admin/VMDetails.pl @@ -80,6 +80,7 @@ sub GenerateFooter($) print "On Wine VMs: \n"; print "The test option can be set to build to only test building, test to only rerun patched tests, module to rerun all of a patched dll or program's tests, or all to always rerun all the tests. \n"; print "The lang option can be set to run the tests in the specified \$LANG locale. The default is en_US (.UTF-8 can be omitted). \n"; + print "The dir option can be set to specify the directory in which to run the tests. A path starting with a single letter followed by a slash specifies the drive, for instance 'c/' for 'c:' (the default). \n"; print "If set, the nosubmit option specifies that the WineTest results should not be published online.\n"; print "</td></tr></tbody>\n"; print "</table></div>\n";

1 0

Francois Gouget : testbot/web: Allow web pages to override the collection headers.
by Alexandre Julliard 03 Dec '18

03 Dec '18

Module: tools Branch: master Commit: 57690b377b4d2edcb5fc64db947c998c2f2b5dde URL: https://source.winehq.org/git/tools.git/?a=commit;h=57690b377b4d2edcb5fc64d… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Dec 3 20:19:46 2018 +0100 testbot/web: Allow web pages to override the collection headers. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/ObjectModel/CGI/CollectionBlock.pm | 17 +++++++++++++++-- testbot/lib/ObjectModel/CGI/CollectionBlockForPage.pm | 7 +++++++ testbot/lib/ObjectModel/CGI/CollectionPage.pm | 7 +++++++ 3 files changed, 29 insertions(+), 2 deletions(-) diff --git a/testbot/lib/ObjectModel/CGI/CollectionBlock.pm b/testbot/lib/ObjectModel/CGI/CollectionBlock.pm index f675e6b..105280e 100644 --- a/testbot/lib/ObjectModel/CGI/CollectionBlock.pm +++ b/testbot/lib/ObjectModel/CGI/CollectionBlock.pm @@ -238,14 +238,27 @@ sub GenerateHeaderRow($$$) { if ($self->CallDisplayProperty($PropertyDescriptor)) { - print "<th>", $self->escapeHTML($PropertyDescriptor->GetDisplayName()), - "</th>\n"; + $self->CallGenerateHeaderCell($PropertyDescriptor); } } print "</tr>\n"; } +sub CallGenerateHeaderCell($$) +{ + my ($self, $PropertyDescriptor) = @_; + + return $self->GenerateHeaderCell($PropertyDescriptor); +} + +sub GenerateHeaderCell($$) +{ + my ($self, $PropertyDescriptor) = @_; + print "<th>", $self->escapeHTML($PropertyDescriptor->GetDisplayName()), + "</th>\n"; +} + sub CallGenerateDataRow($$$$$$) { my ($self, $Item, $PropertyDescriptors, $DetailsPage, $Class, $Actions) = @_; diff --git a/testbot/lib/ObjectModel/CGI/CollectionBlockForPage.pm b/testbot/lib/ObjectModel/CGI/CollectionBlockForPage.pm index ff8247e..03a4508 100644 --- a/testbot/lib/ObjectModel/CGI/CollectionBlockForPage.pm +++ b/testbot/lib/ObjectModel/CGI/CollectionBlockForPage.pm @@ -45,6 +45,13 @@ sub CallGenerateFormEnd($) $self->{EnclosingPage}->GenerateFormEnd($self); } +sub CallGenerateHeaderCell($$) +{ + my ($self, $PropertyDescriptor) = @_; + + return $self->{EnclosingPage}->GenerateHeaderCell($self, $PropertyDescriptor); +} + sub CallGenerateHeaderRow($$$) { my ($self, $PropertyDescriptors, $Actions) = @_; diff --git a/testbot/lib/ObjectModel/CGI/CollectionPage.pm b/testbot/lib/ObjectModel/CGI/CollectionPage.pm index 194379f..5c48954 100644 --- a/testbot/lib/ObjectModel/CGI/CollectionPage.pm +++ b/testbot/lib/ObjectModel/CGI/CollectionPage.pm @@ -94,6 +94,13 @@ sub GenerateFormEnd($$) $CollectionBlock->GenerateFormEnd(); } +sub GenerateHeaderCell($$$) +{ + my ($self, $CollectionBlock, $PropertyDescriptor) = @_; + + $CollectionBlock->GenerateHeaderCell($PropertyDescriptor); +} + sub GenerateHeaderRow($$$$) { my ($self, $CollectionBlock, $PropertyDescriptors, $Actions) = @_;

1 0

Józef Kucia : vkd3d: Add FIXME() for unsupported strip cut values.
by Alexandre Julliard 03 Dec '18

03 Dec '18

Module: vkd3d Branch: master Commit: a1ad45be69aa4be6525f120f79264ddd3000caff URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=a1ad45be69aa4be6525f120… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Dec 3 11:31:30 2018 +0100 vkd3d: Add FIXME() for unsupported strip cut values. In Vulkan, the strip cut value is derived from the current index buffer format. We could recompile the pipeline to handle more cases. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d/command.c | 18 ++++++++++++++++++ libs/vkd3d/state.c | 6 ++---- libs/vkd3d/vkd3d_private.h | 4 +++- 3 files changed, 23 insertions(+), 5 deletions(-) diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index 3d5e898..2e6357a 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -1703,6 +1703,8 @@ static void d3d12_command_list_reset_state(struct d3d12_command_list *list, memset(list->strides, 0, sizeof(list->strides)); list->primitive_topology = VK_PRIMITIVE_TOPOLOGY_POINT_LIST; + list->index_buffer_format = DXGI_FORMAT_UNKNOWN; + memset(list->views, 0, sizeof(list->views)); list->fb_width = 0; list->fb_height = 0; @@ -2293,6 +2295,20 @@ static void STDMETHODCALLTYPE d3d12_command_list_DrawIndexedInstanced(ID3D12Grap return; } + switch (list->state->u.graphics.index_buffer_strip_cut_value) + { + case D3D12_INDEX_BUFFER_STRIP_CUT_VALUE_0xFFFF: + if (list->index_buffer_format != DXGI_FORMAT_R16_UINT) + FIXME("Strip cut value 0xffff is not supported with index buffer format %#x.\n", list->index_buffer_format); + break; + case D3D12_INDEX_BUFFER_STRIP_CUT_VALUE_0xFFFFFFFF: + if (list->index_buffer_format != DXGI_FORMAT_R32_UINT) + FIXME("Strip cut value 0xffffffff is not supported with index buffer format %#x.\n", list->index_buffer_format); + break; + default: + break; + } + VK_CALL(vkCmdDrawIndexed(list->vk_command_buffer, index_count_per_instance, instance_count, start_vertex_location, base_vertex_location, start_instance_location)); } @@ -3475,6 +3491,8 @@ static void STDMETHODCALLTYPE d3d12_command_list_IASetIndexBuffer(ID3D12Graphics return; } + list->index_buffer_format = view->Format; + resource = vkd3d_gpu_va_allocator_dereference(&list->device->gpu_va_allocator, view->BufferLocation); VK_CALL(vkCmdBindIndexBuffer(list->vk_command_buffer, resource->u.vk_buffer, view->BufferLocation - resource->gpu_address, index_type)); diff --git a/libs/vkd3d/state.c b/libs/vkd3d/state.c index 03d8ef3..64c2158 100644 --- a/libs/vkd3d/state.c +++ b/libs/vkd3d/state.c @@ -2236,11 +2236,9 @@ static HRESULT d3d12_pipeline_state_init_graphics(struct d3d12_pipeline_state *s switch (desc->IBStripCutValue) { case D3D12_INDEX_BUFFER_STRIP_CUT_VALUE_DISABLED: - graphics->primitive_restart_enable = VK_FALSE; - break; case D3D12_INDEX_BUFFER_STRIP_CUT_VALUE_0xFFFF: case D3D12_INDEX_BUFFER_STRIP_CUT_VALUE_0xFFFFFFFF: - graphics->primitive_restart_enable = VK_TRUE; + graphics->index_buffer_strip_cut_value = desc->IBStripCutValue; break; default: WARN("Invalid index buffer strip cut value %#x.\n", desc->IBStripCutValue); @@ -2506,7 +2504,7 @@ VkPipeline d3d12_pipeline_state_get_or_create_pipeline(struct d3d12_pipeline_sta ia_desc.pNext = NULL; ia_desc.flags = 0; ia_desc.topology = topology; - ia_desc.primitiveRestartEnable = graphics->primitive_restart_enable; + ia_desc.primitiveRestartEnable = !!graphics->index_buffer_strip_cut_value; blend_desc.sType = VK_STRUCTURE_TYPE_PIPELINE_COLOR_BLEND_STATE_CREATE_INFO; blend_desc.pNext = NULL; diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h index f977559..7e04dc3 100644 --- a/libs/vkd3d/vkd3d_private.h +++ b/libs/vkd3d/vkd3d_private.h @@ -531,7 +531,7 @@ struct d3d12_graphics_pipeline_state size_t attachment_count, rt_idx; VkRenderPass render_pass; - VkBool32 primitive_restart_enable; + D3D12_INDEX_BUFFER_STRIP_CUT_VALUE index_buffer_strip_cut_value; struct VkPipelineRasterizationStateCreateInfo rs_desc; struct VkPipelineMultisampleStateCreateInfo ms_desc; struct VkPipelineDepthStencilStateCreateInfo ds_desc; @@ -696,6 +696,8 @@ struct d3d12_command_list uint32_t strides[D3D12_IA_VERTEX_INPUT_RESOURCE_SLOT_COUNT]; VkPrimitiveTopology primitive_topology; + DXGI_FORMAT index_buffer_format; + VkImageView views[D3D12_SIMULTANEOUS_RENDER_TARGET_COUNT + 1]; unsigned int fb_width; unsigned int fb_height;

1 0

Józef Kucia : vkd3d: Implement D3D12_INDIRECT_ARGUMENT_TYPE_DRAW_INDEXED.
by Alexandre Julliard 03 Dec '18

03 Dec '18

Module: vkd3d Branch: master Commit: 6851bc6667cda7f9506f21705b747bb3a0e7fb17 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=6851bc6667cda7f9506f217… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Dec 3 11:31:31 2018 +0100 vkd3d: Implement D3D12_INDIRECT_ARGUMENT_TYPE_DRAW_INDEXED. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d/command.c | 59 +++++++++++++++++++++++++++++++++++++++------------- 1 file changed, 44 insertions(+), 15 deletions(-) diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index 2e6357a..937c7e3 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -2251,6 +2251,34 @@ static bool d3d12_command_list_begin_render_pass(struct d3d12_command_list *list return true; } +static void d3d12_command_list_check_index_buffer_strip_cut_value(struct d3d12_command_list *list) +{ + struct d3d12_graphics_pipeline_state *graphics = &list->state->u.graphics; + + /* In Vulkan, the strip cut value is derived from the index buffer format. */ + switch (graphics->index_buffer_strip_cut_value) + { + case D3D12_INDEX_BUFFER_STRIP_CUT_VALUE_0xFFFF: + if (list->index_buffer_format != DXGI_FORMAT_R16_UINT) + { + FIXME("Strip cut value 0xffff is not supported with index buffer format %#x.\n", + list->index_buffer_format); + } + break; + + case D3D12_INDEX_BUFFER_STRIP_CUT_VALUE_0xFFFFFFFF: + if (list->index_buffer_format != DXGI_FORMAT_R32_UINT) + { + FIXME("Strip cut value 0xffffffff is not supported with index buffer format %#x.\n", + list->index_buffer_format); + } + break; + + default: + break; + } +} + static void STDMETHODCALLTYPE d3d12_command_list_DrawInstanced(ID3D12GraphicsCommandList *iface, UINT vertex_count_per_instance, UINT instance_count, UINT start_vertex_location, UINT start_instance_location) @@ -2287,27 +2315,15 @@ static void STDMETHODCALLTYPE d3d12_command_list_DrawIndexedInstanced(ID3D12Grap iface, index_count_per_instance, instance_count, start_vertex_location, base_vertex_location, start_instance_location); - vk_procs = &list->device->vk_procs; - if (!d3d12_command_list_begin_render_pass(list)) { WARN("Failed to begin render pass, ignoring draw call.\n"); return; } - switch (list->state->u.graphics.index_buffer_strip_cut_value) - { - case D3D12_INDEX_BUFFER_STRIP_CUT_VALUE_0xFFFF: - if (list->index_buffer_format != DXGI_FORMAT_R16_UINT) - FIXME("Strip cut value 0xffff is not supported with index buffer format %#x.\n", list->index_buffer_format); - break; - case D3D12_INDEX_BUFFER_STRIP_CUT_VALUE_0xFFFFFFFF: - if (list->index_buffer_format != DXGI_FORMAT_R32_UINT) - FIXME("Strip cut value 0xffffffff is not supported with index buffer format %#x.\n", list->index_buffer_format); - break; - default: - break; - } + vk_procs = &list->device->vk_procs; + + d3d12_command_list_check_index_buffer_strip_cut_value(list); VK_CALL(vkCmdDrawIndexed(list->vk_command_buffer, index_count_per_instance, instance_count, start_vertex_location, base_vertex_location, start_instance_location)); @@ -4113,6 +4129,19 @@ static void STDMETHODCALLTYPE d3d12_command_list_ExecuteIndirect(ID3D12GraphicsC arg_buffer_offset, max_command_count, signature_desc->ByteStride)); break; + case D3D12_INDIRECT_ARGUMENT_TYPE_DRAW_INDEXED: + if (!d3d12_command_list_begin_render_pass(list)) + { + WARN("Failed to begin render pass, ignoring draw.\n"); + break; + } + + d3d12_command_list_check_index_buffer_strip_cut_value(list); + + VK_CALL(vkCmdDrawIndexedIndirect(list->vk_command_buffer, arg_impl->u.vk_buffer, + arg_buffer_offset, max_command_count, signature_desc->ByteStride)); + break; + case D3D12_INDIRECT_ARGUMENT_TYPE_DISPATCH: if (max_command_count != 1) FIXME("Ignoring command count %u.\n", max_command_count);

1 0

Józef Kucia : tests: Print adapter info on Windows.
by Alexandre Julliard 03 Dec '18

03 Dec '18

Module: vkd3d Branch: master Commit: b4d2306b9ba726a678b2d08c3585f56da3cdb0b3 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=b4d2306b9ba726a678b2d08… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Dec 3 11:31:26 2018 +0100 tests: Print adapter info on Windows. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/vkd3d_dxgi.idl | 26 +++++++++++++++++++++++++- tests/d3d12.c | 29 +++++++++++++++++++++++++++-- 2 files changed, 52 insertions(+), 3 deletions(-) diff --git a/include/vkd3d_dxgi.idl b/include/vkd3d_dxgi.idl index 5b80e1f..7e07a78 100644 --- a/include/vkd3d_dxgi.idl +++ b/include/vkd3d_dxgi.idl @@ -38,7 +38,6 @@ typedef enum DXGI_MODE_ROTATION DXGI_MODE_ROTATION_ROTATE270 = 0x4, } DXGI_MODE_ROTATION; -interface IDXGIAdapter; interface IDXGIAdapter1; interface IDXGIOutput; typedef struct DXGI_SWAP_CHAIN_DESC DXGI_SWAP_CHAIN_DESC; @@ -54,6 +53,19 @@ const DXGI_USAGE DXGI_USAGE_READ_ONLY = 0x00000100ul; const DXGI_USAGE DXGI_USAGE_DISCARD_ON_PRESENT = 0x00000200ul; const DXGI_USAGE DXGI_USAGE_UNORDERED_ACCESS = 0x00000400ul; +typedef struct DXGI_ADAPTER_DESC +{ + WCHAR Description[128]; + UINT VendorId; + UINT DeviceId; + UINT SubSysId; + UINT Revision; + SIZE_T DedicatedVideoMemory; + SIZE_T DedicatedSystemMemory; + SIZE_T SharedSystemMemory; + LUID AdapterLuid; +} DXGI_ADAPTER_DESC; + [ local, object, @@ -80,6 +92,18 @@ interface IDXGIDeviceSubObject : IDXGIObject } [ + object, + local, + uuid(2411e7e1-12ac-4ccf-bd14-9798e8534dc0) +] +interface IDXGIAdapter : IDXGIObject +{ + HRESULT EnumOutputs(UINT output_idx, IDXGIOutput **output); + HRESULT GetDesc(DXGI_ADAPTER_DESC *desc); + HRESULT CheckInterfaceSupport(REFGUID guid, void *umd_version); +} + +[ local, object, uuid(310d36a0-d2e7-4c0a-aa04-6a9d23b8886a), diff --git a/tests/d3d12.c b/tests/d3d12.c index e5a6249..3956fba 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -890,18 +890,41 @@ static IUnknown *create_adapter(void) return adapter; } - if (use_adapter_idx) - hr = IDXGIFactory4_EnumAdapters(factory, use_adapter_idx, (IDXGIAdapter **)&adapter); + hr = IDXGIFactory4_EnumAdapters(factory, use_adapter_idx, (IDXGIAdapter **)&adapter); IDXGIFactory4_Release(factory); if (FAILED(hr)) trace("Failed to get adapter, hr %#x.\n", hr); return adapter; } + +static void print_adapter_info(void) +{ + IDXGIAdapter *dxgi_adapter; + DXGI_ADAPTER_DESC desc; + IUnknown *adapter; + HRESULT hr; + + if (!(adapter = create_adapter())) + return; + + hr = IUnknown_QueryInterface(adapter, &IID_IDXGIAdapter, (void **)&dxgi_adapter); + ok(hr == S_OK, "Failed to query IDXGIAdapter, hr %#x.\n", hr); + IUnknown_Release(adapter); + + hr = IDXGIAdapter_GetDesc(dxgi_adapter, &desc); + ok(hr == S_OK, "Failed to get adapter desc, hr %#x.\n", hr); + + trace("Adapter: %04x:%04x.\n", desc.VendorId, desc.DeviceId); + + IDXGIAdapter_Release(dxgi_adapter); +} #else static IUnknown *create_adapter(void) { return NULL; } + +static void print_adapter_info(void) {} #endif static ID3D12Device *create_device(void) @@ -21923,6 +21946,8 @@ START_TEST(d3d12) ID3D12Debug_Release(debug); } + print_adapter_info(); + run_test(test_create_device); run_test(test_node_count); run_test(test_check_feature_support);

1 0

Józef Kucia : tests: Add more flexible todo() implementation.
by Alexandre Julliard 03 Dec '18

03 Dec '18

Module: vkd3d Branch: master Commit: 8553696c2d6bc746e167768e27c7cbd1adb94c16 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=8553696c2d6bc746e167768… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Dec 3 11:31:27 2018 +0100 tests: Add more flexible todo() implementation. Based on wine/test.h. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/private/vkd3d_test.h | 75 ++++++++++++++++++++++++++++---------------- tests/d3d12.c | 56 ++++++++++++++------------------- 2 files changed, 71 insertions(+), 60 deletions(-) Diff: https://source.winehq.org/git/vkd3d.git/?a=commitdiff;h=8553696c2d6bc746e16…

1 0