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

Jacek Caban : win32u: Move GetMenuItemID implementation from user32.
by Alexandre Julliard 21 Jun '22

21 Jun '22

Module: wine Branch: master Commit: 9f267c225893f665ffb0d8c8636166a2b42a4789 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9f267c225893f665ffb0d8c8… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jun 21 13:52:55 2022 +0200 win32u: Move GetMenuItemID implementation from user32. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/user32/menu.c | 12 ++---------- dlls/win32u/menu.c | 6 ++++++ include/ntuser.h | 1 + 3 files changed, 9 insertions(+), 10 deletions(-) diff --git a/dlls/user32/menu.c b/dlls/user32/menu.c index 434353e8892..76144706771 100644 --- a/dlls/user32/menu.c +++ b/dlls/user32/menu.c @@ -537,17 +537,9 @@ INT WINAPI GetMenuItemCount( HMENU menu ) /********************************************************************** * GetMenuItemID (USER32.@) */ -UINT WINAPI GetMenuItemID( HMENU hMenu, INT nPos ) +UINT WINAPI GetMenuItemID( HMENU menu, INT pos ) { - POPUPMENU *menu; - UINT id, pos; - - if (!(menu = find_menu_item(hMenu, nPos, MF_BYPOSITION, &pos))) - return -1; - - id = menu->items[pos].fType & MF_POPUP ? -1 : menu->items[pos].wID; - release_menu_ptr(menu); - return id; + return NtUserThunkedMenuItemInfo( menu, pos, MF_BYPOSITION, NtUserGetMenuItemID, NULL, NULL ); } diff --git a/dlls/win32u/menu.c b/dlls/win32u/menu.c index bee04f36dbf..eab97e58d39 100644 --- a/dlls/win32u/menu.c +++ b/dlls/win32u/menu.c @@ -1121,6 +1121,12 @@ UINT WINAPI NtUserThunkedMenuItemInfo( HMENU handle, UINT pos, UINT flags, UINT switch (method) { + case NtUserGetMenuItemID: + if (!(menu = find_menu_item( handle, pos, flags, &i ))) return -1; + ret = menu->items[i].fType & MF_POPUP ? -1 : menu->items[i].wID; + release_menu_ptr( menu ); + break; + case NtUserGetMenuItemInfoA: return get_menu_item_info( handle, pos, flags, info, TRUE ); diff --git a/include/ntuser.h b/include/ntuser.h index d92332f13b9..41b328376a9 100644 --- a/include/ntuser.h +++ b/include/ntuser.h @@ -224,6 +224,7 @@ enum NtUserSetMenuItemInfo, NtUserInsertMenuItem, /* Wine extensions */ + NtUserGetMenuItemID, NtUserGetMenuItemInfoA, NtUserGetMenuItemInfoW, NtUserGetMenuState,

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 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

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

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

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

David Curtiss : ws2_32: Allow getsockname after AcceptEx.
by Alexandre Julliard 20 Jun '22

20 Jun '22

Module: wine Branch: master Commit: 68d4643a6758cbe87f90054fdcabf0558fc353ca URL: https://source.winehq.org/git/wine.git/?a=commit;h=68d4643a6758cbe87f90054f… Author: David Curtiss <david.curtiss(a)ni.com> Date: Mon Jun 6 15:34:12 2022 -0500 ws2_32: Allow getsockname after AcceptEx. .NET 6's HTTP/Socket code queries this. Winsock allows getsockname on the AcceptEx AcceptSocket, but only if SO_UPDATE_ACCEPT_CONTEXT is set. Signed-off-by: David Curtiss <david.curtiss(a)ni.com> --- dlls/ws2_32/tests/sock.c | 9 +++++++++ server/sock.c | 1 + 2 files changed, 10 insertions(+) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index af4226e6258..3ec0ab67040 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -8143,6 +8143,15 @@ static void test_AcceptEx(void) ok(bret, "GetOverlappedResult failed, error %ld\n", GetLastError()); ok(bytesReturned == 0, "bytesReturned isn't supposed to be %ld\n", bytesReturned); + /* Try to call getsockname on the acceptor socket. + * + * On Windows, this requires setting SO_UPDATE_ACCEPT_CONTEXT. */ + iret = setsockopt(acceptor, SOL_SOCKET, SO_UPDATE_ACCEPT_CONTEXT, (char *)&listener, sizeof(SOCKET)); + ok(!iret, "Failed to set accept context %ld\n", GetLastError()); + iret = getsockname(acceptor, (struct sockaddr *)&peerAddress, &remoteSize); + ok(!iret, "getsockname failed.\n"); + ok(remoteSize == sizeof(struct sockaddr_in), "got remote size %u\n", remoteSize); + closesocket(connector); connector = INVALID_SOCKET; closesocket(acceptor); diff --git a/server/sock.c b/server/sock.c index b11ebddb51d..2f1b33a333d 100644 --- a/server/sock.c +++ b/server/sock.c @@ -1846,6 +1846,7 @@ static int accept_into_socket( struct sock *sock, struct sock *acceptsock ) } acceptsock->state = SOCK_CONNECTED; + acceptsock->bound = 1; acceptsock->pending_events = 0; acceptsock->reported_events = 0; acceptsock->proto = sock->proto;

1 0

Jinoh Kang : riched20: Commit and wrap paragraphs after changing text properties.
by Alexandre Julliard 20 Jun '22

20 Jun '22

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

David Kahurani : xmllite/reader: Avoid memory leak on error path.
by Alexandre Julliard 20 Jun '22

20 Jun '22

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

David Kahurani : xmllite/writer: Handle possible memory allocation failures.
by Alexandre Julliard 20 Jun '22

20 Jun '22

Module: wine Branch: master Commit: 098f3c892e3acb63fac7130afce80afd3e7925ba URL: https://source.winehq.org/git/wine.git/?a=commit;h=098f3c892e3acb63fac7130a… Author: David Kahurani <k.kahurani(a)gmail.com> Date: Mon Jun 20 12:49:46 2022 +0300 xmllite/writer: Handle possible memory allocation failures. Signed-off-by: David Kahurani <k.kahurani(a)gmail.com> --- dlls/xmllite/writer.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/dlls/xmllite/writer.c b/dlls/xmllite/writer.c index 58d9edea059..3f5b3527f23 100644 --- a/dlls/xmllite/writer.c +++ b/dlls/xmllite/writer.c @@ -180,6 +180,13 @@ static struct element *alloc_element(xmlwriter *writer, const WCHAR *prefix, con len += lstrlenW(local); ret->qname = writer_alloc(writer, (len + 1)*sizeof(WCHAR)); + + if (!ret->qname) + { + writer_free(writer, ret); + return NULL; + } + ret->len = len; if (prefix) { @@ -249,7 +256,8 @@ static WCHAR *writer_strndupW(const xmlwriter *writer, const WCHAR *str, int len size = (len + 1) * sizeof(WCHAR); ret = writer_alloc(writer, size); - memcpy(ret, str, size); + if (ret) memcpy(ret, str, size); + return ret; }

1 0