October 2023 - Wine-commits

Francois Gouget : advapi32/tests: Avoid unneeded reallocations of the ReadEventLog() buffer.
by Alexandre Julliard 13 Oct '23

13 Oct '23

Module: wine Branch: master Commit: b34ec64537dea91af45ac40df616172348016bf4 URL: https://gitlab.winehq.org/wine/wine/-/commit/b34ec64537dea91af45ac40df61617… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Oct 13 12:41:22 2023 +0200 advapi32/tests: Avoid unneeded reallocations of the ReadEventLog() buffer. Also we don't care about the content of the buffer so using HeapRealloc() makes no sense. --- dlls/advapi32/tests/eventlog.c | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/dlls/advapi32/tests/eventlog.c b/dlls/advapi32/tests/eventlog.c index 5e5e311bcbd..7bd0c5a7cd2 100644 --- a/dlls/advapi32/tests/eventlog.c +++ b/dlls/advapi32/tests/eventlog.c @@ -780,6 +780,7 @@ static void test_readwrite(void) DWORD i; char *localcomputer = NULL; DWORD size; + void* buf; if (pCreateWellKnownSid) { @@ -962,9 +963,10 @@ static void test_readwrite(void) handle = OpenEventLogA(NULL, eventlogname); ok(handle != NULL, "OpenEventLogA(%s) failed : %ld\n", eventlogname, GetLastError()); i = 0; + size = sizeof(EVENTLOGRECORD) + 128; + buf = HeapAlloc(GetProcessHeap(), 0, size); for (;;) { - void *buf; DWORD read, needed; EVENTLOGRECORD *record; char *sourcename, *computername; @@ -973,7 +975,6 @@ static void test_readwrite(void) BOOL run_sidtests = read_write[i].evt_sid & sidavailable; winetest_push_context("%lu", i); - buf = HeapAlloc(GetProcessHeap(), 0, sizeof(EVENTLOGRECORD)); SetLastError(0xdeadbeef); ret = ReadEventLogA(handle, EVENTLOG_SEQUENTIAL_READ | EVENTLOG_FORWARDS_READ, @@ -981,13 +982,17 @@ static void test_readwrite(void) ok(!ret, "Expected failure\n"); if (!ret && GetLastError() != ERROR_INSUFFICIENT_BUFFER) { - HeapFree(GetProcessHeap(), 0, buf); ok(GetLastError() == ERROR_HANDLE_EOF, "record %ld, got %ld\n", i, GetLastError()); winetest_pop_context(); break; } - buf = HeapReAlloc(GetProcessHeap(), 0, buf, needed); + if (needed > size) + { + HeapFree(GetProcessHeap(), 0, buf); + size = needed; + buf = HeapAlloc(GetProcessHeap(), 0, size); + } ret = ReadEventLogA(handle, EVENTLOG_SEQUENTIAL_READ | EVENTLOG_FORWARDS_READ, 0, buf, needed, &read, &needed); ok(ret, "Expected success: %ld\n", GetLastError()); @@ -1057,10 +1062,10 @@ static void test_readwrite(void) ok(record->Length == *(DWORD *)((BYTE *)buf + record->Length - sizeof(DWORD)), "Expected the closing DWORD to contain the length of the record\n"); - HeapFree(GetProcessHeap(), 0, buf); winetest_pop_context(); i++; } + HeapFree(GetProcessHeap(), 0, buf); CloseEventLog(handle); /* Test clearing a real eventlog */

1 0

Francois Gouget : advapi32/tests: Don't check the content of the buffer if ReadEventLog() fails.
by Alexandre Julliard 13 Oct '23

13 Oct '23

Module: wine Branch: master Commit: 0e44c658b6d1e3ad87f0fe58e75910a95c10f015 URL: https://gitlab.winehq.org/wine/wine/-/commit/0e44c658b6d1e3ad87f0fe58e75910… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Oct 13 12:42:19 2023 +0200 advapi32/tests: Don't check the content of the buffer if ReadEventLog() fails. --- dlls/advapi32/tests/eventlog.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/dlls/advapi32/tests/eventlog.c b/dlls/advapi32/tests/eventlog.c index 7bd0c5a7cd2..ee24771edcb 100644 --- a/dlls/advapi32/tests/eventlog.c +++ b/dlls/advapi32/tests/eventlog.c @@ -996,7 +996,11 @@ static void test_readwrite(void) ret = ReadEventLogA(handle, EVENTLOG_SEQUENTIAL_READ | EVENTLOG_FORWARDS_READ, 0, buf, needed, &read, &needed); ok(ret, "Expected success: %ld\n", GetLastError()); - + if (!ret) + { + winetest_pop_context(); + break; + } record = (EVENTLOGRECORD *)buf; ok(record->Length == read,

1 0

Brendan Shanks : winemac.drv: Fix redundant calls to [NSCursor set].
by Alexandre Julliard 13 Oct '23

13 Oct '23

Module: wine Branch: master Commit: 8f7483d04baedbed23bcf76c7988458ebd65c294 URL: https://gitlab.winehq.org/wine/wine/-/commit/8f7483d04baedbed23bcf76c798845… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Thu Oct 12 21:39:05 2023 -0700 winemac.drv: Fix redundant calls to [NSCursor set]. Since self.cursorFrames is a copy property, its pointer value will only equal frames when both are nil. Also return early from the function if the array contents are equivalent. --- dlls/winemac.drv/cocoa_app.m | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winemac.drv/cocoa_app.m b/dlls/winemac.drv/cocoa_app.m index 881f0a50e02..c1a35af5a00 100644 --- a/dlls/winemac.drv/cocoa_app.m +++ b/dlls/winemac.drv/cocoa_app.m @@ -1048,7 +1048,7 @@ static NSString* WineLocalizedString(unsigned int stringID) - (void) setCursorWithFrames:(NSArray*)frames { - if (self.cursorFrames == frames) + if (self.cursorFrames == frames || [self.cursorFrames isEqualToArray:frames]) return; self.cursorFrames = frames;

1 0

Francois Gouget : secur32/tests: Skip the tests instead of crashing if Kerberos is not supported.
by Alexandre Julliard 13 Oct '23

13 Oct '23

Module: wine Branch: master Commit: db89311aa1847b8ff2fb51604238f50549e934e3 URL: https://gitlab.winehq.org/wine/wine/-/commit/db89311aa1847b8ff2fb51604238f5… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Oct 9 15:22:08 2023 +0200 secur32/tests: Skip the tests instead of crashing if Kerberos is not supported. This avoids a crash when Wine is compiled using --without-krb5. This makes test_ticket_cache() more consistent with test_kerberos(). --- dlls/secur32/tests/secur32.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/secur32/tests/secur32.c b/dlls/secur32/tests/secur32.c index b1a1db76c3e..dd6eea095bf 100644 --- a/dlls/secur32/tests/secur32.c +++ b/dlls/secur32/tests/secur32.c @@ -446,7 +446,7 @@ static void test_kerberos(void) status = QuerySecurityPackageInfoA(provider, &info); - ok(status == SEC_E_OK, "Kerberos package not installed, skipping test\n"); + ok(status == SEC_E_OK, "Kerberos package not installed (%08lx), skipping test\n", status); if(status != SEC_E_OK) return; @@ -479,7 +479,12 @@ static void test_ticket_cache(void) RtlInitAnsiString( &name, MICROSOFT_KERBEROS_NAME_A ); status = LsaLookupAuthenticationPackage( lsa, &name, &package ); - ok( !status, "got %08lx\n", status ); + ok(status == SEC_E_OK, "Kerberos package not installed (%08lx), skipping test\n", status); + if(status != SEC_E_OK) + { + LsaDeregisterLogonProcess( lsa ); + return; + } status = LsaCallAuthenticationPackage( lsa, package, &req, sizeof(req), (void **)&resp, &len, &status ); ok( !status, "got %08lx\n", status );

1 0

Alexandre Julliard : ntdll: Move LdrInitializeThunk to the CPU backends.
by Alexandre Julliard 13 Oct '23

13 Oct '23

Module: wine Branch: master Commit: b35f00070f838981b1d40ff1c316cfda89606b0e URL: https://gitlab.winehq.org/wine/wine/-/commit/b35f00070f838981b1d40ff1c316cf… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Oct 13 15:57:03 2023 +0200 ntdll: Move LdrInitializeThunk to the CPU backends. --- dlls/ntdll/loader.c | 16 ++-------------- dlls/ntdll/ntdll_misc.h | 2 +- dlls/ntdll/signal_arm.c | 13 +++++++------ dlls/ntdll/signal_arm64.c | 13 +++++++------ dlls/ntdll/signal_i386.c | 11 +++++++++++ dlls/ntdll/signal_x86_64.c | 11 +++++++++++ 6 files changed, 39 insertions(+), 27 deletions(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index e0cfead6893..1a87f4d1f5e 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -4188,28 +4188,17 @@ static void release_address_space(void) } /****************************************************************** - * LdrInitializeThunk (NTDLL.@) + * loader_init * * Attach to all the loaded dlls. * If this is the first time, perform the full process initialization. */ -void WINAPI LdrInitializeThunk( CONTEXT *context, ULONG_PTR unknown2, ULONG_PTR unknown3, ULONG_PTR unknown4 ) +void loader_init( CONTEXT *context, void **entry ) { static int attach_done; NTSTATUS status; ULONG_PTR cookie; WINE_MODREF *wm; - void **entry; - -#ifdef __i386__ - entry = (void **)&context->Eax; -#elif defined(__x86_64__) - entry = (void **)&context->Rcx; -#elif defined(__arm__) - entry = (void **)&context->R0; -#elif defined(__aarch64__) - entry = (void **)&context->X0; -#endif if (process_detaching) NtTerminateThread( GetCurrentThread(), 0 ); @@ -4335,7 +4324,6 @@ void WINAPI LdrInitializeThunk( CONTEXT *context, ULONG_PTR unknown2, ULONG_PTR } RtlLeaveCriticalSection( &loader_section ); - signal_start_thread( context ); } diff --git a/dlls/ntdll/ntdll_misc.h b/dlls/ntdll/ntdll_misc.h index ad8e2691224..8d489afda7f 100644 --- a/dlls/ntdll/ntdll_misc.h +++ b/dlls/ntdll/ntdll_misc.h @@ -68,12 +68,12 @@ extern const char *debugstr_exception_code( DWORD code ) DECLSPEC_HIDDEN; extern void set_native_thread_name( DWORD tid, const char *name ) DECLSPEC_HIDDEN; /* init routines */ +extern void loader_init( CONTEXT *context, void **entry ) DECLSPEC_HIDDEN; extern void version_init(void) DECLSPEC_HIDDEN; extern void debug_init(void) DECLSPEC_HIDDEN; extern void actctx_init(void) DECLSPEC_HIDDEN; extern void locale_init(void) DECLSPEC_HIDDEN; extern void init_user_process_params(void) DECLSPEC_HIDDEN; -extern void CDECL DECLSPEC_NORETURN signal_start_thread( CONTEXT *ctx ) DECLSPEC_HIDDEN; extern void get_resource_lcids( LANGID *user, LANGID *user_neutral, LANGID *system ) DECLSPEC_HIDDEN; /* module handling */ diff --git a/dlls/ntdll/signal_arm.c b/dlls/ntdll/signal_arm.c index f5b2f8c1252..fd653e16381 100644 --- a/dlls/ntdll/signal_arm.c +++ b/dlls/ntdll/signal_arm.c @@ -1487,13 +1487,14 @@ USHORT WINAPI RtlCaptureStackBackTrace( ULONG skip, ULONG count, PVOID *buffer, return 0; } -/*********************************************************************** - * signal_start_thread +/****************************************************************** + * LdrInitializeThunk (NTDLL.@) */ -__ASM_GLOBAL_FUNC( signal_start_thread, - "mov sp, r0\n\t" /* context */ - "mov r1, #1\n\t" - "b " __ASM_NAME("NtContinue") ) +void WINAPI LdrInitializeThunk( CONTEXT *context, ULONG_PTR unk2, ULONG_PTR unk3, ULONG_PTR unk4 ) +{ + loader_init( context, (void **)&context->R0 ); + NtContinue( context, TRUE ); +} /********************************************************************** * DbgBreakPoint (NTDLL.@) diff --git a/dlls/ntdll/signal_arm64.c b/dlls/ntdll/signal_arm64.c index dfc5c0e31ed..85d31abc028 100644 --- a/dlls/ntdll/signal_arm64.c +++ b/dlls/ntdll/signal_arm64.c @@ -1524,13 +1524,14 @@ USHORT WINAPI RtlCaptureStackBackTrace( ULONG skip, ULONG count, PVOID *buffer, return 0; } -/*********************************************************************** - * signal_start_thread +/****************************************************************** + * LdrInitializeThunk (NTDLL.@) */ -__ASM_GLOBAL_FUNC( signal_start_thread, - "mov sp, x0\n\t" /* context */ - "mov x1, #1\n\t" - "b " __ASM_NAME("NtContinue") ) +void WINAPI LdrInitializeThunk( CONTEXT *context, ULONG_PTR unk2, ULONG_PTR unk3, ULONG_PTR unk4 ) +{ + loader_init( context, (void **)&context->X0 ); + NtContinue( context, TRUE ); +} /********************************************************************** * DbgBreakPoint (NTDLL.@) diff --git a/dlls/ntdll/signal_i386.c b/dlls/ntdll/signal_i386.c index b2f251bf26a..7174bd36afe 100644 --- a/dlls/ntdll/signal_i386.c +++ b/dlls/ntdll/signal_i386.c @@ -537,6 +537,7 @@ USHORT WINAPI RtlCaptureStackBackTrace( ULONG skip, ULONG count, PVOID *buffer, /*********************************************************************** * signal_start_thread */ +extern void CDECL DECLSPEC_NORETURN signal_start_thread( CONTEXT *ctx ) DECLSPEC_HIDDEN; __ASM_GLOBAL_FUNC( signal_start_thread, "movl 4(%esp),%esi\n\t" /* context */ "leal -12(%esi),%edi\n\t" @@ -554,6 +555,16 @@ __ASM_GLOBAL_FUNC( signal_start_thread, "movl %esi,(%esp)\n\t" "call " __ASM_STDCALL("NtContinue", 8) ) +/****************************************************************** + * LdrInitializeThunk (NTDLL.@) + */ +void WINAPI LdrInitializeThunk( CONTEXT *context, ULONG_PTR unk2, ULONG_PTR unk3, ULONG_PTR unk4 ) +{ + loader_init( context, (void **)&context->Eax ); + signal_start_thread( context ); +} + + /********************************************************************** * DbgBreakPoint (NTDLL.@) */ diff --git a/dlls/ntdll/signal_x86_64.c b/dlls/ntdll/signal_x86_64.c index 2f7715a0a60..ce57722a930 100644 --- a/dlls/ntdll/signal_x86_64.c +++ b/dlls/ntdll/signal_x86_64.c @@ -1590,6 +1590,7 @@ USHORT WINAPI RtlCaptureStackBackTrace( ULONG skip, ULONG count, PVOID *buffer, /*********************************************************************** * signal_start_thread */ +extern void CDECL DECLSPEC_NORETURN signal_start_thread( CONTEXT *ctx ) DECLSPEC_HIDDEN; __ASM_GLOBAL_FUNC( signal_start_thread, "movq %rcx,%rbx\n\t" /* context */ /* clear the thread stack */ @@ -1607,6 +1608,16 @@ __ASM_GLOBAL_FUNC( signal_start_thread, "call " __ASM_NAME("NtContinue") ) +/****************************************************************** + * LdrInitializeThunk (NTDLL.@) + */ +void WINAPI LdrInitializeThunk( CONTEXT *context, ULONG_PTR unk2, ULONG_PTR unk3, ULONG_PTR unk4 ) +{ + loader_init( context, (void **)&context->Rcx ); + signal_start_thread( context ); +} + + /********************************************************************** * DbgBreakPoint (NTDLL.@) */

1 0

Hans Leidekker : mmdevapi/tests: Don't initialize the audio client twice.
by Alexandre Julliard 13 Oct '23

13 Oct '23

Module: wine Branch: master Commit: 23de0bff1defe1d073c672bd2f4b7ca25da2ae15 URL: https://gitlab.winehq.org/wine/wine/-/commit/23de0bff1defe1d073c672bd2f4b7c… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Oct 13 10:19:48 2023 +0200 mmdevapi/tests: Don't initialize the audio client twice. It leaves the client in a bad state, causing test failures on recent Windows versions. --- dlls/mmdevapi/tests/capture.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/dlls/mmdevapi/tests/capture.c b/dlls/mmdevapi/tests/capture.c index f3b426a7f9a..660e74de3de 100644 --- a/dlls/mmdevapi/tests/capture.c +++ b/dlls/mmdevapi/tests/capture.c @@ -531,9 +531,6 @@ static void test_audioclient(void) trace("Returned latency: %u.%04u ms\n", (UINT)(t1/10000), (UINT)(t1 % 10000)); - hr = IAudioClient_Initialize(ac, AUDCLNT_SHAREMODE_SHARED, 0, 5000000, 0, pwfx, NULL); - ok(hr == AUDCLNT_E_ALREADY_INITIALIZED, "Calling Initialize twice returns %08lx\n", hr); - hr = IAudioClient_SetEventHandle(ac, NULL); ok(hr == E_INVALIDARG, "SetEventHandle(NULL) returns %08lx\n", hr);

1 0

Hans Leidekker : mmdevapi/tests: Relax a capture test.
by Alexandre Julliard 13 Oct '23

13 Oct '23

Module: wine Branch: master Commit: 85844ff5b4880dfacf8d2ee404f5356208f2a12f URL: https://gitlab.winehq.org/wine/wine/-/commit/85844ff5b4880dfacf8d2ee404f535… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Oct 13 16:15:00 2023 +0200 mmdevapi/tests: Relax a capture test. --- dlls/mmdevapi/tests/capture.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/mmdevapi/tests/capture.c b/dlls/mmdevapi/tests/capture.c index 660e74de3de..08ab730ef1a 100644 --- a/dlls/mmdevapi/tests/capture.c +++ b/dlls/mmdevapi/tests/capture.c @@ -283,7 +283,7 @@ static void test_capture(IAudioClient *ac, HANDLE handle, WAVEFORMATEX *wfx) /* Native's position is one period further than what we read. * Perhaps that's precisely the meaning of DATA_DISCONTINUITY: * signal when the position jump left a gap. */ - ok(pos == sum + frames, "Position %u last %u frames %u\n", (UINT)pos, sum, frames); + ok(pos >= sum + frames, "Position %u last %u frames %u\n", (UINT)pos, sum, frames); sum = pos; }else{ /* win10 */ ok(pos == sum, "Position %u last %u frames %u\n", (UINT)pos, sum, frames);

1 0

Alexandros Frantzis : winewayland.drv: Respect the compositor requested surface config.
by Alexandre Julliard 13 Oct '23

13 Oct '23

Module: wine Branch: master Commit: e1222ac33ab7e4dba1ff21bb6c233fa89d6c39a6 URL: https://gitlab.winehq.org/wine/wine/-/commit/e1222ac33ab7e4dba1ff21bb6c233f… Author: Alexandros Frantzis <alexandros.frantzis(a)collabora.com> Date: Fri Sep 29 13:25:38 2023 +0300 winewayland.drv: Respect the compositor requested surface config. If we are processing a config request by the compositor, consider that config as authoritative for the window. Otherwise use the window state to determine the new Wayland state to apply. --- dlls/winewayland.drv/window.c | 34 ++++++++++++++++++++++------------ 1 file changed, 22 insertions(+), 12 deletions(-) diff --git a/dlls/winewayland.drv/window.c b/dlls/winewayland.drv/window.c index 0cb3ba3a15a..5704931c21e 100644 --- a/dlls/winewayland.drv/window.c +++ b/dlls/winewayland.drv/window.c @@ -196,7 +196,7 @@ static void wayland_win_data_update_wayland_state(struct wayland_win_data *data) { struct wayland_surface *surface = data->wayland_surface; uint32_t window_state; - struct wayland_surface_config *conf; + BOOL processing_config; pthread_mutex_lock(&surface->mutex); @@ -206,24 +206,34 @@ static void wayland_win_data_update_wayland_state(struct wayland_win_data *data) (NtUserGetWindowLongW(surface->hwnd, GWL_STYLE) & WS_MAXIMIZE) ? WAYLAND_SURFACE_CONFIG_STATE_MAXIMIZED : 0; - conf = surface->processing.serial ? &surface->processing : &surface->current; + processing_config = surface->processing.serial && + !surface->processing.processed; - TRACE("hwnd=%p window_state=%#x conf->state=%#x\n", - data->hwnd, window_state, conf->state); + TRACE("hwnd=%p window_state=%#x %s->state=%#x\n", + data->hwnd, window_state, + processing_config ? "processing" : "current", + processing_config ? surface->processing.state : surface->current.state); - if ((window_state & WAYLAND_SURFACE_CONFIG_STATE_MAXIMIZED) && - !(conf->state & WAYLAND_SURFACE_CONFIG_STATE_MAXIMIZED)) + /* If we are not processing a compositor requested config, use the + * window state to determine and update the Wayland state. */ + if (!processing_config) { - xdg_toplevel_set_maximized(surface->xdg_toplevel); + if ((window_state & WAYLAND_SURFACE_CONFIG_STATE_MAXIMIZED) && + !(surface->current.state & WAYLAND_SURFACE_CONFIG_STATE_MAXIMIZED)) + { + xdg_toplevel_set_maximized(surface->xdg_toplevel); + } + else if (!(window_state & WAYLAND_SURFACE_CONFIG_STATE_MAXIMIZED) && + (surface->current.state & WAYLAND_SURFACE_CONFIG_STATE_MAXIMIZED)) + { + xdg_toplevel_unset_maximized(surface->xdg_toplevel); + } } - else if (!(window_state & WAYLAND_SURFACE_CONFIG_STATE_MAXIMIZED) && - (conf->state & WAYLAND_SURFACE_CONFIG_STATE_MAXIMIZED)) + else { - xdg_toplevel_unset_maximized(surface->xdg_toplevel); + surface->processing.processed = TRUE; } - conf->processed = TRUE; - out: pthread_mutex_unlock(&surface->mutex); wl_display_flush(process_wayland.wl_display);

1 0

Rémi Bernon : dmband: Download / unload bands when initializing / ending band track.
by Alexandre Julliard 13 Oct '23

13 Oct '23

Module: wine Branch: master Commit: b0573f9dc3aab086069a16b97dc1d04ae2709cb9 URL: https://gitlab.winehq.org/wine/wine/-/commit/b0573f9dc3aab086069a16b97dc1d0… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Sun Sep 10 14:41:51 2023 +0200 dmband: Download / unload bands when initializing / ending band track. --- dlls/dmband/bandtrack.c | 39 ++++++++++++++++++++++++++++++++++----- dlls/dmband/tests/dmband.c | 2 -- 2 files changed, 34 insertions(+), 7 deletions(-) diff --git a/dlls/dmband/bandtrack.c b/dlls/dmband/bandtrack.c index 845345a9fa2..6233d39b9c0 100644 --- a/dlls/dmband/bandtrack.c +++ b/dlls/dmband/bandtrack.c @@ -104,10 +104,13 @@ static ULONG WINAPI band_track_Release(IDirectMusicTrack8 *iface) return ref; } -static HRESULT WINAPI band_track_Init(IDirectMusicTrack8 *iface, IDirectMusicSegment *pSegment) +static HRESULT WINAPI band_track_Init(IDirectMusicTrack8 *iface, IDirectMusicSegment *segment) { struct band_track *This = impl_from_IDirectMusicTrack8(iface); - FIXME("(%p, %p): stub\n", This, pSegment); + + FIXME("(%p, %p): stub\n", This, segment); + + if (!segment) return E_POINTER; return S_OK; } @@ -116,16 +119,42 @@ static HRESULT WINAPI band_track_InitPlay(IDirectMusicTrack8 *iface, void **state_data, DWORD virtual_track8id, DWORD flags) { struct band_track *This = impl_from_IDirectMusicTrack8(iface); + struct band_entry *entry; + HRESULT hr; + + FIXME("(%p, %p, %p, %p, %ld, %lx): semi-stub\n", This, segment_state, performance, state_data, virtual_track8id, flags); + + if (!performance) return E_POINTER; - FIXME("(%p, %p, %p, %p, %ld, %lx): stub\n", This, segment_state, performance, state_data, virtual_track8id, flags); + if (This->header.bAutoDownload) + { + LIST_FOR_EACH_ENTRY(entry, &This->bands, struct band_entry, entry) + { + if (FAILED(hr = IDirectMusicBand_Download(entry->band, performance))) + return hr; + } + } return S_OK; } -static HRESULT WINAPI band_track_EndPlay(IDirectMusicTrack8 *iface, void *pStateData) +static HRESULT WINAPI band_track_EndPlay(IDirectMusicTrack8 *iface, void *state_data) { struct band_track *This = impl_from_IDirectMusicTrack8(iface); - FIXME("(%p, %p): stub\n", This, pStateData); + struct band_entry *entry; + HRESULT hr; + + FIXME("(%p, %p): semi-stub\n", This, state_data); + + if (This->header.bAutoDownload) + { + LIST_FOR_EACH_ENTRY(entry, &This->bands, struct band_entry, entry) + { + if (FAILED(hr = IDirectMusicBand_Unload(entry->band, NULL))) + return hr; + } + } + return S_OK; } diff --git a/dlls/dmband/tests/dmband.c b/dlls/dmband/tests/dmband.c index 07ffcf4e7fe..ee45ca33714 100644 --- a/dlls/dmband/tests/dmband.c +++ b/dlls/dmband/tests/dmband.c @@ -226,12 +226,10 @@ static void test_bandtrack(void) ok(hr == S_OK, "DirectMusicBandTrack create failed: %#lx, expected S_OK\n", hr); /* IDirectMusicTrack8 */ - todo_wine { hr = IDirectMusicTrack8_Init(dmt8, NULL); ok(hr == E_POINTER, "IDirectMusicTrack8_Init failed: %#lx\n", hr); hr = IDirectMusicTrack8_InitPlay(dmt8, NULL, NULL, NULL, 0, 0); ok(hr == E_POINTER, "IDirectMusicTrack8_InitPlay failed: %#lx\n", hr); - } hr = IDirectMusicTrack8_EndPlay(dmt8, NULL); ok(hr == S_OK, "IDirectMusicTrack8_EndPlay failed: %#lx\n", hr); hr = IDirectMusicTrack8_Play(dmt8, NULL, 0, 0, 0, 0, NULL, NULL, 0);

1 0

Rémi Bernon : dmime: Implement sequence track IDirectMusicTrack_Play.
by Alexandre Julliard 13 Oct '23

13 Oct '23

Module: wine Branch: master Commit: fd68076c36555d97593213a024d6ab6246de6e52 URL: https://gitlab.winehq.org/wine/wine/-/commit/fd68076c36555d97593213a024d6ab… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Sep 11 00:04:46 2023 +0200 dmime: Implement sequence track IDirectMusicTrack_Play. --- dlls/dmime/seqtrack.c | 95 +++++++++++++++++++++++++++++++++++++++++++++--- dlls/dmime/tests/dmime.c | 13 +------ 2 files changed, 91 insertions(+), 17 deletions(-) diff --git a/dlls/dmime/seqtrack.c b/dlls/dmime/seqtrack.c index 21b78ff26cd..a6043cb4a89 100644 --- a/dlls/dmime/seqtrack.c +++ b/dlls/dmime/seqtrack.c @@ -108,13 +108,96 @@ static HRESULT WINAPI sequence_track_EndPlay(IDirectMusicTrack8 *iface, void *pS return S_OK; } -static HRESULT WINAPI sequence_track_Play(IDirectMusicTrack8 *iface, void *pStateData, - MUSIC_TIME mtStart, MUSIC_TIME mtEnd, MUSIC_TIME mtOffset, DWORD dwFlags, - IDirectMusicPerformance *pPerf, IDirectMusicSegmentState *pSegSt, DWORD dwVirtualID) +static HRESULT WINAPI sequence_track_Play(IDirectMusicTrack8 *iface, void *state_data, + MUSIC_TIME start_time, MUSIC_TIME end_time, MUSIC_TIME time_offset, DWORD segment_flags, + IDirectMusicPerformance *performance, IDirectMusicSegmentState *segment_state, DWORD track_id) { - struct sequence_track *This = impl_from_IDirectMusicTrack8(iface); - FIXME("(%p, %p, %ld, %ld, %ld, %ld, %p, %p, %ld): stub\n", This, pStateData, mtStart, mtEnd, mtOffset, dwFlags, pPerf, pSegSt, dwVirtualID); - return S_OK; + struct sequence_track *This = impl_from_IDirectMusicTrack8(iface); + IDirectMusicGraph *graph; + HRESULT hr; + UINT i; + + TRACE("(%p, %p, %ld, %ld, %ld, %#lx, %p, %p, %ld)\n", This, state_data, start_time, end_time, + time_offset, segment_flags, performance, segment_state, track_id); + + if (start_time != 0) FIXME("start_time %ld not implemented\n", start_time); + if (end_time != -1) FIXME("end_time %ld not implemented\n", end_time); + if (time_offset != 0) FIXME("time_offset %ld not implemented\n", time_offset); + if (segment_flags) FIXME("segment_flags %#lx not implemented\n", segment_flags); + if (segment_state) FIXME("segment_state %p not implemented\n", segment_state); + + if (FAILED(hr = IDirectMusicPerformance_QueryInterface(performance, + &IID_IDirectMusicGraph, (void **)&graph))) + return hr; + + for (i = 0; SUCCEEDED(hr) &&i < This->count; i++) + { + DMUS_IO_SEQ_ITEM *item = This->items + i; + DMUS_NOTE_PMSG *msg; + + if (FAILED(hr = IDirectMusicPerformance_AllocPMsg(performance, sizeof(*msg), + (DMUS_PMSG **)&msg))) + break; + + msg->mtTime = item->mtTime; + msg->dwFlags = DMUS_PMSGF_MUSICTIME; + msg->dwPChannel = item->dwPChannel; + msg->dwVirtualTrackID = track_id; + msg->dwType = DMUS_PMSGT_NOTE; + msg->dwGroupID = 1; + msg->mtDuration = item->mtDuration; + msg->wMusicValue = item->bByte1; + msg->nOffset = item->nOffset; + msg->bVelocity = item->bByte2; + msg->bFlags = 1; + msg->bMidiValue = item->bByte1; + + if (FAILED(hr = IDirectMusicGraph_StampPMsg(graph, (DMUS_PMSG *)msg)) + || FAILED(hr = IDirectMusicPerformance_SendPMsg(performance, (DMUS_PMSG *)msg))) + { + IDirectMusicPerformance_FreePMsg(performance, (DMUS_PMSG *)msg); + break; + } + } + + for (i = 0; SUCCEEDED(hr) &&i < This->curve_count; i++) + { + DMUS_IO_CURVE_ITEM *item = This->curve_items + i; + DMUS_CURVE_PMSG *msg; + + if (FAILED(hr = IDirectMusicPerformance_AllocPMsg(performance, sizeof(*msg), + (DMUS_PMSG **)&msg))) + break; + + msg->mtTime = item->mtStart; + msg->dwFlags = DMUS_PMSGF_MUSICTIME; + msg->dwPChannel = item->dwPChannel; + msg->dwVirtualTrackID = track_id; + msg->dwType = DMUS_PMSGT_CURVE; + msg->mtDuration = item->mtDuration; + msg->mtOriginalStart = item->mtStart; + msg->mtResetDuration = item->mtResetDuration; + msg->nStartValue = item->nStartValue; + msg->nEndValue = item->nEndValue; + msg->nResetValue = item->nResetValue; + msg->nOffset = item->nOffset; + msg->bType = item->bType; + msg->bCurveShape = item->bCurveShape; + msg->bCCData = item->bCCData; + msg->bFlags = item->bFlags; + msg->wParamType = item->wParamType; + msg->wMergeIndex = item->wMergeIndex; + + if (FAILED(hr = IDirectMusicGraph_StampPMsg(graph, (DMUS_PMSG *)msg)) + || FAILED(hr = IDirectMusicPerformance_SendPMsg(performance, (DMUS_PMSG *)msg))) + { + IDirectMusicPerformance_FreePMsg(performance, (DMUS_PMSG *)msg); + break; + } + } + + IDirectMusicGraph_Release(graph); + return hr; } static HRESULT WINAPI sequence_track_GetParam(IDirectMusicTrack8 *iface, REFGUID type, diff --git a/dlls/dmime/tests/dmime.c b/dlls/dmime/tests/dmime.c index 412cccce781..6881eac80c6 100644 --- a/dlls/dmime/tests/dmime.c +++ b/dlls/dmime/tests/dmime.c @@ -3502,30 +3502,21 @@ static void test_sequence_track(void) ret = test_tool_wait_message(tool, 500, (DMUS_PMSG **)&note); ok(!ret, "got %#lx\n", ret); - if (note->dwType == DMUS_PMSGT_NOTE) - { check_dmus_note_pmsg(note, 0, 0, 500, 60, 120); - } hr = IDirectMusicPerformance_FreePMsg(performance, (DMUS_PMSG *)note); ok(hr == S_OK, "got %#lx\n", hr); ret = test_tool_wait_message(tool, 500, (DMUS_PMSG **)&note); - todo_wine ok(!ret, "got %#lx\n", ret); - if (!ret) - { + ok(!ret, "got %#lx\n", ret); check_dmus_note_pmsg(note, 1000, 1, 200, 50, 100); hr = IDirectMusicPerformance_FreePMsg(performance, (DMUS_PMSG *)note); ok(hr == S_OK, "got %#lx\n", hr); - } ret = test_tool_wait_message(tool, 500, &msg); - todo_wine ok(!ret, "got %#lx\n", ret); - if (!ret) - { + ok(!ret, "got %#lx\n", ret); ok(msg->dwType == DMUS_PMSGT_DIRTY, "got %#lx\n", msg->dwType); hr = IDirectMusicPerformance_FreePMsg(performance, msg); ok(hr == S_OK, "got %#lx\n", hr); - } IDirectMusicSegment_Release(segment);

1 0