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

Rémi Bernon : winemac: Remove now unnecessary cocoa window surface pointer.
by Alexandre Julliard 25 Jun '24

25 Jun '24

Module: wine Branch: master Commit: 22c517319aca0ac4e5d5897d0a1411c3445d37f3 URL: https://gitlab.winehq.org/wine/wine/-/commit/22c517319aca0ac4e5d5897d0a1411… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Jun 21 10:15:12 2024 +0200 winemac: Remove now unnecessary cocoa window surface pointer. --- dlls/winemac.drv/cocoa_window.h | 3 --- dlls/winemac.drv/cocoa_window.m | 19 +------------------ dlls/winemac.drv/macdrv_cocoa.h | 1 - dlls/winemac.drv/surface.c | 1 - dlls/winemac.drv/window.c | 1 - 5 files changed, 1 insertion(+), 24 deletions(-) diff --git a/dlls/winemac.drv/cocoa_window.h b/dlls/winemac.drv/cocoa_window.h index 9539e4ebdd7..b5168d0c128 100644 --- a/dlls/winemac.drv/cocoa_window.h +++ b/dlls/winemac.drv/cocoa_window.h @@ -44,9 +44,6 @@ void* hwnd; WineEventQueue* queue; - void* surface; - pthread_mutex_t* surface_mutex; - CGDirectDisplayID _lastDisplayID; NSTimeInterval _lastDisplayTime; diff --git a/dlls/winemac.drv/cocoa_window.m b/dlls/winemac.drv/cocoa_window.m index 8889e83bc8c..caf06ff338f 100644 --- a/dlls/winemac.drv/cocoa_window.m +++ b/dlls/winemac.drv/cocoa_window.m @@ -410,8 +410,6 @@ static CVReturn WineDisplayLinkCallback(CVDisplayLinkRef displayLink, const CVTi @property (nonatomic) void* hwnd; @property (retain, readwrite, nonatomic) WineEventQueue* queue; -(a)property (nonatomic) void* surface; - @property (nonatomic) BOOL shapeChangedSinceLastDraw; @property (readonly, nonatomic) BOOL needsTransparency; @@ -527,7 +525,7 @@ static CVReturn WineDisplayLinkCallback(CVDisplayLinkRef displayLink, const CVTi if ([window contentView] != self) return; - if (window.closing || !window.surface) + if (window.closing) return; imageRect = layer.bounds; @@ -1021,7 +1019,6 @@ static CVReturn WineDisplayLinkCallback(CVDisplayLinkRef displayLink, const CVTi @synthesize disabled, noForeground, preventsAppActivation, floating, fullscreen, fakingClose, closing, latentParentWindow, hwnd, queue; @synthesize drawnSinceShown; - @synthesize surface; @synthesize shapeChangedSinceLastDraw; @synthesize colorKeyed, colorKeyRed, colorKeyGreen, colorKeyBlue; @synthesize usePerPixelAlpha; @@ -3500,20 +3497,6 @@ void macdrv_set_cocoa_parent_window(macdrv_window w, macdrv_window parent) }); } -/*********************************************************************** - * macdrv_set_window_surface - */ -void macdrv_set_window_surface(macdrv_window w, struct window_surface *window_surface) -{ -(a)autoreleasepool -{ - WineWindow* window = (WineWindow*)w; - - OnMainThread(^{ - window.surface = window_surface; - }); -} -} /*********************************************************************** * macdrv_window_set_color_image diff --git a/dlls/winemac.drv/macdrv_cocoa.h b/dlls/winemac.drv/macdrv_cocoa.h index 31159ab060d..30ab06c3662 100644 --- a/dlls/winemac.drv/macdrv_cocoa.h +++ b/dlls/winemac.drv/macdrv_cocoa.h @@ -552,7 +552,6 @@ extern void macdrv_hide_cocoa_window(macdrv_window w); extern void macdrv_set_cocoa_window_frame(macdrv_window w, const CGRect* new_frame); extern void macdrv_get_cocoa_window_frame(macdrv_window w, CGRect* out_frame); extern void macdrv_set_cocoa_parent_window(macdrv_window w, macdrv_window parent); -extern void macdrv_set_window_surface(macdrv_window w, struct window_surface *window_surface); extern void macdrv_window_set_color_image(macdrv_window w, CGImageRef image, CGRect rect, CGRect dirty); extern void macdrv_set_window_shape(macdrv_window w, const CGRect *rects, int count); extern void macdrv_set_window_alpha(macdrv_window w, CGFloat alpha); diff --git a/dlls/winemac.drv/surface.c b/dlls/winemac.drv/surface.c index f3d48ab194f..4dc15770853 100644 --- a/dlls/winemac.drv/surface.c +++ b/dlls/winemac.drv/surface.c @@ -317,7 +317,6 @@ BOOL macdrv_CreateLayeredWindow(HWND hwnd, const RECT *window_rect, COLORREF col if (!surface || !EqualRect(&surface->rect, &rect)) { data->surface = create_surface(data->hwnd, data->cocoa_window, &rect, NULL, TRUE); - macdrv_set_window_surface(data->cocoa_window, data->surface); if (surface) window_surface_release(surface); surface = data->surface; if (data->unminimized_surface) diff --git a/dlls/winemac.drv/window.c b/dlls/winemac.drv/window.c index 35198f45607..36f3e3053d6 100644 --- a/dlls/winemac.drv/window.c +++ b/dlls/winemac.drv/window.c @@ -2011,7 +2011,6 @@ void macdrv_WindowPosChanged(HWND hwnd, HWND insert_after, UINT swp_flags, } else { - macdrv_set_window_surface(data->cocoa_window, surface); if (data->unminimized_surface) { window_surface_release(data->unminimized_surface);

1 0

Rémi Bernon : winemac: Remove unnecessary surface_clip_to_visible_rect.
by Alexandre Julliard 25 Jun '24

25 Jun '24

Module: wine Branch: master Commit: 5e4a5b0be2aef7ddc38738d2c28de126eb437b00 URL: https://gitlab.winehq.org/wine/wine/-/commit/5e4a5b0be2aef7ddc38738d2c28de1… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Jun 21 10:15:49 2024 +0200 winemac: Remove unnecessary surface_clip_to_visible_rect. The surface bounds aren't used anyway and surface images are cropped to the UI layer extends, regardless of the dirty area. --- dlls/winemac.drv/surface.c | 20 -------------------- 1 file changed, 20 deletions(-) diff --git a/dlls/winemac.drv/surface.c b/dlls/winemac.drv/surface.c index 4dc15770853..8b68d5d0ab5 100644 --- a/dlls/winemac.drv/surface.c +++ b/dlls/winemac.drv/surface.c @@ -224,25 +224,6 @@ void set_surface_use_alpha(struct window_surface *window_surface, BOOL use_alpha if (surface) surface->use_alpha = use_alpha; } -/*********************************************************************** - * surface_clip_to_visible_rect - * - * Intersect the accumulated drawn region with a new visible rect, - * effectively discarding stale drawing in the surface slack area. - */ -static void surface_clip_to_visible_rect(struct window_surface *window_surface, const RECT *visible_rect) -{ - struct macdrv_window_surface *surface = get_mac_surface(window_surface); - RECT rect = *visible_rect; - OffsetRect(&rect, -rect.left, -rect.top); - - if (!surface) return; - - window_surface_lock(window_surface); - intersect_rect(&window_surface->bounds, &window_surface->bounds, &rect); - window_surface_unlock(window_surface); -} - static inline RECT get_surface_rect(const RECT *visible_rect) { @@ -279,7 +260,6 @@ BOOL macdrv_CreateWindowSurface(HWND hwnd, UINT swp_flags, const RECT *visible_r if (EqualRect(&data->surface->rect, &surface_rect)) { /* existing surface is good enough */ - surface_clip_to_visible_rect(data->surface, visible_rect); window_surface_add_ref(data->surface); *surface = data->surface; goto done;

1 0

Danyil Blyschak : gdi32/uniscribe: Ensure the cache is initialised.
by Alexandre Julliard 25 Jun '24

25 Jun '24

Module: wine Branch: master Commit: 09a6d0f2913b064e09ed0bdc27b7bbc17a5fb0fc URL: https://gitlab.winehq.org/wine/wine/-/commit/09a6d0f2913b064e09ed0bdc27b7bb… Author: Danyil Blyschak <dblyschak(a)codeweavers.com> Date: Mon Jun 24 12:45:10 2024 -0500 gdi32/uniscribe: Ensure the cache is initialised. Call init_script_cache() in ScriptTextOut() to ensure that a cache exists for the logic around the ETO_GLYPH_INDEX flag. --- dlls/gdi32/uniscribe/usp10.c | 3 ++- dlls/usp10/tests/usp10.c | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/gdi32/uniscribe/usp10.c b/dlls/gdi32/uniscribe/usp10.c index 72e75224069..1fda1841533 100644 --- a/dlls/gdi32/uniscribe/usp10.c +++ b/dlls/gdi32/uniscribe/usp10.c @@ -3510,7 +3510,7 @@ HRESULT WINAPI ScriptTextOut(const HDC hdc, SCRIPT_CACHE *psc, int x, int y, UIN int iReserved, const WORD *pwGlyphs, int cGlyphs, const int *piAdvance, const int *piJustify, const GOFFSET *pGoffset) { - HRESULT hr = S_OK; + HRESULT hr; INT i, dir = 1; INT *lpDx; WORD *reordered_glyphs = (WORD *)pwGlyphs; @@ -3521,6 +3521,7 @@ HRESULT WINAPI ScriptTextOut(const HDC hdc, SCRIPT_CACHE *psc, int x, int y, UIN if (!hdc || !psc) return E_INVALIDARG; if (!piAdvance || !psa || !pwGlyphs) return E_INVALIDARG; + if ((hr = init_script_cache(hdc, psc)) != S_OK) return hr; fuOptions &= ETO_CLIPPED | ETO_OPAQUE; fuOptions |= ETO_IGNORELANGUAGE; diff --git a/dlls/usp10/tests/usp10.c b/dlls/usp10/tests/usp10.c index 7516bfb2a97..92b26e56392 100644 --- a/dlls/usp10/tests/usp10.c +++ b/dlls/usp10/tests/usp10.c @@ -2777,6 +2777,7 @@ static void test_ScriptTextOut(HDC hdc) hr = ScriptTextOut(hdc, &psc, 0, 0, 0, NULL, &pItem[0].a, NULL, 0, pwOutGlyphs1, pcGlyphs, piAdvance, NULL, pGoffset); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + ok(!!psc, "Got unexpected psc %p.\n", psc); /* Test Rect Rgn is acceptable. */ SetRect(&rect, 10, 10, 40, 20);

1 0

Elizabeth Figura : ntdll: Do not set io->Status at the end of sock_ioctl().
by Alexandre Julliard 25 Jun '24

25 Jun '24

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 : ntdll: Factor filling the IOSB into set_async_direct_result().
by Alexandre Julliard 25 Jun '24

25 Jun '24

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 : quartz/tests: Handle the case where ddraw returns system memory.
by Alexandre Julliard 25 Jun '24

25 Jun '24

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

Torge Matthies : winegstreamer: Handle Gstreamer pipeline flushes gracefully in the media source.
by Alexandre Julliard 24 Jun '24

24 Jun '24

Module: wine Branch: master Commit: 9dd9c455d345835a9a5454546b8489245b81f3ed URL: https://gitlab.winehq.org/wine/wine/-/commit/9dd9c455d345835a9a5454546b8489… Author: Torge Matthies <openglfreak(a)googlemail.com> Date: Fri Jun 14 03:11:44 2024 +0200 winegstreamer: Handle Gstreamer pipeline flushes gracefully in the media source. If a GST_EVENT_FLUSH_START event is received between the calls from PE code to wg_parser_stream_get_buffer and wg_parser_stream_copy_buffer, the latter function will return an error, resulting in the sample request being dropped without having delivered a sample. If wg_parser_stream_copy_buffer returns an error, retry the whole wait_on_sample procedure. Flushes can be triggered by seek operations. --- dlls/winegstreamer/media_source.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/winegstreamer/media_source.c b/dlls/winegstreamer/media_source.c index 474bc42ae15..030d0c1b9a2 100644 --- a/dlls/winegstreamer/media_source.c +++ b/dlls/winegstreamer/media_source.c @@ -728,6 +728,7 @@ static HRESULT media_stream_send_sample(struct media_stream *stream, const struc if (!wg_parser_stream_copy_buffer(stream->wg_stream, data, 0, wg_buffer->size)) { + hr = S_FALSE; wg_parser_stream_release_buffer(stream->wg_stream); IMFMediaBuffer_Unlock(buffer); goto out; @@ -789,8 +790,12 @@ static HRESULT wait_on_sample(struct media_stream *stream, IUnknown *token) TRACE("%p, %p\n", stream, token); - if (wg_parser_stream_get_buffer(source->wg_parser, stream->wg_stream, &buffer)) - return media_stream_send_sample(stream, &buffer, token); + while (wg_parser_stream_get_buffer(source->wg_parser, stream->wg_stream, &buffer)) + { + HRESULT hr = media_stream_send_sample(stream, &buffer, token); + if (hr != S_FALSE) + return hr; + } return media_stream_send_eos(source, stream); }

1 0

Alistair Leslie-Hughes : msado15: Implement _Recordset get/put CacheSize.
by Alexandre Julliard 24 Jun '24

24 Jun '24

Module: wine Branch: master Commit: 794e1f188494b7d4ff034d2e52731c66f19980ee URL: https://gitlab.winehq.org/wine/wine/-/commit/794e1f188494b7d4ff034d2e52731c… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Mon Jun 24 18:45:17 2024 +1000 msado15: Implement _Recordset get/put CacheSize. --- dlls/msado15/recordset.c | 16 ++++++++++++---- dlls/msado15/tests/msado15.c | 16 ++++++++++++++++ 2 files changed, 28 insertions(+), 4 deletions(-) diff --git a/dlls/msado15/recordset.c b/dlls/msado15/recordset.c index 36938db88cc..1b1c033320a 100644 --- a/dlls/msado15/recordset.c +++ b/dlls/msado15/recordset.c @@ -50,6 +50,7 @@ struct recordset CursorTypeEnum cursor_type; IRowset *row_set; EditModeEnum editmode; + LONG cache_size; VARIANT filter; DBTYPE *columntypes; @@ -1449,14 +1450,20 @@ static HRESULT WINAPI recordset_put_Bookmark( _Recordset *iface, VARIANT bookmar static HRESULT WINAPI recordset_get_CacheSize( _Recordset *iface, LONG *size ) { - FIXME( "%p, %p\n", iface, size ); - return E_NOTIMPL; + struct recordset *recordset = impl_from_Recordset( iface ); + TRACE( "%p, %p\n", iface, size ); + + *size = recordset->cache_size; + return S_OK; } static HRESULT WINAPI recordset_put_CacheSize( _Recordset *iface, LONG size ) { - FIXME( "%p, %ld\n", iface, size ); - return E_NOTIMPL; + struct recordset *recordset = impl_from_Recordset( iface ); + TRACE( "%p, %ld\n", iface, size ); + + recordset->cache_size = size; + return S_OK; } static HRESULT WINAPI recordset_get_CursorType( _Recordset *iface, CursorTypeEnum *cursor_type ) @@ -2792,6 +2799,7 @@ HRESULT Recordset_create( void **obj ) recordset->cursor_type = adOpenForwardOnly; recordset->row_set = NULL; recordset->editmode = adEditNone; + recordset->cache_size = 1; VariantInit( &recordset->filter ); recordset->columntypes = NULL; recordset->haccessors = NULL; diff --git a/dlls/msado15/tests/msado15.c b/dlls/msado15/tests/msado15.c index 9c9afbc120f..45dbf2c2239 100644 --- a/dlls/msado15/tests/msado15.c +++ b/dlls/msado15/tests/msado15.c @@ -61,6 +61,7 @@ static void test_Recordset(void) HRESULT hr; VARIANT bookmark, filter, active; EditModeEnum editmode; + LONG cache_size; hr = CoCreateInstance( &CLSID_Recordset, NULL, CLSCTX_INPROC_SERVER, &IID__Recordset, (void **)&recordset ); ok( hr == S_OK, "got %08lx\n", hr ); @@ -111,6 +112,21 @@ static void test_Recordset(void) ok( hr == S_OK, "got %08lx\n", hr ); ok( cursor == adOpenForwardOnly, "got %d\n", cursor ); + cache_size = 0; + hr = _Recordset_get_CacheSize( recordset, &cache_size ); + ok( hr == S_OK, "got %08lx\n", hr ); + ok( cache_size == 1, "got %ld\n", cache_size ); + + hr = _Recordset_put_CacheSize( recordset, 5 ); + ok( hr == S_OK, "got %08lx\n", hr ); + + hr = _Recordset_get_CacheSize( recordset, &cache_size ); + ok( hr == S_OK, "got %08lx\n", hr ); + ok( cache_size == 5, "got %ld\n", cache_size ); + + hr = _Recordset_put_CacheSize( recordset, 1 ); + ok( hr == S_OK, "got %08lx\n", hr ); + editmode = -1; hr = _Recordset_get_EditMode( recordset, &editmode ); ok( hr == MAKE_ADO_HRESULT( adErrObjectClosed ), "got %08lx\n", hr );

1 0

Alistair Leslie-Hughes : msado15: Implement _Recordset get/put MaxRecords.
by Alexandre Julliard 24 Jun '24

24 Jun '24

Module: wine Branch: master Commit: c483e5d45606b497812e16d26b1e146cd8c6cb16 URL: https://gitlab.winehq.org/wine/wine/-/commit/c483e5d45606b497812e16d26b1e14… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Mon Jun 24 18:59:50 2024 +1000 msado15: Implement _Recordset get/put MaxRecords. --- dlls/msado15/recordset.c | 16 ++++++++++++---- dlls/msado15/tests/msado15.c | 17 ++++++++++++++++- 2 files changed, 28 insertions(+), 5 deletions(-) diff --git a/dlls/msado15/recordset.c b/dlls/msado15/recordset.c index 1b1c033320a..b288f4c547c 100644 --- a/dlls/msado15/recordset.c +++ b/dlls/msado15/recordset.c @@ -51,6 +51,7 @@ struct recordset IRowset *row_set; EditModeEnum editmode; LONG cache_size; + ADO_LONGPTR max_records; VARIANT filter; DBTYPE *columntypes; @@ -1532,14 +1533,20 @@ static HRESULT WINAPI recordset_put_LockType( _Recordset *iface, LockTypeEnum lo static HRESULT WINAPI recordset_get_MaxRecords( _Recordset *iface, ADO_LONGPTR *max_records ) { - FIXME( "%p, %p\n", iface, max_records ); - return E_NOTIMPL; + struct recordset *recordset = impl_from_Recordset( iface ); + TRACE( "%p, %p\n", iface, max_records ); + + *max_records = recordset->max_records; + return S_OK; } static HRESULT WINAPI recordset_put_MaxRecords( _Recordset *iface, ADO_LONGPTR max_records ) { - FIXME( "%p, %Id\n", iface, max_records ); - return E_NOTIMPL; + struct recordset *recordset = impl_from_Recordset( iface ); + TRACE( "%p, %Id\n", iface, max_records ); + + recordset->max_records = max_records; + return S_OK; } static HRESULT WINAPI recordset_get_RecordCount( _Recordset *iface, ADO_LONGPTR *count ) @@ -2800,6 +2807,7 @@ HRESULT Recordset_create( void **obj ) recordset->row_set = NULL; recordset->editmode = adEditNone; recordset->cache_size = 1; + recordset->max_records = 0; VariantInit( &recordset->filter ); recordset->columntypes = NULL; recordset->haccessors = NULL; diff --git a/dlls/msado15/tests/msado15.c b/dlls/msado15/tests/msado15.c index 45dbf2c2239..b6c1c391e71 100644 --- a/dlls/msado15/tests/msado15.c +++ b/dlls/msado15/tests/msado15.c @@ -53,7 +53,7 @@ static void test_Recordset(void) Properties *props; Property *prop; LONG count, state; - ADO_LONGPTR rec_count; + ADO_LONGPTR rec_count, max_records; VARIANT missing, val, index; CursorLocationEnum location; CursorTypeEnum cursor; @@ -127,6 +127,21 @@ static void test_Recordset(void) hr = _Recordset_put_CacheSize( recordset, 1 ); ok( hr == S_OK, "got %08lx\n", hr ); + max_records = 0; + hr = _Recordset_get_MaxRecords( recordset, &max_records ); + ok( hr == S_OK, "got %08lx\n", hr ); + ok( max_records == 0, "got %Id\n", max_records ); + + hr = _Recordset_put_MaxRecords( recordset, 5 ); + ok( hr == S_OK, "got %08lx\n", hr ); + + hr = _Recordset_get_MaxRecords( recordset, &max_records ); + ok( hr == S_OK, "got %08lx\n", hr ); + ok( max_records == 5, "got %Id\n", max_records ); + + hr = _Recordset_put_MaxRecords( recordset, 0 ); + ok( hr == S_OK, "got %08lx\n", hr ); + editmode = -1; hr = _Recordset_get_EditMode( recordset, &editmode ); ok( hr == MAKE_ADO_HRESULT( adErrObjectClosed ), "got %08lx\n", hr );

1 0

Zhiyi Zhang : rometadata: Add initial dll.
by Alexandre Julliard 24 Jun '24

24 Jun '24

Module: wine Branch: master Commit: cbf1310f87f24238f37d57ebc48f07dbd992b4a3 URL: https://gitlab.winehq.org/wine/wine/-/commit/cbf1310f87f24238f37d57ebc48f07… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Mon Jun 24 12:16:18 2024 +0800 rometadata: Add initial dll. --- configure | 3 + configure.ac | 2 + dlls/rometadata/Makefile.in | 6 ++ dlls/rometadata/main.c | 194 +++++++++++++++++++++++++++++++++++++ dlls/rometadata/rometadata.spec | 1 + dlls/rometadata/tests/Makefile.in | 5 + dlls/rometadata/tests/rometadata.c | 70 +++++++++++++ include/Makefile.in | 1 + include/rometadata.h | 24 +++++ 9 files changed, 306 insertions(+)

1 0