wine-devel November 2018

wine-devel@winehq.org

75 participants
771 discussions

[PATCH v2 1/4] rpcrt4: Write type format strings for coclasses.
by Zebediah Figura 14 Nov '18

14 Nov '18

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=19016 Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/rpcrt4/ndr_typelib.c | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) diff --git a/dlls/rpcrt4/ndr_typelib.c b/dlls/rpcrt4/ndr_typelib.c index f68e61e5fa..82ee53d7e7 100644 --- a/dlls/rpcrt4/ndr_typelib.c +++ b/dlls/rpcrt4/ndr_typelib.c @@ -324,6 +324,37 @@ static size_t write_ip_tfs(unsigned char *str, size_t *len, const GUID *iid) return off; } +static void get_default_iface(ITypeInfo *typeinfo, WORD count, GUID *iid) +{ + ITypeInfo *refinfo; + HREFTYPE reftype; + TYPEATTR *attr; + int flags, i; + + for (i = 0; i < count; ++i) + { + ITypeInfo_GetImplTypeFlags(typeinfo, i, &flags); + if (flags & IMPLTYPEFLAG_FDEFAULT) + { + ITypeInfo_GetRefTypeOfImplType(typeinfo, i, &reftype); + ITypeInfo_GetRefTypeInfo(typeinfo, reftype, &refinfo); + ITypeInfo_GetTypeAttr(refinfo, &attr); + *iid = attr->guid; + ITypeInfo_ReleaseTypeAttr(refinfo, attr); + ITypeInfo_Release(refinfo); + return; + } + } + + /* If no interface was explicitly marked default, choose the first one. */ + ITypeInfo_GetRefTypeOfImplType(typeinfo, 0, &reftype); + ITypeInfo_GetRefTypeInfo(typeinfo, reftype, &refinfo); + ITypeInfo_GetTypeAttr(refinfo, &attr); + *iid = attr->guid; + ITypeInfo_ReleaseTypeAttr(refinfo, attr); + ITypeInfo_Release(refinfo); +} + static size_t write_pointer_tfs(ITypeInfo *typeinfo, unsigned char *str, size_t *len, TYPEDESC *desc, BOOL toplevel, BOOL onstack) { @@ -331,6 +362,7 @@ static size_t write_pointer_tfs(ITypeInfo *typeinfo, unsigned char *str, size_t ref, off = *len; ITypeInfo *refinfo; TYPEATTR *attr; + GUID guid; if (desc->vt == VT_USERDEFINED) { @@ -358,6 +390,10 @@ static size_t write_pointer_tfs(ITypeInfo *typeinfo, unsigned char *str, case TKIND_DISPATCH: write_ip_tfs(str, len, &attr->guid); break; + case TKIND_COCLASS: + get_default_iface(refinfo, attr->cImplTypes, &guid); + write_ip_tfs(str, len, &guid); + break; case TKIND_ALIAS: off = write_pointer_tfs(refinfo, str, len, &attr->tdescAlias, toplevel, onstack); break; -- 2.19.1

3 6

[PATCH] xinput1_3: Report SUCCESS from XInputSetState when FFB isn't available.
by Alistair Leslie-Hughes 14 Nov '18

14 Nov '18

From: Beren Minor <beren.minor+git(a)gmail.com> Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45992 Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/xinput1_3/hid.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/xinput1_3/hid.c b/dlls/xinput1_3/hid.c index 8a35443753..d7e22483d4 100644 --- a/dlls/xinput1_3/hid.c +++ b/dlls/xinput1_3/hid.c @@ -457,10 +457,9 @@ DWORD HID_set_state(xinput_controller* device, XINPUT_VIBRATION* state) return ERROR_SUCCESS; return GetLastError(); } - return ERROR_SUCCESS; } - return ERROR_NOT_SUPPORTED; + return ERROR_SUCCESS; } void HID_enable(xinput_controller* device, BOOL enable) -- 2.19.1

1 0

[PATCH 1/2] rpcrt4: Write type format strings for coclasses.
by Zebediah Figura 14 Nov '18

14 Nov '18

2 2

[PATCH v2 3/3] hidclass.sys: move IoSetDeviceInterfaceState to PNP_RemoveDevice
by Aric Stewart 14 Nov '18

14 Nov '18

v2: Divide patch as suggested by Zebediah Figura Signed-off-by: Aric Stewart <aric(a)codeweavers.com> --- dlls/hidclass.sys/device.c | 11 ----------- dlls/hidclass.sys/pnp.c | 8 ++++++++ 2 files changed, 8 insertions(+), 11 deletions(-)

1 0

[PATCH v2 1/3] ntoskrnl.exe: Create the device interface symlink in IoSetDeviceInterfaceState
by Aric Stewart 14 Nov '18

14 Nov '18

Rename patch as suggested by Zebediah Figura Signed-off-by: Aric Stewart <aric(a)codeweavers.com> --- dlls/ntoskrnl.exe/ntoskrnl.c | 76 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 76 insertions(+)

1 0

[PATCH 1/2] ntoskrnl.exe: Enable bus devices in IoSetDeviceInterfaceState
by Aric Stewart 14 Nov '18

14 Nov '18

Signed-off-by: Aric Stewart <aric(a)codeweavers.com> --- dlls/ntoskrnl.exe/ntoskrnl.c | 76 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 76 insertions(+)

2 2

[PATCH] testbot: Allow more than one test environment per Wine build.
by Francois Gouget 14 Nov '18

14 Nov '18

This implies not assuming that the mission's build uniquely identifies the testing environment. Let GetMissionBaseName() deal with coming up with a suitable identifier for the wineprefix and test reports. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- This lays the groundwork for testing a given build in multiple locales. testbot/bin/WineRunWineTest.pl | 12 ++++----- testbot/bin/build/WineReconfig.pl | 9 ++++--- testbot/bin/build/WineTest.pl | 38 ++++++++++++++--------------- testbot/lib/Build/Utils.pm | 24 ++++++++++-------- testbot/lib/WineTestBot/Missions.pm | 8 +++++- 5 files changed, 51 insertions(+), 40 deletions(-) diff --git a/testbot/bin/WineRunWineTest.pl b/testbot/bin/WineRunWineTest.pl index 3784ef0657..592162ad7b 100755 --- a/testbot/bin/WineRunWineTest.pl +++ b/testbot/bin/WineRunWineTest.pl @@ -290,10 +290,10 @@ sub WrapUpAndExit($;$$$) if ($Step->Type eq 'suite' and $Status eq 'completed' and !$TimedOut) { - foreach my $Build (keys %{$TaskMissions->{Builds}}) + foreach my $Mission (@{$TaskMissions->{Missions}}) { # Keep the old report if the new one is missing - my $RptFileName = "$Build.report"; + my $RptFileName = GetMissionBaseName($Mission) .".report"; if (-f "$TaskDir/$RptFileName" and !-z "$TaskDir/$RptFileName") { # Update the VM's reference WineTest results for WineSendLog.pl @@ -549,9 +549,9 @@ elsif (!defined $TAError) # Grab the test reports if any # -foreach my $Build (keys %{$TaskMissions->{Builds}}) +foreach my $Mission (@{$TaskMissions->{Missions}}) { - my $RptFileName = "$Build.report"; + my $RptFileName = GetMissionBaseName($Mission) .".report"; Debug(Elapsed($Start), " Retrieving '$RptFileName'\n"); if ($TA->GetFile($RptFileName, "$TaskDir/$RptFileName")) { @@ -606,9 +606,9 @@ if ($NewStatus eq 'completed') { my $LatestDir = "$DataDir/latest"; my $StepDir = $Step->GetDir(); - foreach my $Build (keys %{$TaskMissions->{Builds}}) + foreach my $Mission (@{$TaskMissions->{Missions}}) { - my $RptFileName = "$Build.report"; + my $RptFileName = GetMissionBaseName($Mission) .".report"; my $RefReport = $Task->VM->Name ."_$RptFileName"; for my $Suffix ("", ".err") { diff --git a/testbot/bin/build/WineReconfig.pl b/testbot/bin/build/WineReconfig.pl index 898f72c5b6..cc25da0cc8 100755 --- a/testbot/bin/build/WineReconfig.pl +++ b/testbot/bin/build/WineReconfig.pl @@ -103,17 +103,18 @@ sub UpdateWinePrefixes($) # Set up brand new WinePrefixes ready for use for testing. # This way we do it once instead of doing it for every test, thus saving - # time. Note that this requires using a different wineprefix for each build. + # time. Note that this requires using a different wineprefix for each + # mission. foreach my $Mission (@{$TaskMissions->{Missions}}) { next if ($Mission->{test} eq "build"); - SetupWineEnvironment($Mission->{Build}); - InfoMsg "\nRecreating the $Mission->{Build} wineprefix\n"; + my $BaseName = SetupWineEnvironment($Mission); + InfoMsg "\nRecreating the $BaseName wineprefix\n"; # Wait for the wineprefix creation to complete so it is really done # before the snapshot gets updated. - my $ErrMessage = CreateWinePrefix($Mission->{Build}, "wait"); + my $ErrMessage = CreateWinePrefix($Mission, "wait"); if (defined $ErrMessage) { LogMsg "$ErrMessage\n"; diff --git a/testbot/bin/build/WineTest.pl b/testbot/bin/build/WineTest.pl index 6df028fa95..4947a12a62 100755 --- a/testbot/bin/build/WineTest.pl +++ b/testbot/bin/build/WineTest.pl @@ -84,34 +84,34 @@ sub SetupTest($$) LogMsg "tests\n" if (!$InTests); $InTests = 1; - InfoMsg "\nRunning $Test in the $Mission->{Build} Wine\n"; - SetupWineEnvironment($Mission->{Build}); + my $BaseName = SetupWineEnvironment($Mission); + InfoMsg "\nRunning $Test in the $BaseName Wine\n"; + return $BaseName; } sub DailyWineTest($$$$) { my ($Mission, $NoSubmit, $BaseTag, $Args) = @_; - SetupTest("WineTest", $Mission); + my $BaseName = SetupTest("WineTest", $Mission); # Run WineTest. Ignore the exit code since it returns non-zero whenever # there are test failures. - my $Tag = SanitizeTag("$BaseTag-$Mission->{Build}"); - RunWine($Mission->{Build}, "./programs/winetest/winetest.exe.so", - "-c -o '../$Mission->{Build}.report' -t $Tag ". - ShArgv2Cmd(@$Args)); - if (!-f "$Mission->{Build}.report") + my $Tag = SanitizeTag("$BaseTag-$BaseName"); + RunWine($Mission, "./programs/winetest/winetest.exe.so", + "-c -o '../$BaseName.report' -t $Tag ". ShArgv2Cmd(@$Args)); + if (!-f "$BaseName.report") { - LogMsg "WineTest did not produce a report file\n"; + LogMsg "WineTest did not produce the $BaseName report\n"; return 0; } # Send the report to the website if ((!$NoSubmit and !$Mission->{nosubmit}) and - RunWine($Mission->{Build}, "./programs/winetest/winetest.exe.so", - "-c -s '../$Mission->{Build}.report'")) + RunWine($Mission, "./programs/winetest/winetest.exe.so", + "-c -s '../$BaseName.report'")) { - LogMsg "WineTest failed to send the $Mission->{Build} report\n"; + LogMsg "WineTest failed to send the $BaseName report\n"; # Soldier on in case it's just a network issue } @@ -153,26 +153,26 @@ sub TestPatch($$) return 1 if (!@TestList); } - SetupTest("the tests", $Mission); + my $BaseName = SetupTest("the tests", $Mission); if (!-d $ENV{WINEPREFIX}) { # FIXME Wait for the wineserver as a workaround for bug 41713. my $ErrMessage = CreateWinePrefix($Mission, "wait"); if (defined $ErrMessage) { - LogMsg "Could not create the $Mission->{Build} wineprefix: $ErrMessage\n"; + LogMsg "Could not create the $BaseName wineprefix: $ErrMessage\n"; return 0; } } # Run WineTest. Ignore the exit code since it returns non-zero whenever # there are test failures. - RunWine($Mission->{Build}, "./programs/winetest/winetest.exe.so", - "-c -o '../$Mission->{Build}.report' -t test-$Mission->{Build} ". + RunWine($Mission, "./programs/winetest/winetest.exe.so", + "-c -o '../$BaseName.report' -t do.not.submit ". join(" ", @TestList)); - if (!-f "$Mission->{Build}.report") + if (!-f "$BaseName.report") { - LogMsg "WineTest did not produce a report file\n"; + LogMsg "WineTest did not produce the $BaseName report\n"; return 0; } @@ -365,7 +365,7 @@ if ($DataDir =~ /'/) # # Clean up old reports -map { unlink("$_.report") } keys %{$TaskMissions->{Builds}}; +unlink map { GetMissionBaseName($_) .".report" } @{$TaskMissions->{Missions}}; my $Impacts; if ($Action eq "testpatch") diff --git a/testbot/lib/Build/Utils.pm b/testbot/lib/Build/Utils.pm index aa5c205d2d..06fb3d87fc 100644 --- a/testbot/lib/Build/Utils.pm +++ b/testbot/lib/Build/Utils.pm @@ -36,6 +36,7 @@ use Digest::SHA; use File::Path; use WineTestBot::Config; +use WineTestBot::Missions; use WineTestBot::PatchUtils; use WineTestBot::Utils; @@ -327,19 +328,22 @@ sub UpdateAddOns() sub SetupWineEnvironment($) { - my ($Build) = @_; + my ($Mission) = @_; - $ENV{WINEPREFIX} = "$DataDir/wineprefix-$Build"; + my $BaseName = GetMissionBaseName($Mission); + $ENV{WINEPREFIX} = "$DataDir/wineprefix-$BaseName"; $ENV{DISPLAY} ||= ":0.0"; + + return $BaseName; } sub RunWine($$$) { - my ($Build, $Cmd, $CmdArgs) = @_; + my ($Mission, $Cmd, $CmdArgs) = @_; - my $Magic = `cd '$DataDir/wine-$Build' && file $Cmd`; + my $Magic = `cd '$DataDir/wine-$Mission->{Build}' && file $Cmd`; my $Wine = ($Magic =~ /ELF 64/ ? "./wine64" : "./wine"); - return system("cd '$DataDir/wine-$Build' && set -x && ". + return system("cd '$DataDir/wine-$Mission->{Build}' && set -x && ". "time $Wine $Cmd $CmdArgs"); } @@ -348,24 +352,24 @@ sub RunWine($$$) # WinePrefix helpers # -sub CreateWinePrefix($$) +sub CreateWinePrefix($;$) { - my ($Build, $Wait) = @_; + my ($Mission, $Wait) = @_; return "\$WINEPREFIX is not set!" if (!$ENV{WINEPREFIX}); rmtree($ENV{WINEPREFIX}); # Crash dialogs cause delays so disable them - if (RunWine($Build, "./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 $Build build crash dialogs: $!"; + return "Failed to disable the crash dialogs: $!"; } if ($Wait) { # Ensure the WinePrefix has been fully created and the registry files # saved before returning. - system("cd '$DataDir/wine-$Build' && ./server/wineserver -w"); + system("cd '$DataDir/wine-$Mission->{Build}' && ./server/wineserver -w"); } return undef; diff --git a/testbot/lib/WineTestBot/Missions.pm b/testbot/lib/WineTestBot/Missions.pm index 80c1d97227..0dc812d6ba 100644 --- a/testbot/lib/WineTestBot/Missions.pm +++ b/testbot/lib/WineTestBot/Missions.pm @@ -26,7 +26,7 @@ WineTestBot::Missions - Missions parser and helper functions =cut use Exporter 'import'; -our @EXPORT = qw(DumpMissions ParseMissionStatement +our @EXPORT = qw(DumpMissions GetMissionBaseName ParseMissionStatement MergeMissionStatementTasks SplitMissionStatementTasks); @@ -86,6 +86,12 @@ sub ParseMissionStatement($) return (undef, \@Missions); } +sub GetMissionBaseName($) +{ + my ($Mission) = @_; + return $Mission->{Build}; +} + sub MergeMissionStatementTasks($) { my ($MissionStatement) = @_; -- 2.19.1

1 0

[PATCH 2/2] hidclass.sys: Use IoSetDeviceInterfaceState
by Aric Stewart 14 Nov '18

14 Nov '18

Signed-off-by: Aric Stewart <aric(a)codeweavers.com> --- dlls/hidclass.sys/device.c | 18 ------------------ dlls/hidclass.sys/pnp.c | 8 ++++++++ 2 files changed, 8 insertions(+), 18 deletions(-)

2 1

[PATCH] d3dx9: Use the ARRAY_SIZE() macro
by Michael Stefaniuc 13 Nov '18

13 Nov '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/d3dx9_36/font.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/d3dx9_36/font.c b/dlls/d3dx9_36/font.c index 5522dea552..418a3be332 100644 --- a/dlls/d3dx9_36/font.c +++ b/dlls/d3dx9_36/font.c @@ -105,7 +105,7 @@ static HRESULT WINAPI ID3DXFontImpl_GetDescA(ID3DXFont *iface, D3DXFONT_DESCA *d if( !desc ) return D3DERR_INVALIDCALL; memcpy(desc, &This->desc, FIELD_OFFSET(D3DXFONT_DESCA, FaceName)); - WideCharToMultiByte(CP_ACP, 0, This->desc.FaceName, -1, desc->FaceName, sizeof(desc->FaceName) / sizeof(CHAR), NULL, NULL); + WideCharToMultiByte(CP_ACP, 0, This->desc.FaceName, -1, desc->FaceName, ARRAY_SIZE(desc->FaceName), NULL, NULL); return D3D_OK; } @@ -284,8 +284,7 @@ HRESULT WINAPI D3DXCreateFontIndirectA(IDirect3DDevice9 *device, const D3DXFONT_ /* Copy everything but the last structure member. This requires the two D3DXFONT_DESC structures to be equal until the FaceName member */ memcpy(&widedesc, desc, FIELD_OFFSET(D3DXFONT_DESCA, FaceName)); - MultiByteToWideChar(CP_ACP, 0, desc->FaceName, -1, - widedesc.FaceName, sizeof(widedesc.FaceName)/sizeof(WCHAR)); + MultiByteToWideChar(CP_ACP, 0, desc->FaceName, -1, widedesc.FaceName, ARRAY_SIZE(widedesc.FaceName)); return D3DXCreateFontIndirectW(device, &widedesc, font); } -- 2.14.5

2 1

[PATCH] advapi32: Add DECL_HOTPATCH to registry functions
by Alistair Leslie-Hughes 13 Nov '18

13 Nov '18

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46135 Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/advapi32/registry.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/advapi32/registry.c b/dlls/advapi32/registry.c index b537f69db0..3018372a63 100644 --- a/dlls/advapi32/registry.c +++ b/dlls/advapi32/registry.c @@ -363,7 +363,7 @@ LSTATUS WINAPI RegOverridePredefKey( HKEY hkey, HKEY override ) * * See RegCreateKeyExA. */ -LSTATUS WINAPI RegCreateKeyExW( HKEY hkey, LPCWSTR name, DWORD reserved, LPWSTR class, +LSTATUS WINAPI DECLSPEC_HOTPATCH RegCreateKeyExW( HKEY hkey, LPCWSTR name, DWORD reserved, LPWSTR class, DWORD options, REGSAM access, SECURITY_ATTRIBUTES *sa, PHKEY retkey, LPDWORD dispos ) { @@ -410,7 +410,7 @@ LSTATUS WINAPI RegCreateKeyExW( HKEY hkey, LPCWSTR name, DWORD reserved, LPWSTR * FIXME * MAXIMUM_ALLOWED in access mask not supported by server */ -LSTATUS WINAPI RegCreateKeyExA( HKEY hkey, LPCSTR name, DWORD reserved, LPSTR class, +LSTATUS WINAPI DECLSPEC_HOTPATCH RegCreateKeyExA( HKEY hkey, LPCSTR name, DWORD reserved, LPSTR class, DWORD options, REGSAM access, SECURITY_ATTRIBUTES *sa, PHKEY retkey, LPDWORD dispos ) { @@ -516,7 +516,7 @@ LSTATUS WINAPI RegCreateKeyTransactedA( HKEY hkey, LPCSTR name, DWORD reserved, * * See RegOpenKeyExA. */ -LSTATUS WINAPI RegOpenKeyExW( HKEY hkey, LPCWSTR name, DWORD options, REGSAM access, PHKEY retkey ) +LSTATUS WINAPI DECLSPEC_HOTPATCH RegOpenKeyExW( HKEY hkey, LPCWSTR name, DWORD options, REGSAM access, PHKEY retkey ) { OBJECT_ATTRIBUTES attr; UNICODE_STRING nameW; @@ -1333,7 +1333,7 @@ LSTATUS WINAPI RegDeleteKeyA( HKEY hkey, LPCSTR name ) * Success: ERROR_SUCCESS * Failure: Error code */ -LSTATUS WINAPI RegSetValueExW( HKEY hkey, LPCWSTR name, DWORD reserved, +LSTATUS WINAPI DECLSPEC_HOTPATCH RegSetValueExW( HKEY hkey, LPCWSTR name, DWORD reserved, DWORD type, const BYTE *data, DWORD count ) { UNICODE_STRING nameW; @@ -1365,7 +1365,7 @@ LSTATUS WINAPI RegSetValueExW( HKEY hkey, LPCWSTR name, DWORD reserved, * win95 does not care about count for REG_SZ and finds out the len by itself (js) * NT does definitely care (aj) */ -LSTATUS WINAPI RegSetValueExA( HKEY hkey, LPCSTR name, DWORD reserved, DWORD type, +LSTATUS WINAPI DECLSPEC_HOTPATCH RegSetValueExA( HKEY hkey, LPCSTR name, DWORD reserved, DWORD type, const BYTE *data, DWORD count ) { ANSI_STRING nameA; @@ -1759,7 +1759,7 @@ static DWORD query_perf_data(const WCHAR *query, DWORD *type, void *data, DWORD * * See RegQueryValueExA. */ -LSTATUS WINAPI RegQueryValueExW( HKEY hkey, LPCWSTR name, LPDWORD reserved, LPDWORD type, +LSTATUS WINAPI DECLSPEC_HOTPATCH RegQueryValueExW( HKEY hkey, LPCWSTR name, LPDWORD reserved, LPDWORD type, LPBYTE data, LPDWORD count ) { NTSTATUS status; -- 2.19.1

1 0

← Newer
1
...
44
45
46
47
48
49
50
...
78
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-devel November 2018