November 2021 - Wine-Commits

Rémi Bernon : dinput8/tests: Make test_device_input tests more predictable.
by Alexandre Julliard Nov. 10, 2021

Nov. 10, 2021

Module: wine Branch: master Commit: 352b5b188e743088c4e642dbdda95275fc54500f URL: https://source.winehq.org/git/wine.git/?a=commit;h=352b5b188e743088c4e642db… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Nov 10 10:52:22 2021 +0100 dinput8/tests: Make test_device_input tests more predictable. Using a notification event to wait for input, addressing spurious failures or timeouts. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput8/tests/device.c | 97 ++++++++++++++++++++++++++++++--------------- 1 file changed, 65 insertions(+), 32 deletions(-) diff --git a/dlls/dinput8/tests/device.c b/dlls/dinput8/tests/device.c index 3cad4ce256c..5ae9e225dc9 100644 --- a/dlls/dinput8/tests/device.c +++ b/dlls/dinput8/tests/device.c @@ -90,67 +90,100 @@ static void flush_events(void) } } -static void test_device_input(IDirectInputDevice8A *lpdid, DWORD event_type, DWORD event, UINT_PTR expected) +static void test_device_input( IDirectInputDevice8A *device, DWORD type, DWORD code, UINT_PTR expected ) { HRESULT hr; DIDEVICEOBJECTDATA obj_data; - DWORD data_size = 1; + DWORD res, data_size = 1; + HANDLE event; int i; - hr = IDirectInputDevice8_Acquire(lpdid); - ok (SUCCEEDED(hr), "Failed to acquire device hr=%08x\n", hr); + event = CreateEventW( NULL, FALSE, FALSE, NULL ); + ok( event != NULL, "CreateEventW failed, error %u\n", GetLastError() ); - if (event_type == INPUT_KEYBOARD) - keybd_event(0, event, KEYEVENTF_SCANCODE, 0); + IDirectInputDevice_Unacquire( device ); - if (event_type == INPUT_MOUSE) - mouse_event( event, 0, 0, 0, 0); + hr = IDirectInputDevice8_SetEventNotification( device, event ); + ok( hr == DI_OK, "SetEventNotification returned %#x\n", hr ); - flush_events(); - IDirectInputDevice8_Poll(lpdid); - hr = IDirectInputDevice8_GetDeviceData(lpdid, sizeof(obj_data), &obj_data, &data_size, 0); + hr = IDirectInputDevice8_Acquire( device ); + ok( hr == DI_OK, "Acquire returned %#x\n", hr ); - if (data_size != 1) + if (type == INPUT_KEYBOARD) { - win_skip("We're not able to inject input into Windows dinput8 with events\n"); - IDirectInputDevice_Unacquire(lpdid); - return; + keybd_event( 0, code, KEYEVENTF_SCANCODE, 0 ); + res = WaitForSingleObject( event, 100 ); + ok( res == WAIT_OBJECT_0, "WaitForSingleObject returned %#x\n", res ); + + keybd_event( 0, code, KEYEVENTF_SCANCODE | KEYEVENTF_KEYUP, 0 ); + res = WaitForSingleObject( event, 100 ); + ok( res == WAIT_OBJECT_0, "WaitForSingleObject returned %#x\n", res ); + } + if (type == INPUT_MOUSE) + { + mouse_event( MOUSEEVENTF_LEFTDOWN, 0, 0, 0, 0 ); + res = WaitForSingleObject( event, 100 ); + ok( res == WAIT_OBJECT_0, "WaitForSingleObject returned %#x\n", res ); + + mouse_event( MOUSEEVENTF_LEFTUP, 0, 0, 0, 0 ); + res = WaitForSingleObject( event, 100 ); + ok( res == WAIT_OBJECT_0, "WaitForSingleObject returned %#x\n", res ); } - ok (obj_data.uAppData == expected, "Retrieval of action failed uAppData=%lu expected=%lu\n", obj_data.uAppData, expected); + hr = IDirectInputDevice8_GetDeviceData( device, sizeof(obj_data), &obj_data, &data_size, 0 ); + ok( hr == DI_OK, "GetDeviceData returned %#x\n", hr ); + ok( data_size == 1, "got data size %u, expected 1\n", data_size ); + ok( obj_data.uAppData == expected, "got action uAppData %p, expected %p\n", + (void *)obj_data.uAppData, (void *)expected ); /* Check for buffer overflow */ for (i = 0; i < 17; i++) - if (event_type == INPUT_KEYBOARD) + { + if (type == INPUT_KEYBOARD) { - keybd_event( VK_SPACE, DIK_SPACE, 0, 0); - keybd_event( VK_SPACE, DIK_SPACE, KEYEVENTF_KEYUP, 0); + keybd_event( VK_SPACE, DIK_SPACE, 0, 0 ); + res = WaitForSingleObject( event, 100 ); + ok( res == WAIT_OBJECT_0, "WaitForSingleObject returned %#x\n", res ); + + keybd_event( VK_SPACE, DIK_SPACE, KEYEVENTF_KEYUP, 0 ); + res = WaitForSingleObject( event, 100 ); + ok( res == WAIT_OBJECT_0, "WaitForSingleObject returned %#x\n", res ); } - else if (event_type == INPUT_MOUSE) + if (type == INPUT_MOUSE) { - mouse_event(MOUSEEVENTF_LEFTDOWN, 1, 1, 0, 0); - mouse_event(MOUSEEVENTF_LEFTUP, 1, 1, 0, 0); - } + mouse_event( MOUSEEVENTF_LEFTDOWN, 1, 1, 0, 0 ); + res = WaitForSingleObject( event, 100 ); + ok( res == WAIT_OBJECT_0, "WaitForSingleObject returned %#x\n", res ); - flush_events(); - IDirectInputDevice8_Poll(lpdid); + mouse_event( MOUSEEVENTF_LEFTUP, 1, 1, 0, 0 ); + res = WaitForSingleObject( event, 100 ); + ok( res == WAIT_OBJECT_0, "WaitForSingleObject returned %#x\n", res ); + } + } data_size = 1; - hr = IDirectInputDevice8_GetDeviceData(lpdid, sizeof(obj_data), &obj_data, &data_size, 0); - ok(hr == DI_BUFFEROVERFLOW, "GetDeviceData() failed: %08x\n", hr); + hr = IDirectInputDevice8_GetDeviceData( device, sizeof(obj_data), &obj_data, &data_size, 0 ); + ok( hr == DI_BUFFEROVERFLOW, "GetDeviceData returned %#x\n", hr ); data_size = 1; - hr = IDirectInputDevice8_GetDeviceData(lpdid, sizeof(obj_data), &obj_data, &data_size, 0); - ok(hr == DI_OK && data_size == 1, "GetDeviceData() failed: %08x cnt:%d\n", hr, data_size); + hr = IDirectInputDevice8_GetDeviceData( device, sizeof(obj_data), &obj_data, &data_size, 0 ); + ok( hr == DI_OK, "GetDeviceData returned %#x\n", hr ); + ok( data_size == 1, "got data_size %u, expected 1\n", data_size ); /* drain device's queue */ while (data_size == 1) { - hr = IDirectInputDevice8_GetDeviceData(lpdid, sizeof(obj_data), &obj_data, &data_size, 0); - ok(hr == DI_OK, "GetDeviceData() failed: %08x cnt:%d\n", hr, data_size); + hr = IDirectInputDevice8_GetDeviceData( device, sizeof(obj_data), &obj_data, &data_size, 0 ); + ok( hr == DI_OK, "GetDeviceData returned %#x\n", hr ); if (hr != DI_OK) break; } - IDirectInputDevice_Unacquire(lpdid); + hr = IDirectInputDevice_Unacquire( device ); + ok( hr == DI_OK, "Unacquire returned %#x\n", hr ); + + hr = IDirectInputDevice8_SetEventNotification( device, NULL ); + ok( hr == DI_OK, "SetEventNotification returned %#x\n", hr ); + + CloseHandle( event ); } static void test_build_action_map(IDirectInputDevice8A *lpdid, DIACTIONFORMATA *lpdiaf,

1 0

Henri Verbeet : ddraw: Use wined3d_bit_scan() in compute_sphere_visibility().
by Alexandre Julliard Nov. 10, 2021

Nov. 10, 2021

Module: wine Branch: master Commit: 996cfb841ef5618f78400d42a862d2015ff37536 URL: https://source.winehq.org/git/wine.git/?a=commit;h=996cfb841ef5618f78400d42… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Nov 10 11:36:08 2021 +0100 ddraw: Use wined3d_bit_scan() in compute_sphere_visibility(). Rémi Bernon reports an unspecified issue with gcc 11 related to compute_sphere_visibility() expecting 12 input planes, but d3d_device3_ComputeSphereVisibility() only providing 6. The actual number of planes required depends on the "enabled_planes" mask. This patch should make the code better reflect that, but I do not have a gcc 11 setup to verify it resolves the issue there. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/device.c | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index 8afbab0e58d..6e8f109173b 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -4638,17 +4638,20 @@ static void prepare_clip_space_planes(struct d3d_device *device, struct wined3d_ plane[5].w = m._44 - m._43; } -static void compute_sphere_visibility(struct wined3d_vec4 plane[12], DWORD enabled_planes, BOOL equality, - D3DVECTOR *centers, D3DVALUE *radii, DWORD sphere_count, DWORD *return_values) +static void compute_sphere_visibility(const struct wined3d_vec4 *planes, DWORD enabled_planes, BOOL equality, + const D3DVECTOR *centres, const D3DVALUE *radii, unsigned int sphere_count, DWORD *return_values) { - UINT i, j; + unsigned int mask, i, j; + memset(return_values, 0, sphere_count * sizeof(*return_values)); for (i = 0; i < sphere_count; ++i) { - return_values[i] = 0; - for (j = 0; j < 12; ++j) - if (enabled_planes & 1u << j) - return_values[i] |= in_plane(j, plane[j], centers[i], radii[i], equality); + mask = enabled_planes; + while (mask) + { + j = wined3d_bit_scan(&mask); + return_values[i] |= in_plane(j, planes[j], centres[i], radii[i], equality); + } } }

1 0

Zebediah Figura : wined3d: Allocate all OpenGL buffer BOs from heap.
by Alexandre Julliard Nov. 10, 2021

Nov. 10, 2021

Module: wine Branch: master Commit: 83d60c5206379eaade2fa6b2ea71fc46bfffbd17 URL: https://source.winehq.org/git/wine.git/?a=commit;h=83d60c5206379eaade2fa6b2… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Nov 9 11:36:05 2021 -0600 wined3d: Allocate all OpenGL buffer BOs from heap. That is, no longer allocate a wined3d_bo_gl as part of the wined3d_buffer_gl structure. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/buffer.c | 10 ++++++++-- dlls/wined3d/wined3d_private.h | 2 -- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index 79ee68c177a..fca8ab707f2 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -171,9 +171,11 @@ static void wined3d_buffer_gl_destroy_buffer_object(struct wined3d_buffer_gl *bu struct wined3d_context_gl *context_gl) { struct wined3d_resource *resource = &buffer_gl->b.resource; + struct wined3d_bo_gl *bo_gl; if (!buffer_gl->b.buffer_object) return; + bo_gl = wined3d_bo_gl(buffer_gl->b.buffer_object); if (context_gl->c.transform_feedback_active && (resource->bind_flags & WINED3D_BIND_STREAM_OUTPUT) && wined3d_context_is_graphics_state_dirty(&context_gl->c, STATE_STREAM_OUTPUT)) @@ -191,7 +193,8 @@ static void wined3d_buffer_gl_destroy_buffer_object(struct wined3d_buffer_gl *bu buffer_gl->b.bo_user.valid = false; list_remove(&buffer_gl->b.bo_user.entry); - wined3d_context_gl_destroy_bo(context_gl, &buffer_gl->bo); + wined3d_context_gl_destroy_bo(context_gl, bo_gl); + heap_free(bo_gl); buffer_gl->b.buffer_object = NULL; } @@ -210,6 +213,9 @@ static BOOL wined3d_buffer_gl_create_buffer_object(struct wined3d_buffer_gl *buf TRACE("Creating an OpenGL buffer object for wined3d buffer %p with usage %s.\n", buffer_gl, debug_d3dusage(buffer_gl->b.resource.usage)); + if (!(bo = heap_alloc(sizeof(*bo)))) + return FALSE; + size = buffer_gl->b.resource.size; binding = wined3d_buffer_gl_binding_from_bind_flags(gl_info, buffer_gl->b.resource.bind_flags); if (buffer_gl->b.resource.usage & WINED3DUSAGE_DYNAMIC) @@ -218,12 +224,12 @@ static BOOL wined3d_buffer_gl_create_buffer_object(struct wined3d_buffer_gl *buf coherent = false; } gl_storage_flags = wined3d_resource_gl_storage_flags(&buffer_gl->b.resource); - bo = &buffer_gl->bo; if (!wined3d_context_gl_create_bo(context_gl, size, binding, usage, coherent, gl_storage_flags, bo)) { ERR("Failed to create OpenGL buffer object.\n"); buffer_gl->b.flags &= ~WINED3D_BUFFER_USE_BO; buffer_clear_dirty_areas(&buffer_gl->b); + heap_free(bo); return FALSE; } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 60702bc9777..fc950cda3c3 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -5087,8 +5087,6 @@ HRESULT wined3d_buffer_no3d_init(struct wined3d_buffer *buffer_no3d, struct wine struct wined3d_buffer_gl { struct wined3d_buffer b; - - struct wined3d_bo_gl bo; }; static inline struct wined3d_buffer_gl *wined3d_buffer_gl(struct wined3d_buffer *buffer)

1 0

Jacek Caban : winebuild: Use find_clang_tool for ld and nm tools.
by Alexandre Julliard Nov. 10, 2021

Nov. 10, 2021

Module: wine Branch: master Commit: c41059bcbafacd4725d48327101087a36d36cd7c URL: https://source.winehq.org/git/wine.git/?a=commit;h=c41059bcbafacd4725d48327… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Nov 10 17:48:26 2021 +0100 winebuild: Use find_clang_tool for ld and nm tools. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winebuild/utils.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/winebuild/utils.c b/tools/winebuild/utils.c index 16b1fc2d968..07acb80eb8a 100644 --- a/tools/winebuild/utils.c +++ b/tools/winebuild/utils.c @@ -273,9 +273,9 @@ struct strarray find_tool( const char *name, const char * const *names ) names++; } - if (!file && names == alt_names + 1) + if (!file && strcmp( name, "as" )) /* llvm-as is not a gas replacement */ { - if (cc_command.count) file = find_clang_tool( cc_command, "lld-link" ); + if (cc_command.count) file = find_clang_tool( cc_command, name ); if (!file && !(file = find_binary( "llvm", name ))) { struct strarray clang = empty_strarray;

1 0

Rémi Bernon : dinput8/tests: Add older dinput HID force-feedback tests.
by Alexandre Julliard Nov. 10, 2021

Nov. 10, 2021

Module: wine Branch: master Commit: 95fca9198b2c7791bebd809888beafbecd0018b8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=95fca9198b2c7791bebd8098… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Nov 10 10:52:23 2021 +0100 dinput8/tests: Add older dinput HID force-feedback tests. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput8/tests/Makefile.in | 2 +- dlls/dinput8/tests/hid.c | 360 +++++++++++++++++++++++++++++------------ 2 files changed, 262 insertions(+), 100 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=95fca9198b2c7791bebd…

1 0

Zebediah Figura : wined3d: Avoid accessing the "bo" member of struct wined3d_buffer_gl.
by Alexandre Julliard Nov. 10, 2021

Nov. 10, 2021

Module: wine Branch: master Commit: c465f339a7a408be9ab69d7db54308b9e5eecd56 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c465f339a7a408be9ab69d7d… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Nov 10 11:36:10 2021 +0100 wined3d: Avoid accessing the "bo" member of struct wined3d_buffer_gl. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/buffer.c | 14 +++++++++----- dlls/wined3d/context_gl.c | 12 ++++++------ dlls/wined3d/state.c | 36 ++++++++++++++++++++++-------------- dlls/wined3d/view.c | 35 +++++++++++++++++++---------------- 4 files changed, 56 insertions(+), 41 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=c465f339a7a408be9ab6…

1 0

Nikolay Sivov : evr/mixer: Flush on MFT_MESSAGE_NOTIFY_END_STREAMING.
by Alexandre Julliard Nov. 10, 2021

Nov. 10, 2021

Module: wine Branch: master Commit: d86580b69f11572b46390b95ff8a927777864a07 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d86580b69f11572b46390b95… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Nov 10 15:33:22 2021 +0300 evr/mixer: Flush on MFT_MESSAGE_NOTIFY_END_STREAMING. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/evr/mixer.c | 21 +++------ dlls/evr/tests/evr.c | 121 +++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 128 insertions(+), 14 deletions(-) diff --git a/dlls/evr/mixer.c b/dlls/evr/mixer.c index b9a28c4ad75..8fe80c2f4a9 100644 --- a/dlls/evr/mixer.c +++ b/dlls/evr/mixer.c @@ -1125,34 +1125,27 @@ static HRESULT WINAPI video_mixer_transform_ProcessMessage(IMFTransform *iface, TRACE("%p, %#x, %#lx.\n", iface, message, param); + EnterCriticalSection(&mixer->cs); + switch (message) { case MFT_MESSAGE_SET_D3D_MANAGER: - - EnterCriticalSection(&mixer->cs); - video_mixer_release_device_manager(mixer); if (param) hr = IUnknown_QueryInterface((IUnknown *)param, &IID_IDirect3DDeviceManager9, (void **)&mixer->device_manager); - LeaveCriticalSection(&mixer->cs); - break; case MFT_MESSAGE_COMMAND_FLUSH: - - EnterCriticalSection(&mixer->cs); video_mixer_flush_input(mixer); - LeaveCriticalSection(&mixer->cs); break; case MFT_MESSAGE_NOTIFY_BEGIN_STREAMING: case MFT_MESSAGE_NOTIFY_END_STREAMING: - - EnterCriticalSection(&mixer->cs); - - if (!mixer->is_streaming) + if (mixer->is_streaming) + video_mixer_flush_input(mixer); + else { for (i = 0; i < mixer->input_count; ++i) video_mixer_request_sample(mixer, i); @@ -1160,8 +1153,6 @@ static HRESULT WINAPI video_mixer_transform_ProcessMessage(IMFTransform *iface, mixer->is_streaming = message == MFT_MESSAGE_NOTIFY_BEGIN_STREAMING; - LeaveCriticalSection(&mixer->cs); - break; case MFT_MESSAGE_COMMAND_DRAIN: @@ -1172,6 +1163,8 @@ static HRESULT WINAPI video_mixer_transform_ProcessMessage(IMFTransform *iface, hr = E_NOTIMPL; } + LeaveCriticalSection(&mixer->cs); + return hr; } diff --git a/dlls/evr/tests/evr.c b/dlls/evr/tests/evr.c index 57b64937b79..046a7e4db59 100644 --- a/dlls/evr/tests/evr.c +++ b/dlls/evr/tests/evr.c @@ -94,6 +94,15 @@ static IFilterGraph2 *create_graph(void) return ret; } +#define EXPECT_REF(obj,ref) _expect_ref((IUnknown*)obj, ref, __LINE__) +static void _expect_ref(IUnknown *obj, ULONG ref, int line) +{ + ULONG rc; + IUnknown_AddRef(obj); + rc = IUnknown_Release(obj); + ok_(__FILE__,line)(rc == ref, "Unexpected refcount %d, expected %d.\n", rc, ref); +} + static ULONG get_refcount(void *iface) { IUnknown *unknown = iface; @@ -3061,6 +3070,117 @@ static void test_MFIsFormatYUV(void) } } +static void test_mixer_render(void) +{ + IMFMediaType *video_type, *output_type; + IMFVideoMixerControl *mixer_control; + IDirect3DDeviceManager9 *manager; + IMFVideoProcessor *processor; + IDirect3DSurface9 *surface; + IDirect3DDevice9 *device; + IMFTransform *mixer; + IMFSample *sample; + DWORD status; + HWND window; + UINT token; + HRESULT hr; + + window = create_window(); + if (!(device = create_device(window))) + { + skip("Failed to create a D3D device, skipping tests.\n"); + goto done; + } + + hr = MFCreateVideoMixer(NULL, &IID_IDirect3DDevice9, &IID_IMFTransform, (void **)&mixer); + ok(hr == S_OK, "Failed to create a mixer, hr %#x.\n", hr); + + hr = IMFTransform_QueryInterface(mixer, &IID_IMFVideoProcessor, (void **)&processor); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IMFTransform_QueryInterface(mixer, &IID_IMFVideoMixerControl, (void **)&mixer_control); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + /* Configure device and media types. */ + hr = DXVA2CreateDirect3DDeviceManager9(&token, &manager); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IDirect3DDeviceManager9_ResetDevice(manager, device, token); + ok(hr == S_OK, "Failed to set a device, hr %#x.\n", hr); + + hr = IMFTransform_ProcessMessage(mixer, MFT_MESSAGE_SET_D3D_MANAGER, (ULONG_PTR)manager); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + video_type = create_video_type(&MFVideoFormat_RGB32); + + hr = IMFMediaType_SetUINT64(video_type, &MF_MT_FRAME_SIZE, (UINT64)64 << 32 | 64); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + hr = IMFMediaType_SetUINT32(video_type, &MF_MT_ALL_SAMPLES_INDEPENDENT, TRUE); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IMFTransform_SetInputType(mixer, 0, video_type, 0); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IMFTransform_GetOutputAvailableType(mixer, 0, 0, &output_type); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IMFTransform_SetOutputType(mixer, 0, output_type, 0); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + IMFMediaType_Release(output_type); + IMFMediaType_Release(video_type); + + surface = create_surface(manager, 64, 64); + ok(!!surface, "Failed to create input surface.\n"); + + hr = MFCreateVideoSampleFromSurface((IUnknown *)surface, &sample); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + EXPECT_REF(sample, 1); + hr = IMFTransform_ProcessInput(mixer, 0, sample, 0); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + EXPECT_REF(sample, 2); + + hr = IMFTransform_GetOutputStatus(mixer, &status); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(status == MFT_OUTPUT_STATUS_SAMPLE_READY, "Unexpected status %#x.\n", status); + + /* FLUSH/END_STREAMING releases input */ + hr = IMFTransform_ProcessMessage(mixer, MFT_MESSAGE_NOTIFY_END_STREAMING, 0); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + EXPECT_REF(sample, 1); + + hr = IMFTransform_GetOutputStatus(mixer, &status); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(!status, "Unexpected status %#x.\n", status); + + hr = IMFTransform_ProcessInput(mixer, 0, sample, 0); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + EXPECT_REF(sample, 2); + + hr = IMFTransform_GetOutputStatus(mixer, &status); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(status == MFT_OUTPUT_STATUS_SAMPLE_READY, "Unexpected status %#x.\n", status); + + hr = IMFTransform_ProcessMessage(mixer, MFT_MESSAGE_COMMAND_FLUSH, 0); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + EXPECT_REF(sample, 1); + + hr = IMFTransform_GetOutputStatus(mixer, &status); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(!status, "Unexpected status %#x.\n", status); + + IMFSample_Release(sample); + IDirect3DSurface9_Release(surface); + IMFTransform_Release(mixer); + + IDirect3DDevice9_Release(device); + IDirect3DDeviceManager9_Release(manager); + +done: + DestroyWindow(window); +} + START_TEST(evr) { IMFVideoPresenter *presenter; @@ -3099,6 +3219,7 @@ START_TEST(evr) test_mixer_output_rectangle(); test_mixer_zorder(); test_mixer_samples(); + test_mixer_render(); test_MFIsFormatYUV(); CoUninitialize();

1 0

Alistair Leslie-Hughes : msdasql: IDBProperties doesn't support DBPROPSET_DATASOURCEINFO property set.
by Alexandre Julliard Nov. 10, 2021

Nov. 10, 2021

Module: wine Branch: master Commit: f43b312562c73fe21c64abe3fb6fc040847db8e9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f43b312562c73fe21c64abe3… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Nov 10 17:17:00 2021 +1100 msdasql: IDBProperties doesn't support DBPROPSET_DATASOURCEINFO property set. Native msado15 queries this to workout if interface IMultipleResults can be used with CreateCommand. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msdasql/msdasql_main.c | 21 +++++++++++++++++++++ dlls/msdasql/tests/provider.c | 26 ++++++++++++++++++++++---- 2 files changed, 43 insertions(+), 4 deletions(-) diff --git a/dlls/msdasql/msdasql_main.c b/dlls/msdasql/msdasql_main.c index e58facc47fc..e98945b9777 100644 --- a/dlls/msdasql/msdasql_main.c +++ b/dlls/msdasql/msdasql_main.c @@ -35,6 +35,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(msdasql); +DEFINE_GUID(DBPROPSET_DATASOURCEINFO, 0xc8b522bb, 0x5cf3, 0x11ce, 0xad, 0xe5, 0x00, 0xaa, 0x00, 0x44, 0x77, 0x3d); DEFINE_GUID(DBPROPSET_DBINIT, 0xc8b522bc, 0x5cf3, 0x11ce, 0xad, 0xe5, 0x00, 0xaa, 0x00, 0x44, 0x77, 0x3d); DEFINE_GUID(DBGUID_DEFAULT, 0xc8b521fb, 0x5cf3, 0x11ce, 0xad, 0xe5, 0x00, 0xaa, 0x00, 0x44, 0x77, 0x3d); @@ -345,6 +346,26 @@ static HRESULT WINAPI dbprops_GetProperties(IDBProperties *iface, ULONG cPropert } propset = CoTaskMemAlloc(cPropertyIDSets * sizeof(DBPROPSET)); + + if (IsEqualGUID(&rgPropertyIDSets[0].guidPropertySet, &DBPROPSET_DATASOURCEINFO)) + { + TRACE("Propertyset DBPROPSET_DATASOURCEINFO not supported\n"); + propset->guidPropertySet = rgPropertyIDSets[0].guidPropertySet; + propset->cProperties = rgPropertyIDSets[0].cPropertyIDs; + + propset->rgProperties = CoTaskMemAlloc(propset->cProperties * sizeof(DBPROP)); + + for (j=0; j < propset->cProperties; j++) + { + propset->rgProperties[j].dwPropertyID = rgPropertyIDSets[0].rgPropertyIDs[j]; + propset->rgProperties[j].dwStatus = DBPROPSTATUS_NOTSUPPORTED; + } + + *prgPropertySets = propset; + + return DB_E_ERRORSOCCURRED; + } + propset->guidPropertySet = DBPROPSET_DBINIT; for (i=0; i < cPropertyIDSets; i++) diff --git a/dlls/msdasql/tests/provider.c b/dlls/msdasql/tests/provider.c index 9b75f40a741..353e2ec58c8 100644 --- a/dlls/msdasql/tests/provider.c +++ b/dlls/msdasql/tests/provider.c @@ -31,6 +31,7 @@ #include "wine/test.h" +DEFINE_GUID(DBPROPSET_DATASOURCEINFO, 0xc8b522bb, 0x5cf3, 0x11ce, 0xad, 0xe5, 0x00, 0xaa, 0x00, 0x44, 0x77, 0x3d); DEFINE_GUID(DBPROPSET_DBINITALL, 0xc8b522ca, 0x5cf3, 0x11ce, 0xad, 0xe5, 0x00, 0xaa, 0x00, 0x44, 0x77, 0x3d); DEFINE_GUID(DBPROPSET_DBINIT, 0xc8b522bc, 0x5cf3, 0x11ce, 0xad, 0xe5, 0x00, 0xaa, 0x00, 0x44, 0x77, 0x3d); @@ -72,9 +73,14 @@ static void test_Properties(void) HRESULT hr; IDBProperties *props; DBPROPIDSET propidset; + DBPROPID propid; ULONG infocount; DBPROPINFOSET *propinfoset; + DBPROPIDSET propidlist; + DBPROPSET *propset; WCHAR *desc; + ULONG propcnt; + ULONG i; DBPROPID properties[14] = { DBPROP_AUTH_PASSWORD, DBPROP_AUTH_PERSIST_SENSITIVE_AUTHINFO, DBPROP_AUTH_USERID, @@ -97,10 +103,6 @@ static void test_Properties(void) if (hr == S_OK) { VARTYPE types[14] = { VT_BSTR, VT_BOOL, VT_BSTR, VT_BSTR, intptr_vartype, VT_BSTR, VT_I4, VT_I2 , VT_I4, VT_BSTR, VT_I4, VT_BSTR, VT_I4, VT_I4 }; - ULONG i; - DBPROPIDSET propidlist; - ULONG propcnt; - DBPROPSET *propset; ok(IsEqualGUID(&propinfoset->guidPropertySet, &DBPROPSET_DBINIT), "got %s\n", debugstr_guid(&propinfoset->guidPropertySet)); ok(propinfoset->cPropertyInfos == 14, "got %d\n", propinfoset->cPropertyInfos); @@ -162,6 +164,22 @@ static void test_Properties(void) CoTaskMemFree(propset); } + propid = DBPROP_MULTIPLERESULTS; + propidlist.rgPropertyIDs = &propid; + propidlist.cPropertyIDs = 1; + propidlist.guidPropertySet = DBPROPSET_DATASOURCEINFO; + + propcnt = 0; + propset = NULL; + hr = IDBProperties_GetProperties(props, 1, &propidlist, &propcnt, &propset); + ok(hr == DB_E_ERRORSOCCURRED, "got 0x%08x\n", hr); + ok(IsEqualGUID(&propset->guidPropertySet, &DBPROPSET_DATASOURCEINFO), "got %s\n", debugstr_guid(&propset->guidPropertySet)); + ok(propset->cProperties == 1, "got %d\n", propset->cProperties); + ok(propset->rgProperties[0].dwPropertyID == DBPROP_MULTIPLERESULTS, "got %d\n", propset->rgProperties[0].dwPropertyID); + ok(propset->rgProperties[0].dwStatus == DBPROPSTATUS_NOTSUPPORTED, "got %d\n", propset->rgProperties[0].dwStatus); + + CoTaskMemFree(propset); + IDBProperties_Release(props); }

1 0

Zebediah Figura : wined3d: Introduce wined3d_context_gl_reference_buffer().
by Alexandre Julliard Nov. 10, 2021

Nov. 10, 2021

Module: wine Branch: master Commit: 4b22faa94eb1be15de1da4649719fd53a05942ae URL: https://source.winehq.org/git/wine.git/?a=commit;h=4b22faa94eb1be15de1da464… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Nov 10 11:36:09 2021 +0100 wined3d: Introduce wined3d_context_gl_reference_buffer(). Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context_gl.c | 62 ++++++++++++++++++++---------------------- dlls/wined3d/wined3d_private.h | 11 ++++++++ 2 files changed, 41 insertions(+), 32 deletions(-) diff --git a/dlls/wined3d/context_gl.c b/dlls/wined3d/context_gl.c index 09c871efcd4..d63b928ca70 100644 --- a/dlls/wined3d/context_gl.c +++ b/dlls/wined3d/context_gl.c @@ -3796,8 +3796,8 @@ static void context_gl_load_shader_resources(struct wined3d_context_gl *context_ struct wined3d_shader_sampler_map_entry *entry; struct wined3d_shader_resource_view_gl *srv_gl; struct wined3d_shader_resource_view *view; - struct wined3d_buffer_gl *buffer_gl; struct wined3d_shader *shader; + struct wined3d_buffer *buffer; unsigned int i, j; for (i = 0; i < WINED3D_SHADER_TYPE_COUNT; ++i) @@ -3813,10 +3813,10 @@ static void context_gl_load_shader_resources(struct wined3d_context_gl *context_ if (!state->cb[i][j].buffer) continue; - buffer_gl = wined3d_buffer_gl(state->cb[i][j].buffer); - wined3d_buffer_load(&buffer_gl->b, &context_gl->c, state); - wined3d_context_gl_reference_bo(context_gl, &buffer_gl->bo); - if (!buffer_gl->b.bo_user.valid) + buffer = state->cb[i][j].buffer; + wined3d_buffer_load(buffer, &context_gl->c, state); + wined3d_context_gl_reference_buffer(context_gl, buffer); + if (!buffer->bo_user.valid) device_invalidate_state(context_gl->c.device, STATE_CONSTANT_BUFFER(i)); } @@ -3829,9 +3829,9 @@ static void context_gl_load_shader_resources(struct wined3d_context_gl *context_ if (view->resource->type == WINED3D_RTYPE_BUFFER) { - buffer_gl = wined3d_buffer_gl(buffer_from_resource(view->resource)); - wined3d_buffer_load(&buffer_gl->b, &context_gl->c, state); - wined3d_context_gl_reference_bo(context_gl, &buffer_gl->bo); + buffer = buffer_from_resource(view->resource); + wined3d_buffer_load(buffer, &context_gl->c, state); + wined3d_context_gl_reference_buffer(context_gl, buffer); srv_gl = wined3d_shader_resource_view_gl(view); if (!srv_gl->bo_user.valid) @@ -3850,8 +3850,8 @@ static void context_gl_load_unordered_access_resources(struct wined3d_context_gl { struct wined3d_unordered_access_view_gl *uav_gl; struct wined3d_unordered_access_view *view; - struct wined3d_buffer_gl *buffer_gl; struct wined3d_texture *texture; + struct wined3d_buffer *buffer; unsigned int i; context_gl->c.uses_uavs = 0; @@ -3866,10 +3866,10 @@ static void context_gl_load_unordered_access_resources(struct wined3d_context_gl if (view->resource->type == WINED3D_RTYPE_BUFFER) { - buffer_gl = wined3d_buffer_gl(buffer_from_resource(view->resource)); - wined3d_buffer_load_location(&buffer_gl->b, &context_gl->c, WINED3D_LOCATION_BUFFER); + buffer = buffer_from_resource(view->resource); + wined3d_buffer_load_location(buffer, &context_gl->c, WINED3D_LOCATION_BUFFER); wined3d_unordered_access_view_invalidate_location(view, ~WINED3D_LOCATION_BUFFER); - wined3d_context_gl_reference_bo(context_gl, &buffer_gl->bo); + wined3d_context_gl_reference_buffer(context_gl, buffer); uav_gl = wined3d_unordered_access_view_gl(view); if (!uav_gl->bo_user.valid) @@ -3889,20 +3889,18 @@ static void context_gl_load_unordered_access_resources(struct wined3d_context_gl static void context_gl_load_stream_output_buffers(struct wined3d_context_gl *context_gl, const struct wined3d_state *state) { + struct wined3d_buffer *buffer; unsigned int i; for (i = 0; i < ARRAY_SIZE(state->stream_output); ++i) { - struct wined3d_buffer_gl *buffer_gl; - - if (!state->stream_output[i].buffer) + if (!(buffer = state->stream_output[i].buffer)) continue; - buffer_gl = wined3d_buffer_gl(state->stream_output[i].buffer); - wined3d_buffer_load(&buffer_gl->b, &context_gl->c, state); - wined3d_buffer_invalidate_location(&buffer_gl->b, ~WINED3D_LOCATION_BUFFER); - wined3d_context_gl_reference_bo(context_gl, &buffer_gl->bo); - if (!buffer_gl->b.bo_user.valid) + wined3d_buffer_load(buffer, &context_gl->c, state); + wined3d_buffer_invalidate_location(buffer, ~WINED3D_LOCATION_BUFFER); + wined3d_context_gl_reference_buffer(context_gl, buffer); + if (!buffer->bo_user.valid) device_invalidate_state(context_gl->c.device, STATE_STREAM_OUTPUT); } } @@ -3954,15 +3952,15 @@ static BOOL context_apply_draw_state(struct wined3d_context *context, while (map) { const struct wined3d_stream_info_element *e; - struct wined3d_buffer_gl *buffer_gl; + struct wined3d_buffer *buffer; e = &context->stream_info.elements[wined3d_bit_scan(&map)]; - buffer_gl = wined3d_buffer_gl(state->streams[e->stream_idx].buffer); + buffer = state->streams[e->stream_idx].buffer; - if (!buffer_gl->b.bo_user.valid) + if (!buffer->bo_user.valid) device_invalidate_state(device, STATE_STREAMSRC); else - wined3d_buffer_load(&buffer_gl->b, context, state); + wined3d_buffer_load(buffer, context, state); } /* Loading the buffers above may have invalidated the stream info. */ if (wined3d_context_is_graphics_state_dirty(context, STATE_STREAMSRC)) @@ -3972,28 +3970,28 @@ static BOOL context_apply_draw_state(struct wined3d_context *context, while (map) { const struct wined3d_stream_info_element *e; - struct wined3d_buffer_gl *buffer_gl; + struct wined3d_buffer *buffer; e = &context->stream_info.elements[wined3d_bit_scan(&map)]; - buffer_gl = wined3d_buffer_gl(state->streams[e->stream_idx].buffer); + buffer = state->streams[e->stream_idx].buffer; - wined3d_context_gl_reference_bo(context_gl, &buffer_gl->bo); + wined3d_context_gl_reference_buffer(context_gl, buffer); } if (indexed && state->index_buffer) { - struct wined3d_buffer_gl *buffer_gl = wined3d_buffer_gl(state->index_buffer); + struct wined3d_buffer *buffer = state->index_buffer; if (context->stream_info.all_vbo) { - wined3d_buffer_load(&buffer_gl->b, context, state); - if (!buffer_gl->b.bo_user.valid) + wined3d_buffer_load(buffer, context, state); + if (!buffer->bo_user.valid) device_invalidate_state(device, STATE_INDEXBUFFER); - wined3d_context_gl_reference_bo(context_gl, &buffer_gl->bo); + wined3d_context_gl_reference_buffer(context_gl, buffer); } else { - wined3d_buffer_load_sysmem(&buffer_gl->b, context); + wined3d_buffer_load_sysmem(buffer, context); } } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 2880a5c6b90..60702bc9777 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1612,6 +1612,11 @@ struct wined3d_bo_gl uint64_t command_fence_id; }; +static inline struct wined3d_bo_gl *wined3d_bo_gl(struct wined3d_bo *bo) +{ + return CONTAINING_RECORD(bo, struct wined3d_bo_gl, b); +} + static inline GLuint wined3d_bo_gl_id(uintptr_t bo) { return bo ? ((struct wined3d_bo_gl *)bo)->id : 0; @@ -6581,6 +6586,12 @@ static inline void wined3d_context_gl_reference_bo(struct wined3d_context_gl *co bo_gl->command_fence_id = device_gl->current_fence_id; } +static inline void wined3d_context_gl_reference_buffer(struct wined3d_context_gl *context_gl, + struct wined3d_buffer *buffer) +{ + wined3d_context_gl_reference_bo(context_gl, wined3d_bo_gl(buffer->buffer_object)); +} + static inline bool wined3d_map_persistent(void) { return sizeof(void *) >= sizeof(uint64_t);

1 0

Zebediah Figura : wined3d: Try to allocate new Vulkan BOs from the client thread for DISCARD maps.
by Alexandre Julliard Nov. 10, 2021

Nov. 10, 2021

Module: wine Branch: master Commit: b72053868a00e7a327fadabc55c0eb1191cf2bc2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b72053868a00e7a327fadabc… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Nov 9 11:36:07 2021 -0600 wined3d: Try to allocate new Vulkan BOs from the client thread for DISCARD maps. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/adapter_gl.c | 13 +++++++++++ dlls/wined3d/adapter_vk.c | 50 ++++++++++++++++++++++++++++++++++++++++++ dlls/wined3d/buffer.c | 37 +++++++++++++++++++++++++++++-- dlls/wined3d/cs.c | 13 ++++++++++- dlls/wined3d/directx.c | 12 ++++++++++ dlls/wined3d/wined3d_private.h | 11 ++++++++++ 6 files changed, 133 insertions(+), 3 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=b72053868a00e7a327fa…

1 0