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

Francois Gouget : ntoskrnl.exe: Fix the name of CONFIGURATION_TYPE' s MaximumType enum entry.
by Alexandre Julliard 27 Aug '19

27 Aug '19

Module: wine Branch: master Commit: 1718fbd25826a28331cb6fc68d0ce3bbab711cbb URL: https://source.winehq.org/git/wine.git/?a=commit;h=1718fbd25826a28331cb6fc6… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Aug 27 03:33:54 2019 +0200 ntoskrnl.exe: Fix the name of CONFIGURATION_TYPE's MaximumType enum entry. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- 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 32f9a6f..36f69cd 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

1 0

Francois Gouget : wdscore: Fix the name of the WdsIterate*() stubs.
by Alexandre Julliard 27 Aug '19

27 Aug '19

Module: wine Branch: master Commit: 2094ca241941deb479fb6780fb448db422d16abc URL: https://source.winehq.org/git/wine.git/?a=commit;h=2094ca241941deb479fb6780… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Aug 27 03:34:33 2019 +0200 wdscore: Fix the name of the WdsIterate*() stubs. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- 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 ab4aeb7..15958b8 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

1 0

Francois Gouget : api-*-advapi32-*: Fix the name of the ConvertToAutoInheritPrivateObjectSecurity() stub.
by Alexandre Julliard 27 Aug '19

27 Aug '19

Module: wine Branch: master Commit: d7d6aa113803c0b00e140224abcbd40ae8dd33fd URL: https://source.winehq.org/git/wine.git/?a=commit;h=d7d6aa113803c0b00e140224… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Aug 27 03:35:35 2019 +0200 api-*-advapi32-*: Fix the name of the ConvertToAutoInheritPrivateObjectSecurity() stub. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .../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 579811b..1d58187 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 +@ stdcall ConvertToAutoInheritPrivateObjectSecurity(ptr ptr ptr ptr long ptr) advapi32.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

1 0

Alexandre Julliard : kernelbase: Comment out DECLSPEC_HOTPATCH on stub functions.
by Alexandre Julliard 27 Aug '19

27 Aug '19

Module: wine Branch: master Commit: 5fb8e3edef02030c056dc827bfbdf3c45c78bdac URL: https://source.winehq.org/git/wine.git/?a=commit;h=5fb8e3edef02030c056dc827… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Aug 27 11:46:51 2019 +0200 kernelbase: Comment out DECLSPEC_HOTPATCH on stub functions. It triggers a MinGW compiler bug. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47633 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/file.c | 2 +- dlls/kernelbase/process.c | 7 +++---- dlls/kernelbase/thread.c | 2 +- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/dlls/kernelbase/file.c b/dlls/kernelbase/file.c index 2aa751c..ed1471d 100644 --- a/dlls/kernelbase/file.c +++ b/dlls/kernelbase/file.c @@ -1172,7 +1172,7 @@ HANDLE WINAPI DECLSPEC_HOTPATCH OpenFileById( HANDLE handle, LPFILE_ID_DESCRIPTO /*********************************************************************** * ReOpenFile (kernelbase.@) */ -HANDLE WINAPI DECLSPEC_HOTPATCH ReOpenFile( HANDLE handle, DWORD access, DWORD sharing, DWORD flags ) +HANDLE WINAPI /* DECLSPEC_HOTPATCH */ ReOpenFile( HANDLE handle, DWORD access, DWORD sharing, DWORD flags ) { FIXME( "(%p, %d, %d, %d): stub\n", handle, access, sharing, flags ); return INVALID_HANDLE_VALUE; diff --git a/dlls/kernelbase/process.c b/dlls/kernelbase/process.c index 8423a54..a205b14 100644 --- a/dlls/kernelbase/process.c +++ b/dlls/kernelbase/process.c @@ -155,7 +155,7 @@ DWORD WINAPI DECLSPEC_HOTPATCH GetProcessId( HANDLE process ) /********************************************************************** * GetProcessMitigationPolicy (kernelbase.@) */ -BOOL WINAPI DECLSPEC_HOTPATCH GetProcessMitigationPolicy( HANDLE process, PROCESS_MITIGATION_POLICY policy, +BOOL WINAPI /* DECLSPEC_HOTPATCH */ GetProcessMitigationPolicy( HANDLE process, PROCESS_MITIGATION_POLICY policy, void *buffer, SIZE_T length ) { FIXME( "(%p, %u, %p, %lu): stub\n", process, policy, buffer, length ); @@ -291,7 +291,7 @@ BOOL WINAPI DECLSPEC_HOTPATCH SetProcessAffinityUpdateMode( HANDLE process, DWOR /********************************************************************** * SetProcessMitigationPolicy (kernelbase.@) */ -BOOL WINAPI DECLSPEC_HOTPATCH SetProcessMitigationPolicy( PROCESS_MITIGATION_POLICY policy, +BOOL WINAPI /* DECLSPEC_HOTPATCH */ SetProcessMitigationPolicy( PROCESS_MITIGATION_POLICY policy, void *buffer, SIZE_T length ) { FIXME( "(%d, %p, %lu): stub\n", policy, buffer, length ); @@ -302,7 +302,7 @@ BOOL WINAPI DECLSPEC_HOTPATCH SetProcessMitigationPolicy( PROCESS_MITIGATION_POL /*********************************************************************** * SetProcessPriorityBoost (kernelbase.@) */ -BOOL WINAPI DECLSPEC_HOTPATCH SetProcessPriorityBoost( HANDLE process, BOOL disable ) +BOOL WINAPI /* DECLSPEC_HOTPATCH */ SetProcessPriorityBoost( HANDLE process, BOOL disable ) { FIXME( "(%p,%d): stub\n", process, disable ); return TRUE; @@ -327,7 +327,6 @@ BOOL WINAPI DECLSPEC_HOTPATCH SetProcessShutdownParameters( DWORD level, DWORD f BOOL WINAPI DECLSPEC_HOTPATCH SetProcessWorkingSetSizeEx( HANDLE process, SIZE_T minset, SIZE_T maxset, DWORD flags ) { - WARN( "(%p,%ld,%ld,%x): stub - harmless\n", process, minset, maxset, flags ); return TRUE; } diff --git a/dlls/kernelbase/thread.c b/dlls/kernelbase/thread.c index 518ea93..2bc3d85 100644 --- a/dlls/kernelbase/thread.c +++ b/dlls/kernelbase/thread.c @@ -1084,7 +1084,7 @@ PTP_CLEANUP_GROUP WINAPI DECLSPEC_HOTPATCH CreateThreadpoolCleanupGroup(void) /*********************************************************************** * CreateThreadpoolIo (kernelbase.@) */ -PTP_IO WINAPI DECLSPEC_HOTPATCH CreateThreadpoolIo( HANDLE handle, PTP_WIN32_IO_CALLBACK callback, +PTP_IO WINAPI /* DECLSPEC_HOTPATCH */ CreateThreadpoolIo( HANDLE handle, PTP_WIN32_IO_CALLBACK callback, PVOID userdata, TP_CALLBACK_ENVIRON *environment ) { FIXME( "(%p, %p, %p, %p): stub\n", handle, callback, userdata, environment );

1 0

Zhiyi Zhang : msctf: Check TF_GetThreadMgr error in DocumentMgr_Destructor.
by Alexandre Julliard 27 Aug '19

27 Aug '19

Module: wine Branch: master Commit: 0bebbbaa51c7647389ef9ac886169f6037356460 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0bebbbaa51c7647389ef9ac8… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Tue Aug 27 21:06:41 2019 +0800 msctf: Check TF_GetThreadMgr error in DocumentMgr_Destructor. Thread manager could be already destroyed when calling DocumentMgr_Destructor. This removes the error dialog when closing Unreal Engine 4 games. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msctf/documentmgr.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/msctf/documentmgr.c b/dlls/msctf/documentmgr.c index dd49cd0..44856db 100644 --- a/dlls/msctf/documentmgr.c +++ b/dlls/msctf/documentmgr.c @@ -77,11 +77,15 @@ static inline EnumTfContext *impl_from_IEnumTfContexts(IEnumTfContexts *iface) static void DocumentMgr_Destructor(DocumentMgr *This) { - ITfThreadMgr *tm; + ITfThreadMgr *tm = NULL; TRACE("destroying %p\n", This); TF_GetThreadMgr(&tm); - ThreadMgr_OnDocumentMgrDestruction(tm, &This->ITfDocumentMgr_iface); + if (tm) + { + ThreadMgr_OnDocumentMgrDestruction(tm, &This->ITfDocumentMgr_iface); + ITfThreadMgr_Release(tm); + } if (This->contextStack[0]) ITfContext_Release(This->contextStack[0]);

1 0

Hans Leidekker : ntdll: Read the chassis type from sysfs.
by Alexandre Julliard 27 Aug '19

27 Aug '19

Module: wine Branch: master Commit: 4e71e86747234a7add959befecbbbb9428908717 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4e71e86747234a7add959bef… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Aug 27 16:35:54 2019 +0200 ntdll: Read the chassis type from sysfs. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/nt.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/nt.c b/dlls/ntdll/nt.c index a9985fb..06f8f39 100644 --- a/dlls/ntdll/nt.c +++ b/dlls/ntdll/nt.c @@ -115,7 +115,7 @@ struct smbios_board { struct smbios_chassis { struct smbios_header hdr; BYTE vendor; - BYTE shape; + BYTE type; BYTE version; BYTE serial; BYTE asset_tag; @@ -2117,6 +2117,7 @@ static NTSTATUS get_firmware_info(SYSTEM_FIRMWARE_TABLE_INFORMATION *sfti, ULONG char board_vendor[128], board_product[128], board_version[128], board_serial[128]; size_t board_vendor_len, board_product_len, board_version_len, board_serial_len; char chassis_vendor[128], chassis_version[128], chassis_serial[128], chassis_asset_tag[128]; + char chassis_type[11] = "2"; /* unknown */ size_t chassis_vendor_len, chassis_version_len, chassis_serial_len, chassis_asset_tag_len; char *buffer = (char*)sfti->TableBuffer; BYTE string_count; @@ -2142,6 +2143,7 @@ static NTSTATUS get_firmware_info(SYSTEM_FIRMWARE_TABLE_INFORMATION *sfti, ULONG chassis_version_len = get_smbios_string("/sys/class/dmi/id/chassis_version", S(chassis_version)); chassis_serial_len = get_smbios_string("/sys/class/dmi/id/chassis_serial", S(chassis_serial)); chassis_asset_tag_len = get_smbios_string("/sys/class/dmi/id/chassis_tag", S(chassis_asset_tag)); + get_smbios_string("/sys/class/dmi/id/chassis_type", S(chassis_type)); #undef S *required_len = sizeof(struct smbios_prologue); @@ -2237,7 +2239,7 @@ static NTSTATUS get_firmware_info(SYSTEM_FIRMWARE_TABLE_INFORMATION *sfti, ULONG chassis->hdr.length = sizeof(struct smbios_chassis); chassis->hdr.handle = 0; chassis->vendor = chassis_vendor_len ? ++string_count : 0; - chassis->shape = 0x2; /* unknown */ + chassis->type = atoi(chassis_type); chassis->version = chassis_version_len ? ++string_count : 0; chassis->serial = chassis_serial_len ? ++string_count : 0; chassis->asset_tag = chassis_asset_tag_len ? ++string_count : 0;

1 0

Francois Gouget : testbot: Sanitize the environment for system() & co.
by Alexandre Julliard 27 Aug '19

27 Aug '19

Module: tools Branch: master Commit: 3ef757cc31d4792a0b1a0f394d1dcfb0454b9751 URL: https://source.winehq.org/git/tools.git/?a=commit;h=3ef757cc31d4792a0b1a0f3… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Aug 27 01:49:30 2019 +0200 testbot: Sanitize the environment for system() & co. system() may start a shell so make sure its behavior will not be modified in unexpected ways by the environment ($CDPATH, $IFS) or an external file ($ENV, $BASH_ENV). Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/Config.pm | 3 +++ 1 file changed, 3 insertions(+) diff --git a/testbot/lib/WineTestBot/Config.pm b/testbot/lib/WineTestBot/Config.pm index 4469229..d6267de 100644 --- a/testbot/lib/WineTestBot/Config.pm +++ b/testbot/lib/WineTestBot/Config.pm @@ -69,6 +69,9 @@ $LogDir = "$::RootDir/var"; $DataDir = "$::RootDir/var"; $BinDir = "$::RootDir/bin"; +# Sanitize the environment for system() & co +delete @ENV{qw(IFS CDPATH ENV BASH_ENV)}; # from perlsec + # See the ScheduleOnHost() documentation in lib/WineTestBot/Jobs.pm $MaxRevertingVMs = 1; $MaxRevertsWhileRunningVMs = 0;

1 0

Francois Gouget : testbot: Specify the service path instead of relying on $PATH.
by Alexandre Julliard 27 Aug '19

27 Aug '19

Module: tools Branch: master Commit: ccc707a6414c0462c0a0e538c858113f51916769 URL: https://source.winehq.org/git/tools.git/?a=commit;h=ccc707a6414c0462c0a0e53… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Aug 27 01:50:35 2019 +0200 testbot: Specify the service path instead of relying on $PATH. This allows CheckWineTestBot.pl to use the same $PATH as the other tools. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- 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 9c2e291..0af2550 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

1 0

Francois Gouget : testbot: Fix the "no snapshot" case in BackupVM.
by Alexandre Julliard 27 Aug '19

27 Aug '19

Module: tools Branch: master Commit: 8c53a4830914ace8293504a337c5c3e6e979da83 URL: https://source.winehq.org/git/tools.git/?a=commit;h=8c53a4830914ace8293504a… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Aug 27 01:53:23 2019 +0200 testbot: Fix the "no snapshot" case in BackupVM. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/scripts/BackupVM | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/testbot/scripts/BackupVM b/testbot/scripts/BackupVM index 2cf3320..d7e5483 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!

1 0

Alexandre Julliard : Revert "wine/asm.h: Quote stdcall decored symbols."
by Alexandre Julliard 27 Aug '19

27 Aug '19

Module: wine Branch: master Commit: a0190cc27c609ebd96bd2f31811ac81c0ea4c511 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a0190cc27c609ebd96bd2f31… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Aug 27 10:12:29 2019 +0200 Revert "wine/asm.h: Quote stdcall decored symbols." This reverts commit bdcc54c19d7356077362e7001aa9c4a08919af89. It breaks with older binutils. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wine/asm.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/wine/asm.h b/include/wine/asm.h index 66062c0..01dfdb1 100644 --- a/include/wine/asm.h +++ b/include/wine/asm.h @@ -28,7 +28,7 @@ #endif #if defined(_WIN32) && defined(__i386__) -# define __ASM_STDCALL(name,args) "\"" __ASM_NAME(name) "@" #args "\"" +# define __ASM_STDCALL(name,args) __ASM_NAME(name) "@" #args #else # define __ASM_STDCALL(name,args) __ASM_NAME(name) #endif

1 0