June 2022 - Wine-Commits - list.winehq.org

Hans Leidekker : include: Move SECPKG_ATTR defines to a new header and add missing definitions.
by Alexandre Julliard June 21, 2022

June 21, 2022

Module: wine Branch: master Commit: 4ce39cd09b1ab740c2b493dfabc99b4696cb6116 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4ce39cd09b1ab740c2b493df… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Jun 20 19:59:06 2022 +0200 include: Move SECPKG_ATTR defines to a new header and add missing definitions. --- include/minschannel.h | 44 ++++++++++++++++++++++++++++++++++++++++++++ include/schannel.h | 39 +++++++++++++++++++++++---------------- 2 files changed, 67 insertions(+), 16 deletions(-) diff --git a/include/minschannel.h b/include/minschannel.h new file mode 100644 index 00000000000..c30ae85922b --- /dev/null +++ b/include/minschannel.h @@ -0,0 +1,44 @@ +/* + * Copyright 2022 Hans Leidekker for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#ifndef __WINE_MINSCHANNEL_H__ +#define __WINE_MINSCHANNEL_H__ + +#define SECPKG_ATTR_ISSUER_LIST 0x50 +#define SECPKG_ATTR_REMOTE_CRED 0x51 +#define SECPKG_ATTR_LOCAL_CRED 0x52 +#define SECPKG_ATTR_REMOTE_CERT_CONTEXT 0x53 +#define SECPKG_ATTR_LOCAL_CERT_CONTEXT 0x54 +#define SECPKG_ATTR_ROOT_STORE 0x55 +#define SECPKG_ATTR_SUPPORTED_ALGS 0x56 +#define SECPKG_ATTR_CIPHER_STRENGTHS 0x57 +#define SECPKG_ATTR_SUPPORTED_PROTOCOLS 0x58 +#define SECPKG_ATTR_ISSUER_LIST_EX 0x59 +#define SECPKG_ATTR_CONNECTION_INFO 0x5a +#define SECPKG_ATTR_EAP_KEY_BLOCK 0x5b +#define SECPKG_ATTR_MAPPED_CRED_ATTR 0x5c +#define SECPKG_ATTR_SESSION_INFO 0x5d +#define SECPKG_ATTR_APP_DATA 0x5e +#define SECPKG_ATTR_REMOTE_CERTIFICATES 0x5f +#define SECPKG_ATTR_CLIENT_CERT_POLICY 0x60 +#define SECPKG_ATTR_CC_POLICY_RESULT 0x61 +#define SECPKG_ATTR_USE_NCRYPT 0x62 +#define SECPKG_ATTR_LOCAL_CERT_INFO 0x63 +#define SECPKG_ATTR_CIPHER_INFO 0x64 + +#endif /* __WINE_MINSCHANNEL_H__ */ diff --git a/include/schannel.h b/include/schannel.h index 556ec1882c9..3aa85832fd3 100644 --- a/include/schannel.h +++ b/include/schannel.h @@ -18,6 +18,7 @@ #ifndef __WINE_SCHANNEL_H__ #define __WINE_SCHANNEL_H__ +#include <minschannel.h> #include <wincrypt.h> /* Package names */ @@ -179,22 +180,6 @@ static const WCHAR SCHANNEL_NAME_W[] = { 'S','c','h','a','n','n','e','l',0 }; #define SCH_CRED_IGNORE_NO_REVOCATION_CHECK 2048 #define SCH_CRED_IGNORE_REVOCATION_OFFLINE 4096 -#define SECPKG_ATTR_ISSUER_LIST 0x50 -#define SECPKG_ATTR_REMOTE_CRED 0x51 -#define SECPKG_ATTR_LOCAL_CRED 0x52 -#define SECPKG_ATTR_REMOTE_CERT_CONTEXT 0x53 -#define SECPKG_ATTR_LOCAL_CERT_CONTEXT 0x54 -#define SECPKG_ATTR_ROOT_STORE 0x55 -#define SECPKG_ATTR_SUPPORTED_ALGS 0x56 -#define SECPKG_ATTR_CIPHER_STRENGTHS 0x57 -#define SECPKG_ATTR_SUPPORTED_PROTOCOLS 0x58 -#define SECPKG_ATTR_ISSUER_LIST_EX 0x59 -#define SECPKG_ATTR_CONNECTION_INFO 0x5a -#define SECPKG_ATTR_EAP_KEY_BLOCK 0x5b -#define SECPKG_ATTR_MAPPED_CRED_ATTR 0x5c -#define SECPKG_ATTR_SESSION_INFO 0x5d -#define SECPKG_ATTR_APP_DATA 0x5e - #define UNISP_RPC_ID 14 struct _HMAPPER; @@ -299,4 +284,26 @@ typedef struct _SecPkgContext_ConnectionInfo DWORD dwExchStrength; } SecPkgContext_ConnectionInfo, *PSecPkgContext_ConnectionInfo; +#define SECPKGCONTEXT_CIPHERINFO_V1 1 +#define SZ_ALG_MAX_SIZE 64 + +typedef struct _SecPkgContext_CipherInfo +{ + DWORD dwVersion; + DWORD dwProtocol; + DWORD dwCipherSuite; + DWORD dwBaseCipherSuite; + WCHAR szCipherSuite[SZ_ALG_MAX_SIZE]; + WCHAR szCipher[SZ_ALG_MAX_SIZE]; + DWORD dwCipherLen; + DWORD dwCipherBlockLen; + WCHAR szHash[SZ_ALG_MAX_SIZE]; + DWORD dwHashLen; + WCHAR szExchange[SZ_ALG_MAX_SIZE]; + DWORD dwMinExchangeLen; + DWORD dwMaxExchangeLen; + WCHAR szCertificate[SZ_ALG_MAX_SIZE]; + DWORD dwKeyType; +} SecPkgContext_CipherInfo, *PSecPkgContext_CipherInfo; + #endif /* __WINE_SCHANNEL_H__ */

1 0

Jinoh Kang : ntdll/tests: Add more tests for \Device\NamedPipe\ root directory.
by Alexandre Julliard June 21, 2022

June 21, 2022

Module: wine Branch: master Commit: b8d11f76dad106817bd0b7c959ac6c1397f2f237 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b8d11f76dad106817bd0b7c9… Author: Jinoh Kang <jinoh.kang.kr(a)gmail.com> Date: Thu Nov 25 22:08:02 2021 +0900 ntdll/tests: Add more tests for \Device\NamedPipe\ root directory. Signed-off-by: Jinoh Kang <jinoh.kang.kr(a)gmail.com> --- dlls/ntdll/tests/om.c | 9 +++++ dlls/ntdll/tests/pipe.c | 90 ++++++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 98 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/tests/om.c b/dlls/ntdll/tests/om.c index 2e03abd13ed..f151d55d800 100644 --- a/dlls/ntdll/tests/om.c +++ b/dlls/ntdll/tests/om.c @@ -1881,6 +1881,15 @@ static void test_query_object(void) pNtClose( handle ); + handle = CreateFileA( "\\\\.\\pipe\\", 0, 0, NULL, OPEN_EXISTING, 0, 0 ); + ok( handle != INVALID_HANDLE_VALUE, "CreateFile failed (%lu)\n", GetLastError() ); + + test_object_name( handle, L"\\Device\\NamedPipe\\", TRUE ); + test_object_type( handle, L"File" ); + test_file_info( handle ); + + pNtClose( handle ); + RtlInitUnicodeString( &path, L"\\REGISTRY\\Machine" ); status = pNtCreateKey( &handle, KEY_READ, &attr, 0, 0, 0, 0 ); ok( status == STATUS_SUCCESS, "NtCreateKey failed status %lx\n", status ); diff --git a/dlls/ntdll/tests/pipe.c b/dlls/ntdll/tests/pipe.c index dc9737e73d8..0ad09daaa82 100644 --- a/dlls/ntdll/tests/pipe.c +++ b/dlls/ntdll/tests/pipe.c @@ -51,6 +51,13 @@ typedef struct { ULONG NamedPipeEnd; } FILE_PIPE_LOCAL_INFORMATION; +typedef struct _FILE_PIPE_WAIT_FOR_BUFFER { + LARGE_INTEGER Timeout; + ULONG NameLength; + BOOLEAN TimeoutSpecified; + WCHAR Name[1]; +} FILE_PIPE_WAIT_FOR_BUFFER, *PFILE_PIPE_WAIT_FOR_BUFFER; + #ifndef FILE_SYNCHRONOUS_IO_ALERT #define FILE_SYNCHRONOUS_IO_ALERT 0x10 #endif @@ -62,6 +69,10 @@ typedef struct { #ifndef FSCTL_PIPE_LISTEN #define FSCTL_PIPE_LISTEN CTL_CODE(FILE_DEVICE_NAMED_PIPE, 2, METHOD_BUFFERED, FILE_ANY_ACCESS) #endif + +#ifndef FSCTL_PIPE_WAIT +#define FSCTL_PIPE_WAIT CTL_CODE(FILE_DEVICE_NAMED_PIPE, 6, METHOD_BUFFERED, FILE_ANY_ACCESS) +#endif #endif static NTSTATUS (WINAPI *pNtFsControlFile) (HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc, PVOID apc_context, PIO_STATUS_BLOCK io, ULONG code, PVOID in_buffer, ULONG in_size, PVOID out_buffer, ULONG out_size); @@ -177,6 +188,48 @@ static NTSTATUS listen_pipe(HANDLE hPipe, HANDLE hEvent, PIO_STATUS_BLOCK iosb, return pNtFsControlFile(hPipe, hEvent, use_apc ? &ioapc: NULL, use_apc ? &dummy: NULL, iosb, FSCTL_PIPE_LISTEN, 0, 0, 0, 0); } +static NTSTATUS wait_pipe(HANDLE handle, PUNICODE_STRING name, const LARGE_INTEGER* timeout) +{ + HANDLE event; + NTSTATUS status; + OBJECT_ATTRIBUTES attr; + IO_STATUS_BLOCK iosb; + FILE_PIPE_WAIT_FOR_BUFFER *pipe_wait; + ULONG pipe_wait_size; + + pipe_wait_size = offsetof(FILE_PIPE_WAIT_FOR_BUFFER, Name[0]) + name->Length; + pipe_wait = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, pipe_wait_size); + if (!pipe_wait) return STATUS_NO_MEMORY; + + pipe_wait->TimeoutSpecified = !!timeout; + pipe_wait->NameLength = name->Length; + if (timeout) pipe_wait->Timeout = *timeout; + memcpy(pipe_wait->Name, name->Buffer, name->Length); + + InitializeObjectAttributes(&attr, NULL, 0, 0, NULL); + status = NtCreateEvent(&event, GENERIC_ALL, &attr, NotificationEvent, FALSE); + if (status != STATUS_SUCCESS) + { + ok(0, "NtCreateEvent failure: %#lx\n", status); + HeapFree(GetProcessHeap(), 0, pipe_wait); + return status; + } + + memset(&iosb, 0, sizeof(iosb)); + iosb.Status = STATUS_PENDING; + status = pNtFsControlFile(handle, event, NULL, NULL, &iosb, FSCTL_PIPE_WAIT, + pipe_wait, pipe_wait_size, NULL, 0); + if (status == STATUS_PENDING) + { + WaitForSingleObject(event, INFINITE); + status = iosb.Status; + } + + NtClose(event); + HeapFree(GetProcessHeap(), 0, pipe_wait); + return status; +} + static void test_create_invalid(void) { IO_STATUS_BLOCK iosb; @@ -2420,6 +2473,7 @@ static void test_security_info(void) static void test_empty_name(void) { + static const LARGE_INTEGER zero_timeout = {{ 0 }}; HANDLE hdirectory, hpipe, hpipe2, hwrite, hwrite2, handle; OBJECT_TYPE_INFORMATION *type_info; OBJECT_NAME_INFORMATION *name_info; @@ -2450,6 +2504,10 @@ static void test_empty_name(void) FILE_SHARE_READ|FILE_SHARE_WRITE, FILE_OPEN, 0, NULL, 0 ); ok(!status, "Got unexpected status %#lx.\n", status); + pRtlInitUnicodeString(&name, L"nonexistent_pipe"); + status = wait_pipe(hdirectory, &name, &zero_timeout); + todo_wine ok(status == STATUS_ILLEGAL_FUNCTION, "unexpected status for FSCTL_PIPE_WAIT on \\Device\\NamedPipe: %#lx\n", status); + name.Buffer = NULL; name.Length = 0; name.MaximumLength = 0; @@ -2462,6 +2520,17 @@ static void test_empty_name(void) todo_wine ok(status == STATUS_OBJECT_NAME_INVALID, "Got unexpected status %#lx.\n", status); if (!status) CloseHandle(hpipe); + + pRtlInitUnicodeString(&name, L"test3\\pipe"); + attr.RootDirectory = hdirectory; + attr.ObjectName = &name; + timeout.QuadPart = -(LONG64)10000000; + status = pNtCreateNamedPipeFile(&hpipe, GENERIC_READ|GENERIC_WRITE, &attr, &io, FILE_SHARE_READ|FILE_SHARE_WRITE, + FILE_CREATE, FILE_PIPE_FULL_DUPLEX, 0, 0, 0, 1, 256, 256, &timeout); + ok(status == STATUS_OBJECT_NAME_INVALID, "unexpected status from NtCreateNamedPipeFile: %#lx\n", status); + if (!status) + CloseHandle(hpipe); + CloseHandle(hdirectory); pRtlInitUnicodeString(&name, L"\\Device\\NamedPipe\\"); @@ -2475,6 +2544,10 @@ static void test_empty_name(void) FILE_SHARE_READ|FILE_SHARE_WRITE, FILE_OPEN, 0, NULL, 0 ); ok(!status, "Got unexpected status %#lx.\n", status); + pRtlInitUnicodeString(&name, L"nonexistent_pipe"); + status = wait_pipe(hdirectory, &name, &zero_timeout); + ok(status == STATUS_OBJECT_NAME_NOT_FOUND, "unexpected status for FSCTL_PIPE_WAIT on \\Device\\NamedPipe\\: %#lx\n", status); + name.Buffer = NULL; name.Length = 0; name.MaximumLength = 0; @@ -2565,9 +2638,24 @@ static void test_empty_name(void) CloseHandle(hwrite); CloseHandle(hpipe); - CloseHandle(hdirectory); CloseHandle(hpipe2); CloseHandle(hwrite2); + + pRtlInitUnicodeString(&name, L"test3\\pipe"); + attr.RootDirectory = hdirectory; + attr.ObjectName = &name; + timeout.QuadPart = -(LONG64)10000000; + status = pNtCreateNamedPipeFile(&hpipe, GENERIC_READ|GENERIC_WRITE, &attr, &io, FILE_SHARE_READ|FILE_SHARE_WRITE, + FILE_CREATE, FILE_PIPE_FULL_DUPLEX, 0, 0, 0, 1, 256, 256, &timeout); + todo_wine ok(!status, "unexpected failure from NtCreateNamedPipeFile: %#lx\n", status); + + handle = CreateFileA("\\\\.\\pipe\\test3\\pipe", GENERIC_READ, FILE_SHARE_READ|FILE_SHARE_WRITE, NULL, + OPEN_EXISTING, 0, 0 ); + todo_wine ok(handle != INVALID_HANDLE_VALUE, "Failed to open NamedPipe (%lu)\n", GetLastError()); + + CloseHandle(handle); + CloseHandle(hpipe); + CloseHandle(hdirectory); } START_TEST(pipe)

1 0

Biswapriyo Nath : include: Add ID3D12Device3 declaration in vkd3d_d3d12.idl.
by Alexandre Julliard June 21, 2022

June 21, 2022

Module: vkd3d Branch: master Commit: a021b0a7d38c0ce6b35bbe20869b8ef8d370e528 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=a021b0a7d38c0ce6b35bbe2… Author: Biswapriyo Nath <nathbappai(a)gmail.com> Date: Sat Jun 11 11:10:23 2022 +0530 include: Add ID3D12Device3 declaration in vkd3d_d3d12.idl. Signed-off-by: Biswapriyo Nath <nathbappai(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/vkd3d_d3d12.idl | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/include/vkd3d_d3d12.idl b/include/vkd3d_d3d12.idl index 4bbd235c..e30df590 100644 --- a/include/vkd3d_d3d12.idl +++ b/include/vkd3d_d3d12.idl @@ -250,6 +250,13 @@ typedef enum D3D12_RAYTRACING_TIER D3D12_RAYTRACING_TIER_1_0 = 0xa, } D3D12_RAYTRACING_TIER; +typedef enum D3D12_RESIDENCY_FLAGS +{ + D3D12_RESIDENCY_FLAG_NONE = 0x0, + D3D12_RESIDENCY_FLAG_DENY_OVERBUDGET = 0x1, +} D3D12_RESIDENCY_FLAGS; +cpp_quote("DEFINE_ENUM_FLAG_OPERATORS(D3D12_RESIDENCY_FLAGS);") + interface ID3D12Fence; interface ID3D12RootSignature; interface ID3D12Heap; @@ -2563,6 +2570,32 @@ interface ID3D12Device2 : ID3D12Device1 [out, iid_is(riid)] void **pipeline_state); } +[ + uuid(81dadc15-2bad-4392-93c5-101345c4aa98), + object, + local, + pointer_default(unique) +] +interface ID3D12Device3 : ID3D12Device2 +{ + HRESULT OpenExistingHeapFromAddress( + [in] const void *address, + [in] REFIID riid, + [out, iid_is(riid)] void **heap); + + HRESULT OpenExistingHeapFromFileMapping( + [in] HANDLE file_mapping, + [in] REFIID riid, + [out, iid_is(riid)] void **heap); + + HRESULT EnqueueMakeResident( + [in] D3D12_RESIDENCY_FLAGS flags, + [in] UINT num_objects, + [in] ID3D12Pageable *const *objects, + [in] ID3D12Fence *fence, + [in] UINT64 fence_value); +} + [ uuid(34ab647b-3cc8-46ac-841b-c0965645c046), object,

1 0

Biswapriyo Nath : include: Add more D3D12_HEAP_FLAGS in vkd3d_d3d12.idl.
by Alexandre Julliard June 21, 2022

June 21, 2022

Module: vkd3d Branch: master Commit: f9921fc6916e639d50b8ba7cca182ffe72cc9504 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=f9921fc6916e639d50b8ba7… Author: Biswapriyo Nath <nathbappai(a)gmail.com> Date: Sat Jun 11 11:10:23 2022 +0530 include: Add more D3D12_HEAP_FLAGS in vkd3d_d3d12.idl. Signed-off-by: Biswapriyo Nath <nathbappai(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/vkd3d_d3d12.idl | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/include/vkd3d_d3d12.idl b/include/vkd3d_d3d12.idl index 4d96d25c..4bbd235c 100644 --- a/include/vkd3d_d3d12.idl +++ b/include/vkd3d_d3d12.idl @@ -413,6 +413,11 @@ typedef enum D3D12_HEAP_FLAGS D3D12_HEAP_FLAG_SHARED_CROSS_ADAPTER = 0x20, D3D12_HEAP_FLAG_DENY_RT_DS_TEXTURES = 0x40, D3D12_HEAP_FLAG_DENY_NON_RT_DS_TEXTURES = 0x80, + D3D12_HEAP_FLAG_HARDWARE_PROTECTED = 0x100, + D3D12_HEAP_FLAG_ALLOW_WRITE_WATCH = 0x200, + D3D12_HEAP_FLAG_ALLOW_SHADER_ATOMICS = 0x400, + D3D12_HEAP_FLAG_CREATE_NOT_RESIDENT = 0x800, + D3D12_HEAP_FLAG_CREATE_NOT_ZEROED = 0x1000, D3D12_HEAP_FLAG_ALLOW_ALL_BUFFERS_AND_TEXTURES = 0x00, D3D12_HEAP_FLAG_ALLOW_ONLY_BUFFERS = 0xc0, D3D12_HEAP_FLAG_ALLOW_ONLY_NON_RT_DS_TEXTURES = 0x44,

1 0

Francois Gouget : testbot/web: Show the web patch id as a tooltip.
by Alexandre Julliard June 21, 2022

June 21, 2022

Module: tools Branch: master Commit: 42f8de30ca6eee8ac6c3de647649ae7ddde3ccbd URL: https://source.winehq.org/git/tools.git/?a=commit;h=42f8de30ca6eee8ac6c3de6… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Jun 20 18:23:20 2022 +0200 testbot/web: Show the web patch id as a tooltip. This helps cross-reference the TestBot patch list with the jobs and patches website. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/web/PatchesList.pl | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/testbot/web/PatchesList.pl b/testbot/web/PatchesList.pl index fc074ada..bf7c52b2 100644 --- a/testbot/web/PatchesList.pl +++ b/testbot/web/PatchesList.pl @@ -53,7 +53,9 @@ sub GenerateDataView($$$) $Row->{Item}->Disposition =~ /job ([0-9]+)$/) { my $JobId = $1; - print "<a href='/JobDetails.pl?Key=$JobId'>Job $JobId</a>"; + my $Title = $Row->{Item}->WebPatchId; + $Title = " title='Web patch $Title'" if ($Title); + print "<a href='/JobDetails.pl?Key=$JobId'$Title>Job $JobId</a>"; } else {

1 0

Francois Gouget : testbot/Engine: Don't schedule jobs until the initialization is done.
by Alexandre Julliard June 21, 2022

June 21, 2022

Module: tools Branch: master Commit: a45ffb01723a651ceafb86e8cbb00d6d44f1cdff URL: https://source.winehq.org/git/tools.git/?a=commit;h=a45ffb01723a651ceafb86e… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Jun 20 18:23:57 2022 +0200 testbot/Engine: Don't schedule jobs until the initialization is done. On startup the Engine starts processes to check the state of each VM, marking them as dirty in the process. But the VM status change causes ScheduleJobs() to be called through the VMStatusChange notification, potentially before all check processes have been started. So make sure no job is scheduled until the Engine is ready. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/Engine.pl | 1 + testbot/lib/WineTestBot/Engine/Scheduler.pm | 21 +++++++++++++++++++-- 2 files changed, 20 insertions(+), 2 deletions(-) diff --git a/testbot/bin/Engine.pl b/testbot/bin/Engine.pl index 9d836529..39577d14 100755 --- a/testbot/bin/Engine.pl +++ b/testbot/bin/Engine.pl @@ -780,6 +780,7 @@ sub main() # Cleanup starts processes to update the VMs. Run ScheduleJobs() now so it # can detect if these processes get stuck. + StartJobScheduler(); ScheduleJobs(); # Check for patches that arrived while the server was off. diff --git a/testbot/lib/WineTestBot/Engine/Scheduler.pm b/testbot/lib/WineTestBot/Engine/Scheduler.pm index 1b21ab97..f91bf3fd 100644 --- a/testbot/lib/WineTestBot/Engine/Scheduler.pm +++ b/testbot/lib/WineTestBot/Engine/Scheduler.pm @@ -28,7 +28,7 @@ WineTestBot::Engine::Scheduler - Schedules the TestBot tasks =cut use Exporter 'import'; -our @EXPORT = qw(ScheduleJobs CheckJobs); +our @EXPORT = qw(StartJobScheduler ScheduleJobs CheckJobs); use File::Copy; @@ -945,7 +945,24 @@ sub _PowerOffDirtyVMs($) } } -my $_InScheduleJobs; +my $_InScheduleJobs = 1; + +=pod +=over 12 + +=item C<StartJobScheduler()> + +Job scheduling is disabled initially to let the Engine perform its +initialization without interference. + +=back +=cut + +sub StartJobScheduler() +{ + $_InScheduleJobs = undef; +} + my $_LastTaskCounts = ""; =pod

1 0

Alistair Leslie-Hughes : d3drm: Return S_OK from IDirect3DRMMeshBuilder3::Optimize().
by Alexandre Julliard June 20, 2022

June 20, 2022

Module: wine Branch: master Commit: b581165950cc117ae5006dc5cfc1d6d02979d142 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b581165950cc117ae5006dc5… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Mon Jun 13 18:11:05 2022 +1000 d3drm: Return S_OK from IDirect3DRMMeshBuilder3::Optimize(). Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/d3drm/meshbuilder.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/d3drm/meshbuilder.c b/dlls/d3drm/meshbuilder.c index 2867ea14ebe..a897941c81e 100644 --- a/dlls/d3drm/meshbuilder.c +++ b/dlls/d3drm/meshbuilder.c @@ -2134,7 +2134,7 @@ static HRESULT WINAPI d3drm_mesh_builder3_Optimize(IDirect3DRMMeshBuilder3 *ifac { FIXME("iface %p, flags %#lx stub!\n", iface, flags); - return E_NOTIMPL; + return S_OK; } static HRESULT WINAPI d3drm_mesh_builder3_AddFacesIndexed(IDirect3DRMMeshBuilder3 *iface,

1 0

Nikolay Sivov : d3d11: Remove null dxgi object checks.
by Alexandre Julliard June 20, 2022

June 20, 2022

Module: wine Branch: master Commit: f6f66661b3fabdcd6cf2f4999b3029e72d492fa4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f6f66661b3fabdcd6cf2f499… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Jun 16 14:53:19 2022 +0300 d3d11: Remove null dxgi object checks. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/d3d11/texture.c | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/dlls/d3d11/texture.c b/dlls/d3d11/texture.c index 7be689d1f0f..64e78702fd7 100644 --- a/dlls/d3d11/texture.c +++ b/dlls/d3d11/texture.c @@ -32,6 +32,7 @@ static inline struct d3d_texture1d *impl_from_ID3D11Texture1D(ID3D11Texture1D *i static HRESULT STDMETHODCALLTYPE d3d11_texture1d_QueryInterface(ID3D11Texture1D *iface, REFIID iid, void **out) { struct d3d_texture1d *texture = impl_from_ID3D11Texture1D(iface); + HRESULT hr; TRACE("iface %p, iid %s, out %p.\n", iface, debugstr_guid(iid), out); @@ -54,16 +55,15 @@ static HRESULT STDMETHODCALLTYPE d3d11_texture1d_QueryInterface(ID3D11Texture1D return S_OK; } - if (texture->dxgi_resource) + TRACE("Forwarding to dxgi resource.\n"); + + if (FAILED(hr = IUnknown_QueryInterface(texture->dxgi_resource, iid, out))) { - TRACE("Forwarding to dxgi resource.\n"); - return IUnknown_QueryInterface(texture->dxgi_resource, iid, out); + WARN("%s not implemented, returning %#lx.\n", debugstr_guid(iid), hr); + *out = NULL; } - WARN("%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid(iid)); - - *out = NULL; - return E_NOINTERFACE; + return hr; } static ULONG STDMETHODCALLTYPE d3d11_texture1d_AddRef(ID3D11Texture1D *iface) @@ -514,6 +514,7 @@ HRESULT d3d_texture1d_create(struct d3d_device *device, const D3D11_TEXTURE1D_DE static HRESULT STDMETHODCALLTYPE d3d11_texture2d_QueryInterface(ID3D11Texture2D *iface, REFIID riid, void **object) { struct d3d_texture2d *texture = impl_from_ID3D11Texture2D(iface); + HRESULT hr; TRACE("iface %p, riid %s, object %p.\n", iface, debugstr_guid(riid), object); @@ -535,16 +536,15 @@ static HRESULT STDMETHODCALLTYPE d3d11_texture2d_QueryInterface(ID3D11Texture2D return S_OK; } - if (texture->dxgi_resource) + TRACE("Forwarding to dxgi resource.\n"); + + if (FAILED(hr = IUnknown_QueryInterface(texture->dxgi_resource, riid, object))) { - TRACE("Forwarding to dxgi resource.\n"); - return IUnknown_QueryInterface(texture->dxgi_resource, riid, object); + WARN("%s not implemented, returning %#lx.\n", debugstr_guid(riid), hr); + *object = NULL; } - WARN("%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid(riid)); - - *object = NULL; - return E_NOINTERFACE; + return hr; } static ULONG STDMETHODCALLTYPE d3d11_texture2d_AddRef(ID3D11Texture2D *iface)

1 0

David Kahurani : xmllite/reader: Avoid memory leak on error path.
by Alexandre Julliard June 20, 2022

June 20, 2022

Module: wine Branch: master Commit: 630c38b261960a814bdbdfdc8ab9c52bb4ef0179 URL: https://source.winehq.org/git/wine.git/?a=commit;h=630c38b261960a814bdbdfdc… Author: David Kahurani <k.kahurani(a)gmail.com> Date: Mon Jun 20 12:01:19 2022 +0300 xmllite/reader: Avoid memory leak on error path. attr->value should not be freed as it was not allocated attr->localname should instead having just being previously allocated and not freed anywhere else Signed-off-by: David Kahurani <k.kahurani(a)gmail.com> --- dlls/xmllite/reader.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/xmllite/reader.c b/dlls/xmllite/reader.c index 4045b4dfcca..d99f121e0cb 100644 --- a/dlls/xmllite/reader.c +++ b/dlls/xmllite/reader.c @@ -424,7 +424,7 @@ static HRESULT reader_add_attr(xmlreader *reader, strval *prefix, strval *localn { hr = reader_strvaldup(reader, value, &attr->value); if (hr != S_OK) - reader_free_strvalued(reader, &attr->value); + reader_free_strvalued(reader, &attr->localname); } if (hr != S_OK) {

1 0

Jinoh Kang : riched20: Commit and wrap paragraphs after changing text properties.
by Alexandre Julliard June 20, 2022

June 20, 2022

Module: wine Branch: master Commit: 0974f047b57357252ec94bea119e5291250a446c URL: https://source.winehq.org/git/wine.git/?a=commit;h=0974f047b57357252ec94bea… Author: Jinoh Kang <jinoh.kang.kr(a)gmail.com> Date: Mon Jun 20 20:37:01 2022 +0900 riched20: Commit and wrap paragraphs after changing text properties. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53170 Signed-off-by: Jinoh Kang <jinoh.kang.kr(a)gmail.com> --- dlls/riched20/richole.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dlls/riched20/richole.c b/dlls/riched20/richole.c index 3d88b8a65b0..afecd34dc2a 100644 --- a/dlls/riched20/richole.c +++ b/dlls/riched20/richole.c @@ -647,6 +647,9 @@ static void textrange_set_font(ITextRange *range, ITextFont *font) cursor_from_char_ofs( services->editor, start, &from ); cursor_from_char_ofs( services->editor, end, &to ); ME_SetCharFormat( services->editor, &from, &to, &fmt ); + ME_CommitUndo( services->editor ); + ME_WrapMarkedParagraphs( services->editor ); + ME_UpdateScrollBar( services->editor ); } } @@ -805,6 +808,9 @@ static HRESULT set_textfont_prop(ITextFontImpl *font, enum textfont_prop_id prop cursor_from_char_ofs( services->editor, start, &from ); cursor_from_char_ofs( services->editor, end, &to ); ME_SetCharFormat( services->editor, &from, &to, &fmt ); + ME_CommitUndo( services->editor ); + ME_WrapMarkedParagraphs( services->editor ); + ME_UpdateScrollBar( services->editor ); return S_OK; }

1 0