June 2020 - Wine-devel - list.winehq.org

[PATCH v4 01/11] msscript.ocx: Implement IScriptModuleCollection::get_Count.
by Gabriel Ivăncescu 17 Jun '20

17 Jun '20

Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/msscript.ocx/msscript.c | 7 +++++-- dlls/msscript.ocx/tests/msscript.c | 12 ++++++------ 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/dlls/msscript.ocx/msscript.c b/dlls/msscript.ocx/msscript.c index e397044..8fb127e 100644 --- a/dlls/msscript.ocx/msscript.c +++ b/dlls/msscript.ocx/msscript.c @@ -893,9 +893,12 @@ static HRESULT WINAPI ScriptModuleCollection_get_Count(IScriptModuleCollection * { ScriptControl *This = impl_from_IScriptModuleCollection(iface); - FIXME("(%p)->(%p)\n", This, plCount); + TRACE("(%p)->(%p)\n", This, plCount); - return E_NOTIMPL; + if (!plCount) return E_POINTER; + + *plCount = This->module_count; + return S_OK; } static HRESULT WINAPI ScriptModuleCollection_Add(IScriptModuleCollection *iface, BSTR name, diff --git a/dlls/msscript.ocx/tests/msscript.c b/dlls/msscript.ocx/tests/msscript.c index 6a07303..fbbe831 100644 --- a/dlls/msscript.ocx/tests/msscript.c +++ b/dlls/msscript.ocx/tests/msscript.c @@ -2331,11 +2331,11 @@ static void test_IScriptControl_get_Modules(void) ok(hr == S_OK, "IScriptControl_get_Modules failed: 0x%08x.\n", hr); hr = IScriptModuleCollection_get_Count(mods, NULL); - todo_wine ok(hr == E_POINTER, "IScriptModuleCollection_get_Count returned: 0x%08x.\n", hr); + ok(hr == E_POINTER, "IScriptModuleCollection_get_Count returned: 0x%08x.\n", hr); count = 0; hr = IScriptModuleCollection_get_Count(mods, &count); - todo_wine ok(hr == S_OK, "IScriptModuleCollection_get_Count failed: 0x%08x.\n", hr); - todo_wine ok(count == 1, "count is not 1, got %d.\n", count); + ok(hr == S_OK, "IScriptModuleCollection_get_Count failed: 0x%08x.\n", hr); + ok(count == 1, "count is not 1, got %d.\n", count); V_VT(&var) = VT_I4; V_I4(&var) = -1; @@ -2372,7 +2372,7 @@ static void test_IScriptControl_get_Modules(void) SysFreeString(str); hr = IScriptModuleCollection_get_Count(mods, &count); - todo_wine ok(hr == S_OK, "IScriptModuleCollection_get_Count failed: 0x%08x.\n", hr); + ok(hr == S_OK, "IScriptModuleCollection_get_Count failed: 0x%08x.\n", hr); todo_wine ok(count == 3, "count is not 3, got %d.\n", count); V_VT(&var) = VT_I4; V_I4(&var) = count + 1; @@ -2411,8 +2411,8 @@ static void test_IScriptControl_get_Modules(void) SysFreeString(str); hr = IScriptModuleCollection_get_Count(mods, &count); - todo_wine ok(hr == S_OK, "IScriptModuleCollection_get_Count failed: 0x%08x.\n", hr); - todo_wine ok(count == 1, "count is not 1, got %d.\n", count); + ok(hr == S_OK, "IScriptModuleCollection_get_Count failed: 0x%08x.\n", hr); + ok(count == 1, "count is not 1, got %d.\n", count); IScriptModuleCollection_Release(mods); IScriptControl_Release(sc); -- 2.21.0

2 12

[PATCH 1/2] winemenubuilder: Change blacklist to a more neutral word (try 2)
by André Hentschel 17 Jun '20

17 Jun '20

Signed-off-by: André Hentschel <nerv(a)dawncrow.de> --- programs/winemenubuilder/winemenubuilder.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/programs/winemenubuilder/winemenubuilder.c b/programs/winemenubuilder/winemenubuilder.c index d6fc9e29234..ee53619bb9e 100644 --- a/programs/winemenubuilder/winemenubuilder.c +++ b/programs/winemenubuilder/winemenubuilder.c @@ -2470,7 +2470,7 @@ static BOOL write_freedesktop_mime_type_entry(const char *packages_dir, const ch return ret; } -static BOOL is_extension_blacklisted(LPCWSTR extension) +static BOOL is_extension_banned(LPCWSTR extension) { /* These are managed through external tools like wine.desktop, to evade malware created file type associations */ static const WCHAR comW[] = {'.','c','o','m',0}; @@ -2564,7 +2564,7 @@ static BOOL generate_associations(const char *xdg_data_home, const char *package size *= 2; } while (ret == ERROR_MORE_DATA); - if (ret == ERROR_SUCCESS && extensionW[0] == '.' && !is_extension_blacklisted(extensionW)) + if (ret == ERROR_SUCCESS && extensionW[0] == '.' && !is_extension_banned(extensionW)) { char *extensionA = NULL; WCHAR *commandW = NULL; -- 2.17.1

2 2

[PATCH v2 1/4] netio.sys: Add stub interface for connection sockets.
by Paul Gofman 17 Jun '20

17 Jun '20

Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- dlls/netio.sys/netio.c | 88 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 88 insertions(+) diff --git a/dlls/netio.sys/netio.c b/dlls/netio.sys/netio.c index 2b8848a275e..408d75856c6 100644 --- a/dlls/netio.sys/netio.c +++ b/dlls/netio.sys/netio.c @@ -181,6 +181,90 @@ static const WSK_PROVIDER_LISTEN_DISPATCH wsk_provider_listen_dispatch = wsk_get_local_address, }; +static NTSTATUS WINAPI wsk_connect(WSK_SOCKET *socket, SOCKADDR *remote_address, ULONG flags, IRP *irp) +{ + FIXME("socket %p, remote_address %p, flags %#x, irp %p stub.\n", socket, remote_address, flags, irp); + + return STATUS_NOT_IMPLEMENTED; +} + +static NTSTATUS WINAPI wsk_get_remote_address(WSK_SOCKET *socket, SOCKADDR *remote_address, IRP *irp) +{ + FIXME("socket %p, remote_address %p, irp %p stub.\n", socket, remote_address, irp); + + return STATUS_NOT_IMPLEMENTED; +} + +static NTSTATUS WINAPI wsk_send(WSK_SOCKET *socket, WSK_BUF *buffer, ULONG flags, IRP *irp) +{ + FIXME("socket %p, buffer %p, flags %#x, irp %p stub.\n", socket, buffer, flags, irp); + + return STATUS_NOT_IMPLEMENTED; +} + +static NTSTATUS WINAPI wsk_receive(WSK_SOCKET *socket, WSK_BUF *buffer, ULONG flags, IRP *irp) +{ + FIXME("socket %p, buffer %p, flags %#x, irp %p stub.\n", socket, buffer, flags, irp); + + return STATUS_NOT_IMPLEMENTED; +} + +static NTSTATUS WINAPI wsk_disconnect(WSK_SOCKET *socket, WSK_BUF *buffer, ULONG flags, IRP *irp) +{ + FIXME("socket %p, buffer %p, flags %#x, irp %p stub.\n", socket, buffer, flags, irp); + + return STATUS_NOT_IMPLEMENTED; +} + +static NTSTATUS WINAPI wsk_release(WSK_SOCKET *socket, WSK_DATA_INDICATION *data_indication) +{ + FIXME("socket %p, data_indication %p stub.\n", socket, data_indication); + + return STATUS_NOT_IMPLEMENTED; +} + +static NTSTATUS WINAPI wsk_connext_ex(WSK_SOCKET *socket, SOCKADDR *remote_address, WSK_BUF *buffer, + ULONG flags, IRP *irp) +{ + FIXME("socket %p, remote_address %p, buffer %p, flags %#x, irp %p stub.\n", + socket, remote_address, buffer, flags, irp); + + return STATUS_NOT_IMPLEMENTED; +} + +static NTSTATUS WINAPI wsk_send_ex(void) +{ + FIXME("stub (no prototype, will crash).\n"); + + return STATUS_NOT_IMPLEMENTED; +} + +static NTSTATUS WINAPI wsk_receive_ex(void) +{ + FIXME("stub (no prototype, will crash).\n"); + + return STATUS_NOT_IMPLEMENTED; +} + +static const WSK_PROVIDER_CONNECTION_DISPATCH wsk_provider_connection_dispatch = +{ + { + wsk_control_socket, + wsk_close_socket, + }, + wsk_bind, + wsk_connect, + wsk_get_local_address, + wsk_get_remote_address, + wsk_send, + wsk_receive, + wsk_disconnect, + wsk_release, + wsk_connext_ex, + wsk_send_ex, + wsk_receive_ex, +}; + static NTSTATUS WINAPI wsk_socket(WSK_CLIENT *client, ADDRESS_FAMILY address_family, USHORT socket_type, ULONG protocol, ULONG flags, void *socket_context, const void *dispatch, PEPROCESS owning_process, PETHREAD owning_thread, SECURITY_DESCRIPTOR *security_descriptor, IRP *irp) @@ -225,6 +309,10 @@ static NTSTATUS WINAPI wsk_socket(WSK_CLIENT *client, ADDRESS_FAMILY address_fam socket->wsk_socket.Dispatch = &wsk_provider_listen_dispatch; break; + case WSK_FLAG_CONNECTION_SOCKET: + socket->wsk_socket.Dispatch = &wsk_provider_connection_dispatch; + break; + default: FIXME("Flags %#x not implemented.\n", flags); closesocket(s); -- 2.26.2

1 3

[PATCH 1/4] netio.sys: Add stub interface for connection sockets.
by Paul Gofman 17 Jun '20

17 Jun '20

Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- dlls/netio.sys/netio.c | 88 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 88 insertions(+) diff --git a/dlls/netio.sys/netio.c b/dlls/netio.sys/netio.c index 2b8848a275e..408d75856c6 100644 --- a/dlls/netio.sys/netio.c +++ b/dlls/netio.sys/netio.c @@ -181,6 +181,90 @@ static const WSK_PROVIDER_LISTEN_DISPATCH wsk_provider_listen_dispatch = wsk_get_local_address, }; +static NTSTATUS WINAPI wsk_connect(WSK_SOCKET *socket, SOCKADDR *remote_address, ULONG flags, IRP *irp) +{ + FIXME("socket %p, remote_address %p, flags %#x, irp %p stub.\n", socket, remote_address, flags, irp); + + return STATUS_NOT_IMPLEMENTED; +} + +static NTSTATUS WINAPI wsk_get_remote_address(WSK_SOCKET *socket, SOCKADDR *remote_address, IRP *irp) +{ + FIXME("socket %p, remote_address %p, irp %p stub.\n", socket, remote_address, irp); + + return STATUS_NOT_IMPLEMENTED; +} + +static NTSTATUS WINAPI wsk_send(WSK_SOCKET *socket, WSK_BUF *buffer, ULONG flags, IRP *irp) +{ + FIXME("socket %p, buffer %p, flags %#x, irp %p stub.\n", socket, buffer, flags, irp); + + return STATUS_NOT_IMPLEMENTED; +} + +static NTSTATUS WINAPI wsk_receive(WSK_SOCKET *socket, WSK_BUF *buffer, ULONG flags, IRP *irp) +{ + FIXME("socket %p, buffer %p, flags %#x, irp %p stub.\n", socket, buffer, flags, irp); + + return STATUS_NOT_IMPLEMENTED; +} + +static NTSTATUS WINAPI wsk_disconnect(WSK_SOCKET *socket, WSK_BUF *buffer, ULONG flags, IRP *irp) +{ + FIXME("socket %p, buffer %p, flags %#x, irp %p stub.\n", socket, buffer, flags, irp); + + return STATUS_NOT_IMPLEMENTED; +} + +static NTSTATUS WINAPI wsk_release(WSK_SOCKET *socket, WSK_DATA_INDICATION *data_indication) +{ + FIXME("socket %p, data_indication %p stub.\n", socket, data_indication); + + return STATUS_NOT_IMPLEMENTED; +} + +static NTSTATUS WINAPI wsk_connext_ex(WSK_SOCKET *socket, SOCKADDR *remote_address, WSK_BUF *buffer, + ULONG flags, IRP *irp) +{ + FIXME("socket %p, remote_address %p, buffer %p, flags %#x, irp %p stub.\n", + socket, remote_address, buffer, flags, irp); + + return STATUS_NOT_IMPLEMENTED; +} + +static NTSTATUS WINAPI wsk_send_ex(void) +{ + FIXME("stub (no prototype, will crash).\n"); + + return STATUS_NOT_IMPLEMENTED; +} + +static NTSTATUS WINAPI wsk_receive_ex(void) +{ + FIXME("stub (no prototype, will crash).\n"); + + return STATUS_NOT_IMPLEMENTED; +} + +static const WSK_PROVIDER_CONNECTION_DISPATCH wsk_provider_connection_dispatch = +{ + { + wsk_control_socket, + wsk_close_socket, + }, + wsk_bind, + wsk_connect, + wsk_get_local_address, + wsk_get_remote_address, + wsk_send, + wsk_receive, + wsk_disconnect, + wsk_release, + wsk_connext_ex, + wsk_send_ex, + wsk_receive_ex, +}; + static NTSTATUS WINAPI wsk_socket(WSK_CLIENT *client, ADDRESS_FAMILY address_family, USHORT socket_type, ULONG protocol, ULONG flags, void *socket_context, const void *dispatch, PEPROCESS owning_process, PETHREAD owning_thread, SECURITY_DESCRIPTOR *security_descriptor, IRP *irp) @@ -225,6 +309,10 @@ static NTSTATUS WINAPI wsk_socket(WSK_CLIENT *client, ADDRESS_FAMILY address_fam socket->wsk_socket.Dispatch = &wsk_provider_listen_dispatch; break; + case WSK_FLAG_CONNECTION_SOCKET: + socket->wsk_socket.Dispatch = &wsk_provider_connection_dispatch; + break; + default: FIXME("Flags %#x not implemented.\n", flags); closesocket(s); -- 2.26.2

1 3

[PATCH 1/6] d3dcompiler/tests: Add a test for struct field semantics.
by Zebediah Figura 17 Jun '20

17 Jun '20

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/d3dcompiler_43/tests/hlsl_d3d9.c | 49 +++++++++++++++++++++++++++ 1 file changed, 49 insertions(+) diff --git a/dlls/d3dcompiler_43/tests/hlsl_d3d9.c b/dlls/d3dcompiler_43/tests/hlsl_d3d9.c index 24829235a5b..edff59b6337 100644 --- a/dlls/d3dcompiler_43/tests/hlsl_d3d9.c +++ b/dlls/d3dcompiler_43/tests/hlsl_d3d9.c @@ -900,6 +900,54 @@ static void test_struct_assignment(void) release_test_context(&test_context); } +static void test_struct_semantics(void) +{ + struct test_context test_context; + ID3D10Blob *ps_code = NULL; + struct vec4 v; + + static const char ps_source[] = + "struct input\n" + "{\n" + " struct\n" + " {\n" + " float4 texcoord : TEXCOORD0;\n" + " } m;\n" + "};\n" + "struct output\n" + "{\n" + " struct\n" + " {\n" + " float4 color : COLOR;\n" + " } m;\n" + "};\n" + "struct output main(struct input i)\n" + "{\n" + " struct output o;\n" + " o.m.color = i.m.texcoord;\n" + " return o;\n" + "}"; + + if (!init_test_context(&test_context)) + return; + + todo_wine ps_code = compile_shader(ps_source, "ps_2_0"); + if (ps_code) + { + draw_quad(test_context.device, ps_code); + + v = get_color_vec4(test_context.device, 64, 48); + todo_wine ok(compare_vec4(&v, 0.1f, 0.1f, 0.0f, 0.0f, 4096), + "Got unexpected value {%.8e, %.8e, %.8e, %.8e}.\n", v.x, v.y, v.z, v.w); + v = get_color_vec4(test_context.device, 320, 240); + todo_wine ok(compare_vec4(&v, 0.5f, 0.5f, 0.0f, 0.0f, 4096), + "Got unexpected value {%.8e, %.8e, %.8e, %.8e}.\n", v.x, v.y, v.z, v.w); + + ID3D10Blob_Release(ps_code); + } + release_test_context(&test_context); +} + static void check_constant_desc(const char *prefix, const D3DXCONSTANT_DESC *desc, const D3DXCONSTANT_DESC *expect, BOOL nonzero_defaultvalue) { @@ -1208,6 +1256,7 @@ START_TEST(hlsl_d3d9) test_array_dimensions(); test_majority(); test_struct_assignment(); + test_struct_semantics(); test_constant_table(); test_fail(); -- 2.27.0

4 14

[PATCH v2 1/4] wined3d: Set user memory separately for texture sub resources.
by Paul Gofman 17 Jun '20

17 Jun '20

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=43232 Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- v2: - merge conditional blocks related to wined3d_resource_free_sysmem(). I guess we should leave a separate path for '!update_memory_only' as the other branch may decide not to free sysmem as there is no user memory set, while sysmem should still be reallocated if the size of texture changes. dlls/d3d9/device.c | 4 +- dlls/ddraw/surface.c | 80 +++++++++++++++++++--------------- dlls/wined3d/swapchain.c | 4 +- dlls/wined3d/texture.c | 77 ++++++++++++++++++++------------ dlls/wined3d/wined3d.spec | 2 +- dlls/wined3d/wined3d_private.h | 3 +- include/wine/wined3d.h | 2 +- 7 files changed, 103 insertions(+), 69 deletions(-) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 2ee582b4c54..9b1dac0b58c 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -1339,7 +1339,7 @@ static HRESULT WINAPI d3d9_device_CreateTexture(IDirect3DDevice9Ex *iface, } if (set_mem) - wined3d_texture_update_desc(object->wined3d_texture, width, height, + wined3d_texture_update_desc(object->wined3d_texture, 0, width, height, wined3dformat_from_d3dformat(format), WINED3D_MULTISAMPLE_NONE, 0, *shared_handle, 0); @@ -1577,7 +1577,7 @@ static HRESULT d3d9_device_create_surface(struct d3d9_device *device, unsigned i IDirect3DSurface9_AddRef(*surface); if (user_mem) - wined3d_texture_update_desc(texture, width, height, desc.format, + wined3d_texture_update_desc(texture, 0, width, height, desc.format, multisample_type, multisample_quality, user_mem, 0); wined3d_texture_decref(texture); diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index 6d64e8f217c..7b7f16e2a3c 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -4610,7 +4610,7 @@ static HRESULT WINAPI ddraw_surface1_SetClipper(IDirectDrawSurface *iface, IDire *****************************************************************************/ static HRESULT WINAPI ddraw_surface7_SetSurfaceDesc(IDirectDrawSurface7 *iface, DDSURFACEDESC2 *DDSD, DWORD Flags) { - struct ddraw_surface *This = impl_from_IDirectDrawSurface7(iface); + struct ddraw_surface *surface = impl_from_IDirectDrawSurface7(iface); HRESULT hr; const DWORD allowed_flags = DDSD_LPSURFACE | DDSD_PIXELFORMAT | DDSD_WIDTH | DDSD_HEIGHT | DDSD_PITCH | DDSD_CAPS; @@ -4629,9 +4629,9 @@ static HRESULT WINAPI ddraw_surface7_SetSurfaceDesc(IDirectDrawSurface7 *iface, WARN("Flags is %x, returning DDERR_INVALIDPARAMS\n", Flags); return DDERR_INVALIDPARAMS; } - if (!(This->surface_desc.ddsCaps.dwCaps & DDSCAPS_SYSTEMMEMORY) - || This->surface_desc.ddsCaps.dwCaps & DDSCAPS_PRIMARYSURFACE - || This->surface_desc.ddsCaps.dwCaps2 & (DDSCAPS2_TEXTUREMANAGE | DDSCAPS2_D3DTEXTUREMANAGE)) + if (!(surface->surface_desc.ddsCaps.dwCaps & DDSCAPS_SYSTEMMEMORY) + || surface->surface_desc.ddsCaps.dwCaps & DDSCAPS_PRIMARYSURFACE + || surface->surface_desc.ddsCaps.dwCaps2 & (DDSCAPS2_TEXTUREMANAGE | DDSCAPS2_D3DTEXTUREMANAGE)) { WARN("Surface is not in system memory, returning DDERR_INVALIDSURFACETYPE.\n"); return DDERR_INVALIDSURFACETYPE; @@ -4667,10 +4667,10 @@ static HRESULT WINAPI ddraw_surface7_SetSurfaceDesc(IDirectDrawSurface7 *iface, DDSD->u1.lPitch, DDSD->dwWidth); return DDERR_INVALIDPARAMS; } - if (DDSD->dwWidth != This->surface_desc.dwWidth) - TRACE("Surface width changed from %u to %u.\n", This->surface_desc.dwWidth, DDSD->dwWidth); - if (DDSD->u1.lPitch != This->surface_desc.u1.lPitch) - TRACE("Surface pitch changed from %u to %u.\n", This->surface_desc.u1.lPitch, DDSD->u1.lPitch); + if (DDSD->dwWidth != surface->surface_desc.dwWidth) + TRACE("Surface width changed from %u to %u.\n", surface->surface_desc.dwWidth, DDSD->dwWidth); + if (DDSD->u1.lPitch != surface->surface_desc.u1.lPitch) + TRACE("Surface pitch changed from %u to %u.\n", surface->surface_desc.u1.lPitch, DDSD->u1.lPitch); pitch = DDSD->u1.lPitch; width = DDSD->dwWidth; } @@ -4681,8 +4681,8 @@ static HRESULT WINAPI ddraw_surface7_SetSurfaceDesc(IDirectDrawSurface7 *iface, } else { - pitch = This->surface_desc.u1.lPitch; - width = This->surface_desc.dwWidth; + pitch = surface->surface_desc.u1.lPitch; + width = surface->surface_desc.dwWidth; } if (DDSD->dwFlags & DDSD_HEIGHT) @@ -4692,13 +4692,13 @@ static HRESULT WINAPI ddraw_surface7_SetSurfaceDesc(IDirectDrawSurface7 *iface, WARN("Height is 0, returning DDERR_INVALIDPARAMS.\n"); return DDERR_INVALIDPARAMS; } - if (DDSD->dwHeight != This->surface_desc.dwHeight) - TRACE("Surface height changed from %u to %u.\n", This->surface_desc.dwHeight, DDSD->dwHeight); + if (DDSD->dwHeight != surface->surface_desc.dwHeight) + TRACE("Surface height changed from %u to %u.\n", surface->surface_desc.dwHeight, DDSD->dwHeight); height = DDSD->dwHeight; } else { - height = This->surface_desc.dwHeight; + height = surface->surface_desc.dwHeight; } wined3d_mutex_lock(); @@ -4713,17 +4713,17 @@ static HRESULT WINAPI ddraw_surface7_SetSurfaceDesc(IDirectDrawSurface7 *iface, wined3d_mutex_unlock(); return DDERR_INVALIDPARAMS; } - current_format_id = wined3dformat_from_ddrawformat(&This->surface_desc.u4.ddpfPixelFormat); + current_format_id = wined3dformat_from_ddrawformat(&surface->surface_desc.u4.ddpfPixelFormat); if (format_id != current_format_id) TRACE("Surface format changed from %#x to %#x.\n", current_format_id, format_id); } else { - format_id = wined3dformat_from_ddrawformat(&This->surface_desc.u4.ddpfPixelFormat); + format_id = wined3dformat_from_ddrawformat(&surface->surface_desc.u4.ddpfPixelFormat); } - if (FAILED(hr = wined3d_texture_update_desc(This->wined3d_texture, width, height, - format_id, WINED3D_MULTISAMPLE_NONE, 0, DDSD->lpSurface, pitch))) + if (FAILED(hr = wined3d_texture_update_desc(surface->wined3d_texture, surface->sub_resource_idx, + width, height, format_id, WINED3D_MULTISAMPLE_NONE, 0, DDSD->lpSurface, pitch))) { WARN("Failed to update surface desc, hr %#x.\n", hr); wined3d_mutex_unlock(); @@ -4731,13 +4731,13 @@ static HRESULT WINAPI ddraw_surface7_SetSurfaceDesc(IDirectDrawSurface7 *iface, } if (DDSD->dwFlags & DDSD_WIDTH) - This->surface_desc.dwWidth = width; + surface->surface_desc.dwWidth = width; if (DDSD->dwFlags & DDSD_PITCH) - This->surface_desc.u1.lPitch = DDSD->u1.lPitch; + surface->surface_desc.u1.lPitch = DDSD->u1.lPitch; if (DDSD->dwFlags & DDSD_HEIGHT) - This->surface_desc.dwHeight = height; + surface->surface_desc.dwHeight = height; if (DDSD->dwFlags & DDSD_PIXELFORMAT) - This->surface_desc.u4.ddpfPixelFormat = DDSD->u4.ddpfPixelFormat; + surface->surface_desc.u4.ddpfPixelFormat = DDSD->u4.ddpfPixelFormat; wined3d_mutex_unlock(); @@ -5859,28 +5859,40 @@ static HRESULT ddraw_surface_reserve_memory(struct wined3d_texture *wined3d_text static const unsigned int extra_size = 0x10000; struct ddraw_texture *texture = wined3d_texture_get_parent(wined3d_texture); - struct wined3d_resource_desc desc; + struct wined3d_resource_desc resource_desc; + struct wined3d_sub_resource_desc desc; unsigned int pitch, slice_pitch; - HRESULT hr; + unsigned int sub_resource_idx; + HRESULT hr = WINED3D_OK; + unsigned int offset; - wined3d_resource_get_desc(wined3d_texture_get_resource(wined3d_texture), &desc); - if (!(texture->texture_memory = heap_alloc_zero(desc.size + extra_size))) + wined3d_resource_get_desc(wined3d_texture_get_resource(wined3d_texture), &resource_desc); + if (!(texture->texture_memory = heap_alloc_zero(resource_desc.size + extra_size))) { ERR("Out of memory.\n"); return E_OUTOFMEMORY; } TRACE("texture->texture_memory %p.\n", texture->texture_memory); - wined3d_texture_get_pitch(wined3d_texture, 0, &pitch, &slice_pitch); - - if (FAILED(hr = wined3d_texture_update_desc(wined3d_texture, - desc.width, desc.height, desc.format, - WINED3D_MULTISAMPLE_NONE, 0, texture->texture_memory, pitch))) + offset = 0; + sub_resource_idx = 0; + while (wined3d_texture_get_sub_resource_desc(wined3d_texture, sub_resource_idx, &desc) + == WINED3D_OK) { - heap_free(texture->texture_memory); - texture->texture_memory = NULL; - } + wined3d_texture_get_pitch(wined3d_texture, sub_resource_idx, &pitch, &slice_pitch); + if (FAILED(hr = wined3d_texture_update_desc(wined3d_texture, sub_resource_idx, + desc.width, desc.height, resource_desc.format, + desc.multisample_type, desc.multisample_quality, + (BYTE *)texture->texture_memory + offset, pitch))) + { + heap_free(texture->texture_memory); + texture->texture_memory = NULL; + break; + } + ++sub_resource_idx; + offset += desc.size; + } return hr; } @@ -6477,7 +6489,7 @@ HRESULT ddraw_surface_create(struct ddraw *ddraw, const DDSURFACEDESC2 *surface_ } } - if ((desc->dwFlags & DDSD_LPSURFACE) && FAILED(hr = wined3d_texture_update_desc(wined3d_texture, + if ((desc->dwFlags & DDSD_LPSURFACE) && FAILED(hr = wined3d_texture_update_desc(wined3d_texture, 0, wined3d_desc.width, wined3d_desc.height, wined3d_desc.format, WINED3D_MULTISAMPLE_NONE, 0, desc->lpSurface, pitch))) { diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index e034bdf6241..e9d62728b48 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -1925,14 +1925,14 @@ HRESULT CDECL wined3d_swapchain_resize_buffers(struct wined3d_swapchain *swapcha HRESULT hr; UINT i; - if (FAILED(hr = wined3d_texture_update_desc(swapchain->front_buffer, desc->backbuffer_width, + if (FAILED(hr = wined3d_texture_update_desc(swapchain->front_buffer, 0, desc->backbuffer_width, desc->backbuffer_height, desc->backbuffer_format, desc->multisample_type, desc->multisample_quality, NULL, 0))) return hr; for (i = 0; i < desc->backbuffer_count; ++i) { - if (FAILED(hr = wined3d_texture_update_desc(swapchain->back_buffers[i], desc->backbuffer_width, + if (FAILED(hr = wined3d_texture_update_desc(swapchain->back_buffers[i], 0, desc->backbuffer_width, desc->backbuffer_height, desc->backbuffer_format, desc->multisample_type, desc->multisample_quality, NULL, 0))) return hr; diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index b1e08383f62..8e05c6ae194 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -734,9 +734,9 @@ void wined3d_texture_get_memory(struct wined3d_texture *texture, unsigned int su if (locations & WINED3D_LOCATION_SYSMEM) { - if (texture->user_memory) + if (texture->sub_resources[sub_resource_idx].user_memory) { - data->addr = texture->user_memory; + data->addr = texture->sub_resources[sub_resource_idx].user_memory; } else { @@ -1416,6 +1416,7 @@ static void wined3d_texture_cleanup_sync(struct wined3d_texture *texture) ULONG CDECL wined3d_texture_decref(struct wined3d_texture *texture) { + unsigned int i, sub_resource_count; ULONG refcount; TRACE("texture %p, swapchain %p.\n", texture, texture->swapchain); @@ -1432,8 +1433,15 @@ ULONG CDECL wined3d_texture_decref(struct wined3d_texture *texture) * since the application is allowed to free that memory once the * texture is destroyed. Note that this implies that * the destroy handler can't access that memory either. */ - if (texture->user_memory) - wined3d_resource_wait_idle(&texture->resource); + sub_resource_count = texture->layer_count * texture->level_count; + for (i = 0; i < sub_resource_count; ++i) + { + if (texture->sub_resources[i].user_memory) + { + wined3d_resource_wait_idle(&texture->resource); + break; + } + } texture->resource.device->adapter->adapter_ops->adapter_destroy_texture(texture); } @@ -1729,11 +1737,12 @@ void wined3d_texture_gl_set_compatible_renderbuffer(struct wined3d_texture_gl *t checkGLcall("set compatible renderbuffer"); } -HRESULT CDECL wined3d_texture_update_desc(struct wined3d_texture *texture, UINT width, UINT height, - enum wined3d_format_id format_id, enum wined3d_multisample_type multisample_type, - UINT multisample_quality, void *mem, UINT pitch) +HRESULT CDECL wined3d_texture_update_desc(struct wined3d_texture *texture, unsigned int sub_resource_idx, + UINT width, UINT height, enum wined3d_format_id format_id, + enum wined3d_multisample_type multisample_type, UINT multisample_quality, void *mem, UINT pitch) { struct wined3d_texture_sub_resource *sub_resource; + unsigned int i, level, sub_resource_count; const struct wined3d_d3d_info *d3d_info; const struct wined3d_gl_info *gl_info; const struct wined3d_format *format; @@ -1745,8 +1754,9 @@ HRESULT CDECL wined3d_texture_update_desc(struct wined3d_texture *texture, UINT bool create_dib = false; TRACE("texture %p, width %u, height %u, format %s, multisample_type %#x, multisample_quality %u, " - "mem %p, pitch %u.\n", - texture, width, height, debug_d3dformat(format_id), multisample_type, multisample_quality, mem, pitch); + "mem %p, pitch %u, sub_resource_idx %u.\n", + texture, width, height, debug_d3dformat(format_id), multisample_type, multisample_quality, mem, pitch, + sub_resource_idx); device = texture->resource.device; d3d = device->wined3d; @@ -1754,8 +1764,11 @@ HRESULT CDECL wined3d_texture_update_desc(struct wined3d_texture *texture, UINT d3d_info = &device->adapter->d3d_info; format = wined3d_get_format(device->adapter, format_id, texture->resource.bind_flags); resource_size = wined3d_format_calculate_size(format, device->surface_alignment, width, height, 1); + level = sub_resource_idx % texture->level_count; + sub_resource_count = texture->level_count * texture->layer_count; - update_memory_only = width == texture->resource.width && height == texture->resource.height + update_memory_only = width == wined3d_texture_get_level_width(texture, level) + && height == wined3d_texture_get_level_height(texture, level) && format_id == texture->resource.format->id && multisample_type == texture->resource.multisample_type && multisample_quality == texture->resource.multisample_quality; @@ -1768,16 +1781,16 @@ HRESULT CDECL wined3d_texture_update_desc(struct wined3d_texture *texture, UINT { unsigned int current_row_pitch, current_slice_pitch; - wined3d_texture_get_pitch(texture, 0, &current_row_pitch, &current_slice_pitch); + wined3d_texture_get_pitch(texture, level, &current_row_pitch, &current_slice_pitch); update_memory_only = pitch == current_row_pitch && slice_pitch == current_slice_pitch; } if (!resource_size) return WINED3DERR_INVALIDCALL; - if (texture->level_count * texture->layer_count > 1 && !update_memory_only) + if (sub_resource_count > 1 && !update_memory_only) { - WARN("Texture has multiple sub-resources, not supported.\n"); + FIXME("Texture has multiple sub-resources, not supported.\n"); return WINED3DERR_INVALIDCALL; } @@ -1812,18 +1825,29 @@ HRESULT CDECL wined3d_texture_update_desc(struct wined3d_texture *texture, UINT if (texture->dc_info && texture->dc_info[0].dc) { - struct wined3d_texture_idx texture_idx = {texture, 0}; + struct wined3d_texture_idx texture_idx = {texture, sub_resource_idx}; wined3d_cs_destroy_object(device->cs, wined3d_texture_destroy_dc, &texture_idx); wined3d_cs_finish(device->cs, WINED3D_CS_QUEUE_DEFAULT); create_dib = true; } - wined3d_resource_free_sysmem(&texture->resource); + texture->sub_resources[sub_resource_idx].user_memory = mem; - if (!update_memory_only) + if (update_memory_only) { - sub_resource = &texture->sub_resources[0]; + for (i = 0; i < sub_resource_count; ++i) + if (!texture->sub_resources[i].user_memory) + break; + + if (i == sub_resource_count) + wined3d_resource_free_sysmem(&texture->resource); + } + else + { + wined3d_resource_free_sysmem(&texture->resource); + + sub_resource = &texture->sub_resources[sub_resource_idx]; texture->row_pitch = pitch; texture->slice_pitch = slice_pitch; @@ -1871,11 +1895,8 @@ HRESULT CDECL wined3d_texture_update_desc(struct wined3d_texture *texture, UINT } } - if (!(texture->user_memory = mem)) - { - if (!wined3d_resource_prepare_sysmem(&texture->resource)) - ERR("Failed to allocate resource memory.\n"); - } + if (!mem && !wined3d_resource_prepare_sysmem(&texture->resource)) + ERR("Failed to allocate resource memory.\n"); /* The format might be changed to a format that needs conversion. * If the surface didn't use PBOs previously but could now, don't @@ -1884,12 +1905,12 @@ HRESULT CDECL wined3d_texture_update_desc(struct wined3d_texture *texture, UINT if (texture->resource.map_binding == WINED3D_LOCATION_BUFFER && !wined3d_texture_use_pbo(texture, gl_info)) texture->resource.map_binding = WINED3D_LOCATION_SYSMEM; - wined3d_texture_validate_location(texture, 0, WINED3D_LOCATION_SYSMEM); - wined3d_texture_invalidate_location(texture, 0, ~WINED3D_LOCATION_SYSMEM); + wined3d_texture_validate_location(texture, sub_resource_idx, WINED3D_LOCATION_SYSMEM); + wined3d_texture_invalidate_location(texture, sub_resource_idx, ~WINED3D_LOCATION_SYSMEM); if (create_dib) { - struct wined3d_texture_idx texture_idx = {texture, 0}; + struct wined3d_texture_idx texture_idx = {texture, sub_resource_idx}; wined3d_cs_init_object(device->cs, wined3d_texture_create_dc, &texture_idx); wined3d_cs_finish(device->cs, WINED3D_CS_QUEUE_DEFAULT); @@ -3116,7 +3137,7 @@ static BOOL wined3d_texture_gl_prepare_location(struct wined3d_texture *texture, switch (location) { case WINED3D_LOCATION_SYSMEM: - return texture->user_memory ? TRUE + return texture->sub_resources[sub_resource_idx].user_memory ? TRUE : wined3d_resource_prepare_sysmem(&texture->resource); case WINED3D_LOCATION_BUFFER: @@ -4420,7 +4441,7 @@ static BOOL wined3d_texture_no3d_prepare_location(struct wined3d_texture *textur unsigned int sub_resource_idx, struct wined3d_context *context, unsigned int location) { if (location == WINED3D_LOCATION_SYSMEM) - return texture->user_memory ? TRUE + return texture->sub_resources[sub_resource_idx].user_memory ? TRUE : wined3d_resource_prepare_sysmem(&texture->resource); FIXME("Unhandled location %s.\n", wined3d_debug_location(location)); @@ -5058,7 +5079,7 @@ static BOOL wined3d_texture_vk_prepare_location(struct wined3d_texture *texture, switch (location) { case WINED3D_LOCATION_SYSMEM: - return texture->user_memory ? TRUE + return texture->sub_resources[sub_resource_idx].user_memory ? TRUE : wined3d_resource_prepare_sysmem(&texture->resource); case WINED3D_LOCATION_TEXTURE_RGB: diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index f4a648cac8b..295b50a32c7 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -307,7 +307,7 @@ @ cdecl wined3d_texture_set_lod(ptr long) @ cdecl wined3d_texture_set_overlay_position(ptr long long long) @ cdecl wined3d_texture_set_sub_resource_parent(ptr long ptr) -@ cdecl wined3d_texture_update_desc(ptr long long long long long ptr long) +@ cdecl wined3d_texture_update_desc(ptr long long long long long long ptr long) @ cdecl wined3d_texture_update_overlay(ptr long ptr ptr long ptr long) @ cdecl wined3d_unordered_access_view_create(ptr ptr ptr ptr ptr) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 9556f8c0abb..211d76c97f5 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -4059,7 +4059,6 @@ struct wined3d_texture DWORD flags; DWORD update_map_binding; - void *user_memory; unsigned int row_pitch; unsigned int slice_pitch; @@ -4112,6 +4111,8 @@ struct wined3d_texture uint32_t map_flags; DWORD locations; struct wined3d_bo_gl bo; + + void *user_memory; } *sub_resources; }; diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 5450b4d2117..346d1d0dfa8 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2808,7 +2808,7 @@ HRESULT __cdecl wined3d_texture_set_overlay_position(struct wined3d_texture *tex unsigned int sub_resource_idx, LONG x, LONG y); void __cdecl wined3d_texture_set_sub_resource_parent(struct wined3d_texture *texture, unsigned int sub_resource_idx, void *parent); -HRESULT __cdecl wined3d_texture_update_desc(struct wined3d_texture *texture, +HRESULT __cdecl wined3d_texture_update_desc(struct wined3d_texture *texture, unsigned int sub_resource_idx, UINT width, UINT height, enum wined3d_format_id format_id, enum wined3d_multisample_type multisample_type, UINT multisample_quality, void *mem, UINT pitch); -- 2.26.2

3 11

[PATCH] d2d1: Implement D2D1CreateDevice().
by Henri Verbeet 17 Jun '20

17 Jun '20

From: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- This supersedes patch 187157. Minor style changes. dlls/d2d1/d2d1.spec | 2 +- dlls/d2d1/d2d1_private.h | 1 + dlls/d2d1/factory.c | 32 ++++++++++++++++++++++++++++++++ dlls/d2d1/tests/d2d1.c | 19 +++++++++++++++++++ include/d2d1_1.idl | 17 +++++++++++++++++ 5 files changed, 70 insertions(+), 1 deletion(-) diff --git a/dlls/d2d1/d2d1.spec b/dlls/d2d1/d2d1.spec index fff6f1c9c81..0ebcd0af553 100644 --- a/dlls/d2d1/d2d1.spec +++ b/dlls/d2d1/d2d1.spec @@ -4,7 +4,7 @@ @ stdcall D2D1IsMatrixInvertible(ptr) @ stdcall D2D1InvertMatrix(ptr) @ stub D2D1ConvertColorSpace -@ stub D2D1CreateDevice +@ stdcall D2D1CreateDevice(ptr ptr ptr) @ stub D2D1CreateDeviceContext @ stub D2D1SinCos @ stub D2D1Tan diff --git a/dlls/d2d1/d2d1_private.h b/dlls/d2d1/d2d1_private.h index 4eb7e33142d..4546d5c1e3a 100644 --- a/dlls/d2d1/d2d1_private.h +++ b/dlls/d2d1/d2d1_private.h @@ -27,6 +27,7 @@ #include <math.h> #define COBJMACROS #include "d2d1_2.h" +#include "d3d11.h" #ifdef D2D1_INIT_GUID #include "initguid.h" #endif diff --git a/dlls/d2d1/factory.c b/dlls/d2d1/factory.c index 80334d82d02..2f50836bbcd 100644 --- a/dlls/d2d1/factory.c +++ b/dlls/d2d1/factory.c @@ -681,6 +681,38 @@ BOOL WINAPI D2D1InvertMatrix(D2D1_MATRIX_3X2_F *matrix) return d2d_matrix_invert(matrix, &m); } +HRESULT WINAPI D2D1CreateDevice(IDXGIDevice *dxgi_device, + const D2D1_CREATION_PROPERTIES *properties, ID2D1Device **device) +{ + D2D1_CREATION_PROPERTIES default_properties = {0}; + D2D1_FACTORY_OPTIONS factory_options; + ID3D11Device *d3d_device; + ID2D1Factory1 *factory; + HRESULT hr; + + TRACE("dxgi_device %p, properties %p, device %p.\n", dxgi_device, properties, device); + + if (!properties) + { + if (SUCCEEDED(IDXGIDevice_QueryInterface(dxgi_device, &IID_ID3D11Device, (void **)&d3d_device))) + { + if (!(ID3D11Device_GetCreationFlags(d3d_device) & D3D11_CREATE_DEVICE_SINGLETHREADED)) + default_properties.threadingMode = D2D1_THREADING_MODE_MULTI_THREADED; + ID3D11Device_Release(d3d_device); + } + properties = &default_properties; + } + + factory_options.debugLevel = properties->debugLevel; + if (FAILED(hr = D2D1CreateFactory(properties->threadingMode, + &IID_ID2D1Factory1, &factory_options, (void **)&factory))) + return hr; + + hr = ID2D1Factory1_CreateDevice(factory, dxgi_device, device); + ID2D1Factory1_Release(factory); + return hr; +} + static BOOL get_config_key_dword(HKEY default_key, HKEY application_key, const char *name, DWORD *value) { DWORD type, data, size; diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index 87c87324f3d..f52a34514e4 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -28,6 +28,9 @@ #include "wincodec.h" #include "wine/heap.h" +static HRESULT (WINAPI *pD2D1CreateDevice)(IDXGIDevice *dxgi_device, + const D2D1_CREATION_PROPERTIES *properties, ID2D1Device **device); + static BOOL use_mt = TRUE; static struct test_entry @@ -7911,6 +7914,7 @@ static void test_bezier_intersect(void) static void test_create_device(void) { + D2D1_CREATION_PROPERTIES properties = {0}; ID3D10Device1 *d3d_device; IDXGIDevice *dxgi_device; ID2D1Factory1 *factory; @@ -7943,6 +7947,19 @@ static void test_create_device(void) ID2D1Factory_Release(factory2); ID2D1Device_Release(device); + if (pD2D1CreateDevice) + { + hr = pD2D1CreateDevice(dxgi_device, NULL, &device); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ID2D1Device_Release(device); + + hr = pD2D1CreateDevice(dxgi_device, &properties, &device); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ID2D1Device_Release(device); + } + else + win_skip("D2D1CreateDevice() is unavailable.\n"); + IDXGIDevice_Release(dxgi_device); ID3D10Device1_Release(d3d_device); @@ -9416,6 +9433,8 @@ START_TEST(d2d1) unsigned int argc, i; char **argv; + pD2D1CreateDevice = (void *)GetProcAddress(GetModuleHandleA("d2d1.dll"), "D2D1CreateDevice"); + use_mt = !getenv("WINETEST_NO_MT_D3D"); argc = winetest_get_mainargs(&argv); diff --git a/include/d2d1_1.idl b/include/d2d1_1.idl index 4a644ffd4ca..ddb7669c24b 100644 --- a/include/d2d1_1.idl +++ b/include/d2d1_1.idl @@ -187,6 +187,20 @@ typedef enum D2D1_PROPERTY_TYPE D2D1_PROPERTY_TYPE_FORCE_DWORD = 0xffffffff, } D2D1_PROPERTY_TYPE; +typedef enum D2D1_THREADING_MODE +{ + D2D1_THREADING_MODE_SINGLE_THREADED = D2D1_FACTORY_TYPE_SINGLE_THREADED, + D2D1_THREADING_MODE_MULTI_THREADED = D2D1_FACTORY_TYPE_MULTI_THREADED, + D2D1_THREADING_MODE_FORCE_DWORD = 0xffffffff, +} D2D1_THREADING_MODE; + +typedef struct D2D1_CREATION_PROPERTIES +{ + D2D1_THREADING_MODE threadingMode; + D2D1_DEBUG_LEVEL debugLevel; + D2D1_DEVICE_CONTEXT_OPTIONS options; +} D2D1_CREATION_PROPERTIES; + typedef struct D2D1_STROKE_STYLE_PROPERTIES1 { D2D1_CAP_STYLE startCap; @@ -777,3 +791,6 @@ interface ID2D1Factory1 : ID2D1Factory [out] ID2D1Properties **props ); } + +[local] HRESULT __stdcall D2D1CreateDevice(IDXGIDevice *dxgi_device, + const D2D1_CREATION_PROPERTIES *creation_properties, ID2D1Device **device); -- 2.20.1

1 0

[PATCH 1/4] evr/tests: Add basic creation test for default mixer object.
by Nikolay Sivov 17 Jun '20

17 Jun '20

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/evr/Makefile.in | 3 ++- dlls/evr/evr.spec | 2 +- dlls/evr/mixer.c | 28 ++++++++++++++++++++ dlls/evr/tests/Makefile.in | 2 +- dlls/evr/tests/evr.c | 32 ++++++++++++++++++++++ include/evr.idl | 54 ++++++++++++++++++++++++++++++++++++++ 6 files changed, 118 insertions(+), 3 deletions(-) create mode 100644 dlls/evr/mixer.c diff --git a/dlls/evr/Makefile.in b/dlls/evr/Makefile.in index 053d80e61d7..b1db77e639f 100644 --- a/dlls/evr/Makefile.in +++ b/dlls/evr/Makefile.in @@ -5,6 +5,7 @@ EXTRADLLFLAGS = -mno-cygwin C_SRCS = \ evr.c \ - main.c + main.c \ + mixer.c IDL_SRCS = evr_classes.idl diff --git a/dlls/evr/evr.spec b/dlls/evr/evr.spec index c78900c5762..ea87f16da15 100644 --- a/dlls/evr/evr.spec +++ b/dlls/evr/evr.spec @@ -13,7 +13,7 @@ @ stub MFCreateVideoMediaTypeFromSubtype @ stub MFCreateVideoMediaTypeFromVideoInfoHeader2 @ stub MFCreateVideoMediaTypeFromVideoInfoHeader -@ stub MFCreateVideoMixer +@ stdcall MFCreateVideoMixer(ptr ptr ptr ptr) @ stub MFCreateVideoMixerAndPresenter @ stub MFCreateVideoOTA @ stub MFCreateVideoPresenter2 diff --git a/dlls/evr/mixer.c b/dlls/evr/mixer.c new file mode 100644 index 00000000000..fe2f4bab1df --- /dev/null +++ b/dlls/evr/mixer.c @@ -0,0 +1,28 @@ +/* + * Copyright 2020 Nikolay Sivov + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "wine/debug.h" +#include "evr.h" + +WINE_DEFAULT_DEBUG_CHANNEL(evr); + +HRESULT WINAPI MFCreateVideoMixer(IUnknown *owner, REFIID riid_device, REFIID riid, void **obj) +{ + FIXME("%p, %s, %s, %p.\n", owner, debugstr_guid(riid_device), debugstr_guid(riid), obj); + return E_NOTIMPL; +} diff --git a/dlls/evr/tests/Makefile.in b/dlls/evr/tests/Makefile.in index 8dc11e5e558..529c5354508 100644 --- a/dlls/evr/tests/Makefile.in +++ b/dlls/evr/tests/Makefile.in @@ -1,5 +1,5 @@ TESTDLL = evr.dll -IMPORTS = mfuuid strmiids uuid ole32 oleaut32 +IMPORTS = mfuuid strmiids uuid dxguid ole32 oleaut32 evr C_SRCS = \ evr.c diff --git a/dlls/evr/tests/evr.c b/dlls/evr/tests/evr.c index 489b7b949db..adb2b777a2e 100644 --- a/dlls/evr/tests/evr.c +++ b/dlls/evr/tests/evr.c @@ -22,6 +22,7 @@ #include "dshow.h" #include "wine/test.h" #include "d3d9.h" +#include "evr.h" #include "initguid.h" #include "dxva2api.h" @@ -337,6 +338,36 @@ static void test_pin_info(void) ok(!ref, "Got outstanding refcount %d.\n", ref); } +static void test_default_mixer(void) +{ + IMFTransform *transform; + IUnknown *unk; + HRESULT hr; + + hr = MFCreateVideoMixer(NULL, &IID_IDirect3DDevice9, &IID_IMFTransform, (void **)&transform); +todo_wine + ok(hr == S_OK, "Failed to create default mixer, hr %#x.\n", hr); + if (FAILED(hr)) + return; + + hr = IMFTransform_QueryInterface(transform, &IID_IMFTopologyServiceLookupClient, (void **)&unk); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + IUnknown_Release(unk); + + hr = IMFTransform_QueryInterface(transform, &IID_IMFVideoDeviceID, (void **)&unk); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + IUnknown_Release(unk); + + IMFTransform_Release(transform); + + hr = MFCreateVideoMixer(NULL, &IID_IMFTransform, &IID_IMFTransform, (void **)&transform); + ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + + hr = CoCreateInstance(&CLSID_MFVideoMixer9, NULL, CLSCTX_INPROC_SERVER, &IID_IMFTransform, (void **)&transform); + ok(hr == S_OK, "Failed to create default mixer, hr %#x.\n", hr); + IMFTransform_Release(transform); +} + START_TEST(evr) { CoInitialize(NULL); @@ -346,6 +377,7 @@ START_TEST(evr) test_enum_pins(); test_find_pin(); test_pin_info(); + test_default_mixer(); CoUninitialize(); } diff --git a/include/evr.idl b/include/evr.idl index 3768b41b16e..39b4853b2e3 100644 --- a/include/evr.idl +++ b/include/evr.idl @@ -107,3 +107,57 @@ interface IMFVideoRenderer : IUnknown [in] IMFVideoPresenter *pVideoPresenter ); } + +typedef enum _MF_SERVICE_LOOKUP_TYPE +{ + MF_SERVICE_LOOKUP_UPSTREAM, + MF_SERVICE_LOOKUP_UPSTREAM_DIRECT, + MF_SERVICE_LOOKUP_DOWNSTREAM, + MF_SERVICE_LOOKUP_DOWNSTREAM_DIRECT, + MF_SERVICE_LOOKUP_ALL, + MF_SERVICE_LOOKUP_GLOBAL, +} MF_SERVICE_LOOKUP_TYPE; + +[ + object, + uuid(fa993889-4383-415a-a930-dd472a8cf6f7), + local +] +interface IMFTopologyServiceLookup : IUnknown +{ + HRESULT LookupService( + [in] MF_SERVICE_LOOKUP_TYPE lookup_type, + [in] DWORD index, + [in] REFGUID service, + [in] REFIID riid, + [out, iid_is(riid)] void **objects, + [in, out] DWORD *num_objects + ); +} + +[ + object, + uuid(fa99388a-4383-415a-a930-dd472a8cf6f7), + local +] +interface IMFTopologyServiceLookupClient : IUnknown +{ + HRESULT InitServicePointers( + [in] IMFTopologyServiceLookup *service_lookup + ); + HRESULT ReleaseServicePointers(); +} + +[ + object, + uuid(a38d9567-5a9c-4f3c-b293-8eb415b279ba), + local +] +interface IMFVideoDeviceID : IUnknown +{ + HRESULT GetDeviceID( + [out] IID *device_id + ); +} + +cpp_quote("HRESULT WINAPI MFCreateVideoMixer(IUnknown *owner, REFIID riid_device, REFIID riid, void **obj);") -- 2.27.0

3 10

[PATCH 1/2] include: Add else cases for __cdecl
by André Hentschel 17 Jun '20

17 Jun '20

Signed-off-by: André Hentschel <nerv(a)dawncrow.de> --- include/msvcrt/corecrt.h | 2 ++ include/windef.h | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/include/msvcrt/corecrt.h b/include/msvcrt/corecrt.h index c98b72f7d35..ad46c56591c 100644 --- a/include/msvcrt/corecrt.h +++ b/include/msvcrt/corecrt.h @@ -100,6 +100,8 @@ # define __cdecl __attribute__((pcs("aapcs-vfp"))) # elif defined(__aarch64__) && defined (__GNUC__) # define __cdecl __attribute__((ms_abi)) +# else +# define __cdecl # endif #endif /* __cdecl */ diff --git a/include/windef.h b/include/windef.h index 7ece7c8628b..521c3ab4512 100644 --- a/include/windef.h +++ b/include/windef.h @@ -93,7 +93,7 @@ extern "C" { # define __cdecl __attribute__((pcs("aapcs-vfp"))) # elif defined(__aarch64__) && defined (__GNUC__) # define __cdecl __attribute__((ms_abi)) -# elif !defined(_MSC_VER) +# else # define __cdecl # endif #endif /* __cdecl */ -- 2.17.1

2 4

[PATCH] d3dcompiler: Check shader for NULL.
by Matteo Bruni 17 Jun '20

17 Jun '20

Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> --- I had this local change to 24c84947c835d42190e61b70ee5be98bdedd1e9b that I forgot to commit and send in place of the simple signoff. Oh well... dlls/d3dcompiler_43/compiler.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/d3dcompiler_43/compiler.c b/dlls/d3dcompiler_43/compiler.c index 78fb0c46cc09..c400b83d8d1a 100644 --- a/dlls/d3dcompiler_43/compiler.c +++ b/dlls/d3dcompiler_43/compiler.c @@ -805,7 +805,7 @@ static HRESULT compile_shader(const char *preproc_shader, const char *target, co if (FAILED(blob_hr = D3DCreateBlob(size, &buffer))) { HeapFree(GetProcessHeap(), 0, messages); - if (*shader) + if (shader && *shader) { ID3D10Blob_Release(*shader); *shader = NULL; -- 2.26.2

1 0