wine-commits June 2022

wine-commits@winehq.org

2 participants
791 discussions

Zhiyi Zhang : uxtheme: Support parsing more button parts and states.
by Alexandre Julliard 21 Jun '22

21 Jun '22

Module: wine Branch: master Commit: 22adfc67b4dcbacf1c0991a15c056db0e5b639b0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=22adfc67b4dcbacf1c0991a1… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Mon Jun 6 11:31:55 2022 +0800 uxtheme: Support parsing more button parts and states. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/uxtheme/stylemap.c | 45 +++++++++++++++++++++++++++++++++++++++++++++ include/vsstyle.h | 9 +++++++++ 2 files changed, 54 insertions(+) diff --git a/dlls/uxtheme/stylemap.c b/dlls/uxtheme/stylemap.c index 07fafbe0bde..7a0a64cc470 100644 --- a/dlls/uxtheme/stylemap.c +++ b/dlls/uxtheme/stylemap.c @@ -341,6 +341,7 @@ static const MSSTYLES_CLASS_MAP classButton[] = { {BP_PUSHBUTTON, PBS_PRESSED, L"PRESSED"}, {BP_PUSHBUTTON, PBS_DISABLED, L"DISABLED"}, {BP_PUSHBUTTON, PBS_DEFAULTED, L"DEFAULTED"}, + {BP_PUSHBUTTON, PBS_DEFAULTED_ANIMATING, L"DEFAULTED_ANIMATING"}, {BP_RADIOBUTTON, 0, L"RADIOBUTTON"}, {BP_RADIOBUTTON, RBS_UNCHECKEDNORMAL, L"UNCHECKEDNORMAL"}, {BP_RADIOBUTTON, RBS_UNCHECKEDHOT, L"UNCHECKEDHOT"}, @@ -363,6 +364,14 @@ static const MSSTYLES_CLASS_MAP classButton[] = { {BP_CHECKBOX, CBS_MIXEDHOT, L"MIXEDHOT"}, {BP_CHECKBOX, CBS_MIXEDPRESSED, L"MIXEDPRESSED"}, {BP_CHECKBOX, CBS_MIXEDDISABLED, L"MIXEDDISABLED"}, + {BP_CHECKBOX, CBS_IMPLICITNORMAL, L"IMPLICITNORMAL"}, + {BP_CHECKBOX, CBS_IMPLICITHOT, L"IMPLICITHOT"}, + {BP_CHECKBOX, CBS_IMPLICITPRESSED, L"IMPLICITPRESSED"}, + {BP_CHECKBOX, CBS_IMPLICITDISABLED, L"IMPLICITDISABLED"}, + {BP_CHECKBOX, CBS_EXCLUDEDNORMAL, L"EXCLUDEDNORMAL"}, + {BP_CHECKBOX, CBS_EXCLUDEDHOT, L"EXCLUDEDHOT"}, + {BP_CHECKBOX, CBS_EXCLUDEDPRESSED, L"EXCLUDEDPRESSED"}, + {BP_CHECKBOX, CBS_EXCLUDEDDISABLED, L"EXCLUDEDDISABLED"}, {BP_GROUPBOX, 0, L"GROUPBOX"}, {BP_GROUPBOX, GBS_NORMAL, L"NORMAL"}, {BP_GROUPBOX, GBS_DISABLED, L"DISABLED"}, @@ -380,6 +389,42 @@ static const MSSTYLES_CLASS_MAP classButton[] = { {BP_COMMANDLINKGLYPH, CMDLGS_PRESSED, L"PRESSED"}, {BP_COMMANDLINKGLYPH, CMDLGS_DISABLED, L"DISABLED"}, {BP_COMMANDLINKGLYPH, CMDLGS_DEFAULTED, L"DEFAULTED"}, + {BP_RADIOBUTTON_HCDISABLED, 0, L"RADIOBUTTON_HCDISABLED"}, + {BP_RADIOBUTTON_HCDISABLED, RBS_UNCHECKEDNORMAL, L"UNCHECKEDNORMAL"}, + {BP_RADIOBUTTON_HCDISABLED, RBS_UNCHECKEDHOT, L"UNCHECKEDHOT"}, + {BP_RADIOBUTTON_HCDISABLED, RBS_UNCHECKEDPRESSED, L"UNCHECKEDPRESSED"}, + {BP_RADIOBUTTON_HCDISABLED, RBS_UNCHECKEDDISABLED, L"UNCHECKEDDISABLED"}, + {BP_RADIOBUTTON_HCDISABLED, RBS_CHECKEDNORMAL, L"CHECKEDNORMAL"}, + {BP_RADIOBUTTON_HCDISABLED, RBS_CHECKEDHOT, L"CHECKEDHOT"}, + {BP_RADIOBUTTON_HCDISABLED, RBS_CHECKEDPRESSED, L"CHECKEDPRESSED"}, + {BP_RADIOBUTTON_HCDISABLED, RBS_CHECKEDDISABLED, L"CHECKEDDISABLED"}, + {BP_CHECKBOX_HCDISABLED, 0, L"CHECKBOX_HCDISABLED"}, + {BP_CHECKBOX_HCDISABLED, CBS_UNCHECKEDNORMAL, L"UNCHECKEDNORMAL"}, + {BP_CHECKBOX_HCDISABLED, CBS_UNCHECKEDHOT, L"UNCHECKEDHOT"}, + {BP_CHECKBOX_HCDISABLED, CBS_UNCHECKEDPRESSED, L"UNCHECKEDPRESSED"}, + {BP_CHECKBOX_HCDISABLED, CBS_UNCHECKEDDISABLED, L"UNCHECKEDDISABLED"}, + {BP_CHECKBOX_HCDISABLED, CBS_CHECKEDNORMAL, L"CHECKEDNORMAL"}, + {BP_CHECKBOX_HCDISABLED, CBS_CHECKEDHOT, L"CHECKEDHOT"}, + {BP_CHECKBOX_HCDISABLED, CBS_CHECKEDPRESSED, L"CHECKEDPRESSED"}, + {BP_CHECKBOX_HCDISABLED, CBS_CHECKEDDISABLED, L"CHECKEDDISABLED"}, + {BP_CHECKBOX_HCDISABLED, CBS_MIXEDNORMAL, L"MIXEDNORMAL"}, + {BP_CHECKBOX_HCDISABLED, CBS_MIXEDHOT, L"MIXEDHOT"}, + {BP_CHECKBOX_HCDISABLED, CBS_MIXEDPRESSED, L"MIXEDPRESSED"}, + {BP_CHECKBOX_HCDISABLED, CBS_MIXEDDISABLED, L"MIXEDDISABLED"}, + {BP_CHECKBOX_HCDISABLED, CBS_IMPLICITNORMAL, L"IMPLICITNORMAL"}, + {BP_CHECKBOX_HCDISABLED, CBS_IMPLICITHOT, L"IMPLICITHOT"}, + {BP_CHECKBOX_HCDISABLED, CBS_IMPLICITPRESSED, L"IMPLICITPRESSED"}, + {BP_CHECKBOX_HCDISABLED, CBS_IMPLICITDISABLED, L"IMPLICITDISABLED"}, + {BP_CHECKBOX_HCDISABLED, CBS_EXCLUDEDNORMAL, L"EXCLUDEDNORMAL"}, + {BP_CHECKBOX_HCDISABLED, CBS_EXCLUDEDHOT, L"EXCLUDEDHOT"}, + {BP_CHECKBOX_HCDISABLED, CBS_EXCLUDEDPRESSED, L"EXCLUDEDPRESSED"}, + {BP_CHECKBOX_HCDISABLED, CBS_EXCLUDEDDISABLED, L"EXCLUDEDDISABLED"}, + {BP_GROUPBOX_HCDISABLED, 0, L"GROUPBOX_HCDISABLED"}, + {BP_GROUPBOX_HCDISABLED, GBS_NORMAL, L"NORMAL"}, + {BP_GROUPBOX_HCDISABLED, GBS_DISABLED, L"DISABLED"}, + {BP_PUSHBUTTONDROPDOWN, 0, L"PUSHBUTTONDROPDOWN"}, + {BP_PUSHBUTTONDROPDOWN, PBDDS_NORMAL, L"NORMAL"}, + {BP_PUSHBUTTONDROPDOWN, PBDDS_DISABLED, L"DISABLED"}, {0, 0, L""} }; diff --git a/include/vsstyle.h b/include/vsstyle.h index d6ea9071f64..f5af8492aef 100644 --- a/include/vsstyle.h +++ b/include/vsstyle.h @@ -72,6 +72,10 @@ enum BUTTONPARTS { BP_USERBUTTON = 5, BP_COMMANDLINK = 6, BP_COMMANDLINKGLYPH = 7, + BP_RADIOBUTTON_HCDISABLED = 8, + BP_CHECKBOX_HCDISABLED = 9, + BP_GROUPBOX_HCDISABLED = 10, + BP_PUSHBUTTONDROPDOWN = 11, }; #define BUTTONSTYLEPARTS BUTTONPARTS; @@ -141,6 +145,11 @@ enum COMMANDLINKGLYPHSTATES { CMDLGS_DEFAULTED = 5, }; +enum PUSHBUTTONDROPDOWNSTATES { + PBDDS_NORMAL = 1, + PBDDS_DISABLED = 2, +}; + /* COMBOBOXSTYLE class */ #if defined(_MSC_VER) || defined(__MINGW32__) #define VSCLASS_COMBOBOXSTYLE L"COMBOBOXSTYLE"

1 0

Jinoh Kang : ntdll/tests: Add more tests for \Device\NamedPipe\ root directory.
by Alexandre Julliard 21 Jun '22

21 Jun '22

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 21 Jun '22

21 Jun '22

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 21 Jun '22

21 Jun '22

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/Engine: Don't schedule jobs until the initialization is done.
by Alexandre Julliard 21 Jun '22

21 Jun '22

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

Francois Gouget : testbot/web: Show the web patch id as a tooltip.
by Alexandre Julliard 21 Jun '22

21 Jun '22

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

Nikolay Sivov : d3d11: Remove null dxgi object checks.
by Alexandre Julliard 20 Jun '22

20 Jun '22

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

Alistair Leslie-Hughes : d3drm: Return S_OK from IDirect3DRMMeshBuilder3::Optimize().
by Alexandre Julliard 20 Jun '22

20 Jun '22

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

Paul Gofman : winex11.drv: Destroy GLX pbuffer when destroying drawable.
by Alexandre Julliard 20 Jun '22

20 Jun '22

Module: wine Branch: master Commit: e68b27b14fa66ad61656195f5e68b03eafbbce7c URL: https://source.winehq.org/git/wine.git/?a=commit;h=e68b27b14fa66ad61656195f… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Tue Jun 14 11:19:56 2022 -0500 winex11.drv: Destroy GLX pbuffer when destroying drawable. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- dlls/winex11.drv/opengl.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c index 468d10fbbae..8d6afba9a6f 100644 --- a/dlls/winex11.drv/opengl.c +++ b/dlls/winex11.drv/opengl.c @@ -1165,6 +1165,10 @@ static void release_gl_drawable( struct gl_drawable *gl ) pglXDestroyPixmap( gdi_display, gl->drawable ); XFreePixmap( gdi_display, gl->pixmap ); break; + case DC_GL_PBUFFER: + TRACE( "destroying pbuffer drawable %lx\n", gl->drawable ); + pglXDestroyPbuffer( gdi_display, gl->drawable ); + break; default: break; } @@ -2316,7 +2320,6 @@ static BOOL X11DRV_wglDestroyPbufferARB( struct wgl_pbuffer *object ) pthread_mutex_lock( &context_mutex ); list_remove( &object->entry ); pthread_mutex_unlock( &context_mutex ); - pglXDestroyPbuffer(gdi_display, object->gl->drawable); release_gl_drawable( object->gl ); if (object->tmp_context) pglXDestroyContext(gdi_display, object->tmp_context);

1 0

Paul Gofman : winex11.drv: Store wgl_drawable instead of GLX drawable in wgl_pbuffer.
by Alexandre Julliard 20 Jun '22

20 Jun '22

Module: wine Branch: master Commit: 2299d400260d0bfaf3218a023262bff13768713e URL: https://source.winehq.org/git/wine.git/?a=commit;h=2299d400260d0bfaf3218a02… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Tue Jun 14 11:10:14 2022 -0500 winex11.drv: Store wgl_drawable instead of GLX drawable in wgl_pbuffer. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- dlls/winex11.drv/opengl.c | 84 ++++++++++++++++++++++++----------------------- 1 file changed, 43 insertions(+), 41 deletions(-) diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c index 017a8813caa..468d10fbbae 100644 --- a/dlls/winex11.drv/opengl.c +++ b/dlls/winex11.drv/opengl.c @@ -209,26 +209,6 @@ struct wgl_context struct list entry; }; -struct wgl_pbuffer -{ - Drawable drawable; - const struct wgl_pixel_format* fmt; - int width; - int height; - int* attribList; - int use_render_texture; /* This is also the internal texture format */ - int texture_bind_target; - int texture_bpp; - GLint texture_format; - GLuint texture_target; - GLenum texture_type; - GLuint texture; - int texture_level; - GLXContext tmp_context; - GLXContext prev_context; - struct list entry; -}; - enum dc_gl_type { DC_GL_NONE, /* no GL support (pixel format not set yet) */ @@ -252,6 +232,26 @@ struct gl_drawable BOOL mutable_pf; }; +struct wgl_pbuffer +{ + struct gl_drawable *gl; + const struct wgl_pixel_format* fmt; + int width; + int height; + int* attribList; + int use_render_texture; /* This is also the internal texture format */ + int texture_bind_target; + int texture_bpp; + GLint texture_format; + GLuint texture_target; + GLenum texture_type; + GLuint texture; + int texture_level; + GLXContext tmp_context; + GLXContext prev_context; + struct list entry; +}; + enum glx_swap_control_method { GLX_SWAP_CONTROL_NONE, @@ -2276,9 +2276,19 @@ static struct wgl_pbuffer *X11DRV_wglCreatePbufferARB( HDC hdc, int iPixelFormat } PUSH1(attribs, None); - object->drawable = pglXCreatePbuffer(gdi_display, fmt->fbconfig, attribs); - TRACE("new Pbuffer drawable as %lx\n", object->drawable); - if (!object->drawable) { + if (!(object->gl = calloc( 1, sizeof(*object->gl) ))) + { + SetLastError(ERROR_NO_SYSTEM_RESOURCES); + goto create_failed; + } + object->gl->type = DC_GL_PBUFFER; + object->gl->format = object->fmt; + object->gl->ref = 1; + + object->gl->drawable = pglXCreatePbuffer(gdi_display, fmt->fbconfig, attribs); + TRACE("new Pbuffer drawable as %p (%lx)\n", object->gl, object->gl->drawable); + if (!object->gl->drawable) { + free( object->gl ); SetLastError(ERROR_NO_SYSTEM_RESOURCES); goto create_failed; /* unexpected error */ } @@ -2306,7 +2316,8 @@ static BOOL X11DRV_wglDestroyPbufferARB( struct wgl_pbuffer *object ) pthread_mutex_lock( &context_mutex ); list_remove( &object->entry ); pthread_mutex_unlock( &context_mutex ); - pglXDestroyPbuffer(gdi_display, object->drawable); + pglXDestroyPbuffer(gdi_display, object->gl->drawable); + release_gl_drawable( object->gl ); if (object->tmp_context) pglXDestroyContext(gdi_display, object->tmp_context); free( object ); @@ -2321,30 +2332,21 @@ static BOOL X11DRV_wglDestroyPbufferARB( struct wgl_pbuffer *object ) static HDC X11DRV_wglGetPbufferDCARB( struct wgl_pbuffer *object ) { struct x11drv_escape_set_drawable escape; - struct gl_drawable *gl, *prev; + struct gl_drawable *prev; HDC hdc; hdc = NtGdiOpenDCW( NULL, NULL, NULL, 0, TRUE, NULL, NULL, NULL ); if (!hdc) return 0; - if (!(gl = calloc( 1, sizeof(*gl) ))) - { - NtGdiDeleteObjectApp( hdc ); - return 0; - } - gl->type = DC_GL_PBUFFER; - gl->drawable = object->drawable; - gl->format = object->fmt; - gl->ref = 1; - pthread_mutex_lock( &context_mutex ); if (!XFindContext( gdi_display, (XID)hdc, gl_pbuffer_context, (char **)&prev )) release_gl_drawable( prev ); - XSaveContext( gdi_display, (XID)hdc, gl_pbuffer_context, (char *)gl ); + grab_gl_drawable( object->gl ); + XSaveContext( gdi_display, (XID)hdc, gl_pbuffer_context, (char *)object->gl ); pthread_mutex_unlock( &context_mutex ); escape.code = X11DRV_SET_DRAWABLE; - escape.drawable = object->drawable; + escape.drawable = object->gl->drawable; escape.mode = IncludeInferiors; SetRect( &escape.dc_rect, 0, 0, object->width, object->height ); NtGdiExtEscape( hdc, NULL, 0, X11DRV_ESCAPE, sizeof(escape), (LPSTR)&escape, 0, NULL ); @@ -2364,10 +2366,10 @@ static BOOL X11DRV_wglQueryPbufferARB( struct wgl_pbuffer *object, int iAttribut switch (iAttribute) { case WGL_PBUFFER_WIDTH_ARB: - pglXQueryDrawable(gdi_display, object->drawable, GLX_WIDTH, (unsigned int*) piValue); + pglXQueryDrawable(gdi_display, object->gl->drawable, GLX_WIDTH, (unsigned int*) piValue); break; case WGL_PBUFFER_HEIGHT_ARB: - pglXQueryDrawable(gdi_display, object->drawable, GLX_HEIGHT, (unsigned int*) piValue); + pglXQueryDrawable(gdi_display, object->gl->drawable, GLX_HEIGHT, (unsigned int*) piValue); break; case WGL_PBUFFER_LOST_ARB: @@ -2981,7 +2983,7 @@ static BOOL X11DRV_wglBindTexImageARB( struct wgl_pbuffer *object, int iBuffer ) FIXME("partial stub!\n"); } - TRACE("drawable=%lx, context=%p\n", object->drawable, prev_context); + TRACE("drawable=%p (%lx), context=%p\n", object->gl, object->gl->drawable, prev_context); if (!object->tmp_context || object->prev_context != prev_context) { if (object->tmp_context) pglXDestroyContext(gdi_display, object->tmp_context); @@ -2992,7 +2994,7 @@ static BOOL X11DRV_wglBindTexImageARB( struct wgl_pbuffer *object, int iBuffer ) opengl_funcs.gl.p_glGetIntegerv(object->texture_bind_target, &prev_binded_texture); /* Switch to our pbuffer */ - pglXMakeCurrent(gdi_display, object->drawable, object->tmp_context); + pglXMakeCurrent(gdi_display, object->gl->drawable, object->tmp_context); /* Make sure that the prev_binded_texture is set as the current texture state isn't shared between contexts. * After that copy the pbuffer texture data. */

1 0

← Newer
1
...
24
25
26
27
28
29
30
...
80
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-commits June 2022