August 2019 - Wine-devel - list.winehq.org

[PATCH] api-*-advapi32-*: Fix the name of the ConvertToAutoInheritPrivateObjectSecurity() stub.
by Francois Gouget 26 Aug '19

26 Aug '19

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- .../api-ms-win-downlevel-advapi32-l1-1-0.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/api-ms-win-downlevel-advapi32-l1-1-0/api-ms-win-downlevel-advapi32-l1-1-0.spec b/dlls/api-ms-win-downlevel-advapi32-l1-1-0/api-ms-win-downlevel-advapi32-l1-1-0.spec index 579811b7773..c7ef15a0561 100644 --- a/dlls/api-ms-win-downlevel-advapi32-l1-1-0/api-ms-win-downlevel-advapi32-l1-1-0.spec +++ b/dlls/api-ms-win-downlevel-advapi32-l1-1-0/api-ms-win-downlevel-advapi32-l1-1-0.spec @@ -23,7 +23,7 @@ @ stdcall AreAllAccessesGranted(long long) advapi32.AreAllAccessesGranted @ stdcall AreAnyAccessesGranted(long long) advapi32.AreAnyAccessesGranted @ stdcall CheckTokenMembership(long ptr ptr) advapi32.CheckTokenMembership -@ stub ConvertToAutoInheritPrivateObjecSecurity +@ stub ConvertToAutoInheritPrivateObjectSecurity @ stdcall CopySid(long ptr ptr) advapi32.CopySid @ stdcall CreatePrivateObjectSecurity(ptr ptr ptr long long ptr) advapi32.CreatePrivateObjectSecurity @ stdcall CreatePrivateObjectSecurityEx(ptr ptr ptr ptr long long long ptr) advapi32.CreatePrivateObjectSecurityEx -- 2.20.1

1 0

[PATCH] wdscore: Fix the name of the WdsIterate*() stubs.
by Francois Gouget 26 Aug '19

26 Aug '19

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- dlls/wdscore/wdscore.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wdscore/wdscore.spec b/dlls/wdscore/wdscore.spec index ab4aeb783b9..15958b86aba 100644 --- a/dlls/wdscore/wdscore.spec +++ b/dlls/wdscore/wdscore.spec @@ -125,8 +125,8 @@ @ stub WdsInitializeDataUInt32 @ stub WdsInitializeDataUInt64 @ stub WdsIsDiagnosticModeEnabled -@ stub WdsInterateOfflineQueue -@ stub WdsInterateQueue +@ stub WdsIterateOfflineQueue +@ stub WdsIterateQueue @ stub WdsLockBlackboardValue @ stub WdsLockExecutionGroup @ stub WdsLogCreate -- 2.20.1

1 0

[PATCH] ntoskrnl.exe: Fix the name of CONFIGURATION_TYPE's MaximumType enum entry.
by Francois Gouget 26 Aug '19

26 Aug '19

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- include/ddk/ntddk.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/ddk/ntddk.h b/include/ddk/ntddk.h index 32f9a6feafa..36f69cdf9a2 100644 --- a/include/ddk/ntddk.h +++ b/include/ddk/ntddk.h @@ -104,7 +104,7 @@ typedef enum _CONFIGURATION_TYPE DockingInformation, RealModeIrqRoutingTable, RealModePCIEnumeration, - MaximunType + MaximumType } CONFIGURATION_TYPE, *PCONFIGURATION_TYPE; typedef struct _IMAGE_INFO -- 2.20.1

1 0

[PATCH] ninput: Fix the name of MANIPULATION_VELOCITY's velocityExpansion field.
by Francois Gouget 26 Aug '19

26 Aug '19

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- include/interactioncontext.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/interactioncontext.h b/include/interactioncontext.h index a643b626cd7..a3a5f345984 100644 --- a/include/interactioncontext.h +++ b/include/interactioncontext.h @@ -113,7 +113,7 @@ typedef struct MANIPULATION_VELOCITY { float velocityX; float velocityY; - float velocityExapnsion; + float velocityExpansion; float velocityAngular; } MANIPULATION_VELOCITY; -- 2.20.1

1 0

[PATCH] ntdll: Fix the spelling of StoragePortClassGuid.
by Francois Gouget 26 Aug '19

26 Aug '19

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- include/ntddstor.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/ntddstor.h b/include/ntddstor.h index d38a9471d4a..b8c4bb73b0d 100644 --- a/include/ntddstor.h +++ b/include/ntddstor.h @@ -68,7 +68,7 @@ DEFINE_GUID(FloppyClassGuid, 0x53f56311, 0xb6bf, 0x11d0, 0x94, 0xf2, 0x00, 0xa0, 0xc9, 0x1e, 0xfb, 0x8b); DEFINE_GUID(CdChangerClassGuid, 0x53f56312, 0xb6bf, 0x11d0, 0x94, 0xf2, 0x00, 0xa0, 0xc9, 0x1e, 0xfb, 0x8b); -DEFINE_GUID(StroagePortClassGuid, +DEFINE_GUID(StoragePortClassGuid, 0x2accfe60, 0xc130, 0x11d2, 0xb0, 0x82, 0x00, 0xa0, 0xc9, 0x1e, 0xfb, 0x8b); typedef struct _STORAGE_DEVICE_NUMBER { -- 2.20.1

1 0

[PATCH] dbgeng: Fix the spelling of GetInterruptTimeout().
by Francois Gouget 26 Aug '19

26 Aug '19

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- include/dbgeng.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/dbgeng.h b/include/dbgeng.h index 3eeb6705e26..d916d2433a3 100644 --- a/include/dbgeng.h +++ b/include/dbgeng.h @@ -1733,7 +1733,7 @@ DECLARE_INTERFACE_(IDebugControl, IUnknown) /* IDebugControl */ STDMETHOD(GetInterrupt)(THIS) PURE; STDMETHOD(SetInterrupt)(THIS_ ULONG flags) PURE; - STDMETHOD(GetIterruptTimeout)(THIS_ ULONG *timeout) PURE; + STDMETHOD(GetInterruptTimeout)(THIS_ ULONG *timeout) PURE; STDMETHOD(SetInterruptTimeout)(THIS_ ULONG timeout) PURE; STDMETHOD(GetLogFile)(THIS_ char *buffer, ULONG buffer_size, ULONG *file_size, BOOL *append) PURE; STDMETHOD(OpenLogFile)(THIS_ const char *file, BOOL append) PURE; @@ -1853,7 +1853,7 @@ DECLARE_INTERFACE_(IDebugControl2, IUnknown) /* IDebugControl */ STDMETHOD(GetInterrupt)(THIS) PURE; STDMETHOD(SetInterrupt)(THIS_ ULONG flags) PURE; - STDMETHOD(GetIterruptTimeout)(THIS_ ULONG *timeout) PURE; + STDMETHOD(GetInterruptTimeout)(THIS_ ULONG *timeout) PURE; STDMETHOD(SetInterruptTimeout)(THIS_ ULONG timeout) PURE; STDMETHOD(GetLogFile)(THIS_ char *buffer, ULONG buffer_size, ULONG *file_size, BOOL *append) PURE; STDMETHOD(OpenLogFile)(THIS_ const char *file, BOOL append) PURE; -- 2.20.1

1 0

[PATCH 8/8] ntdll: Call send_debug_event from debug handler on x86_64.
by Jacek Caban 26 Aug '19

26 Aug '19

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/kernel32/tests/debugger.c | 2 ++ dlls/ntdll/signal_x86_64.c | 31 +++++++++++++++++++++++++++---- 2 files changed, 29 insertions(+), 4 deletions(-)

2 1

[PATCH 1/8] kernel32/tests: Add exception handling race test.
by Jacek Caban 26 Aug '19

26 Aug '19

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- This patch demonstrates a problem that I noticed while debugging VS remote debugger on Wine. When you use 'break' command of the debugger, VS does following: 1. suspend all debuggee threads (with SuspendThread(), not any dedicated debug API) 2. for each thread, modify process code so that memory of its current instruction is 0xcc (int $3) 3. resume all threads 4. expect breakpoint exception 5. restore process memory When process is restored in (3), all threads race to execute the breakpoint. The first exception will suspend the whole process until debugger processes the exception. However, multiple threads may have already executed the breakpoint before OS has a chance to suspend them. This is the case on Windows as well (although it seems more likely on Wine, since its supervention requires server round trip and sending signals). Due to the way this currently works on Wine, it's problematic for two reasons: 1. the thread that loses the race may have already set its suspension context by queue_exception_event and receive SIGUSR1 later. Suspending inside signal handler will fail because the context is already set and the whole thread enters an invalid state. We could fix it by blocking signals inside send_debug_event(), but: 2. suspended threads may already be in exception handling code. This is not really expected. On Windows (except for a few anomalies I've seen; I don't think they are expected behaviour), other threads that manage to execute the breakpoint are reported to be executing it when the process is suspended on the first exception. On Wine, however, they are more likely to be suspended inside exception handling code at this point. This is somewhat weird from debugger point of view: they are not reported as executing the breakpoint before it's removed, but they will report that they hit it anyway. My solution, implemented for x86_64 by this patch series, is to report the exception and do suspension inside signal handler. Currently we don't do any blocking in signal handlers other than SIGUSR1, but as far as I can see we should be able to do that. dlls/kernel32/tests/debugger.c | 83 ++++++++++++++++++++++++++++++++++ 1 file changed, 83 insertions(+)

2 1

[PATCH v2] testbot: Fix the "no snapshot" case in BackupVM.
by Francois Gouget 26 Aug '19

26 Aug '19

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- While the previous version allowed me to do a backup of my VM which did not yet have snapshots, Alexandre rightfully pointed out it stopped backing up snapshots at all. Ouch. Now I need to backup VMs with snapshots again so here's a proper fix. testbot/scripts/BackupVM | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/testbot/scripts/BackupVM b/testbot/scripts/BackupVM index 2cf3320d..d7e54839 100755 --- a/testbot/scripts/BackupVM +++ b/testbot/scripts/BackupVM @@ -209,10 +209,14 @@ then fi snapshots=`echo "/$snapdir/$opt_vm"/*.xml` -if [ -n "$opt_snapshot" -a "$snapshots" = "/$snapdir/$opt_vm/*.xml" ] +if [ "$snapshots" = "/$snapdir/$opt_vm/*.xml" ] then - error "the '$opt_vm' VM does not seem to have snapshots! Use --no-snapshot if this is expected." - exit 2 + if [ -n "$opt_snapshot" ] + then + error "the '$opt_vm' VM does not seem to have snapshots! Use --no-snapshot if this is expected." + exit 2 + fi + snapshots="" fi # Backup the symbolic links but also their targets! -- 2.20.1

1 0

[PATCH] testbot: Specify the service path instead of relying on $PATH.
by Francois Gouget 26 Aug '19

26 Aug '19

This allows CheckWineTestBot.pl to use the same $PATH as the other tools. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/scripts/CheckWineTestBot.pl | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/testbot/scripts/CheckWineTestBot.pl b/testbot/scripts/CheckWineTestBot.pl index 9c2e2911..0af2550c 100755 --- a/testbot/scripts/CheckWineTestBot.pl +++ b/testbot/scripts/CheckWineTestBot.pl @@ -38,17 +38,17 @@ sub BEGIN use WineTestBot::Config; use WineTestBot::Engine::Notify; -$ENV{PATH} = "/sbin:/usr/sbin:/usr/bin:/bin"; +$ENV{PATH} = "/usr/bin:/bin"; my $rc = 0; if (! PingEngine()) { if ($> == 0) { - system "service winetestbot restart > /dev/null"; + system "/usr/sbin/service winetestbot restart > /dev/null"; sleep 5; } - + open (SENDMAIL, "|/usr/sbin/sendmail -oi -t -odq"); print SENDMAIL <<"EOF"; From: $RobotEMail -- 2.20.1

1 0