February 2022 - Wine-Devel - list.winehq.org

[PATCH] wined3d: Clear GL backbuffer in wined3d_context_gl_init().
by Paul Gofman Feb. 14, 2022

Feb. 14, 2022

Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- Fixes Serious Sam: The Random Encounter when WGL_SWAP_COPY_ARB is supported and game letterboxes itself in case of aspect ratio mismatch. In which case there is currently garbage dispayed outside the area being updated by the game. dlls/wined3d/context_gl.c | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/context_gl.c b/dlls/wined3d/context_gl.c index 7b40b1de0fb..ff33b8a4d74 100644 --- a/dlls/wined3d/context_gl.c +++ b/dlls/wined3d/context_gl.c @@ -1897,7 +1897,7 @@ HGLRC context_create_wgl_attribs(const struct wined3d_gl_info *gl_info, HDC hdc, } static BOOL wined3d_context_gl_create_wgl_ctx(struct wined3d_context_gl *context_gl, - struct wined3d_swapchain_gl *swapchain_gl) + struct wined3d_swapchain_gl *swapchain_gl, BOOL *new_drawable) { enum wined3d_swap_effect swap_effect = swapchain_gl->s.state.desc.swap_effect; const struct wined3d_format *colour_format, *ds_format; @@ -1920,6 +1920,8 @@ static BOOL wined3d_context_gl_create_wgl_ctx(struct wined3d_context_gl *context swap_effect_copy = swap_effect == WINED3D_SWAP_EFFECT_COPY || swap_effect == WINED3D_SWAP_EFFECT_COPY_VSYNC; + *new_drawable = !GetPixelFormat(context_gl->dc); + if (wined3d_settings.offscreen_rendering_mode == ORM_BACKBUFFER) { static const enum wined3d_format_id ds_formats[] = @@ -2018,7 +2020,7 @@ static BOOL wined3d_context_gl_create_wgl_ctx(struct wined3d_context_gl *context } context_gl->dc_is_private = TRUE; - return wined3d_context_gl_create_wgl_ctx(context_gl, swapchain_gl); + return wined3d_context_gl_create_wgl_ctx(context_gl, swapchain_gl, new_drawable); } share_ctx = device->context_count ? wined3d_context_gl(device->contexts[0])->gl_ctx : NULL; @@ -2064,6 +2066,7 @@ HRESULT wined3d_context_gl_init(struct wined3d_context_gl *context_gl, struct wi const struct wined3d_d3d_info *d3d_info; const struct wined3d_gl_info *gl_info; struct wined3d_device *device; + BOOL new_drawable; unsigned int i; TRACE("context_gl %p, swapchain %p.\n", context_gl, swapchain_gl); @@ -2142,7 +2145,7 @@ HRESULT wined3d_context_gl_init(struct wined3d_context_gl *context_gl, struct wi sizeof(*context_gl->texture_type)))) goto fail; - if (!wined3d_context_gl_create_wgl_ctx(context_gl, swapchain_gl)) + if (!wined3d_context_gl_create_wgl_ctx(context_gl, swapchain_gl, &new_drawable)) goto fail; /* Set up the context defaults. */ @@ -2299,6 +2302,14 @@ HRESULT wined3d_context_gl_init(struct wined3d_context_gl *context_gl, struct wi gl_info->gl_ops.gl.p_glScissor(0, 0, 0, 0); checkGLcall("glScissor"); + if (new_drawable) + { + gl_info->gl_ops.gl.p_glClearColor(0.0f, 0.0f, 0.0f, 0.0f); + gl_info->gl_ops.gl.p_glClearDepth(1.0f); + gl_info->gl_ops.gl.p_glClearStencil(0); + gl_info->gl_ops.gl.p_glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT | GL_STENCIL_BUFFER_BIT); + checkGLcall("glClear"); + } return WINED3D_OK; fail: -- 2.34.1

2 1

[PATCH vkd3d v2] vkd3d: Lock the heap mutex while binding heap memory.
by Conor McCarthy Feb. 14, 2022

Feb. 14, 2022

Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com> --- libs/vkd3d/resource.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/libs/vkd3d/resource.c b/libs/vkd3d/resource.c index 7b94ac92..4c48e22e 100644 --- a/libs/vkd3d/resource.c +++ b/libs/vkd3d/resource.c @@ -1941,11 +1941,17 @@ static HRESULT vkd3d_bind_heap_memory(struct d3d12_device *device, goto allocate_memory; } + /* Syncronisation is not required for binding, but vkMapMemory() may be called + * from another thread and it requires exclusive access. */ + vkd3d_mutex_lock(&heap->mutex); + if (d3d12_resource_is_buffer(resource)) vr = VK_CALL(vkBindBufferMemory(vk_device, resource->u.vk_buffer, heap->vk_memory, heap_offset)); else vr = VK_CALL(vkBindImageMemory(vk_device, resource->u.vk_image, heap->vk_memory, heap_offset)); + vkd3d_mutex_unlock(&heap->mutex); + if (vr == VK_SUCCESS) { resource->heap = heap; -- 2.34.1

2 1

[PATCH vkd3d 1/7] vkd3d-shader/sm4: Skip non-color outputs in shader output mapping.
by Matteo Bruni Feb. 14, 2022

Feb. 14, 2022

Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> --- libs/vkd3d-shader/dxbc.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/libs/vkd3d-shader/dxbc.c b/libs/vkd3d-shader/dxbc.c index d28c303a..27993c73 100644 --- a/libs/vkd3d-shader/dxbc.c +++ b/libs/vkd3d-shader/dxbc.c @@ -1672,6 +1672,9 @@ static bool shader_sm4_init(struct vkd3d_shader_sm4_parser *sm4, const uint32_t { struct vkd3d_shader_signature_element *e = &output_signature->elements[i]; + if (version.type == VKD3D_SHADER_TYPE_PIXEL + && ascii_strcasecmp(e->semantic_name, "SV_Target")) + continue; if (e->register_index >= ARRAY_SIZE(sm4->output_map)) { WARN("Invalid output index %u.\n", e->register_index); -- 2.34.1

3 14

[PATCH v2 1/5] winebus.sys: Only call SDL_HapticRumbleInit if supported, as a fallback.
by Rémi Bernon Feb. 14, 2022

Feb. 14, 2022

The SDL_HAPTIC_LEFTRIGHT effect should be preferred when available. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- v2: Avoid passing possibly NULL impl->sdl_haptic as a parameter. dlls/winebus.sys/bus_sdl.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/dlls/winebus.sys/bus_sdl.c b/dlls/winebus.sys/bus_sdl.c index eba8a959cb4..d036ec2b98e 100644 --- a/dlls/winebus.sys/bus_sdl.c +++ b/dlls/winebus.sys/bus_sdl.c @@ -187,11 +187,10 @@ static BOOL descriptor_add_haptic(struct sdl_device *impl) else { impl->effect_support = pSDL_HapticQuery(impl->sdl_haptic); - if (pSDL_HapticRumbleSupported(impl->sdl_haptic)) + if (!(impl->effect_support & EFFECT_SUPPORT_HAPTICS) && + pSDL_HapticRumbleSupported(impl->sdl_haptic) && + pSDL_HapticRumbleInit(impl->sdl_haptic) == 0) impl->effect_support |= WINE_SDL_HAPTIC_RUMBLE; - - pSDL_HapticStopAll(impl->sdl_haptic); - pSDL_HapticRumbleInit(impl->sdl_haptic); } if (!(impl->effect_support & EFFECT_SUPPORT_HAPTICS) && pSDL_JoystickRumble && -- 2.34.1

1 4

[tools] testbot: Use rebase when updating the Wine source.
by Francois Gouget Feb. 14, 2022

Feb. 14, 2022

The TestBot's Wine source should be unmodified so there should be no difference between 'git merge' and 'git rebase'. If there are local patches (for debugging?) rebase will keep them more visible. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- This avoids a git warning. testbot/lib/Build/Utils.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/lib/Build/Utils.pm b/testbot/lib/Build/Utils.pm index a56a4f2a49..9d169633e6 100644 --- a/testbot/lib/Build/Utils.pm +++ b/testbot/lib/Build/Utils.pm @@ -89,7 +89,7 @@ sub GitPull($) else { InfoMsg "\nUpdating the $Dir source\n"; - system("cd '$DataDir/$Dir' && (set -x && git pull) && ". + system("cd '$DataDir/$Dir' && (set -x && git pull --rebase) && ". "echo $Dir:HEAD=`git rev-parse HEAD`"); } if ($? != 0) -- 2.30.2

1 0

[tools] testbot/WineRunReconfig: Use rebase when updating the TestBot source.
by Francois Gouget Feb. 14, 2022

Feb. 14, 2022

The TestBot source should be unmodified so there should be no difference between 'git merge' and 'git rebase'. If there are local patches (for debugging?) rebase will keep them more visible. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- This avoids a git warning. testbot/bin/WineRunReconfig.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/bin/WineRunReconfig.pl b/testbot/bin/WineRunReconfig.pl index 9bd9429930..c91966d385 100755 --- a/testbot/bin/WineRunReconfig.pl +++ b/testbot/bin/WineRunReconfig.pl @@ -362,7 +362,7 @@ if ($Step->FileType ne "none") my $Script = $VM->Type eq "wine" ? "WineReconfig.pl" : "Reconfig.pl"; $Script = "#!/bin/sh\n". "( set -x\n". - " git pull &&\n". + " git pull --rebase &&\n". " ../bin/build/$Script ". ShQuote(MergeMissionStatementTasks($Task->Missions)) ."\n". ") >Reconfig.log 2>&1\n"; my $TA = $VM->GetAgent(); -- 2.30.2

1 0

[tools] testbot/Janitor: Make the TestLauncher and WineTest matches stricter.
by Francois Gouget Feb. 14, 2022

Feb. 14, 2022

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/bin/Janitor.pl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/testbot/bin/Janitor.pl b/testbot/bin/Janitor.pl index c68920e7c5..1b5bb33c34 100755 --- a/testbot/bin/Janitor.pl +++ b/testbot/bin/Janitor.pl @@ -321,8 +321,8 @@ if (opendir(my $dh, "$DataDir/latest")) # Needed to update Windows VMs next if ($Entry eq "TestAgentd.exe"); # Needed to run the tests - next if ($Entry =~ /^TestLauncher[0-9]*\.exe$/); - next if ($Entry =~ /^winetest[0-9]*-latest\.exe$/); + next if ($Entry =~ /^TestLauncher(?:32|64)\.exe$/); + next if ($Entry =~ /^winetest(?:64)?-latest\.exe$/); $Entry =~ m%^([^/]+)$%; # untaint my $FileName = "$DataDir/latest/$1"; -- 2.30.2

1 0

[tools] testbot/WineRunReconfig: Only the build VMs produce TestAgentd.
by Francois Gouget Feb. 14, 2022

Feb. 14, 2022

Usually this is not an issue because the TestBot server has the TestAgentd.exe binary and the build log does not contain the "Updated TestAgentd.exe" line. But during the initial setup the TestBot server would still try to download TestAgentd.exe from the Wine VMs which would cause a failure. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- Also I apparently manually built TestAgentd.exe when preparing the Wine VMs (or WineReconfig.pl used to do so) so they do have an (out of date) binary available for download. testbot/bin/WineRunReconfig.pl | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/testbot/bin/WineRunReconfig.pl b/testbot/bin/WineRunReconfig.pl index c6f2342916..373e657dc4 100755 --- a/testbot/bin/WineRunReconfig.pl +++ b/testbot/bin/WineRunReconfig.pl @@ -457,11 +457,20 @@ FatalTAError(undef, $TAError) if (defined $TAError); if ($NewStatus eq "completed") { use File::Copy; - foreach my $FileName ("../src/testagentd/TestAgentd.exe", - "../src/TestLauncher/TestLauncher32.exe", - "../src/TestLauncher/TestLauncher64.exe", - "latest/winefiles.txt", - "latest/wine-parentsrc.txt") + my @FileNames = ( + # TestLauncher is used by both Windows and Wine VMs + "../src/TestLauncher/TestLauncher32.exe", + "../src/TestLauncher/TestLauncher64.exe", + # Needed by the TestBot server + "latest/winefiles.txt", + "latest/wine-parentsrc.txt", + ); + if ($VM->Type eq "build") + { + # Only needed for the Windows VMs and only built by the build VMs. + push @FileNames, "../src/testagentd/TestAgentd.exe"; + } + foreach my $FileName (@FileNames) { my $BaseName = basename($FileName); if ($FileName !~ m~^latest/~ and !$LogInfo->{$BaseName} and -- 2.30.2

1 0

[tools] testbot/LibvirtTool: Move waiting for the X session start to its own function.
by Francois Gouget Feb. 14, 2022

Feb. 14, 2022

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/bin/LibvirtTool.pl | 43 ++++++++++++++++++++++---------------- 1 file changed, 25 insertions(+), 18 deletions(-) diff --git a/testbot/bin/LibvirtTool.pl b/testbot/bin/LibvirtTool.pl index e2f2fd3c46..ef94a2be09 100755 --- a/testbot/bin/LibvirtTool.pl +++ b/testbot/bin/LibvirtTool.pl @@ -441,6 +441,30 @@ sub CheckOff() return ChangeStatus("dirty", "off", "done"); } +sub WaitForSession($) +{ + my ($TA) = @_; + + if ($VM->Type eq "wine") + { + # For Wine VMs we have to wait some more for the X session to start. + Debug(Elapsed($Start), " Waiting for the X session\n"); + LogMsg "Waiting for the $VMKey X session\n"; + my $Pid = $TA->Run(["sh", "-c", "while ! xset -display :0.0 q >/dev/null; do sleep 1; done"], 0); + FatalError("Could not check for the $VMKey X session\n") if (!$Pid); + + if (!defined $TA->Wait($Pid, $SleepAfterBoot)) + { + my $ErrMessage = $TA->GetLastError(); + if ($ErrMessage =~ /timed out waiting for the child process/) + { + FatalError("Timed out waiting for the $VMKey X session\n"); + } + FatalError("An error occurred while waiting for the $VMKey X session: $ErrMessage\n"); + } + } +} + sub SetupTestAgentd($$$) { my ($Booting, $UpgradeTestAgentd, $ResetStartCount) = @_; @@ -506,24 +530,7 @@ sub SetupTestAgentd($$$) FatalError("Setting the $VMKey VM system time failed: ". $PTA->GetLastError() ."\n"); } - if ($Booting and $VM->Type eq "wine") - { - # Make sure the X session has had time to start - Debug(Elapsed($Start), " Waiting for the X session\n"); - LogMsg "Waiting for the $VMKey X session\n"; - my $Pid = $TA->Run(["sh", "-c", "while ! xset -display :0.0 q >/dev/null; do sleep 1; done"], 0); - FatalError("Could not check for the $VMKey X session\n") if (!$Pid); - - if (!defined $TA->Wait($Pid, $SleepAfterBoot)) - { - my $ErrMessage = $TA->GetLastError(); - if ($ErrMessage =~ /timed out waiting for the child process/) - { - FatalError("Timed out waiting for the $VMKey X session\n"); - } - FatalError("An error occurred while waiting for the $VMKey X session: $ErrMessage\n"); - } - } + WaitForSession($TA) if ($Booting); if ($ResetStartCount) { -- 2.30.2

1 0

[PATCH 5/6] win32u: Move MessageBeep implementation from user32.
by Jacek Caban Feb. 14, 2022

Feb. 14, 2022

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/user32/driver.c | 12 +----------- dlls/user32/message.c | 5 +---- dlls/win32u/driver.c | 19 ++++++++++++++++--- dlls/win32u/sysparams.c | 10 ++++++++++ include/ntuser.h | 1 + 5 files changed, 29 insertions(+), 18 deletions(-)

2 1

[PATCH 4/6] win32u: Move NtUserSetCursorPos implementation from user32.
by Jacek Caban Feb. 14, 2022

Feb. 14, 2022

2 1

[PATCH 3/6] win32u: Move GetClipCursor implementation from user32.
by Jacek Caban Feb. 14, 2022

Feb. 14, 2022

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/user32/cursoricon.c | 27 +-------------------------- dlls/win32u/cursoricon.c | 28 ++++++++++++++++++++++++++++ dlls/win32u/sysparams.c | 2 ++ dlls/win32u/win32u_private.h | 4 ++++ include/ntuser.h | 1 + 5 files changed, 36 insertions(+), 26 deletions(-)

2 1

[PATCH 2/6] win32u: Move NtUserClipCursor implementation from user32.
by Jacek Caban Feb. 14, 2022

Feb. 14, 2022

2 1

[PATCH 1/6] win32u: Move monitor_from_rect implementation from user32.
by Jacek Caban Feb. 14, 2022

Feb. 14, 2022

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/user32/sysparams.c | 79 +---------------------------------------- dlls/win32u/sysparams.c | 68 +++++++++++++++++++++++++++++++++++ include/ntuser.h | 1 + 3 files changed, 70 insertions(+), 78 deletions(-)

2 1

[PATCH 1/2] msvcirt/tests: Fix uninitialized variable warning.
by Piotr Caban Feb. 14, 2022

Feb. 14, 2022

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcirt/tests/msvcirt.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)

3 2

[PATCH 2/2 v2] msvcirt/tests: Build without -DWINE_NO_LONG_TYPES.
by Piotr Caban Feb. 14, 2022

Feb. 14, 2022

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcirt/tests/Makefile.in | 1 - dlls/msvcirt/tests/msvcirt.c | 84 +++++++++++++++++----------------- 2 files changed, 42 insertions(+), 43 deletions(-)

1 0

[PATCH 1/2 v2] msvcirt/tests: Fix uninitialized variable warning.
by Piotr Caban Feb. 14, 2022

Feb. 14, 2022

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- v2: - removed const from all call_func macros as suggested by Eric dlls/msvcirt/tests/msvcirt.c | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-)

1 0

[PATCH] msi/tests: Fix the trailing linefeed in an ok() message.
by Francois Gouget Feb. 14, 2022

Feb. 14, 2022

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- dlls/msi/tests/msi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msi/tests/msi.c b/dlls/msi/tests/msi.c index 39cbaf56b79..fcdcd60a9f8 100644 --- a/dlls/msi/tests/msi.c +++ b/dlls/msi/tests/msi.c @@ -4553,7 +4553,7 @@ static void test_MsiGetProductInfo(void) ok(r == ERROR_UNKNOWN_PROPERTY, "Expected ERROR_UNKNOWN_PROPERTY, got %d\n", r); ok(!lstrcmpA(buf, "apple"), "Expected buf to be unchanged, got %s\n", buf); - ok(sz == MAX_PATH, "%lun", sz); + ok(sz == MAX_PATH, "%lu\n", sz); res = RegCreateKeyExA(localkey, "InstallProperties", 0, NULL, 0, access, NULL, &propkey, NULL); ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res); -- 2.30.2

2 1

[PATCH] hnetcfg: Fix the spelling of a TRACE() message.
by Francois Gouget Feb. 14, 2022

Feb. 14, 2022

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- dlls/hnetcfg/port.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/hnetcfg/port.c b/dlls/hnetcfg/port.c index bda9455a2b5..61513f97746 100644 --- a/dlls/hnetcfg/port.c +++ b/dlls/hnetcfg/port.c @@ -1522,7 +1522,7 @@ static HRESULT WINAPI static_ports_Add( struct port_mapping mapping_data; HRESULT ret; - TRACE( "iface %p, external %ld, protocol %s, internal %ld, client %s, enabled %d, descritption %s, mapping %p.\n", + TRACE( "iface %p, external %ld, protocol %s, internal %ld, client %s, enabled %d, description %s, mapping %p.\n", iface, external, debugstr_w(protocol), internal, debugstr_w(client), enabled, debugstr_w(description), mapping ); -- 2.30.2

1 0

[PATCH] kernel32/tests: Add a trailing linefeed to an ok() message.
by Francois Gouget Feb. 14, 2022

Feb. 14, 2022

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- dlls/kernel32/tests/pipe.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/kernel32/tests/pipe.c b/dlls/kernel32/tests/pipe.c index f73ef627c67..053e103bf14 100644 --- a/dlls/kernel32/tests/pipe.c +++ b/dlls/kernel32/tests/pipe.c @@ -3081,7 +3081,7 @@ static void test_blocking_rw(HANDLE writer, HANDLE reader, DWORD buf_size, BOOL res = pCancelIoEx(reader, &read_overlapped2); ok(res, "CancelIoEx failed with error %d\n", GetLastError()); res = pCancelIoEx(reader, &read_overlapped2); - ok(!res, "CancelIOEx succeeded unexpectedly"); + ok(!res, "CancelIOEx succeeded unexpectedly\n"); ok(GetLastError() == ERROR_NOT_FOUND, "In CancelIoEx failure, expected ERROR_NOT_FOUND, got %d\n", GetLastError()); test_overlapped_failure(reader, &read_overlapped2, ERROR_OPERATION_ABORTED); -- 2.30.2

1 0

[PATCH] msdasql: Remove a couple of unneeded NULL casts.
by Francois Gouget Feb. 14, 2022

Feb. 14, 2022

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- dlls/msdasql/msdasql_main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msdasql/msdasql_main.c b/dlls/msdasql/msdasql_main.c index 3e1af95b1a7..60d46349590 100644 --- a/dlls/msdasql/msdasql_main.c +++ b/dlls/msdasql/msdasql_main.c @@ -547,7 +547,7 @@ static HRESULT WINAPI dbinit_Initialize(IDBInitialize *iface) } ret = SQLConnectW( provider->hdbc, (SQLWCHAR *)V_BSTR(&provider->properties[i].value), - SQL_NTS, (SQLWCHAR *)NULL, SQL_NTS, (SQLWCHAR *)NULL, SQL_NTS ); + SQL_NTS, NULL, SQL_NTS, NULL, SQL_NTS ); TRACE("SQLConnectW ret %d\n", ret); if (ret != SQL_SUCCESS) { -- 2.30.2

1 0

[PATCH 1/5] winebus.sys: Only call SDL_HapticRumbleInit if supported, as a fallback.
by Rémi Bernon Feb. 14, 2022

Feb. 14, 2022

The SDL_HAPTIC_LEFTRIGHT effect should be preferred when available. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/winebus.sys/bus_sdl.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/dlls/winebus.sys/bus_sdl.c b/dlls/winebus.sys/bus_sdl.c index eba8a959cb4..ce696f5b42f 100644 --- a/dlls/winebus.sys/bus_sdl.c +++ b/dlls/winebus.sys/bus_sdl.c @@ -185,14 +185,12 @@ static BOOL descriptor_add_haptic(struct sdl_device *impl) !(impl->sdl_haptic = pSDL_HapticOpenFromJoystick(impl->sdl_joystick))) impl->effect_support = 0; else - { impl->effect_support = pSDL_HapticQuery(impl->sdl_haptic); - if (pSDL_HapticRumbleSupported(impl->sdl_haptic)) - impl->effect_support |= WINE_SDL_HAPTIC_RUMBLE; - pSDL_HapticStopAll(impl->sdl_haptic); - pSDL_HapticRumbleInit(impl->sdl_haptic); - } + if (!(impl->effect_support & EFFECT_SUPPORT_HAPTICS) && + pSDL_HapticRumbleSupported(impl->sdl_haptic) && + pSDL_HapticRumbleInit(impl->sdl_haptic) == 0) + impl->effect_support |= WINE_SDL_HAPTIC_RUMBLE; if (!(impl->effect_support & EFFECT_SUPPORT_HAPTICS) && pSDL_JoystickRumble && !pSDL_JoystickRumble(impl->sdl_joystick, 0, 0, 0)) -- 2.34.1

1 4

[PATCH] mf: Handle MESourceSeeked and MEStreamSeeked state change events.
by Rémi Bernon Feb. 14, 2022

Feb. 14, 2022

If a session is paused then started again, or if a start position is provided we wait forever for the source to send a MESourceStarted event, when it sends a MESourceSeeked instead. This causes a deadlock in Bright Memory: Infinite as the game then waits for the Start command to complete, while the session is stuck in the SESSION_STATE_STARTING_SOURCES state. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/mf/session.c | 8 ++++++++ dlls/mfplat/tests/mfplat.c | 38 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 46 insertions(+) diff --git a/dlls/mf/session.c b/dlls/mf/session.c index 05b7af81df7..6ee3c454c6e 100644 --- a/dlls/mf/session.c +++ b/dlls/mf/session.c @@ -2295,6 +2295,8 @@ static enum object_state session_get_object_state_for_event(MediaEventType event { switch (event) { + case MESourceSeeked: + case MEStreamSeeked: case MESourceStarted: case MEStreamStarted: case MEStreamSinkStarted: @@ -2471,6 +2473,7 @@ static void session_set_source_object_state(struct media_session *session, IUnkn switch (event_type) { + case MESourceSeeked: case MESourceStarted: case MESourcePaused: case MESourceStopped: @@ -2485,6 +2488,7 @@ static void session_set_source_object_state(struct media_session *session, IUnkn } } break; + case MEStreamSeeked: case MEStreamStarted: case MEStreamPaused: case MEStreamStopped: @@ -3172,6 +3176,10 @@ static HRESULT WINAPI session_events_callback_Invoke(IMFAsyncCallback *iface, IM switch (event_type) { + case MESourceSeeked: + case MEStreamSeeked: + FIXME("Source/stream seeking, semi-stub!\n"); + /* fallthrough */ case MESourceStarted: case MESourcePaused: case MESourceStopped: diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index c70d8a9ca81..cabcc1b06b0 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -942,6 +942,44 @@ static void test_source_resolver(void) video_stream = (IMFMediaStream *)var.punkVal; } + hr = IMFMediaSource_Pause(mediasource); + ok(hr == S_OK, "Failed to pause media source, hr %#x.\n", hr); + if (get_event((IMFMediaEventGenerator *)mediasource, MESourcePaused, &var)) + ok(var.vt == VT_EMPTY, "Unexpected value type.\n"); + + var.vt = VT_EMPTY; + hr = IMFMediaSource_Start(mediasource, descriptor, &GUID_NULL, &var); + ok(hr == S_OK, "Failed to start media source, hr %#x.\n", hr); + + if (get_event((IMFMediaEventGenerator *)mediasource, MESourceStarted, &var)) + ok(var.vt == VT_EMPTY, "Unexpected value type.\n"); + + hr = IMFMediaSource_Pause(mediasource); + ok(hr == S_OK, "Failed to pause media source, hr %#x.\n", hr); + if (get_event((IMFMediaEventGenerator *)mediasource, MESourcePaused, &var)) + ok(var.vt == VT_EMPTY, "Unexpected value type.\n"); + + var.vt = VT_I8; + var.uhVal.QuadPart = 0; + hr = IMFMediaSource_Start(mediasource, descriptor, &GUID_NULL, &var); + ok(hr == S_OK, "Failed to start media source, hr %#x.\n", hr); + + if (get_event((IMFMediaEventGenerator *)mediasource, MESourceSeeked, &var)) + ok(var.vt == VT_I8, "Unexpected value type.\n"); + + hr = IMFMediaSource_Stop(mediasource); + ok(hr == S_OK, "Failed to pause media source, hr %#x.\n", hr); + if (get_event((IMFMediaEventGenerator *)mediasource, MESourceStopped, &var)) + ok(var.vt == VT_EMPTY, "Unexpected value type.\n"); + + var.vt = VT_I8; + var.uhVal.QuadPart = 0; + hr = IMFMediaSource_Start(mediasource, descriptor, &GUID_NULL, &var); + ok(hr == S_OK, "Failed to start media source, hr %#x.\n", hr); + + if (get_event((IMFMediaEventGenerator *)mediasource, MESourceStarted, &var)) + ok(var.vt == VT_I8, "Unexpected value type.\n"); + sample_count = 10; for (i = 0; i < sample_count; ++i) -- 2.34.1

3 2

[PATCH 1/3] mfplay: Implement UpdateVideo().
by Nikolay Sivov Feb. 14, 2022

Feb. 14, 2022

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/mfplay/player.c | 18 ++++++++++++++++-- dlls/mfplay/tests/mfplay.c | 3 --- 2 files changed, 16 insertions(+), 5 deletions(-) diff --git a/dlls/mfplay/player.c b/dlls/mfplay/player.c index 7f9188e5619..31c8e094cd2 100644 --- a/dlls/mfplay/player.c +++ b/dlls/mfplay/player.c @@ -1524,9 +1524,23 @@ static HRESULT WINAPI media_player_GetVideoWindow(IMFPMediaPlayer *iface, HWND * static HRESULT WINAPI media_player_UpdateVideo(IMFPMediaPlayer *iface) { - FIXME("%p.\n", iface); + struct media_player *player = impl_from_IMFPMediaPlayer(iface); + IMFVideoDisplayControl *display_control; + HRESULT hr; + RECT rect; - return E_NOTIMPL; + TRACE("%p.\n", iface); + + if (SUCCEEDED(hr = media_player_get_display_control(player, &display_control))) + { + if (GetClientRect(player->output_window, &rect)) + hr = IMFVideoDisplayControl_SetVideoPosition(display_control, NULL, &rect); + if (SUCCEEDED(hr)) + hr = IMFVideoDisplayControl_RepaintVideo(display_control); + IMFVideoDisplayControl_Release(display_control); + } + + return hr; } static HRESULT WINAPI media_player_SetBorderColor(IMFPMediaPlayer *iface, COLORREF color) diff --git a/dlls/mfplay/tests/mfplay.c b/dlls/mfplay/tests/mfplay.c index 3c2782a9412..44526801c22 100644 --- a/dlls/mfplay/tests/mfplay.c +++ b/dlls/mfplay/tests/mfplay.c @@ -203,7 +203,6 @@ static void test_shutdown(void) ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#lx.\n", hr); hr = IMFPMediaPlayer_UpdateVideo(player); - todo_wine ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#lx.\n", hr); hr = IMFPMediaPlayer_CreateMediaItemFromURL(player, L"url", TRUE, 0, &item); @@ -316,7 +315,6 @@ static void test_video_control(void) ok(hr == MF_E_INVALIDREQUEST, "Unexpected hr %#lx.\n", hr); hr = IMFPMediaPlayer_UpdateVideo(player); - todo_wine ok(hr == MF_E_INVALIDREQUEST, "Unexpected hr %#lx.\n", hr); IMFPMediaPlayer_Release(player); @@ -356,7 +354,6 @@ static void test_video_control(void) ok(hr == MF_E_INVALIDREQUEST, "Unexpected hr %#lx.\n", hr); hr = IMFPMediaPlayer_UpdateVideo(player); - todo_wine ok(hr == MF_E_INVALIDREQUEST, "Unexpected hr %#lx.\n", hr); IMFPMediaPlayer_Release(player); -- 2.34.1

1 2

[PATCH] mfreadwrite/tests: Build without -DWINE_NO_LONG_TYPES.
by Nikolay Sivov Feb. 14, 2022

Feb. 14, 2022

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/mfreadwrite/tests/Makefile.in | 1 - dlls/mfreadwrite/tests/mfplat.c | 314 ++++++++++++++--------------- 2 files changed, 157 insertions(+), 158 deletions(-) diff --git a/dlls/mfreadwrite/tests/Makefile.in b/dlls/mfreadwrite/tests/Makefile.in index 52f738897d3..c7476c14c6b 100644 --- a/dlls/mfreadwrite/tests/Makefile.in +++ b/dlls/mfreadwrite/tests/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES TESTDLL = mfreadwrite.dll IMPORTS = ole32 user32 d3d9 dxva2 mfplat mfreadwrite mfuuid diff --git a/dlls/mfreadwrite/tests/mfplat.c b/dlls/mfreadwrite/tests/mfplat.c index 8417a0d37b7..04c646b51c0 100644 --- a/dlls/mfreadwrite/tests/mfplat.c +++ b/dlls/mfreadwrite/tests/mfplat.c @@ -210,22 +210,22 @@ static HRESULT WINAPI test_media_stream_RequestSample(IMFMediaStream *iface, IUn return E_NOTIMPL; hr = MFCreateSample(&sample); - ok(hr == S_OK, "Failed to create a sample, hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IMFSample_SetSampleTime(sample, 123); - ok(hr == S_OK, "Failed to set sample time, hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); if (token) IMFSample_SetUnknown(sample, &MFSampleExtension_Token, token); /* Reader expects buffers, empty samples are considered an error. */ hr = MFCreateMemoryBuffer(8, &buffer); - ok(hr == S_OK, "Failed to create a buffer, hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IMFSample_AddBuffer(sample, buffer); - ok(hr == S_OK, "Failed to add a buffer, hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); IMFMediaBuffer_Release(buffer); hr = IMFMediaEventQueue_QueueEventParamUnk(stream->event_queue, MEMediaSample, &GUID_NULL, S_OK, (IUnknown *)sample); - ok(hr == S_OK, "Failed to submit event, hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); IMFSample_Release(sample); return S_OK; @@ -355,23 +355,23 @@ static HRESULT WINAPI test_source_CreatePresentationDescriptor(IMFMediaSource *i for (i = 0; i < source->stream_count; ++i) { hr = MFCreateMediaType(&media_type); - ok(hr == S_OK, "Failed to create media type, hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IMFMediaType_SetGUID(media_type, &MF_MT_MAJOR_TYPE, &MFMediaType_Audio); - ok(hr == S_OK, "Failed to set attribute, hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IMFMediaType_SetGUID(media_type, &MF_MT_SUBTYPE, &MFAudioFormat_PCM); - ok(hr == S_OK, "Failed to set attribute, hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IMFMediaType_SetUINT32(media_type, &MF_MT_AUDIO_BITS_PER_SAMPLE, 32); - ok(hr == S_OK, "Failed to set attribute, hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = MFCreateStreamDescriptor(i, 1, &media_type, &sds[i]); - ok(hr == S_OK, "Failed to create stream descriptor, hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); IMFMediaType_Release(media_type); } hr = MFCreatePresentationDescriptor(source->stream_count, sds, &source->pd); - ok(hr == S_OK, "Failed to create presentation descriptor, hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); for (i = 0; i < source->stream_count; ++i) IMFStreamDescriptor_Release(sds[i]); @@ -413,7 +413,7 @@ static HRESULT WINAPI test_source_Start(IMFMediaSource *iface, IMFPresentationDe event_type = source->state == SOURCE_RUNNING ? MESourceSeeked : MESourceStarted; hr = IMFMediaEventQueue_QueueEventParamVar(source->event_queue, event_type, &GUID_NULL, S_OK, NULL); - ok(hr == S_OK, "Failed to queue event, hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); for (i = 0; i < source->stream_count; ++i) { @@ -425,12 +425,12 @@ static HRESULT WINAPI test_source_Start(IMFMediaSource *iface, IMFPresentationDe event_type = source->streams[i]->is_new ? MENewStream : MEUpdatedStream; source->streams[i]->is_new = FALSE; hr = IMFMediaEventQueue_QueueEventParamVar(source->event_queue, event_type, &GUID_NULL, S_OK, &var); - ok(hr == S_OK, "Failed to queue event, hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); event_type = source->state == SOURCE_RUNNING ? MEStreamSeeked : MEStreamStarted; hr = IMFMediaEventQueue_QueueEventParamVar(source->streams[i]->event_queue, event_type, &GUID_NULL, S_OK, NULL); - ok(hr == S_OK, "Failed to queue event, hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); } source->state = SOURCE_RUNNING; @@ -458,7 +458,7 @@ static HRESULT WINAPI test_source_Shutdown(IMFMediaSource *iface) HRESULT hr; hr = IMFMediaEventQueue_Shutdown(source->event_queue); - ok(hr == S_OK, "Failed to shut down event queue, hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); return S_OK; } @@ -491,7 +491,7 @@ static struct test_media_stream *create_test_stream(DWORD stream_index, IMFMedia stream->IMFMediaStream_iface.lpVtbl = &test_media_stream_vtbl; stream->refcount = 1; hr = MFCreateEventQueue(&stream->event_queue); - ok(hr == S_OK, "Failed to create event queue, hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); stream->source = source; IMFMediaSource_AddRef(stream->source); stream->is_new = TRUE; @@ -535,13 +535,13 @@ static IMFByteStream *get_resource_stream(const char *name) ptr = LockResource(LoadResource(GetModuleHandleA(NULL), res)); hr = CreateStreamOnHGlobal(NULL, TRUE, &stream); - ok(hr == S_OK, "Failed to create memory stream, hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IStream_Write(stream, ptr, SizeofResource(GetModuleHandleA(NULL), res), &written); - ok(hr == S_OK, "Failed to write stream content, hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = pMFCreateMFByteStreamOnStream(stream, &bytestream); - ok(hr == S_OK, "Failed to create bytestream, hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); IStream_Release(stream); return bytestream; @@ -556,11 +556,11 @@ static void test_factory(void) hr = CoCreateInstance(&CLSID_MFReadWriteClassFactory, NULL, CLSCTX_INPROC_SERVER, &IID_IMFReadWriteClassFactory, (void **)&factory); - ok(hr == S_OK, "Failed to create class factory, hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = CoCreateInstance(&CLSID_MFReadWriteClassFactory, (IUnknown *)factory, CLSCTX_INPROC_SERVER, &IID_IMFReadWriteClassFactory, (void **)&factory2); - ok(hr == CLASS_E_NOAGGREGATION, "Unexpected hr %#x.\n", hr); + ok(hr == CLASS_E_NOAGGREGATION, "Unexpected hr %#lx.\n", hr); IMFReadWriteClassFactory_Release(factory); @@ -680,64 +680,64 @@ static void test_source_reader(void) IMFByteStream_Release(stream); return; } - ok(hr == S_OK, "Failed to create source reader, hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); /* Access underlying media source object. */ hr = IMFSourceReader_GetServiceForStream(reader, MF_SOURCE_READER_MEDIASOURCE, &GUID_NULL, &IID_IMFMediaSource, (void **)&source); - ok(hr == S_OK, "Failed to get media source interface, hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); IMFMediaSource_Release(source); /* Stream selection. */ hr = IMFSourceReader_GetStreamSelection(reader, MF_SOURCE_READER_FIRST_VIDEO_STREAM, &selected); - ok(hr == MF_E_INVALIDSTREAMNUMBER, "Unexpected hr %#x.\n", hr); + ok(hr == MF_E_INVALIDSTREAMNUMBER, "Unexpected hr %#lx.\n", hr); hr = IMFSourceReader_GetStreamSelection(reader, 100, &selected); - ok(hr == MF_E_INVALIDSTREAMNUMBER, "Unexpected hr %#x.\n", hr); + ok(hr == MF_E_INVALIDSTREAMNUMBER, "Unexpected hr %#lx.\n", hr); selected = FALSE; hr = IMFSourceReader_GetStreamSelection(reader, MF_SOURCE_READER_FIRST_AUDIO_STREAM, &selected); - ok(hr == S_OK, "Failed to get stream selection, hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(selected, "Unexpected selection.\n"); selected = FALSE; hr = IMFSourceReader_GetStreamSelection(reader, 0, &selected); - ok(hr == S_OK, "Failed to get stream selection, hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(selected, "Unexpected selection.\n"); hr = IMFSourceReader_SetStreamSelection(reader, MF_SOURCE_READER_FIRST_VIDEO_STREAM, TRUE); - ok(hr == MF_E_INVALIDSTREAMNUMBER, "Unexpected hr %#x.\n", hr); + ok(hr == MF_E_INVALIDSTREAMNUMBER, "Unexpected hr %#lx.\n", hr); hr = IMFSourceReader_SetStreamSelection(reader, 100, TRUE); - ok(hr == MF_E_INVALIDSTREAMNUMBER, "Unexpected hr %#x.\n", hr); + ok(hr == MF_E_INVALIDSTREAMNUMBER, "Unexpected hr %#lx.\n", hr); hr = IMFSourceReader_SetStreamSelection(reader, MF_SOURCE_READER_FIRST_AUDIO_STREAM, FALSE); - ok(hr == S_OK, "Failed to deselect a stream, hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); selected = TRUE; hr = IMFSourceReader_GetStreamSelection(reader, MF_SOURCE_READER_FIRST_AUDIO_STREAM, &selected); - ok(hr == S_OK, "Failed to get stream selection, hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(!selected, "Unexpected selection.\n"); hr = IMFSourceReader_SetStreamSelection(reader, MF_SOURCE_READER_ALL_STREAMS, TRUE); - ok(hr == S_OK, "Failed to deselect a stream, hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); selected = FALSE; hr = IMFSourceReader_GetStreamSelection(reader, MF_SOURCE_READER_FIRST_AUDIO_STREAM, &selected); - ok(hr == S_OK, "Failed to get stream selection, hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(selected, "Unexpected selection.\n"); /* Native media type. */ hr = IMFSourceReader_GetNativeMediaType(reader, MF_SOURCE_READER_FIRST_VIDEO_STREAM, 0, &mediatype); - ok(hr == MF_E_INVALIDSTREAMNUMBER, "Unexpected hr %#x.\n", hr); + ok(hr == MF_E_INVALIDSTREAMNUMBER, "Unexpected hr %#lx.\n", hr); hr = IMFSourceReader_GetNativeMediaType(reader, 100, 0, &mediatype); - ok(hr == MF_E_INVALIDSTREAMNUMBER, "Unexpected hr %#x.\n", hr); + ok(hr == MF_E_INVALIDSTREAMNUMBER, "Unexpected hr %#lx.\n", hr); hr = IMFSourceReader_GetNativeMediaType(reader, MF_SOURCE_READER_FIRST_AUDIO_STREAM, 0, &mediatype); - ok(hr == S_OK, "Failed to get native mediatype, hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IMFSourceReader_GetNativeMediaType(reader, MF_SOURCE_READER_FIRST_AUDIO_STREAM, 0, &mediatype2); - ok(hr == S_OK, "Failed to get native mediatype, hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(mediatype != mediatype2, "Unexpected media type instance.\n"); IMFMediaType_Release(mediatype2); IMFMediaType_Release(mediatype); @@ -745,56 +745,56 @@ static void test_source_reader(void) /* MF_SOURCE_READER_CURRENT_TYPE_INDEX is Win8+ */ hr = IMFSourceReader_GetNativeMediaType(reader, MF_SOURCE_READER_FIRST_AUDIO_STREAM, MF_SOURCE_READER_CURRENT_TYPE_INDEX, &mediatype); - ok(hr == S_OK || broken(hr == MF_E_NO_MORE_TYPES), "Failed to get native mediatype, hr %#x.\n", hr); + ok(hr == S_OK || broken(hr == MF_E_NO_MORE_TYPES), "Unexpected hr %#lx.\n", hr); if (SUCCEEDED(hr)) IMFMediaType_Release(mediatype); /* Current media type. */ hr = IMFSourceReader_GetCurrentMediaType(reader, MF_SOURCE_READER_FIRST_VIDEO_STREAM, &mediatype); - ok(hr == MF_E_INVALIDSTREAMNUMBER, "Unexpected hr %#x.\n", hr); + ok(hr == MF_E_INVALIDSTREAMNUMBER, "Unexpected hr %#lx.\n", hr); hr = IMFSourceReader_GetCurrentMediaType(reader, 100, &mediatype); - ok(hr == MF_E_INVALIDSTREAMNUMBER, "Unexpected hr %#x.\n", hr); + ok(hr == MF_E_INVALIDSTREAMNUMBER, "Unexpected hr %#lx.\n", hr); hr = IMFSourceReader_GetCurrentMediaType(reader, MF_SOURCE_READER_FIRST_AUDIO_STREAM, &mediatype); - ok(hr == S_OK, "Failed to get current media type, hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); IMFMediaType_Release(mediatype); hr = IMFSourceReader_GetCurrentMediaType(reader, 0, &mediatype); - ok(hr == S_OK, "Failed to get current media type, hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); IMFMediaType_Release(mediatype); hr = IMFSourceReader_ReadSample(reader, MF_SOURCE_READER_FIRST_AUDIO_STREAM, 0, &actual_index, &stream_flags, &timestamp, &sample); - ok(hr == S_OK, "Failed to get a sample, hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); if (hr != S_OK) goto skip_read_sample; - ok(actual_index == 0, "Unexpected stream index %u\n", actual_index); - ok(!stream_flags, "Unexpected stream flags %#x.\n", stream_flags); + ok(!actual_index, "Unexpected stream index %lu.\n", actual_index); + ok(!stream_flags, "Unexpected stream flags %#lx.\n", stream_flags); IMFSample_Release(sample); /* There is no video stream. */ hr = IMFSourceReader_ReadSample(reader, MF_SOURCE_READER_FIRST_VIDEO_STREAM, 0, &actual_index, &stream_flags, &timestamp, &sample); - ok(hr == MF_E_INVALIDSTREAMNUMBER, "Unexpected hr %#x.\n", hr); - ok(actual_index == MF_SOURCE_READER_FIRST_VIDEO_STREAM, "Unexpected stream index %u\n", actual_index); - ok(stream_flags == MF_SOURCE_READERF_ERROR, "Unexpected stream flags %#x.\n", stream_flags); + ok(hr == MF_E_INVALIDSTREAMNUMBER, "Unexpected hr %#lx.\n", hr); + ok(actual_index == MF_SOURCE_READER_FIRST_VIDEO_STREAM, "Unexpected stream index %lu.\n", actual_index); + ok(stream_flags == MF_SOURCE_READERF_ERROR, "Unexpected stream flags %#lx.\n", stream_flags); hr = IMFSourceReader_ReadSample(reader, MF_SOURCE_READER_FIRST_VIDEO_STREAM, 0, NULL, &stream_flags, &timestamp, &sample); - ok(hr == MF_E_INVALIDSTREAMNUMBER, "Unexpected hr %#x.\n", hr); + ok(hr == MF_E_INVALIDSTREAMNUMBER, "Unexpected hr %#lx.\n", hr); hr = IMFSourceReader_ReadSample(reader, MF_SOURCE_READER_FIRST_VIDEO_STREAM, 0, NULL, NULL, &timestamp, &sample); - ok(hr == E_POINTER, "Unexpected hr %#x.\n", hr); + ok(hr == E_POINTER, "Unexpected hr %#lx.\n", hr); hr = IMFSourceReader_ReadSample(reader, MF_SOURCE_READER_FIRST_AUDIO_STREAM, 0, &actual_index, &stream_flags, &timestamp, &sample); - ok(hr == S_OK, "Failed to get a sample, hr %#x.\n", hr); - ok(actual_index == 0, "Unexpected stream index %u\n", actual_index); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + ok(!actual_index, "Unexpected stream index %lu.\n", actual_index); /* TODO: gstreamer outputs .wav sample in increments of 4096, instead of 4410 */ todo_wine { - ok(stream_flags == MF_SOURCE_READERF_ENDOFSTREAM, "Unexpected stream flags %#x.\n", stream_flags); + ok(stream_flags == MF_SOURCE_READERF_ENDOFSTREAM, "Unexpected stream flags %#lx.\n", stream_flags); ok(!sample, "Unexpected sample object.\n"); } if(!stream_flags) @@ -803,82 +803,82 @@ todo_wine hr = IMFSourceReader_ReadSample(reader, MF_SOURCE_READER_FIRST_AUDIO_STREAM, 0, &actual_index, &stream_flags, &timestamp, &sample); - ok(hr == S_OK, "Failed to get a sample, hr %#x.\n", hr); - ok(actual_index == 0, "Unexpected stream index %u\n", actual_index); - ok(stream_flags == MF_SOURCE_READERF_ENDOFSTREAM, "Unexpected stream flags %#x.\n", stream_flags); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + ok(!actual_index, "Unexpected stream index %lu.\n", actual_index); + ok(stream_flags == MF_SOURCE_READERF_ENDOFSTREAM, "Unexpected stream flags %#lx.\n", stream_flags); ok(!sample, "Unexpected sample object.\n"); } hr = IMFSourceReader_ReadSample(reader, MF_SOURCE_READER_FIRST_AUDIO_STREAM, MF_SOURCE_READER_CONTROLF_DRAIN, &actual_index, &stream_flags, &timestamp, &sample); - ok(hr == S_OK, "Failed to get a sample, hr %#x.\n", hr); - ok(actual_index == 0, "Unexpected stream index %u\n", actual_index); - ok(stream_flags == MF_SOURCE_READERF_ENDOFSTREAM, "Unexpected stream flags %#x.\n", stream_flags); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + ok(actual_index == 0, "Unexpected stream index %lu\n", actual_index); + ok(stream_flags == MF_SOURCE_READERF_ENDOFSTREAM, "Unexpected stream flags %#lx.\n", stream_flags); ok(!sample, "Unexpected sample object.\n"); hr = IMFSourceReader_ReadSample(reader, MF_SOURCE_READER_FIRST_AUDIO_STREAM, MF_SOURCE_READER_CONTROLF_DRAIN, &actual_index, &stream_flags, &timestamp, NULL); - ok(hr == E_POINTER, "Unexpected hr %#x.\n", hr); + ok(hr == E_POINTER, "Unexpected hr %#lx.\n", hr); hr = IMFSourceReader_ReadSample(reader, MF_SOURCE_READER_FIRST_AUDIO_STREAM, MF_SOURCE_READER_CONTROLF_DRAIN, &actual_index, NULL, &timestamp, &sample); - ok(hr == E_POINTER, "Unexpected hr %#x.\n", hr); + ok(hr == E_POINTER, "Unexpected hr %#lx.\n", hr); hr = IMFSourceReader_ReadSample(reader, MF_SOURCE_READER_FIRST_AUDIO_STREAM, MF_SOURCE_READER_CONTROLF_DRAIN, NULL, &stream_flags, &timestamp, &sample); - ok(hr == S_OK, "Failed to get a sample, hr %#x.\n", hr); - ok(stream_flags == MF_SOURCE_READERF_ENDOFSTREAM, "Unexpected stream flags %#x.\n", stream_flags); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + ok(stream_flags == MF_SOURCE_READERF_ENDOFSTREAM, "Unexpected stream flags %#lx.\n", stream_flags); ok(!sample, "Unexpected sample object.\n"); hr = IMFSourceReader_ReadSample(reader, MF_SOURCE_READER_FIRST_AUDIO_STREAM, MF_SOURCE_READER_CONTROLF_DRAIN, &actual_index, &stream_flags, NULL, &sample); - ok(hr == S_OK, "Failed to get a sample, hr %#x.\n", hr); - ok(actual_index == 0, "Unexpected stream index %u\n", actual_index); - ok(stream_flags == MF_SOURCE_READERF_ENDOFSTREAM, "Unexpected stream flags %#x.\n", stream_flags); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + ok(!actual_index, "Unexpected stream index %lu\n", actual_index); + ok(stream_flags == MF_SOURCE_READERF_ENDOFSTREAM, "Unexpected stream flags %#lx.\n", stream_flags); ok(!sample, "Unexpected sample object.\n"); hr = IMFSourceReader_ReadSample(reader, MF_SOURCE_READER_ANY_STREAM, MF_SOURCE_READER_CONTROLF_DRAIN, &actual_index, &stream_flags, NULL, &sample); - ok(hr == S_OK, "Failed to get a sample, hr %#x.\n", hr); - ok(actual_index == 0, "Unexpected stream index %u\n", actual_index); - ok(stream_flags == MF_SOURCE_READERF_ENDOFSTREAM, "Unexpected stream flags %#x.\n", stream_flags); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + ok(actual_index == 0, "Unexpected stream index %lu.\n", actual_index); + ok(stream_flags == MF_SOURCE_READERF_ENDOFSTREAM, "Unexpected stream flags %#lx.\n", stream_flags); ok(!sample, "Unexpected sample object.\n"); skip_read_sample: /* Flush. */ hr = IMFSourceReader_Flush(reader, MF_SOURCE_READER_FIRST_VIDEO_STREAM); - ok(hr == MF_E_INVALIDSTREAMNUMBER, "Unexpected hr %#x.\n", hr); + ok(hr == MF_E_INVALIDSTREAMNUMBER, "Unexpected hr %#lx.\n", hr); hr = IMFSourceReader_Flush(reader, 100); - ok(hr == MF_E_INVALIDSTREAMNUMBER, "Unexpected hr %#x.\n", hr); + ok(hr == MF_E_INVALIDSTREAMNUMBER, "Unexpected hr %#lx.\n", hr); hr = IMFSourceReader_Flush(reader, MF_SOURCE_READER_FIRST_AUDIO_STREAM); - ok(hr == S_OK, "Failed to flush stream, hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IMFSourceReader_Flush(reader, MF_SOURCE_READER_FIRST_AUDIO_STREAM); - ok(hr == S_OK, "Failed to flush stream, hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IMFSourceReader_Flush(reader, MF_SOURCE_READER_ALL_STREAMS); - ok(hr == S_OK, "Failed to flush all streams, hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); refcount = IMFSourceReader_Release(reader); - ok(!refcount, "Unexpected refcount %u.\n", refcount); + ok(!refcount, "Unexpected refcount %lu.\n", refcount); /* Async mode. */ callback = create_async_callback(); hr = MFCreateAttributes(&attributes, 1); - ok(hr == S_OK, "Failed to create attributes object, hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IMFAttributes_SetUnknown(attributes, &MF_SOURCE_READER_ASYNC_CALLBACK, (IUnknown *)&callback->IMFSourceReaderCallback_iface); - ok(hr == S_OK, "Failed to set attribute value, hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); IMFSourceReaderCallback_Release(&callback->IMFSourceReaderCallback_iface); refcount = get_refcount(attributes); hr = MFCreateSourceReaderFromByteStream(stream, attributes, &reader); - ok(hr == S_OK, "Failed to create source reader, hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(get_refcount(attributes) > refcount, "Unexpected refcount.\n"); IMFAttributes_Release(attributes); IMFSourceReader_Release(reader); @@ -905,60 +905,60 @@ static void test_source_reader_from_media_source(void) ok(!!source, "Failed to create test source.\n"); hr = MFCreateSourceReaderFromMediaSource(source, NULL, &reader); - ok(hr == S_OK, "Failed to create source reader, hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); /* MF_SOURCE_READER_ANY_STREAM */ hr = IMFSourceReader_SetStreamSelection(reader, 0, FALSE); - ok(hr == S_OK, "Failed to select a stream, hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IMFSourceReader_SetStreamSelection(reader, 1, TRUE); - ok(hr == S_OK, "Failed to select a stream, hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); pos.vt = VT_I8; pos.hVal.QuadPart = 0; hr = IMFSourceReader_SetCurrentPosition(reader, &GUID_NULL, &pos); - ok(hr == S_OK, "Failed to seek to beginning of stream, hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IMFSourceReader_ReadSample(reader, MF_SOURCE_READER_ANY_STREAM, 0, &actual_index, &stream_flags, &timestamp, &sample); - ok(hr == S_OK, "Failed to get a sample, hr %#x.\n", hr); - ok(actual_index == 1, "Unexpected stream index %u\n", actual_index); - ok(!stream_flags, "Unexpected stream flags %#x.\n", stream_flags); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + ok(actual_index == 1, "Unexpected stream index %lu\n", actual_index); + ok(!stream_flags, "Unexpected stream flags %#lx.\n", stream_flags); ok(timestamp == 123, "Unexpected timestamp.\n"); ok(!!sample, "Expected sample object.\n"); IMFSample_Release(sample); hr = IMFSourceReader_SetStreamSelection(reader, 0, TRUE); - ok(hr == S_OK, "Failed to select a stream, hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IMFSourceReader_SetStreamSelection(reader, 2, TRUE); - ok(hr == S_OK, "Failed to select a stream, hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); for (i = 0; i < TEST_SOURCE_NUM_STREAMS + 1; ++i) { hr = IMFSourceReader_ReadSample(reader, MF_SOURCE_READER_ANY_STREAM, 0, &actual_index, &stream_flags, &timestamp, &sample); - ok(hr == S_OK, "Failed to get a sample, hr %#x.\n", hr); - ok(actual_index == i % TEST_SOURCE_NUM_STREAMS, "%d: Unexpected stream index %u\n", i, actual_index); - ok(!stream_flags, "Unexpected stream flags %#x.\n", stream_flags); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + ok(actual_index == i % TEST_SOURCE_NUM_STREAMS, "%d: Unexpected stream index %lu.\n", i, actual_index); + ok(!stream_flags, "Unexpected stream flags %#lx.\n", stream_flags); ok(timestamp == 123, "Unexpected timestamp.\n"); ok(!!sample, "Expected sample object.\n"); IMFSample_Release(sample); } hr = IMFSourceReader_SetStreamSelection(reader, 0, FALSE); - ok(hr == S_OK, "Failed to select a stream, hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IMFSourceReader_SetStreamSelection(reader, 0, TRUE); - ok(hr == S_OK, "Failed to select a stream, hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); for (i = 0; i < TEST_SOURCE_NUM_STREAMS + 1; ++i) { hr = IMFSourceReader_ReadSample(reader, MF_SOURCE_READER_ANY_STREAM, 0, &actual_index, &stream_flags, &timestamp, &sample); - ok(hr == S_OK, "Failed to get a sample, hr %#x.\n", hr); - ok(actual_index == i % TEST_SOURCE_NUM_STREAMS, "%d: Unexpected stream index %u\n", i, actual_index); - ok(!stream_flags, "Unexpected stream flags %#x.\n", stream_flags); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + ok(actual_index == i % TEST_SOURCE_NUM_STREAMS, "%d: Unexpected stream index %lu.\n", i, actual_index); + ok(!stream_flags, "Unexpected stream flags %#lx.\n", stream_flags); ok(timestamp == 123, "Unexpected timestamp.\n"); ok(!!sample, "Expected sample object.\n"); IMFSample_Release(sample); @@ -971,31 +971,31 @@ static void test_source_reader_from_media_source(void) ok(!!source, "Failed to create test source.\n"); hr = MFCreateSourceReaderFromMediaSource(source, NULL, &reader); - ok(hr == S_OK, "Failed to create source reader, hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); /* MF_SOURCE_READER_ANY_STREAM with a single stream */ hr = IMFSourceReader_SetStreamSelection(reader, 0, TRUE); - ok(hr == S_OK, "Failed to select a stream, hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); pos.vt = VT_I8; pos.hVal.QuadPart = 0; hr = IMFSourceReader_SetCurrentPosition(reader, &GUID_NULL, &pos); - ok(hr == S_OK, "Failed to seek to beginning of stream, hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IMFSourceReader_ReadSample(reader, MF_SOURCE_READER_ANY_STREAM, 0, &actual_index, &stream_flags, &timestamp, &sample); - ok(hr == S_OK, "Failed to get a sample, hr %#x.\n", hr); - ok(actual_index == 0, "Unexpected stream index %u\n", actual_index); - ok(!stream_flags, "Unexpected stream flags %#x.\n", stream_flags); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + ok(!actual_index, "Unexpected stream index %lu.\n", actual_index); + ok(!stream_flags, "Unexpected stream flags %#lx.\n", stream_flags); ok(timestamp == 123, "Unexpected timestamp.\n"); ok(!!sample, "Expected sample object.\n"); IMFSample_Release(sample); hr = IMFSourceReader_ReadSample(reader, MF_SOURCE_READER_ANY_STREAM, 0, &actual_index, &stream_flags, &timestamp, &sample); - ok(hr == S_OK, "Failed to get a sample, hr %#x.\n", hr); - ok(actual_index == 0, "Unexpected stream index %u\n", actual_index); - ok(!stream_flags, "Unexpected stream flags %#x.\n", stream_flags); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + ok(!actual_index, "Unexpected stream index %lu\n", actual_index); + ok(!stream_flags, "Unexpected stream flags %#lx.\n", stream_flags); ok(timestamp == 123, "Unexpected timestamp.\n"); ok(!!sample, "Expected sample object.\n"); IMFSample_Release(sample); @@ -1008,29 +1008,29 @@ static void test_source_reader_from_media_source(void) ok(!!source, "Failed to create test source.\n"); hr = MFCreateSourceReaderFromMediaSource(source, NULL, &reader); - ok(hr == S_OK, "Failed to create source reader, hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IMFSourceReader_SetStreamSelection(reader, 0, TRUE); - ok(hr == S_OK, "Failed to select a stream, hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IMFSourceReader_ReadSample(reader, 0, 0, &actual_index, &stream_flags, &timestamp, &sample); - ok(hr == S_OK, "Failed to get a sample, hr %#x.\n", hr); - ok(actual_index == 0, "Unexpected stream index %u\n", actual_index); - ok(!stream_flags, "Unexpected stream flags %#x.\n", stream_flags); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + ok(!actual_index, "Unexpected stream index %lu.\n", actual_index); + ok(!stream_flags, "Unexpected stream flags %#lx.\n", stream_flags); ok(timestamp == 123, "Unexpected timestamp.\n"); ok(!!sample, "Expected sample object.\n"); IMFSample_Release(sample); /* Request from deselected stream. */ hr = IMFSourceReader_SetStreamSelection(reader, 1, FALSE); - ok(hr == S_OK, "Failed to select a stream, hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); actual_index = 0; stream_flags = 0; hr = IMFSourceReader_ReadSample(reader, 1, 0, &actual_index, &stream_flags, &timestamp, &sample); - ok(hr == MF_E_INVALIDREQUEST, "Unexpected hr %#x.\n", hr); - ok(actual_index == 1, "Unexpected stream index %u\n", actual_index); - ok(stream_flags == MF_SOURCE_READERF_ERROR, "Unexpected stream flags %#x.\n", stream_flags); + ok(hr == MF_E_INVALIDREQUEST, "Unexpected hr %#lx.\n", hr); + ok(actual_index == 1, "Unexpected stream index %lu.\n", actual_index); + ok(stream_flags == MF_SOURCE_READERF_ERROR, "Unexpected stream flags %#lx.\n", stream_flags); ok(timestamp == 0, "Unexpected timestamp.\n"); ok(!sample, "Expected sample object.\n"); @@ -1042,41 +1042,41 @@ static void test_source_reader_from_media_source(void) ok(!!source, "Failed to create test source.\n"); hr = MFCreateSourceReaderFromMediaSource(source, NULL, &reader); - ok(hr == S_OK, "Failed to create source reader, hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = MFCreateMediaType(&media_type); - ok(hr == S_OK, "Failed to create media type, hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IMFMediaType_SetGUID(media_type, &MF_MT_MAJOR_TYPE, &MFMediaType_Audio); - ok(hr == S_OK, "Failed to set attribute, hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IMFMediaType_SetGUID(media_type, &MF_MT_SUBTYPE, &MFAudioFormat_PCM); - ok(hr == S_OK, "Failed to set attribute, hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IMFMediaType_SetUINT32(media_type, &MF_MT_AUDIO_BITS_PER_SAMPLE, 16); - ok(hr == S_OK, "Failed to set attribute, hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IMFSourceReader_SetCurrentMediaType(reader, 0, NULL, media_type); - ok(hr == MF_E_TOPO_CODEC_NOT_FOUND, "Unexpected success setting current media type, hr %#x.\n", hr); + ok(hr == MF_E_TOPO_CODEC_NOT_FOUND, "Unexpected hr %#lx.\n", hr); IMFMediaType_Release(media_type); hr = MFCreateMediaType(&media_type); - ok(hr == S_OK, "Failed to create media type, hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IMFMediaType_SetGUID(media_type, &MF_MT_MAJOR_TYPE, &MFMediaType_Audio); - ok(hr == S_OK, "Failed to set attribute, hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IMFMediaType_SetGUID(media_type, &MF_MT_SUBTYPE, &MFAudioFormat_PCM); - ok(hr == S_OK, "Failed to set attribute, hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IMFMediaType_SetUINT32(media_type, &MF_MT_AUDIO_BITS_PER_SAMPLE, 32); - ok(hr == S_OK, "Failed to set attribute, hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IMFSourceReader_SetCurrentMediaType(reader, 0, NULL, media_type); - ok(hr == S_OK, "Failed to set current media type, hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IMFSourceReader_SetStreamSelection(reader, 0, TRUE); - ok(hr == S_OK, "Failed to select a stream, hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IMFSourceReader_ReadSample(reader, 0, 0, &actual_index, &stream_flags, &timestamp, &sample); - ok(hr == S_OK, "Failed to get a sample, hr %#x.\n", hr); - ok(actual_index == 0, "Unexpected stream index %u\n", actual_index); - ok(!stream_flags, "Unexpected stream flags %#x.\n", stream_flags); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + ok(!actual_index, "Unexpected stream index %lu\n", actual_index); + ok(!stream_flags, "Unexpected stream flags %#lx.\n", stream_flags); ok(timestamp == 123, "Unexpected timestamp.\n"); ok(!!sample, "Expected sample object.\n"); IMFSample_Release(sample); @@ -1092,40 +1092,40 @@ static void test_source_reader_from_media_source(void) callback = create_async_callback(); hr = MFCreateAttributes(&attributes, 1); - ok(hr == S_OK, "Failed to create attributes object, hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IMFAttributes_SetUnknown(attributes, &MF_SOURCE_READER_ASYNC_CALLBACK, (IUnknown *)&callback->IMFSourceReaderCallback_iface); - ok(hr == S_OK, "Failed to set attribute value, hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); IMFSourceReaderCallback_Release(&callback->IMFSourceReaderCallback_iface); refcount = get_refcount(attributes); hr = MFCreateSourceReaderFromMediaSource(source, attributes, &reader); - ok(hr == S_OK, "Failed to create source reader, hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(get_refcount(attributes) > refcount, "Unexpected refcount.\n"); hr = IMFSourceReader_SetStreamSelection(reader, 0, TRUE); - ok(hr == S_OK, "Failed to select a stream, hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); /* Return values are delivered to callback only. */ hr = IMFSourceReader_ReadSample(reader, 0, 0, &actual_index, &stream_flags, &timestamp, &sample); - ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + ok(hr == E_INVALIDARG, "Unexpected hr %#lx.\n", hr); hr = IMFSourceReader_ReadSample(reader, 0, 0, NULL, &stream_flags, &timestamp, &sample); - ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + ok(hr == E_INVALIDARG, "Unexpected hr %#lx.\n", hr); hr = IMFSourceReader_ReadSample(reader, 0, 0, NULL, NULL, &timestamp, &sample); - ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + ok(hr == E_INVALIDARG, "Unexpected hr %#lx.\n", hr); hr = IMFSourceReader_ReadSample(reader, 0, 0, NULL, NULL, NULL, &sample); - ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + ok(hr == E_INVALIDARG, "Unexpected hr %#lx.\n", hr); /* Flush() arguments validation. */ hr = IMFSourceReader_Flush(reader, 123); - ok(hr == MF_E_INVALIDSTREAMNUMBER, "Unexpected hr %#x.\n", hr); + ok(hr == MF_E_INVALIDSTREAMNUMBER, "Unexpected hr %#lx.\n", hr); hr = IMFSourceReader_ReadSample(reader, 0, 0, NULL, NULL, NULL, NULL); - ok(hr == MF_E_NOTACCEPTING, "Unexpected hr %#x.\n", hr); + ok(hr == MF_E_NOTACCEPTING, "Unexpected hr %#lx.\n", hr); IMFSourceReader_Release(reader); IMFMediaSource_Release(source); @@ -1137,36 +1137,36 @@ static void test_source_reader_from_media_source(void) fail_request_sample = TRUE; hr = MFCreateSourceReaderFromMediaSource(source, NULL, &reader); - ok(hr == S_OK, "Failed to create source reader, hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IMFSourceReader_SetStreamSelection(reader, 0, TRUE); - ok(hr == S_OK, "Failed to select a stream, hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IMFSourceReader_ReadSample(reader, 0, 0, &actual_index, &stream_flags, &timestamp, &sample); - ok(hr == E_NOTIMPL, "Unexpected ReadSample result, hr %#x.\n", hr); + ok(hr == E_NOTIMPL, "Unexpected hr %#lx.\n", hr); actual_index = ~0u; stream_flags = 0; hr = IMFSourceReader_ReadSample(reader, MF_SOURCE_READER_FIRST_AUDIO_STREAM, 0, &actual_index, &stream_flags, &timestamp, &sample); - ok(hr == E_NOTIMPL, "Unexpected ReadSample result, hr %#x.\n", hr); - ok(actual_index == 0, "Unexpected index %u.\n", actual_index); - ok(stream_flags == MF_SOURCE_READERF_ERROR, "Unexpected flags %#x.\n", stream_flags); + ok(hr == E_NOTIMPL, "Unexpected hr %#lx.\n", hr); + ok(!actual_index, "Unexpected index %lu.\n", actual_index); + ok(stream_flags == MF_SOURCE_READERF_ERROR, "Unexpected flags %#lx.\n", stream_flags); actual_index = ~0u; stream_flags = 0; hr = IMFSourceReader_ReadSample(reader, MF_SOURCE_READER_FIRST_AUDIO_STREAM, 0, &actual_index, &stream_flags, &timestamp, &sample); - ok(hr == E_NOTIMPL, "Unexpected ReadSample result, hr %#x.\n", hr); - ok(actual_index == 0, "Unexpected index %u.\n", actual_index); - ok(stream_flags == MF_SOURCE_READERF_ERROR, "Unexpected flags %#x.\n", stream_flags); + ok(hr == E_NOTIMPL, "Unexpected hr %#lx.\n", hr); + ok(!actual_index, "Unexpected index %lu.\n", actual_index); + ok(stream_flags == MF_SOURCE_READERF_ERROR, "Unexpected flags %#lx.\n", stream_flags); actual_index = ~0u; stream_flags = 0; hr = IMFSourceReader_ReadSample(reader, 0, 0, &actual_index, &stream_flags, &timestamp, &sample); - ok(hr == E_NOTIMPL, "Unexpected ReadSample result, hr %#x.\n", hr); - ok(actual_index == 0, "Unexpected index %u.\n", actual_index); - ok(stream_flags == MF_SOURCE_READERF_ERROR, "Unexpected flags %#x.\n", stream_flags); + ok(hr == E_NOTIMPL, "Unexpected hr %#lx.\n", hr); + ok(!actual_index, "Unexpected index %lu.\n", actual_index); + ok(stream_flags == MF_SOURCE_READERF_ERROR, "Unexpected flags %#lx.\n", stream_flags); IMFSourceReader_Release(reader); IMFMediaSource_Release(source); @@ -1196,22 +1196,22 @@ static void test_reader_d3d9(void) } hr = DXVA2CreateDirect3DDeviceManager9(&token, &d3d9_manager); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IDirect3DDeviceManager9_ResetDevice(d3d9_manager, d3d9_device, token); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); source = create_test_source(3); ok(!!source, "Failed to create test source.\n"); hr = MFCreateAttributes(&attributes, 1); - ok(hr == S_OK, "Failed to create attributes object, hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IMFAttributes_SetUnknown(attributes, &MF_SOURCE_READER_D3D_MANAGER, (IUnknown *)d3d9_manager); - ok(hr == S_OK, "Failed to set attribute, hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = MFCreateSourceReaderFromMediaSource(source, attributes, &reader); - ok(hr == S_OK, "Failed to create source reader, hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); IMFAttributes_Release(attributes); @@ -1230,7 +1230,7 @@ START_TEST(mfplat) HRESULT hr; hr = MFStartup(MF_VERSION, MFSTARTUP_FULL); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); init_functions(); @@ -1240,5 +1240,5 @@ START_TEST(mfplat) test_reader_d3d9(); hr = MFShutdown(); - ok(hr == S_OK, "Failed to shut down, hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); } -- 2.34.1

1 0