January 2024 - Wine-Commits

Alexandre Julliard : ntdll: Use a .seh handler for the unwind exception handler.
by Alexandre Julliard Jan. 29, 2024

Jan. 29, 2024

Module: wine Branch: master Commit: f704b80a2652a41fb569c42207d317c75d8eeb77 URL: https://gitlab.winehq.org/wine/wine/-/commit/f704b80a2652a41fb569c42207d317… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jan 29 13:29:31 2024 +0100 ntdll: Use a .seh handler for the unwind exception handler. --- dlls/ntdll/signal_arm.c | 77 ++++++++++++++++++++++++++++++---------------- dlls/ntdll/signal_arm64.c | 66 +++++++++++++++++++++------------------ dlls/ntdll/signal_x86_64.c | 4 +-- 3 files changed, 88 insertions(+), 59 deletions(-)

1 0

Alexandre Julliard : ntdll: Use the system setjmp/longjmp for exceptions in Unix libs.
by Alexandre Julliard Jan. 29, 2024

Jan. 29, 2024

Module: wine Branch: master Commit: 658a0665d4e947c0b1ed6971ba82ff7b3ca25290 URL: https://gitlab.winehq.org/wine/wine/-/commit/658a0665d4e947c0b1ed6971ba82ff… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Jan 27 13:08:38 2024 +0100 ntdll: Use the system setjmp/longjmp for exceptions in Unix libs. --- dlls/ntdll/unix/signal_arm.c | 38 +----------------------------- dlls/ntdll/unix/signal_arm64.c | 51 +---------------------------------------- dlls/ntdll/unix/signal_i386.c | 35 ++-------------------------- dlls/ntdll/unix/signal_x86_64.c | 41 +-------------------------------- dlls/ntdll/unix/thread.c | 2 +- include/wine/unixlib.h | 25 +++++--------------- 6 files changed, 12 insertions(+), 180 deletions(-)

1 0

Alexandre Julliard : ntdll: Avoid calling DbgBreakPoint() in process_breakpoint().
by Alexandre Julliard Jan. 29, 2024

Jan. 29, 2024

Module: wine Branch: master Commit: d1836e226c003150fe0de19cf96f048eb82b0ac1 URL: https://gitlab.winehq.org/wine/wine/-/commit/d1836e226c003150fe0de19cf96f04… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jan 29 17:07:25 2024 +0100 ntdll: Avoid calling DbgBreakPoint() in process_breakpoint(). --- dlls/kernel32/tests/debugger.c | 11 +---------- dlls/ntdll/signal_i386.c | 2 +- dlls/ntdll/signal_x86_64.c | 2 +- 3 files changed, 3 insertions(+), 12 deletions(-) diff --git a/dlls/kernel32/tests/debugger.c b/dlls/kernel32/tests/debugger.c index b0c69052936..5dc6ca77d48 100644 --- a/dlls/kernel32/tests/debugger.c +++ b/dlls/kernel32/tests/debugger.c @@ -1381,16 +1381,7 @@ static void test_debug_children(const char *name, DWORD flag, BOOL debug_child, /* Except for wxppro and w2008, the initial breakpoint is now somewhere else, possibly within LdrInitShimEngineDynamic, * It's also catching exceptions and ContinueDebugEvent(DBG_EXCEPTION_NOT_HANDLED) should not crash the child now */ - if (broken(ctx.ev.u.Exception.ExceptionRecord.ExceptionAddress == pDbgBreakPoint)) - { - win_skip("Ignoring initial breakpoint address check\n"); - pass_exception = FALSE; - } - else - { - todo_wine - ok(ctx.ev.u.Exception.ExceptionRecord.ExceptionAddress != pDbgBreakPoint, "ExceptionAddress == pDbgBreakPoint\n"); - } + ok(ctx.ev.u.Exception.ExceptionRecord.ExceptionAddress != pDbgBreakPoint, "ExceptionAddress == pDbgBreakPoint\n"); if (pass_exception) { diff --git a/dlls/ntdll/signal_i386.c b/dlls/ntdll/signal_i386.c index 95efec5122c..ee20b5e011e 100644 --- a/dlls/ntdll/signal_i386.c +++ b/dlls/ntdll/signal_i386.c @@ -636,7 +636,7 @@ void WINAPI process_breakpoint(void) { __TRY { - DbgBreakPoint(); + __asm__ volatile("int $3"); } __EXCEPT_ALL { diff --git a/dlls/ntdll/signal_x86_64.c b/dlls/ntdll/signal_x86_64.c index 17c1bb2a651..46357897369 100644 --- a/dlls/ntdll/signal_x86_64.c +++ b/dlls/ntdll/signal_x86_64.c @@ -1734,7 +1734,7 @@ void WINAPI process_breakpoint(void) { __TRY { - DbgBreakPoint(); + __asm__ volatile("int $3"); } __EXCEPT_ALL {

1 0

Alex Henrie : krnl386: Emulate the VGA status register.
by Alexandre Julliard Jan. 29, 2024

Jan. 29, 2024

Module: wine Branch: master Commit: b87bd5e9b0f9536e78254c877bd333d46d151509 URL: https://gitlab.winehq.org/wine/wine/-/commit/b87bd5e9b0f9536e78254c877bd333… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Sun Jan 28 00:16:14 2024 -0700 krnl386: Emulate the VGA status register. Sega Bug uses it as a timer. --- dlls/krnl386.exe16/ioports.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/krnl386.exe16/ioports.c b/dlls/krnl386.exe16/ioports.c index 7f795c2badf..dc188fabecf 100644 --- a/dlls/krnl386.exe16/ioports.c +++ b/dlls/krnl386.exe16/ioports.c @@ -316,6 +316,9 @@ DWORD DOSVM_inport( int port, int size ) case 0x201: res = ~0U; /* no joystick */ break; + case 0x3da: + res = GetTickCount() % 17 == 0 ? 0x4 : 0; /* report vblank about 60 times per second */ + break; default: WARN("Direct I/O read attempted from port %x\n", port); break;

1 0

Eric Pouech : dmime/tests: Add some tests about end-points.
by Alexandre Julliard Jan. 29, 2024

Jan. 29, 2024

Module: wine Branch: master Commit: 8169c4d040e8301e6401a03729443e3b1f635398 URL: https://gitlab.winehq.org/wine/wine/-/commit/8169c4d040e8301e6401a03729443e… Author: Eric Pouech <epouech(a)codeweavers.com> Date: Mon Jan 22 17:40:19 2024 +0100 dmime/tests: Add some tests about end-points. Signed-off-by: Eric Pouech <epouech(a)codeweavers.com> --- dlls/dmime/tests/dmime.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/dmime/tests/dmime.c b/dlls/dmime/tests/dmime.c index f96e6509b7a..26fdf3ef2a5 100644 --- a/dlls/dmime/tests/dmime.c +++ b/dlls/dmime/tests/dmime.c @@ -4512,6 +4512,10 @@ static void test_segment_state(void) ok(hr == S_OK, "got %#lx\n", hr); hr = IDirectMusicSegment_SetRepeats(segment, 0); ok(hr == S_OK, "got %#lx\n", hr); + hr = IDirectMusicSegment_SetLoopPoints(segment, 10, 70); + ok(hr == S_OK, "got %#lx\n", hr); + hr = IDirectMusicSegment_SetLoopPoints(segment, 10, 101); + ok(hr == DMUS_E_OUT_OF_RANGE, "got %#lx\n", hr); hr = IDirectMusicSegment_SetLoopPoints(segment, 0, 0); ok(hr == S_OK, "got %#lx\n", hr);

1 0

Alexandros Frantzis : winewayland.drv: Track and apply latest window cursor on pointer enter.
by Alexandre Julliard Jan. 29, 2024

Jan. 29, 2024

Module: wine Branch: master Commit: fe1f3e277d25b299c8c526c3d706a38fbde24e11 URL: https://gitlab.winehq.org/wine/wine/-/commit/fe1f3e277d25b299c8c526c3d706a3… Author: Alexandros Frantzis <alexandros.frantzis(a)collabora.com> Date: Fri Jan 26 09:45:14 2024 +0200 winewayland.drv: Track and apply latest window cursor on pointer enter. Keep track of the window cursor set for each surface and apply it when the pointer enters the corresponding surface. This fixes a problem where due to transient disagreements between win32 pointer focus and Wayland pointer focus a cursor update may be lost. For example: 1. Assume existing cursor C1. 2. Window is created beneath cursor. 3. The SetCursor(hwnd, C2) driver callback is called, but because the wl_pointer hasn't entered the Wayland surface yet we don't update the wl_pointer cursor. 4. wl_pointer enters the surface, we apply the latest cursor we know about, which is C1. 5. Since no change in cursor window occurs, we don't get any further SetCursor(hwnd, C2) callbacks, so we get stuck with C1. This commit fixes the problem by tracking the per-surface HCURSOR in step 3, regardless of whether the cursor is actually applied. So, in step 4 we can use that HCURSOR for the surface. This change also fixes some cases of our mouselook heuristics not kicking in properly due to missing a SetCursor(hwnd, NULL) in the manner described above. --- dlls/winewayland.drv/wayland_pointer.c | 3 +++ dlls/winewayland.drv/waylanddrv.h | 1 + 2 files changed, 4 insertions(+) diff --git a/dlls/winewayland.drv/wayland_pointer.c b/dlls/winewayland.drv/wayland_pointer.c index fad75c8506c..54dd7931b6e 100644 --- a/dlls/winewayland.drv/wayland_pointer.c +++ b/dlls/winewayland.drv/wayland_pointer.c @@ -670,6 +670,9 @@ static void wayland_set_cursor(HWND hwnd, HCURSOR hcursor, BOOL use_hcursor) if ((surface = wayland_surface_lock_hwnd(hwnd))) { scale = surface->window.scale; + if (use_hcursor) surface->hcursor = hcursor; + else hcursor = surface->hcursor; + use_hcursor = TRUE; pthread_mutex_unlock(&surface->mutex); } else diff --git a/dlls/winewayland.drv/waylanddrv.h b/dlls/winewayland.drv/waylanddrv.h index 0883c43f1ff..f030f6fc6a0 100644 --- a/dlls/winewayland.drv/waylanddrv.h +++ b/dlls/winewayland.drv/waylanddrv.h @@ -201,6 +201,7 @@ struct wayland_surface struct wayland_window_config window; struct wayland_client_surface *client; int buffer_width, buffer_height; + HCURSOR hcursor; }; struct wayland_shm_buffer

1 0

Eric Pouech : dmime: Fix IDirectMusicAudioPath::GetObjectInPath() prototype.
by Alexandre Julliard Jan. 29, 2024

Jan. 29, 2024

Module: wine Branch: master Commit: 1bdf94a409e1862206a27ee77e16b182b6f716de URL: https://gitlab.winehq.org/wine/wine/-/commit/1bdf94a409e1862206a27ee77e16b1… Author: Eric Pouech <epouech(a)codeweavers.com> Date: Fri Jan 26 17:20:32 2024 +0100 dmime: Fix IDirectMusicAudioPath::GetObjectInPath() prototype. Signed-off-by: Eric Pouech <epouech(a)codeweavers.com> --- dlls/dmime/audiopath.c | 4 ++-- include/dmusici.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/dmime/audiopath.c b/dlls/dmime/audiopath.c index 2e6a916136f..3389f965b8f 100644 --- a/dlls/dmime/audiopath.c +++ b/dlls/dmime/audiopath.c @@ -140,12 +140,12 @@ static ULONG WINAPI IDirectMusicAudioPathImpl_Release (IDirectMusicAudioPath *if } static HRESULT WINAPI IDirectMusicAudioPathImpl_GetObjectInPath (IDirectMusicAudioPath *iface, DWORD dwPChannel, DWORD dwStage, DWORD dwBuffer, - REFGUID guidObject, WORD dwIndex, REFGUID iidInterface, void** ppObject) + REFGUID guidObject, DWORD dwIndex, REFGUID iidInterface, void** ppObject) { struct IDirectMusicAudioPathImpl *This = impl_from_IDirectMusicAudioPath(iface); HRESULT hr; - FIXME("(%p, %ld, %ld, %ld, %s, %d, %s, %p): stub\n", This, dwPChannel, dwStage, dwBuffer, debugstr_dmguid(guidObject), + FIXME("(%p, %ld, %ld, %ld, %s, %ld, %s, %p): stub\n", This, dwPChannel, dwStage, dwBuffer, debugstr_dmguid(guidObject), dwIndex, debugstr_dmguid(iidInterface), ppObject); switch (dwStage) { diff --git a/include/dmusici.h b/include/dmusici.h index 80e89a37d0e..bae6d2ae139 100644 --- a/include/dmusici.h +++ b/include/dmusici.h @@ -1177,7 +1177,7 @@ DECLARE_INTERFACE_(IDirectMusicAudioPath,IUnknown) STDMETHOD_(ULONG,AddRef)(THIS) PURE; STDMETHOD_(ULONG,Release)(THIS) PURE; /*** IDirectMusicAudioPath methods ***/ - STDMETHOD(GetObjectInPath)(THIS_ DWORD dwPChannel, DWORD dwStage, DWORD dwBuffer, REFGUID guidObject, WORD dwIndex, REFGUID iidInterface, void **ppObject) PURE; + STDMETHOD(GetObjectInPath)(THIS_ DWORD dwPChannel, DWORD dwStage, DWORD dwBuffer, REFGUID guidObject, DWORD dwIndex, REFGUID iidInterface, void **ppObject) PURE; STDMETHOD(Activate)(THIS_ BOOL fActivate) PURE; STDMETHOD(SetVolume)(THIS_ LONG lVolume, DWORD dwDuration) PURE; STDMETHOD(ConvertPChannel)(THIS_ DWORD dwPChannelIn, DWORD *pdwPChannelOut) PURE;

1 0

Eric Pouech : dmime: Remove unused fields in segment.
by Alexandre Julliard Jan. 29, 2024

Jan. 29, 2024

Module: wine Branch: master Commit: 7d1cfb9e013d1821a62989916cd9bf8fa2669656 URL: https://gitlab.winehq.org/wine/wine/-/commit/7d1cfb9e013d1821a62989916cd9bf… Author: Eric Pouech <epouech(a)codeweavers.com> Date: Fri Jan 26 17:22:58 2024 +0100 dmime: Remove unused fields in segment. Signed-off-by: Eric Pouech <epouech(a)codeweavers.com> --- dlls/dmime/segment.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/dlls/dmime/segment.c b/dlls/dmime/segment.c index 75e8d706ed4..b208f89148c 100644 --- a/dlls/dmime/segment.c +++ b/dlls/dmime/segment.c @@ -49,10 +49,6 @@ struct segment DMUS_IO_SEGMENT_HEADER header; IDirectMusicGraph *pGraph; struct list tracks; - - PCMWAVEFORMAT wave_format; - void *wave_data; - int data_size; }; static struct segment *segment_create(void); @@ -112,7 +108,6 @@ static ULONG WINAPI segment_Release(IDirectMusicSegment8 *iface) list_remove(&entry->entry); track_entry_destroy(entry); } - free(This->wave_data); free(This); }

1 0

Eric Pouech : dmime/tests: Add some tests for loops on wave tracks.
by Alexandre Julliard Jan. 29, 2024

Jan. 29, 2024

Module: wine Branch: master Commit: b2441ad69979dda9d8edbeb4a02f2ce8c142207d URL: https://gitlab.winehq.org/wine/wine/-/commit/b2441ad69979dda9d8edbeb4a02f2c… Author: Eric Pouech <epouech(a)codeweavers.com> Date: Mon Jan 22 17:02:12 2024 +0100 dmime/tests: Add some tests for loops on wave tracks. Signed-off-by: Eric Pouech <epouech(a)codeweavers.com> --- dlls/dmime/tests/dmime.c | 89 +++++++++++++++++++++++++++++++++++++----------- 1 file changed, 70 insertions(+), 19 deletions(-) diff --git a/dlls/dmime/tests/dmime.c b/dlls/dmime/tests/dmime.c index e22193e3a5c..f96e6509b7a 100644 --- a/dlls/dmime/tests/dmime.c +++ b/dlls/dmime/tests/dmime.c @@ -3542,7 +3542,7 @@ static void test_notification_pmsg(void) IDirectMusicTool_Release(tool); } -static void test_wave_pmsg(void) +static void test_wave_pmsg(unsigned num_repeats) { static const DWORD message_types[] = { @@ -3550,17 +3550,25 @@ static void test_wave_pmsg(void) DMUS_PMSGT_WAVE, }; IDirectMusicPerformance *performance; + IDirectMusicSegmentState *state; IDirectMusicSegment *segment; IDirectMusicLoader8 *loader; IDirectMusicGraph *graph; WCHAR test_wav[MAX_PATH]; IDirectMusicTool *tool; DMUS_WAVE_PMSG *wave; + DWORD mt_start_ref; MUSIC_TIME length; DMUS_PMSG *msg; + DWORD value; HRESULT hr; + unsigned i; DWORD ret; + if (num_repeats) + winetest_push_context("with %u repeats", num_repeats); + else + winetest_push_context("without any repeats"); hr = test_tool_create(message_types, ARRAY_SIZE(message_types), &tool); ok(hr == S_OK, "got %#lx\n", hr); @@ -3599,6 +3607,12 @@ static void test_wave_pmsg(void) ok(length == 1, "got %lu\n", length); + if (num_repeats) + { + hr = IDirectMusicSegment_SetRepeats(segment, num_repeats); + ok(hr == S_OK, "got %#lx\n", hr); + } + /* without Download, no DMUS_PMSGT_WAVE is sent */ hr = IDirectMusicPerformance_PlaySegment(performance, segment, 0, 0, NULL); @@ -3611,10 +3625,14 @@ static void test_wave_pmsg(void) ok(hr == S_OK, "got %#lx\n", hr); ret = test_tool_wait_message(tool, 500, &msg); + todo_wine_if(num_repeats) ok(!ret, "got %#lx\n", ret); - ok(msg->dwType == DMUS_PMSGT_DIRTY, "got %p\n", msg); - hr = IDirectMusicPerformance_FreePMsg(performance, msg); - ok(hr == S_OK, "got %#lx\n", hr); + if (!ret) + { + ok(msg->dwType == DMUS_PMSGT_DIRTY, "got %p\n", msg); + hr = IDirectMusicPerformance_FreePMsg(performance, msg); + ok(hr == S_OK, "got %#lx\n", hr); + } ret = test_tool_wait_message(tool, 100, &msg); ok(ret == WAIT_TIMEOUT, "got %#lx\n", ret); @@ -3626,7 +3644,7 @@ static void test_wave_pmsg(void) hr = IDirectMusicSegment8_Download((IDirectMusicSegment8 *)segment, (IUnknown *)performance); ok(hr == S_OK, "got %#lx\n", hr); - hr = IDirectMusicPerformance_PlaySegment(performance, segment, 0, 0, NULL); + hr = IDirectMusicPerformance_PlaySegment(performance, segment, 0, 0, &state); ok(hr == S_OK, "got %#lx\n", hr); ret = test_tool_wait_message(tool, 500, &msg); @@ -3635,24 +3653,54 @@ static void test_wave_pmsg(void) hr = IDirectMusicPerformance_FreePMsg(performance, msg); ok(hr == S_OK, "got %#lx\n", hr); - ret = test_tool_wait_message(tool, 500, (DMUS_PMSG **)&wave); - ok(!ret, "got %#lx\n", ret); - ok(wave->dwType == DMUS_PMSGT_WAVE, "got %p\n", wave); - ok(!!wave->punkUser, "got %p\n", wave->punkUser); - ok(wave->rtStartOffset == 0, "got %I64d\n", wave->rtStartOffset); - ok(wave->rtDuration == 1000000, "got %I64d\n", wave->rtDuration); - ok(wave->lOffset == 0, "got %lu\n", wave->lOffset); - ok(wave->lVolume == 0, "got %lu\n", wave->lVolume); - ok(wave->lPitch == 0, "got %lu\n", wave->lPitch); - ok(wave->bFlags == 0, "got %#x\n", wave->bFlags); - hr = IDirectMusicPerformance_FreePMsg(performance, (DMUS_PMSG *)wave); + hr = IDirectMusicPerformance_ReferenceToMusicTime(performance, 1000000, &length); ok(hr == S_OK, "got %#lx\n", hr); + /* assuming not modified tempo */ + length = round((1000000 * 120.0 * DMUS_PPQ) / 600000000.0); + + for (i = 0; i <= num_repeats; i++) + { + ret = test_tool_wait_message(tool, 500, (DMUS_PMSG **)&wave); + todo_wine_if(num_repeats && ret) + ok(!ret, "got %#lx\n", ret); + if (ret) continue; + ok(wave->dwType == DMUS_PMSGT_WAVE, "got %p\n", wave); + ok(wave->dwSize == sizeof(*wave), "got %lu\n", wave->dwSize); + ok(!!wave->punkUser, "got %p\n", wave->punkUser); + ok((wave->dwFlags & DMUS_PMSGF_REFTIME) && (wave->dwFlags & DMUS_PMSGF_MUSICTIME), + "got %lx\n", wave->dwFlags); + if (i == 0) + mt_start_ref = wave->mtTime; + else + todo_wine + ok(wave->mtTime == mt_start_ref + length * i, "got %lu (%lu,%lu)\n", wave->mtTime, mt_start_ref, i * length); + ok(wave->rtStartOffset == 0, "got %I64d\n", wave->rtStartOffset); + ok(wave->rtDuration == 1000000, "got %I64d\n", wave->rtDuration); + ok(wave->lOffset == 0, "got %lu\n", wave->lOffset); + ok(wave->lVolume == 0, "got %lu\n", wave->lVolume); + ok(wave->lPitch == 0, "got %lu\n", wave->lPitch); + ok(wave->bFlags == 0, "got %#x\n", wave->bFlags); + hr = IDirectMusicPerformance_FreePMsg(performance, (DMUS_PMSG *)wave); + ok(hr == S_OK, "got %#lx\n", hr); + } ret = test_tool_wait_message(tool, 500, &msg); + todo_wine_if(num_repeats) ok(!ret, "got %#lx\n", ret); - ok(msg->dwType == DMUS_PMSGT_DIRTY, "got %p\n", msg); - hr = IDirectMusicPerformance_FreePMsg(performance, msg); + if (!ret) + { + ok(msg->dwType == DMUS_PMSGT_DIRTY, "got %p\n", msg); + hr = IDirectMusicPerformance_FreePMsg(performance, msg); + ok(hr == S_OK, "got %#lx\n", hr); + } + + hr = IDirectMusicSegment_GetRepeats(segment, &value); ok(hr == S_OK, "got %#lx\n", hr); + ok(value == num_repeats, "got %lu\n", value); + + hr = IDirectMusicSegmentState_GetRepeats(state, &value); + ok(hr == S_OK, "got %#lx\n", hr); + ok(value == num_repeats, "got %lu\n", value); hr = IDirectMusicSegment8_Unload((IDirectMusicSegment8 *)segment, (IUnknown *)performance); ok(hr == S_OK, "got %#lx\n", hr); @@ -3670,6 +3718,8 @@ static void test_wave_pmsg(void) IDirectMusicPerformance_Release(performance); IDirectMusicTool_Release(tool); + + winetest_pop_context(); } static void test_sequence_track(void) @@ -4664,7 +4714,8 @@ START_TEST(dmime) test_performance_time(); test_performance_pmsg(); test_notification_pmsg(); - test_wave_pmsg(); + test_wave_pmsg(0); + test_wave_pmsg(10); test_sequence_track(); test_band_track_play(); test_tempo_track_play();

1 0

Eric Pouech : dmime/tests: Fix copy & paste errors.
by Alexandre Julliard Jan. 29, 2024

Jan. 29, 2024

Module: wine Branch: master Commit: 7aef55a996f086042c346b740d4e752a4b4501a5 URL: https://gitlab.winehq.org/wine/wine/-/commit/7aef55a996f086042c346b740d4e75… Author: Eric Pouech <epouech(a)codeweavers.com> Date: Mon Jan 22 16:57:42 2024 +0100 dmime/tests: Fix copy & paste errors. Signed-off-by: Eric Pouech <epouech(a)codeweavers.com> --- dlls/dmime/tests/dmime.c | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/dlls/dmime/tests/dmime.c b/dlls/dmime/tests/dmime.c index e9036511e9d..e22193e3a5c 100644 --- a/dlls/dmime/tests/dmime.c +++ b/dlls/dmime/tests/dmime.c @@ -4483,10 +4483,11 @@ static void test_segment_state(void) hr = IDirectMusicSegmentState_GetStartPoint(state, &time); ok(hr == S_OK, "got %#lx\n", hr); ok(time == 0, "got %#lx\n", time); - time = 0xdeadbeef; + value = 0xdeadbeef; hr = IDirectMusicSegmentState_GetRepeats(state, &value); ok(hr == S_OK, "got %#lx\n", hr); - ok(time == 0xdeadbeef, "got %#lx\n", time); + todo_wine + ok(value == 0, "got %#lx\n", value); time = 0xdeadbeef; hr = IDirectMusicSegmentState_GetStartTime(state, &time); ok(hr == S_OK, "got %#lx\n", hr); @@ -4566,10 +4567,11 @@ static void test_segment_state(void) hr = IDirectMusicSegmentState_GetStartPoint(state, &time); ok(hr == S_OK, "got %#lx\n", hr); ok(time == 50, "got %lu\n", time); - time = 0xdeadbeef; + value = 0xdeadbeef; hr = IDirectMusicSegmentState_GetRepeats(state, &value); ok(hr == S_OK, "got %#lx\n", hr); - ok(time == 0xdeadbeef, "got %#lx\n", time); + todo_wine + ok(value == 0, "got %#lx\n", value); time = 0xdeadbeef; hr = IDirectMusicSegmentState_GetStartTime(state, &time); ok(hr == S_OK, "got %#lx\n", hr); @@ -4596,10 +4598,11 @@ static void test_segment_state(void) hr = IDirectMusicSegmentState_GetStartPoint(state, &time); ok(hr == S_OK, "got %#lx\n", hr); ok(time == 50, "got %#lx\n", time); - time = 0xdeadbeef; + value = 0xdeadbeef; hr = IDirectMusicSegmentState_GetRepeats(state, &value); ok(hr == S_OK, "got %#lx\n", hr); - ok(time == 0xdeadbeef, "got %#lx\n", time); + todo_wine + ok(value == 0, "got %#lx\n", value); time = 0xdeadbeef; hr = IDirectMusicSegmentState_GetStartTime(state, &time); ok(hr == S_OK, "got %#lx\n", hr);

1 0