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

Elizabeth Figura : ntdll: Move set_async_direct_result() to file.c.
by Alexandre Julliard June 25, 2024

June 25, 2024

Module: wine Branch: master Commit: 0c4743e9c151731b6461619f82f8533624324608 URL: https://gitlab.winehq.org/wine/wine/-/commit/0c4743e9c151731b6461619f82f853… Author: Elizabeth Figura <zfigura(a)codeweavers.com> Date: Thu Jun 13 23:14:48 2024 -0500 ntdll: Move set_async_direct_result() to file.c. Similar helpers are in file.c, and sync.c has nothing to do with file I/O otherwise. --- dlls/ntdll/unix/file.c | 31 +++++++++++++++++++++++++++++++ dlls/ntdll/unix/sync.c | 34 ---------------------------------- 2 files changed, 31 insertions(+), 34 deletions(-) diff --git a/dlls/ntdll/unix/file.c b/dlls/ntdll/unix/file.c index b8fb4f19e13..2ce38b34158 100644 --- a/dlls/ntdll/unix/file.c +++ b/dlls/ntdll/unix/file.c @@ -5484,6 +5484,37 @@ static void add_completion( HANDLE handle, ULONG_PTR value, NTSTATUS status, ULO SERVER_END_REQ; } +/* notify direct completion of async and close the wait handle if it is no longer needed */ +void set_async_direct_result( HANDLE *async_handle, IO_STATUS_BLOCK *io, + NTSTATUS status, ULONG_PTR information, BOOL mark_pending ) +{ + unsigned int ret; + + /* if we got STATUS_ALERTED, we must have a valid async handle */ + assert( *async_handle ); + + if (!NT_ERROR(status) && status != STATUS_PENDING) + { + io->Status = status; + io->Information = information; + } + + SERVER_START_REQ( set_async_direct_result ) + { + req->handle = wine_server_obj_handle( *async_handle ); + req->status = status; + req->information = information; + req->mark_pending = mark_pending; + ret = wine_server_call( req ); + if (ret == STATUS_SUCCESS) + *async_handle = wine_server_ptr_handle( reply->handle ); + } + SERVER_END_REQ; + + if (ret != STATUS_SUCCESS) + ERR( "cannot report I/O result back to server: %#x\n", ret ); +} + /* complete async file I/O, signaling completion in all ways necessary */ void file_complete_async( HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc, void *apc_user, IO_STATUS_BLOCK *io, NTSTATUS status, ULONG_PTR information ) diff --git a/dlls/ntdll/unix/sync.c b/dlls/ntdll/unix/sync.c index 326e6e7734e..1d66f0d974f 100644 --- a/dlls/ntdll/unix/sync.c +++ b/dlls/ntdll/unix/sync.c @@ -2667,40 +2667,6 @@ NTSTATUS WINAPI NtWaitForAlertByThreadId( const void *address, const LARGE_INTEG #endif -/* Notify direct completion of async and close the wait handle if it is no longer needed. - */ -void set_async_direct_result( HANDLE *async_handle, IO_STATUS_BLOCK *io, - NTSTATUS status, ULONG_PTR information, BOOL mark_pending ) -{ - unsigned int ret; - - /* if we got STATUS_ALERTED, we must have a valid async handle */ - assert( *async_handle ); - - if (!NT_ERROR(status) && status != STATUS_PENDING) - { - io->Status = status; - io->Information = information; - } - - SERVER_START_REQ( set_async_direct_result ) - { - req->handle = wine_server_obj_handle( *async_handle ); - req->status = status; - req->information = information; - req->mark_pending = mark_pending; - ret = wine_server_call( req ); - if (ret == STATUS_SUCCESS) - *async_handle = wine_server_ptr_handle( reply->handle ); - } - SERVER_END_REQ; - - if (ret != STATUS_SUCCESS) - ERR( "cannot report I/O result back to server: %08x\n", ret ); - - return; -} - /*********************************************************************** * NtCreateTransaction (NTDLL.@) */

1 0

Alexandre Julliard : tools: Add helper functions to get the standard directories.
by Alexandre Julliard June 25, 2024

June 25, 2024

Module: wine Branch: master Commit: 6311297c158d91459fad2b4269d9a070fabc5a5b URL: https://gitlab.winehq.org/wine/wine/-/commit/6311297c158d91459fad2b4269d9a0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 25 11:33:46 2024 +0200 tools: Add helper functions to get the standard directories. --- tools/tools.h | 82 ++++++++++++++++++++++++++++++++++++++++++++++- tools/widl/Makefile.in | 6 +--- tools/widl/widl.c | 24 ++++++-------- tools/winegcc/Makefile.in | 3 +- tools/winegcc/winegcc.c | 11 ++----- tools/wmc/Makefile.in | 4 +-- tools/wmc/wmc.c | 15 +++------ tools/wrc/Makefile.in | 6 +--- tools/wrc/wrc.c | 17 +++------- 9 files changed, 106 insertions(+), 62 deletions(-)

1 0

Brendan Shanks : winemac.drv: Fix warning in [WineWindow grabDockIconSnapshotFromWindow:force:].
by Alexandre Julliard June 25, 2024

June 25, 2024

Module: wine Branch: master Commit: 1620d8f7cabd9e3f6f67dc65fb0f7eed88f65375 URL: https://gitlab.winehq.org/wine/wine/-/commit/1620d8f7cabd9e3f6f67dc65fb0f7e… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Mon Jun 24 15:32:31 2024 -0700 winemac.drv: Fix warning in [WineWindow grabDockIconSnapshotFromWindow:force:]. --- dlls/winemac.drv/cocoa_window.m | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winemac.drv/cocoa_window.m b/dlls/winemac.drv/cocoa_window.m index 61a6ab2cd4e..1a73deedc2c 100644 --- a/dlls/winemac.drv/cocoa_window.m +++ b/dlls/winemac.drv/cocoa_window.m @@ -2338,7 +2338,7 @@ static CVReturn WineDisplayLinkCallback(CVDisplayLinkRef displayLink, const CVTi return; } - const void* windowID = (const void*)(CGWindowID)window.windowNumber; + const void* windowID = (const void*)(uintptr_t)(CGWindowID)window.windowNumber; CFArrayRef windowIDs = CFArrayCreate(NULL, &windowID, 1, NULL); CGImageRef windowImage = CGWindowListCreateImageFromArray(CGRectNull, windowIDs, kCGWindowImageBoundsIgnoreFraming); CFRelease(windowIDs);

1 0

Elizabeth Figura : ntdll: Factor filling the IOSB into set_async_direct_result().
by Alexandre Julliard June 25, 2024

June 25, 2024

Module: wine Branch: master Commit: 5493ff11fa4f6bd9d3d6db74f6d2e4f723a28853 URL: https://gitlab.winehq.org/wine/wine/-/commit/5493ff11fa4f6bd9d3d6db74f6d2e4… Author: Elizabeth Figura <zfigura(a)codeweavers.com> Date: Tue May 28 19:39:23 2024 -0500 ntdll: Factor filling the IOSB into set_async_direct_result(). --- dlls/ntdll/unix/serial.c | 6 ++---- dlls/ntdll/unix/socket.c | 26 +++----------------------- dlls/ntdll/unix/sync.c | 9 ++++++++- dlls/ntdll/unix/unix_private.h | 3 ++- 4 files changed, 15 insertions(+), 29 deletions(-) diff --git a/dlls/ntdll/unix/serial.c b/dlls/ntdll/unix/serial.c index cc3929c7a0b..8637dfbd447 100644 --- a/dlls/ntdll/unix/serial.c +++ b/dlls/ntdll/unix/serial.c @@ -1202,15 +1202,13 @@ static NTSTATUS wait_on( HANDLE handle, int fd, HANDLE event, PIO_APC_ROUTINE ap if (events) { status = STATUS_SUCCESS; - io->Status = STATUS_SUCCESS; - io->Information = sizeof(events); *out_buffer = events; - set_async_direct_result( &wait_handle, STATUS_SUCCESS, sizeof(events), FALSE ); + set_async_direct_result( &wait_handle, io, STATUS_SUCCESS, sizeof(events), FALSE ); } else { status = STATUS_PENDING; - set_async_direct_result( &wait_handle, STATUS_PENDING, 0, TRUE ); + set_async_direct_result( &wait_handle, io, STATUS_PENDING, 0, TRUE ); } } diff --git a/dlls/ntdll/unix/socket.c b/dlls/ntdll/unix/socket.c index 78f24a081c3..b10d51f3c60 100644 --- a/dlls/ntdll/unix/socket.c +++ b/dlls/ntdll/unix/socket.c @@ -875,12 +875,7 @@ static NTSTATUS sock_recv( HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc, voi status = try_recv( fd, async, &information ); if (status == STATUS_DEVICE_NOT_READY && (force_async || !nonblocking)) status = STATUS_PENDING; - if (!NT_ERROR(status) && status != STATUS_PENDING) - { - io->Status = status; - io->Information = information; - } - set_async_direct_result( &wait_handle, status, information, FALSE ); + set_async_direct_result( &wait_handle, io, status, information, FALSE ); } if (status != STATUS_PENDING) @@ -1125,8 +1120,6 @@ static NTSTATUS sock_send( HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc, voi if (status == STATUS_ALERTED) { - ULONG_PTR information; - status = try_send( fd, async ); if (status == STATUS_DEVICE_NOT_READY && (force_async || !nonblocking)) status = STATUS_PENDING; @@ -1138,14 +1131,7 @@ static NTSTATUS sock_send( HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc, voi if (status == STATUS_DEVICE_NOT_READY && async->sent_len) status = STATUS_SUCCESS; - information = async->sent_len; - if (!NT_ERROR(status) && status != STATUS_PENDING) - { - io->Status = status; - io->Information = information; - } - - set_async_direct_result( &wait_handle, status, information, FALSE ); + set_async_direct_result( &wait_handle, io, status, async->sent_len, FALSE ); } if (status != STATUS_PENDING) @@ -1401,13 +1387,7 @@ static NTSTATUS sock_transmit( HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc, status = STATUS_PENDING; information = async->head_cursor + async->file_cursor + async->tail_cursor; - if (!NT_ERROR(status) && status != STATUS_PENDING) - { - io->Status = status; - io->Information = information; - } - - set_async_direct_result( &wait_handle, status, information, TRUE ); + set_async_direct_result( &wait_handle, io, status, information, TRUE ); } if (status != STATUS_PENDING) diff --git a/dlls/ntdll/unix/sync.c b/dlls/ntdll/unix/sync.c index 4b2d7c1ccbc..326e6e7734e 100644 --- a/dlls/ntdll/unix/sync.c +++ b/dlls/ntdll/unix/sync.c @@ -2669,13 +2669,20 @@ NTSTATUS WINAPI NtWaitForAlertByThreadId( const void *address, const LARGE_INTEG /* Notify direct completion of async and close the wait handle if it is no longer needed. */ -void set_async_direct_result( HANDLE *async_handle, NTSTATUS status, ULONG_PTR information, BOOL mark_pending ) +void set_async_direct_result( HANDLE *async_handle, IO_STATUS_BLOCK *io, + NTSTATUS status, ULONG_PTR information, BOOL mark_pending ) { unsigned int ret; /* if we got STATUS_ALERTED, we must have a valid async handle */ assert( *async_handle ); + if (!NT_ERROR(status) && status != STATUS_PENDING) + { + io->Status = status; + io->Information = information; + } + SERVER_START_REQ( set_async_direct_result ) { req->handle = wine_server_obj_handle( *async_handle ); diff --git a/dlls/ntdll/unix/unix_private.h b/dlls/ntdll/unix/unix_private.h index fcb3de83a29..c00b0e4b602 100644 --- a/dlls/ntdll/unix/unix_private.h +++ b/dlls/ntdll/unix/unix_private.h @@ -344,7 +344,8 @@ extern void init_files(void); extern void init_cpu_info(void); extern void file_complete_async( HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc, void *apc_user, IO_STATUS_BLOCK *io, NTSTATUS status, ULONG_PTR information ); -extern void set_async_direct_result( HANDLE *async_handle, NTSTATUS status, ULONG_PTR information, BOOL mark_pending ); +extern void set_async_direct_result( HANDLE *async_handle, IO_STATUS_BLOCK *io, + NTSTATUS status, ULONG_PTR information, BOOL mark_pending ); extern NTSTATUS unixcall_wine_dbg_write( void *args ); extern NTSTATUS unixcall_wine_server_call( void *args );

1 0

Elizabeth Figura : ntdll: Do not set io->Status at the end of sock_ioctl().
by Alexandre Julliard June 25, 2024

June 25, 2024

Module: wine Branch: master Commit: 62df7633e5328ff94295ceabe5fa45e48f34ceb7 URL: https://gitlab.winehq.org/wine/wine/-/commit/62df7633e5328ff94295ceabe5fa45… Author: Elizabeth Figura <zfigura(a)codeweavers.com> Date: Thu Jun 13 22:20:29 2024 -0500 ntdll: Do not set io->Status at the end of sock_ioctl(). The only cases this affects are Wine-internal sockopt ioctls, and ws2_32 does not read back the IOSB status for those. --- dlls/ntdll/unix/socket.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/unix/socket.c b/dlls/ntdll/unix/socket.c index 587faf51ccf..78f24a081c3 100644 --- a/dlls/ntdll/unix/socket.c +++ b/dlls/ntdll/unix/socket.c @@ -1485,6 +1485,10 @@ NTSTATUS sock_ioctl( HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc, void *apc TRACE( "handle %p, code %#x, in_buffer %p, in_size %u, out_buffer %p, out_size %u\n", handle, code, in_buffer, in_size, out_buffer, out_size ); + /* many of the below internal codes return success but don't completely + * fill the iosb or signal completion; such sockopts are only called + * synchronously by ws2_32 */ + switch (code) { case IOCTL_AFD_BIND: @@ -2528,7 +2532,5 @@ NTSTATUS sock_ioctl( HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc, void *apc if (needs_close) close( fd ); - if (status != STATUS_PENDING && !NT_ERROR(status)) io->Status = status; - return status; }

1 0

Elizabeth Figura : quartz/tests: Handle the case where ddraw returns system memory.
by Alexandre Julliard June 25, 2024

June 25, 2024

Module: wine Branch: master Commit: 506cd1345b3e25fc3eb945a49c7852f50ad208ad URL: https://gitlab.winehq.org/wine/wine/-/commit/506cd1345b3e25fc3eb945a49c7852… Author: Elizabeth Figura <zfigura(a)codeweavers.com> Date: Mon Jun 24 17:34:29 2024 -0500 quartz/tests: Handle the case where ddraw returns system memory. Fixes test failures with Windows 7. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=56189 --- dlls/quartz/tests/vmr7.c | 64 ++++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 54 insertions(+), 10 deletions(-) diff --git a/dlls/quartz/tests/vmr7.c b/dlls/quartz/tests/vmr7.c index 58753242108..d35f4d5c01c 100644 --- a/dlls/quartz/tests/vmr7.c +++ b/dlls/quartz/tests/vmr7.c @@ -3641,6 +3641,7 @@ static void test_default_presenter_allocate(void) IVMRSurfaceAllocator *allocator; VMRALLOCATIONINFO info; DDSURFACEDESC2 desc; + HWND window; HRESULT hr; LONG ref; @@ -3669,6 +3670,9 @@ static void test_default_presenter_allocate(void) {16, mmioFOURCC('Y','U','Y','2')}, }; + window = CreateWindowA("static", "quartz_test", WS_OVERLAPPEDWINDOW, 0, 0, + 100, 100, NULL, NULL, NULL, NULL); + hr = CoCreateInstance(&CLSID_AllocPresenter, NULL, CLSCTX_INPROC_SERVER, &IID_IVMRSurfaceAllocator, (void **)&allocator); ok(hr == S_OK, "Got hr %#lx.\n", hr); @@ -3687,6 +3691,8 @@ static void test_default_presenter_allocate(void) for (unsigned int i = 0; i < ARRAY_SIZE(tests); ++i) { + DWORD expect_caps = 0; + HRESULT expect_hr; DWORD count = 2; winetest_push_context("Compression %#lx, depth %u", tests[i].compression, tests[i].depth); @@ -3694,14 +3700,53 @@ static void test_default_presenter_allocate(void) bitmap_header.biBitCount = tests[i].depth; bitmap_header.biCompression = tests[i].compression; + ddraw = create_ddraw(window); + + /* Test whether we can create a surface directly, and how that will + * be translated to the error message and caps. */ + memset(&desc, 0, sizeof(desc)); + desc.dwSize = sizeof(desc); + desc.dwFlags = DDSD_CAPS | DDSD_PIXELFORMAT | DDSD_BACKBUFFERCOUNT | DDSD_WIDTH | DDSD_HEIGHT; + desc.ddsCaps.dwCaps = DDSCAPS_OFFSCREENPLAIN | DDSCAPS_FLIP | DDSCAPS_COMPLEX; + desc.dwWidth = desc.dwHeight = 32; + desc.dwBackBufferCount = 2; + desc.ddpfPixelFormat.dwSize = sizeof(desc.ddpfPixelFormat); + if (tests[i].compression) + { + desc.ddpfPixelFormat.dwFlags = DDPF_FOURCC; + desc.ddpfPixelFormat.dwFourCC = tests[i].compression; + } + else + { + desc.ddpfPixelFormat.dwFlags = DDPF_RGB; + desc.ddpfPixelFormat.dwRGBBitCount = 32; + desc.ddpfPixelFormat.dwRBitMask = 0x00ff0000; + desc.ddpfPixelFormat.dwGBitMask = 0x0000ff00; + desc.ddpfPixelFormat.dwBBitMask = 0x000000ff; + } + hr = IDirectDraw7_CreateSurface(ddraw, &desc, &frontbuffer, NULL); + ok(hr == S_OK || hr == DDERR_INVALIDPIXELFORMAT, "Got hr %#lx.\n", hr); + expect_hr = (hr == S_OK ? S_OK : VFW_E_DDRAW_CAPS_NOT_SUITABLE); + if (hr == S_OK) + { + memset(&desc, 0, sizeof(desc)); + desc.dwSize = sizeof(desc); + hr = IDirectDrawSurface7_GetSurfaceDesc(frontbuffer, &desc); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + expect_caps = desc.ddsCaps.dwCaps & ~(DDSCAPS_FRONTBUFFER | DDSCAPS_COMPLEX); + IDirectDrawSurface7_Release(frontbuffer); + } + + IDirectDraw7_Release(ddraw); + hr = IVMRSurfaceAllocator_AllocateSurface(allocator, 0, &info, &count, &frontbuffer); + ok(hr == expect_hr, "Got hr %#lx.\n", hr); if (hr == VFW_E_DDRAW_CAPS_NOT_SUITABLE) { skip("Format is not supported.\n"); winetest_pop_context(); continue; } - ok(hr == S_OK, "Got hr %#lx.\n", hr); ok(count == 3, "Got count %lu.\n", count); memset(&desc, 0, sizeof(desc)); @@ -3710,8 +3755,8 @@ static void test_default_presenter_allocate(void) ok(hr == S_OK, "Got hr %#lx.\n", hr); todo_wine ok(desc.dwFlags == (DDSD_CAPS | DDSD_WIDTH | DDSD_HEIGHT | DDSD_PITCH | DDSD_PIXELFORMAT), "Got flags %#lx.\n", desc.dwFlags); - todo_wine ok(desc.ddsCaps.dwCaps == (DDSCAPS_LOCALVIDMEM | DDSCAPS_VIDEOMEMORY | DDSCAPS_OFFSCREENPLAIN - | DDSCAPS_FRONTBUFFER | DDSCAPS_FLIP), "Got caps %#lx.\n", desc.ddsCaps.dwCaps); + todo_wine ok(desc.ddsCaps.dwCaps == (expect_caps | DDSCAPS_FRONTBUFFER), + "Expected caps %#lx, got %#lx.\n", (expect_caps | DDSCAPS_FRONTBUFFER), desc.ddsCaps.dwCaps); ok(!desc.ddsCaps.dwCaps2, "Got caps2 %#lx.\n", desc.ddsCaps.dwCaps2); ok(!desc.ddsCaps.dwCaps3, "Got caps2 %#lx.\n", desc.ddsCaps.dwCaps3); ok(!desc.ddsCaps.dwCaps4, "Got caps2 %#lx.\n", desc.ddsCaps.dwCaps4); @@ -3744,8 +3789,8 @@ static void test_default_presenter_allocate(void) ok(hr == S_OK, "Got hr %#lx.\n", hr); todo_wine ok(desc.dwFlags == (DDSD_CAPS | DDSD_WIDTH | DDSD_HEIGHT | DDSD_PITCH | DDSD_PIXELFORMAT), "Got flags %#lx.\n", desc.dwFlags); - todo_wine ok(desc.ddsCaps.dwCaps == (DDSCAPS_LOCALVIDMEM | DDSCAPS_VIDEOMEMORY | DDSCAPS_OFFSCREENPLAIN - | DDSCAPS_BACKBUFFER | DDSCAPS_FLIP), "Got caps %#lx.\n", desc.ddsCaps.dwCaps); + todo_wine ok(desc.ddsCaps.dwCaps == (expect_caps | DDSCAPS_BACKBUFFER), + "Expected caps %#lx, got %#lx.\n", (expect_caps | DDSCAPS_BACKBUFFER), desc.ddsCaps.dwCaps); desc.ddsCaps.dwCaps = DDSCAPS_FLIP; hr = IDirectDrawSurface7_GetAttachedSurface(backbuffer, &desc.ddsCaps, &backbuffer2); @@ -3757,12 +3802,10 @@ static void test_default_presenter_allocate(void) ok(hr == S_OK, "Got hr %#lx.\n", hr); todo_wine ok(desc.dwFlags == (DDSD_CAPS | DDSD_WIDTH | DDSD_HEIGHT | DDSD_PITCH | DDSD_PIXELFORMAT), "Got flags %#lx.\n", desc.dwFlags); - todo_wine_if(desc.ddsCaps.dwCaps == (DDSCAPS_LOCALVIDMEM | DDSCAPS_VIDEOMEMORY | DDSCAPS_OFFSCREENPLAIN - | DDSCAPS_FLIP | DDSCAPS_COMPLEX)) - ok(desc.ddsCaps.dwCaps == (DDSCAPS_LOCALVIDMEM | DDSCAPS_VIDEOMEMORY | DDSCAPS_OFFSCREENPLAIN - | DDSCAPS_FLIP), "Got caps %#lx.\n", desc.ddsCaps.dwCaps); + todo_wine ok(desc.ddsCaps.dwCaps == expect_caps, + "Expected caps %#lx, got %#lx.\n", expect_caps, desc.ddsCaps.dwCaps); - desc.ddsCaps.dwCaps = DDSCAPS_VIDEOMEMORY; + desc.ddsCaps.dwCaps = DDSCAPS_FLIP; hr = IDirectDrawSurface7_GetAttachedSurface(backbuffer2, &desc.ddsCaps, &backbuffer3); ok(hr == S_OK, "Got hr %#lx.\n", hr); if (hr == S_OK) @@ -3804,6 +3847,7 @@ static void test_default_presenter_allocate(void) ok(!ref, "Got outstanding refcount %ld.\n", ref); ref = IDirectDraw7_Release(prev_ddraw); ok(!ref, "Got outstanding refcount %ld.\n", ref); + DestroyWindow(window); } START_TEST(vmr7)

1 0

Santino Mazza : mshtml/tests: Test for IMarkupServices.
by Alexandre Julliard June 24, 2024

June 24, 2024

Module: wine Branch: master Commit: e2100e3f1e4056a4d98d5029a245b9604b62f939 URL: https://gitlab.winehq.org/wine/wine/-/commit/e2100e3f1e4056a4d98d5029a245b9… Author: Santino Mazza <smazza(a)codeweavers.com> Date: Sat Dec 10 17:27:07 2022 -0300 mshtml/tests: Test for IMarkupServices. --- dlls/mshtml/tests/htmldoc.c | 116 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 116 insertions(+) diff --git a/dlls/mshtml/tests/htmldoc.c b/dlls/mshtml/tests/htmldoc.c index ad2544f189a..a691d0e085c 100644 --- a/dlls/mshtml/tests/htmldoc.c +++ b/dlls/mshtml/tests/htmldoc.c @@ -8358,6 +8358,121 @@ static void test_MHTMLDocument(void) release_document(doc); } +static LONG get_document_elements_count(IHTMLDocument2 *doc) +{ + LONG elements_count; + IHTMLElementCollection *elements = NULL; + + IHTMLDocument2_get_all(doc, &elements); + IHTMLElementCollection_get_length(elements, &elements_count); + + IHTMLElementCollection_Release(elements); + return elements_count; +} + +static void test_MarkupContainer(IMarkupServices *markup_services) +{ + IHTMLDOMNode *doc_node; + IHTMLDocument2 *markup_container_doc; + ITargetContainer *target_container_doc; + IInternetSecurityManager *sec_manager; + IMarkupContainer *container = NULL; + ICustomDoc *custom_doc; + IHTMLLocation *location = NULL; + IHTMLElement *body = NULL; + LONG elements_count; + HRESULT hres; + + hres = IMarkupServices_CreateMarkupContainer(markup_services, &container); + todo_wine ok(hres == S_OK, "got 0x%08lx\n", hres); + todo_wine ok(container != NULL, "MarkupContainer is null.\n"); + if (!container) return; + + hres = IMarkupContainer_QueryInterface(container, &IID_IHTMLDocument2, (void**)&markup_container_doc); + ok(hres == S_OK, "got 0x%08lx\n", hres); + + hres = IHTMLDocument2_get_location(markup_container_doc, &location); + ok(hres == E_UNEXPECTED, "expected E_UNEXPECTED, got 0x%08lx\n", hres); + ok(location == NULL, "expected null location\n"); + + hres = IHTMLDocument2_get_body(markup_container_doc, &body); + ok(hres == S_OK, "got 0x%08lx\n", hres); + ok(body == NULL, "expected null body\n"); + + elements_count = get_document_elements_count(markup_container_doc); + ok(elements_count == 0, "expected document to not have elements\n"); + + hres = IMarkupContainer_QueryInterface(container, &IID_IHTMLDOMNode, (void**)&doc_node); + todo_wine ok(hres == E_NOINTERFACE, "expected to fail with E_NOINTERFACE got 0x%08lx\n", hres); + + hres = IHTMLDocument2_QueryInterface(markup_container_doc, &IID_IInternetSecurityManager, (void**)&sec_manager); + ok(hres == E_NOINTERFACE, "expected to fail with E_NOINTERFACE got 0x%08lx\n", hres); + + hres = IHTMLDocument2_QueryInterface(markup_container_doc, &IID_ITargetContainer, (void**)&target_container_doc); + ok(hres == E_NOINTERFACE, "expected to fail with E_NOINTERFACE got 0x%08lx\n", hres); + + hres = IHTMLDocument2_QueryInterface(markup_container_doc, &IID_ICustomDoc, (void**)&custom_doc); + ok(hres == E_NOINTERFACE, "expected to fail with E_NOINTERFACE got 0x%08lx\n", hres); + + IHTMLDocument2_Release(markup_container_doc); + IMarkupContainer_Release(container); +} + +static void test_MarkupServices_ParseString(IMarkupServices *markup_services, IHTMLDocument2 *doc) +{ + HRESULT hres; + LONG document_elements_count, markup_container_elements_count; + IHTMLElement *body; + BSTR inner_text; + IHTMLDocument2 *markup_container_doc = NULL; + IMarkupContainer *markup_container = NULL; + + hres = IMarkupServices_ParseString(markup_services, (OLECHAR*)L"<div>Hello World</div>", 0, &markup_container, NULL, NULL); + todo_wine ok(hres == S_OK, "got 0x%08lx\n", hres); + todo_wine ok(markup_container != NULL, "MarkupContainer is null.\n"); + if (!markup_container) return; + + hres = IMarkupContainer_QueryInterface(markup_container, &IID_IHTMLDocument2, (void**)&markup_container_doc); + ok(hres == S_OK, "failed to query interface of MarkupContainer 0x%08lx\n", hres); + + markup_container_elements_count = get_document_elements_count(markup_container_doc); + ok(markup_container_elements_count == 5, "expected markup container to have 5 elements but got %ld\n", + markup_container_elements_count); + + document_elements_count = get_document_elements_count(doc); + ok(document_elements_count != markup_container_elements_count, + "expected document to not have the same elements count of the markup container %ld == %ld\n", + document_elements_count, markup_container_elements_count); + + hres = IHTMLDocument2_get_body(markup_container_doc, &body); + ok(hres == S_OK, "got 0x%08lx\n", hres); + ok(body != NULL, "got null body\n"); + + hres = IHTMLElement_get_innerText(body, &inner_text); + ok(hres == S_OK, "failed to get inner text error 0x%08lx\n", hres); + ok(inner_text != NULL, "got a null pointer for inner text\n"); + ok(!wcscmp(inner_text, L"Hello World"), "strings don't match, got %ls\n", inner_text); + + SysFreeString(inner_text); + IHTMLElement_Release(body); + IHTMLDocument2_Release(markup_container_doc); + IMarkupContainer_Release(markup_container); +} + +static void test_MarkupServices(IHTMLDocument2 *doc) +{ + HRESULT hres; + IMarkupServices *markup_services = NULL; + + hres = IHTMLDocument2_QueryInterface(doc, &IID_IMarkupServices, (void**)&markup_services); + ok(hres == S_OK, "got 0x%08lx\n", hres); + + test_MarkupContainer(markup_services); + test_MarkupServices_ParseString(markup_services, doc); + + IMarkupServices_Release(markup_services); +} + static void test_HTMLDocument_hlink(DWORD status) { IHTMLDocument2 *doc; @@ -8524,6 +8639,7 @@ static void test_HTMLDocument_http(BOOL with_wbapp) test_travellog(doc); test_binding_ui((IUnknown*)doc); test_doc_domain(doc); + test_MarkupServices(doc); nav_url = nav_serv_url = L"http://test.winehq.org/tests/winehq_snapshot/"; /* for valid prev nav_url */ if(support_wbapp) {

1 0

Ilia Docin : sane.ds: Add SANE option settable flag support.
by Alexandre Julliard June 24, 2024

June 24, 2024

Module: wine Branch: master Commit: ac4e478015397f4f1840a099d9eda0aa7c54721d URL: https://gitlab.winehq.org/wine/wine/-/commit/ac4e478015397f4f1840a099d9eda0… Author: Ilia Docin <ilya.docin(a)contentai.ru> Date: Sun Jun 23 21:15:09 2024 +0300 sane.ds: Add SANE option settable flag support. --- dlls/sane.ds/options.c | 3 +++ dlls/sane.ds/unixlib.c | 1 + dlls/sane.ds/unixlib.h | 1 + 3 files changed, 5 insertions(+) diff --git a/dlls/sane.ds/options.c b/dlls/sane.ds/options.c index 1d39844a770..eb6a308b844 100644 --- a/dlls/sane.ds/options.c +++ b/dlls/sane.ds/options.c @@ -59,6 +59,7 @@ TW_UINT16 sane_option_set_int(const char *option_name, int val, BOOL *needs_relo { struct option_descriptor opt; TW_UINT16 rc = sane_find_option(option_name, TYPE_INT, &opt); + if (!opt.is_settable) return TWCC_OPERATIONERROR; if (rc == TWCC_SUCCESS) rc = sane_option_set_value( opt.optno, &val, needs_reload ); return rc; @@ -77,6 +78,7 @@ TW_UINT16 sane_option_set_bool(const char *option_name, int val ) { struct option_descriptor opt; TW_UINT16 rc = sane_find_option(option_name, TYPE_BOOL, &opt); + if (!opt.is_settable) return TWCC_OPERATIONERROR; if (rc == TWCC_SUCCESS) rc = sane_option_set_value( opt.optno, &val, NULL ); return rc; @@ -102,6 +104,7 @@ TW_UINT16 sane_option_set_str(const char *option_name, char *val, BOOL *needs_re { struct option_descriptor opt; TW_UINT16 rc = sane_find_option(option_name, TYPE_STRING, &opt); + if (!opt.is_settable) return TWCC_OPERATIONERROR; if (rc == TWCC_SUCCESS) rc = sane_option_set_value( opt.optno, val, needs_reload ); return rc; diff --git a/dlls/sane.ds/unixlib.c b/dlls/sane.ds/unixlib.c index 897aa09e5ef..69f085450a8 100644 --- a/dlls/sane.ds/unixlib.c +++ b/dlls/sane.ds/unixlib.c @@ -159,6 +159,7 @@ static void map_descr( struct option_descriptor *descr, const SANE_Option_Descri descr->constraint_type = map_constraint_type( opt->constraint_type ); descr->size = opt->size; descr->is_active = SANE_OPTION_IS_ACTIVE( opt->cap ); + descr->is_settable = SANE_OPTION_IS_SETTABLE( opt->cap ); if (opt->title) len = ntdll_umbstowcs( opt->title, strlen(opt->title), descr->title, ARRAY_SIZE(descr->title) ); descr->title[len] = 0; diff --git a/dlls/sane.ds/unixlib.h b/dlls/sane.ds/unixlib.h index d3ffbf1878d..34e7a9a9796 100644 --- a/dlls/sane.ds/unixlib.h +++ b/dlls/sane.ds/unixlib.h @@ -39,6 +39,7 @@ struct option_descriptor int optno; int size; int is_active; + int is_settable; enum { TYPE_BOOL, TYPE_INT, TYPE_FIXED, TYPE_STRING, TYPE_BUTTON, TYPE_GROUP } type; enum { UNIT_NONE, UNIT_PIXEL, UNIT_BIT, UNIT_MM, UNIT_DPI, UNIT_PERCENT, UNIT_MICROSECOND } unit; enum { CONSTRAINT_NONE, CONSTRAINT_RANGE, CONSTRAINT_WORD_LIST, CONSTRAINT_STRING_LIST } constraint_type;

1 0

Santino Mazza : mshtml: Implement MarkupServices_ParseString.
by Alexandre Julliard June 24, 2024

June 24, 2024

Module: wine Branch: master Commit: f9af971bd7d6799d54436ba9f7fa327b7edfbc77 URL: https://gitlab.winehq.org/wine/wine/-/commit/f9af971bd7d6799d54436ba9f7fa32… Author: Santino Mazza <smazza(a)codeweavers.com> Date: Tue Dec 20 13:22:58 2022 -0300 mshtml: Implement MarkupServices_ParseString. --- dlls/mshtml/htmldoc.c | 48 +++++++++++++++++++++++++++++++++++++++++++-- dlls/mshtml/tests/htmldoc.c | 4 ++-- 2 files changed, 48 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index 45d7740ba11..e761356e05e 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -4823,9 +4823,53 @@ static HRESULT WINAPI MarkupServices_ParseString(IMarkupServices *iface, OLECHAR *pchHTML, DWORD dwFlags, IMarkupContainer **ppContainerResult, IMarkupPointer *pPointerStart, IMarkupPointer *pPointerFinish) { + HRESULT hres; + IMarkupContainer *container; + IHTMLDocument2 *doc; + IHTMLDOMNode *node, *html_node, *new_html_node = NULL; + IHTMLElement *html, *body; HTMLDocumentNode *This = impl_from_IMarkupServices(iface); - FIXME("(%p)->(%s,%lx,%p,%p,%p)\n", This, debugstr_w(pchHTML), dwFlags, ppContainerResult, pPointerStart, pPointerFinish); - return E_NOTIMPL; + TRACE("(%p)->(%s,%lx,%p,%p,%p)\n", This, debugstr_w(pchHTML), dwFlags, ppContainerResult, pPointerStart, pPointerFinish); + + if(dwFlags != 0) + FIXME("flags %lx not implemented.\n", dwFlags); + if(pPointerStart || pPointerFinish) { + FIXME("Pointers not implemented.\n"); + return E_NOTIMPL; + } + + hres = IMarkupServices_CreateMarkupContainer(iface, &container); + if(FAILED(hres)) + return hres; + + IMarkupContainer_QueryInterface(container, &IID_IHTMLDocument2, (void**)&doc); + IHTMLDocument2_QueryInterface(doc, &IID_IHTMLDOMNode, (void**)&node); + IHTMLDocument2_createElement(&This->IHTMLDocument2_iface, (BSTR)L"html", &html); + + IHTMLElement_put_innerHTML(html, (BSTR)L"<head><title></title></head><body></body>"); + IHTMLElement_QueryInterface(html, &IID_IHTMLDOMNode, (void**)&html_node); + IHTMLElement_Release(html); + + IHTMLDOMNode_appendChild(node, html_node, &new_html_node); + IHTMLDOMNode_Release(node); + IHTMLDOMNode_Release(html_node); + IHTMLDOMNode_Release(new_html_node); + + IHTMLDocument2_get_body(doc, &body); + hres = IHTMLElement_put_innerHTML(body, pchHTML); + if (FAILED(hres)) + { + ERR("Failed put_innerHTML hr %#lx\n", hres); + IMarkupContainer_Release(container); + container = NULL; + } + + IHTMLDocument2_Release(doc); + IHTMLElement_Release(body); + + *ppContainerResult = container; + + return hres; } static HRESULT WINAPI MarkupServices_ParseGlobal(IMarkupServices *iface, diff --git a/dlls/mshtml/tests/htmldoc.c b/dlls/mshtml/tests/htmldoc.c index 384834359f9..c64ed784897 100644 --- a/dlls/mshtml/tests/htmldoc.c +++ b/dlls/mshtml/tests/htmldoc.c @@ -8428,8 +8428,8 @@ static void test_MarkupServices_ParseString(IMarkupServices *markup_services, IH IMarkupContainer *markup_container = NULL; hres = IMarkupServices_ParseString(markup_services, (OLECHAR*)L"<div>Hello World</div>", 0, &markup_container, NULL, NULL); - todo_wine ok(hres == S_OK, "got 0x%08lx\n", hres); - todo_wine ok(markup_container != NULL, "MarkupContainer is null.\n"); + ok(hres == S_OK, "got 0x%08lx\n", hres); + ok(markup_container != NULL, "MarkupContainer is null.\n"); if (!markup_container) return; hres = IMarkupContainer_QueryInterface(markup_container, &IID_IHTMLDocument2, (void**)&markup_container_doc);

1 0

Santino Mazza : mshtml: Implement MarkupServices_CreateMarkupContainer.
by Alexandre Julliard June 24, 2024

June 24, 2024

Module: wine Branch: master Commit: f9a8f2f1a309f21d61f8e44eea8cc56aeb146e23 URL: https://gitlab.winehq.org/wine/wine/-/commit/f9a8f2f1a309f21d61f8e44eea8cc5… Author: Santino Mazza <smazza(a)codeweavers.com> Date: Mon Dec 19 10:45:08 2022 -0300 mshtml: Implement MarkupServices_CreateMarkupContainer. --- dlls/mshtml/htmldoc.c | 14 ++++++++++++-- dlls/mshtml/tests/htmldoc.c | 4 ++-- 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index d45cc4cc7a9..45d7740ba11 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -4739,8 +4739,18 @@ static HRESULT WINAPI MarkupServices_CreateMarkupPointer(IMarkupServices *iface, static HRESULT WINAPI MarkupServices_CreateMarkupContainer(IMarkupServices *iface, IMarkupContainer **ppMarkupContainer) { HTMLDocumentNode *This = impl_from_IMarkupServices(iface); - FIXME("(%p)->(%p)\n", This, ppMarkupContainer); - return E_NOTIMPL; + IHTMLDocument2 *frag; + HRESULT hres; + TRACE("(%p)->(%p)\n", This, ppMarkupContainer); + + hres = IHTMLDocument3_createDocumentFragment(&This->IHTMLDocument3_iface, &frag); + if(FAILED(hres)) + return hres; + + IHTMLDocument2_QueryInterface(frag, &IID_IMarkupContainer, (void**)ppMarkupContainer); + IHTMLDocument2_Release(frag); + + return S_OK; } static HRESULT WINAPI MarkupServices_CreateElement(IMarkupServices *iface, diff --git a/dlls/mshtml/tests/htmldoc.c b/dlls/mshtml/tests/htmldoc.c index a691d0e085c..384834359f9 100644 --- a/dlls/mshtml/tests/htmldoc.c +++ b/dlls/mshtml/tests/htmldoc.c @@ -8384,8 +8384,8 @@ static void test_MarkupContainer(IMarkupServices *markup_services) HRESULT hres; hres = IMarkupServices_CreateMarkupContainer(markup_services, &container); - todo_wine ok(hres == S_OK, "got 0x%08lx\n", hres); - todo_wine ok(container != NULL, "MarkupContainer is null.\n"); + ok(hres == S_OK, "got 0x%08lx\n", hres); + ok(container != NULL, "MarkupContainer is null.\n"); if (!container) return; hres = IMarkupContainer_QueryInterface(container, &IID_IHTMLDocument2, (void**)&markup_container_doc);

1 0