January 2021 - wine-commits

Alexandre Julliard : Wine release 6.1
by Alexandre Julliard 29 Jan '21

29 Jan '21

Module: website Branch: master Commit: 42f365b348868fdc7c0dd97934464c8f7d186e6a URL: https://source.winehq.org/git/website.git/?a=commit;h=42f365b348868fdc7c0dd… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jan 29 22:10:36 2021 +0100 Wine release 6.1 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- news/en/2021012901.xml | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/news/en/2021012901.xml b/news/en/2021012901.xml new file mode 100644 index 00000000..798cb6a0 --- /dev/null +++ b/news/en/2021012901.xml @@ -0,0 +1,18 @@ +<news> +<date>January 29, 2021</date> +<title>Wine 6.1 Released</title> +<body> + The Wine development release 6.1 is now available. + <a href="{$root}/announce/6.1">What's new</a> in this release: +<ul> + <li>Arabic text shaping.</li> + <li>More WinRT support in WIDL.</li> + <li>VKD3D version 1.2 is used for Direct3D 12.</li> + <li>Support for Rosetta's memory layout on M1 Macs.</li> + <li>Support for Thumb-2 mode on ARM.</li> + <li>Various bug fixes.</li> +</ul> + +The source is <a href="//dl.winehq.org/wine/source/6.x/wine-6.1.tar.xz">available now</a>. +Binary packages are in the process of being built, and will appear soon at their respective <a href="{$root}/download">download locations</a>. +</body></news>

1 0

Tag wine-6.1 : Alexandre Julliard : Release 6.1
by Alexandre Julliard 29 Jan '21

29 Jan '21

Module: wine Branch: refs/tags/wine-6.1 Tag: 1307e28c37baa85d69d174f73fb2d95fb6393919 URL: https://source.winehq.org/git/wine.git/?a=tag;h=1307e28c37baa85d69d174f73fb… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jan 29 22:04:59 2021 +0100 Release 6.1

1 0

Alexandre Julliard : Release 6.1.
by Alexandre Julliard 29 Jan '21

29 Jan '21

Module: wine Branch: master Commit: 47ac628b4a4e476c1b044765c95d5be2a7101d14 URL: https://source.winehq.org/git/wine.git/?a=commit;h=47ac628b4a4e476c1b044765… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jan 29 22:04:59 2021 +0100 Release 6.1. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- ANNOUNCE | 912 +++++++++++++++++++++++++++++++------------------------------- AUTHORS | 1 + VERSION | 2 +- configure | 18 +- 4 files changed, 460 insertions(+), 473 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=47ac628b4a4e476c1b04…

1 0

Zebediah Figura : include: Define some types before including ntddndis.h.
by Alexandre Julliard 29 Jan '21

29 Jan '21

Module: wine Branch: master Commit: acd9c7085df997902b8157de7912459a8b3abfe7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=acd9c7085df997902b8157de… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Jan 29 10:10:19 2021 -0600 include: Define some types before including ntddndis.h. Note that Windows only defines some types before the include (specifically, NDIS_STATUS, NDIS_HANDLE, NDIS_STRING). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50426 Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/ddk/ndis.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/ddk/ndis.h b/include/ddk/ndis.h index 872b43b5824..6258bc13354 100644 --- a/include/ddk/ndis.h +++ b/include/ddk/ndis.h @@ -21,8 +21,6 @@ #ifndef _NDIS_ #define _NDIS_ -#include <ntddndis.h> - typedef ULONG NDIS_AF, *PNDIS_AF; typedef MDL NDIS_BUFFER, *PNDIS_BUFFER; typedef void *NDIS_HANDLE, **PNDIS_HANDLE, *PNDIS_PACKET_POOL; @@ -30,6 +28,8 @@ typedef ULONG NDIS_OID, *PNDIS_OID; typedef int NDIS_STATUS, *PNDIS_STATUS; typedef UNICODE_STRING NDIS_STRING, *PNDIS_STRING; +#include <ntddndis.h> + typedef enum _NDIS_REQUEST_TYPE { NdisRequestQueryInformation,

1 0

Zebediah Figura : include: Fix the definition of PNDIS_HANDLE.
by Alexandre Julliard 29 Jan '21

29 Jan '21

Module: wine Branch: master Commit: 06a92a85baa93d3e26ba45bea3753d0cd809368b URL: https://source.winehq.org/git/wine.git/?a=commit;h=06a92a85baa93d3e26ba45be… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Jan 29 10:10:18 2021 -0600 include: Fix the definition of PNDIS_HANDLE. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/ddk/ndis.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/ddk/ndis.h b/include/ddk/ndis.h index 38eec8a7ac4..872b43b5824 100644 --- a/include/ddk/ndis.h +++ b/include/ddk/ndis.h @@ -25,7 +25,7 @@ typedef ULONG NDIS_AF, *PNDIS_AF; typedef MDL NDIS_BUFFER, *PNDIS_BUFFER; -typedef void *NDIS_HANDLE, *PNDIS_HANDLE, *PNDIS_PACKET_POOL; +typedef void *NDIS_HANDLE, **PNDIS_HANDLE, *PNDIS_PACKET_POOL; typedef ULONG NDIS_OID, *PNDIS_OID; typedef int NDIS_STATUS, *PNDIS_STATUS; typedef UNICODE_STRING NDIS_STRING, *PNDIS_STRING;

1 0

Michael Stefaniuc : d2d1/tests: Remove superfluous cast to self.
by Alexandre Julliard 29 Jan '21

29 Jan '21

Module: wine Branch: master Commit: 3e1bb7f727fed3d6db597b4900d113474d5f441b URL: https://source.winehq.org/git/wine.git/?a=commit;h=3e1bb7f727fed3d6db597b49… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Thu Jan 28 23:29:38 2021 +0100 d2d1/tests: Remove superfluous cast to self. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/tests/d2d1.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index 3e7df715dda..7c1ff9dc197 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -412,7 +412,7 @@ static void get_d3d11_surface_readback(IDXGISurface *surface, struct resource_re ID3D11Resource_Release(src_resource); ID3D11Device_Release(device); - hr = ID3D11DeviceContext_Map(context, (ID3D11Resource *)rb->u.d3d11_resource, 0, D3D11_MAP_READ, 0, &map_desc); + hr = ID3D11DeviceContext_Map(context, rb->u.d3d11_resource, 0, D3D11_MAP_READ, 0, &map_desc); ok(SUCCEEDED(hr), "Failed to map texture, hr %#x.\n", hr); ID3D11DeviceContext_Release(context);

1 0

Michael Stefaniuc : ddraw: Remove superfluous cast to self.
by Alexandre Julliard 29 Jan '21

29 Jan '21

Module: wine Branch: master Commit: 956721e15c0de5a379a7bba69961e9c353694d1a URL: https://source.winehq.org/git/wine.git/?a=commit;h=956721e15c0de5a379a7bba6… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Thu Jan 28 23:29:39 2021 +0100 ddraw: Remove superfluous cast to self. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/device.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index 3f1fe08c11e..4d24c22650e 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -3179,8 +3179,7 @@ static HRESULT WINAPI d3d_device3_SetTransform(IDirect3DDevice3 *iface, wined3d_mutex_lock(); multiply_matrix(&projection, &device->legacy_clipspace, (struct wined3d_matrix *)matrix); - wined3d_stateblock_set_transform(device->state, - WINED3D_TS_PROJECTION, (struct wined3d_matrix *)&projection); + wined3d_stateblock_set_transform(device->state, WINED3D_TS_PROJECTION, &projection); memcpy(&device->legacy_projection, matrix, sizeof(*matrix)); wined3d_mutex_unlock();

1 0

Zebediah Figura : wined3d: Implement global resource memory barriers.
by Alexandre Julliard 29 Jan '21

29 Jan '21

Module: wine Branch: master Commit: 387a63237d0e040c4e9f53b2bd3580671f832254 URL: https://source.winehq.org/git/wine.git/?a=commit;h=387a63237d0e040c4e9f53b2… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Jan 25 14:58:18 2021 -0600 wined3d: Implement global resource memory barriers. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/glsl_shader.c | 6 ++++++ dlls/wined3d/shader.c | 5 +++++ dlls/wined3d/wined3d_private.h | 1 + 3 files changed, 12 insertions(+) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 6ce9178c561..45eebcc2c20 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -5729,6 +5729,12 @@ static void shader_glsl_sync(const struct wined3d_shader_instruction *ins) sync_flags &= ~WINED3DSSF_GROUP_SHARED_MEMORY; } + if (sync_flags & WINED3DSSF_GLOBAL_UAV) + { + shader_addline(buffer, "memoryBarrier();\n"); + sync_flags &= ~WINED3DSSF_GLOBAL_UAV; + } + if (sync_flags) FIXME("Unhandled sync flags %#x.\n", sync_flags); } diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 8843e6883fc..9052d217148 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -1910,6 +1910,11 @@ static void shader_dump_global_flags(struct wined3d_string_buffer *buffer, DWORD static void shader_dump_sync_flags(struct wined3d_string_buffer *buffer, DWORD sync_flags) { + if (sync_flags & WINED3DSSF_GLOBAL_UAV) + { + shader_addline(buffer, "_uglobal"); + sync_flags &= ~WINED3DSSF_GLOBAL_UAV; + } if (sync_flags & WINED3DSSF_GROUP_SHARED_MEMORY) { shader_addline(buffer, "_g"); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 119ce3af033..101c0287936 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -656,6 +656,7 @@ enum wined3d_shader_sync_flags { WINED3DSSF_THREAD_GROUP = 0x1, WINED3DSSF_GROUP_SHARED_MEMORY = 0x2, + WINED3DSSF_GLOBAL_UAV = 0x8, }; enum wined3d_shader_uav_flags

1 0

Rémi Bernon : d3d11/tests: Add tests for compute shader state swap.
by Alexandre Julliard 29 Jan '21

29 Jan '21

Module: wine Branch: master Commit: fbad62fdca6a2a6a622b13fa385c27a5d3981b0d URL: https://source.winehq.org/git/wine.git/?a=commit;h=fbad62fdca6a2a6a622b13fa… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Jan 27 20:50:05 2021 +0100 d3d11/tests: Add tests for compute shader state swap. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/tests/d3d11.c | 144 +++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 120 insertions(+), 24 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=fbad62fdca6a2a6a622b…

1 0

Rémi Bernon : d3d11/tests: Add tests for domain shader state swap.
by Alexandre Julliard 29 Jan '21

29 Jan '21

Module: wine Branch: master Commit: 7a289ba268376694d30950b716ed0460f31ad6af URL: https://source.winehq.org/git/wine.git/?a=commit;h=7a289ba268376694d30950b7… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Jan 27 20:50:04 2021 +0100 d3d11/tests: Add tests for domain shader state swap. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/tests/d3d11.c | 119 ++++++++++++++++++++++++++++++++++++++--------- 1 file changed, 96 insertions(+), 23 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=7a289ba268376694d309…

1 0

Rémi Bernon : d3d11/tests: Add tests for hull shader state swap.
by Alexandre Julliard 29 Jan '21

29 Jan '21

Module: wine Branch: master Commit: 24c948df6810550df477fefe15e0d24a756dafea URL: https://source.winehq.org/git/wine.git/?a=commit;h=24c948df6810550df477fefe… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Jan 27 20:50:03 2021 +0100 d3d11/tests: Add tests for hull shader state swap. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/tests/d3d11.c | 152 +++++++++++++++++++++++++++++++++++++++++------ 1 file changed, 133 insertions(+), 19 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=24c948df6810550df477…

1 0

Rémi Bernon : d3d11/tests: Add more SwapDeviceContextState tests.
by Alexandre Julliard 29 Jan '21

29 Jan '21

Module: wine Branch: master Commit: e11aa21ac2ac76ed882c666c1dab4e7df2d8fa55 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e11aa21ac2ac76ed882c666c… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Jan 27 20:50:02 2021 +0100 d3d11/tests: Add more SwapDeviceContextState tests. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/tests/d3d11.c | 79 ++++++++++++++++++++++++++++++++++++++++++------ 1 file changed, 69 insertions(+), 10 deletions(-) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 7220be73ac7..20bf62b792e 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -6673,19 +6673,19 @@ static void test_device_context_state(void) 0x00000000, 0x00101e46, 0x00000000, 0x0100003e, }; - ID3DDeviceContextState *context_state, *previous_context_state; + ID3DDeviceContextState *context_state, *previous_context_state, *tmp_context_state, *context_state2; ID3D11SamplerState *sampler, *tmp_sampler; D3D11_SHADER_RESOURCE_VIEW_DESC srv_desc; ID3D11ShaderResourceView *tmp_srv, *srv; D3D11_DEVICE_CONTEXT_TYPE context_type; - ID3D11DeviceContext1 *context = NULL; + ID3D11DeviceContext1 *context = NULL, *context2; D3D11_SAMPLER_DESC sampler_desc; D3D_FEATURE_LEVEL feature_level; ID3D11GeometryShader *tmp_gs, *gs; - ID3D11VertexShader *tmp_vs, *vs; + ID3D11VertexShader *tmp_vs, *vs, *vs2; ID3D11PixelShader *tmp_ps, *ps; - ID3D11Device *d3d11_device; - ID3D11Device1 *device; + ID3D11Device *d3d11_device, *d3d11_device2; + ID3D11Device1 *device, *device2; struct vec4 constant; ID3D11Buffer *cb, *srvb, *tmp_cb; ULONG refcount; @@ -6809,6 +6809,8 @@ static void test_device_context_state(void) ID3D11DeviceContext1_VSSetSamplers(context, 0, 1, &sampler); ID3D11DeviceContext1_VSSetShader(context, vs, NULL, 0); ID3D11DeviceContext1_VSSetShaderResources(context, 0, 1, &srv); + refcount = get_refcount(vs); + ok(refcount == 1, "Got refcount %u, expected 1.\n", refcount); ID3D11DeviceContext1_GSSetConstantBuffers(context, 0, 1, &cb); ID3D11DeviceContext1_GSSetSamplers(context, 0, 1, &sampler); @@ -6820,11 +6822,15 @@ static void test_device_context_state(void) ID3D11DeviceContext1_PSSetShader(context, ps, NULL, 0); ID3D11DeviceContext1_PSSetShaderResources(context, 0, 1, &srv); + previous_context_state = (ID3DDeviceContextState *)0xdeadbeef; + ID3D11DeviceContext1_SwapDeviceContextState(context, NULL, &previous_context_state); + todo_wine ok(previous_context_state == NULL, "Got unexpected state pointer.\n"); + if (previous_context_state) ID3DDeviceContextState_Release(previous_context_state); previous_context_state = NULL; ID3D11DeviceContext1_SwapDeviceContextState(context, context_state, &previous_context_state); - refcount = ID3DDeviceContextState_Release(context_state); - ok(!refcount, "Got refcount %u, expected 0.\n", refcount); ok(previous_context_state != NULL, "Failed to get previous context state\n"); + refcount = get_refcount(vs); + todo_wine ok(refcount == 1, "Got refcount %u, expected 1.\n", refcount); context_type = ID3D11DeviceContext1_GetType(context); ok(context_type == D3D11_DEVICE_CONTEXT_IMMEDIATE, "Unexpected context type %u.\n", context_type); @@ -6868,11 +6874,64 @@ static void test_device_context_state(void) ID3D11DeviceContext1_PSGetShaderResources(context, 0, 1, &tmp_srv); ok(!tmp_srv, "Got unexpected srv %p.\n", tmp_srv); - ID3D11DeviceContext1_SwapDeviceContextState(context, previous_context_state, &context_state); - refcount = ID3DDeviceContextState_Release(context_state); - ok(!refcount, "Got refcount %u, expected 0.\n", refcount); + /* updating the device context should also update the device context state */ + hr = ID3D11Device1_CreateVertexShader(device, simple_vs, sizeof(simple_vs), NULL, &vs2); + ok(SUCCEEDED(hr), "Failed to create vertex shader, hr %#x.\n", hr); + ID3D11DeviceContext1_VSSetShader(context, vs2, NULL, 0); + ID3D11DeviceContext1_SwapDeviceContextState(context, context_state, &tmp_context_state); + refcount = ID3DDeviceContextState_Release(tmp_context_state); + todo_wine ok(refcount == 1, "Got refcount %u, expected 1.\n", refcount); + todo_wine ok(tmp_context_state == context_state, "Got unexpected state pointer.\n"); + tmp_vs = (ID3D11VertexShader *)0xdeadbeef; + ID3D11DeviceContext1_VSGetShader(context, &tmp_vs, NULL, NULL); + todo_wine ok(tmp_vs == vs2, "Got shader %p, expected %p.\n", tmp_vs, vs2); + if (tmp_vs) refcount = ID3D11VertexShader_Release(tmp_vs); + else refcount = 0; + todo_wine ok(refcount == 1, "Got refcount %u, expected 1.\n", refcount); + + /* context states may be used with other devices instances too */ + d3d11_device2 = create_device(NULL); + ok(!!d3d11_device2, "Failed to create device.\n"); + hr = ID3D11Device_QueryInterface(d3d11_device2, &IID_ID3D11Device1, (void **)&device2); + ok(SUCCEEDED(hr), "Failed to query device interface, hr %#x.\n", hr); + ID3D11Device_Release(d3d11_device2); + ID3D11Device1_GetImmediateContext1(device2, &context2); + ok(!!context2, "Failed to get immediate context.\n"); + + ID3D11DeviceContext1_SwapDeviceContextState(context2, context_state, &tmp_context_state); + ok(!!tmp_context_state, "Failed to get context state.\n"); + tmp_vs = (ID3D11VertexShader *)0xdeadbeef; + ID3D11DeviceContext1_VSGetShader(context, &tmp_vs, NULL, NULL); + todo_wine ok(tmp_vs == vs2, "Got shader %p, expected %p.\n", tmp_vs, vs2); + if (tmp_vs) refcount = ID3D11VertexShader_Release(tmp_vs); + else refcount = 0; + todo_wine ok(refcount == 1, "Got refcount %u, expected 1.\n", refcount); + ID3D11DeviceContext1_SwapDeviceContextState(context2, tmp_context_state, &context_state2); + refcount = ID3DDeviceContextState_Release(tmp_context_state); + ok(refcount == 0, "Got refcount %u, expected 1.\n", refcount); + refcount = ID3DDeviceContextState_Release(context_state2); + todo_wine ok(refcount == 1, "Got refcount %u, expected 1.\n", refcount); + todo_wine ok(context_state2 == context_state, "Got unexpected state pointer.\n"); + + refcount = ID3D11DeviceContext1_Release(context2); + ok(refcount == 0, "Got refcount %u, expected 0.\n", refcount); + refcount = ID3D11Device1_Release(device2); + ok(refcount == 0, "Got refcount %u, expected 0.\n", refcount); + + ID3D11DeviceContext1_VSSetShader(context, NULL, NULL, 0); + refcount = ID3D11VertexShader_Release(vs2); + ok(refcount == 0, "Got refcount %u, expected 0.\n", refcount); + + ID3D11DeviceContext1_SwapDeviceContextState(context, previous_context_state, &tmp_context_state); refcount = ID3DDeviceContextState_Release(previous_context_state); ok(!refcount, "Got refcount %u, expected 0.\n", refcount); + refcount = ID3DDeviceContextState_Release(tmp_context_state); + todo_wine ok(refcount == 1, "Got refcount %u, expected 1.\n", refcount); + refcount = ID3DDeviceContextState_Release(context_state); + ok(!refcount, "Got refcount %u, expected 0.\n", refcount); + todo_wine ok(tmp_context_state == context_state, "Got unexpected state pointer.\n"); + refcount = get_refcount(vs); + ok(refcount == 1, "Got refcount %u, expected 1.\n", refcount); /* ID3DDeviceContextState retains the previous state. */

1 0

Jacek Caban : ieframe: Implement SetQueryNetSessionCount.
by Alexandre Julliard 29 Jan '21

29 Jan '21

Module: wine Branch: master Commit: ffecc7f41bccd4c672ac7aa3085dce6b2175db89 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ffecc7f41bccd4c672ac7aa3… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jan 29 14:14:20 2021 +0100 ieframe: Implement SetQueryNetSessionCount. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ieframe/ieframe.h | 9 +++++++++ dlls/ieframe/ieframe.spec | 1 + dlls/ieframe/ieframe_main.c | 22 ++++++++++++++++++++ dlls/ieframe/oleobject.c | 1 + dlls/ieframe/tests/webbrowser.c | 45 +++++++++++++++++++++++++++++++++++++++++ 5 files changed, 78 insertions(+) diff --git a/dlls/ieframe/ieframe.h b/dlls/ieframe/ieframe.h index a35507e6fb3..633906a70ca 100644 --- a/dlls/ieframe/ieframe.h +++ b/dlls/ieframe/ieframe.h @@ -385,3 +385,12 @@ static inline LPSTR co_strdupWtoA(LPCWSTR str) WideCharToMultiByte(CP_ACP, 0, str, -1, ret, len, 0, 0); return ret; } + +enum SessionOp +{ + SESSION_QUERY, + SESSION_INCREMENT, + SESSION_DECREMENT +}; + +LONG WINAPI SetQueryNetSessionCount(DWORD session_op); diff --git a/dlls/ieframe/ieframe.spec b/dlls/ieframe/ieframe.spec index 94eb36db9f3..27d73c5aa62 100644 --- a/dlls/ieframe/ieframe.spec +++ b/dlls/ieframe/ieframe.spec @@ -7,3 +7,4 @@ @ stdcall -private DllUnregisterServer() @ stdcall IEGetWriteableHKCU(ptr) @ stdcall OpenURL(long long str long) +@ stdcall SetQueryNetSessionCount(long) diff --git a/dlls/ieframe/ieframe_main.c b/dlls/ieframe/ieframe_main.c index 5abe502f1e4..b05686f24f9 100644 --- a/dlls/ieframe/ieframe_main.c +++ b/dlls/ieframe/ieframe_main.c @@ -285,3 +285,25 @@ HRESULT WINAPI IEGetWriteableHKCU(HKEY *pkey) FIXME("(%p) stub\n", pkey); return E_NOTIMPL; } + +/*********************************************************************** + * SetQueryNetSessionCount (ieframe.@) + */ +LONG WINAPI SetQueryNetSessionCount(DWORD session_op) +{ + static LONG session_count; + + TRACE("(%x)\n", session_op); + + switch(session_op) + { + case SESSION_QUERY: + return session_count; + case SESSION_INCREMENT: + return InterlockedIncrement(&session_count); + case SESSION_DECREMENT: + return InterlockedDecrement(&session_count); + }; + + return 0; +} diff --git a/dlls/ieframe/oleobject.c b/dlls/ieframe/oleobject.c index be0e6ec5bfc..b8377b35d43 100644 --- a/dlls/ieframe/oleobject.c +++ b/dlls/ieframe/oleobject.c @@ -555,6 +555,7 @@ static HRESULT WINAPI OleObject_SetClientSite(IOleObject *iface, LPOLECLIENTSITE on_offlineconnected_change(This); on_silent_change(This); + SetQueryNetSessionCount(SESSION_INCREMENT); return S_OK; } diff --git a/dlls/ieframe/tests/webbrowser.c b/dlls/ieframe/tests/webbrowser.c index 52d1f707357..903c1062b6c 100644 --- a/dlls/ieframe/tests/webbrowser.c +++ b/dlls/ieframe/tests/webbrowser.c @@ -173,6 +173,15 @@ static const WCHAR *current_url; static int wb_version, expect_update_commands_enable, set_update_commands_enable; static BOOL nav_back_todo, nav_forward_todo; /* FIXME */ +enum SessionOp +{ + SESSION_QUERY, + SESSION_INCREMENT, + SESSION_DECREMENT +}; + +static LONG (WINAPI *pSetQueryNetSessionCount)(DWORD); + #define BUSY_FAIL 2 #define DWL_EXPECT_BEFORE_NAVIGATE 0x01 @@ -1946,6 +1955,7 @@ static void test_ClientSite(IWebBrowser2 *unk, IOleClientSite *client, BOOL stop { IOleObject *oleobj; IOleInPlaceObject *inplace; + DWORD session_count; HWND hwnd; HRESULT hres; @@ -1969,6 +1979,8 @@ static void test_ClientSite(IWebBrowser2 *unk, IOleClientSite *client, BOOL stop ok((hwnd == NULL) ^ (client == NULL), "unexpected hwnd %p\n", hwnd); if(client) { + session_count = pSetQueryNetSessionCount(SESSION_QUERY); + SET_EXPECT(GetContainer); SET_EXPECT(Site_GetWindow); SET_EXPECT(Invoke_AMBIENT_OFFLINEIFNOTCONNECTED); @@ -1995,6 +2007,9 @@ static void test_ClientSite(IWebBrowser2 *unk, IOleClientSite *client, BOOL stop ok(hres == S_OK, "SetClientSite failed: %08x\n", hres); if(client) { + DWORD count = pSetQueryNetSessionCount(SESSION_QUERY); + ok(count == session_count + 1, "count = %u expected %u\n", count, session_count + 1); + CHECK_CALLED(GetContainer); CHECK_CALLED(Site_GetWindow); CHECK_CALLED(Invoke_AMBIENT_OFFLINEIFNOTCONNECTED); @@ -3837,6 +3852,7 @@ static void test_WebBrowser(DWORD flags, BOOL do_close) test_EnumVerbs(webbrowser); test_LocationURL(webbrowser, L""); test_ConnectionPoint(webbrowser, TRUE); + test_ClientSite(webbrowser, &ClientSite, !do_download); test_Extent(webbrowser); test_wb_funcs(webbrowser, TRUE); @@ -4401,6 +4417,29 @@ static void test_SetAdvise(void) IWebBrowser2_Release(browser); } +static void test_SetQueryNetSessionCount(void) +{ + LONG count; + + count = pSetQueryNetSessionCount(SESSION_QUERY); + ok(count == 0, "count = %d\n", count); + + count = pSetQueryNetSessionCount(SESSION_INCREMENT); + ok(count == 1, "count = %d\n", count); + + count = pSetQueryNetSessionCount(SESSION_QUERY); + ok(count == 1, "count = %d\n", count); + + count = pSetQueryNetSessionCount(0xdeadbeef); + ok(count == 0, "count = %d\n", count); + + count = pSetQueryNetSessionCount(SESSION_DECREMENT); + ok(count == 0, "count = %d\n", count); + + count = pSetQueryNetSessionCount(SESSION_QUERY); + ok(count == 0, "count = %d\n", count); +} + static HRESULT WINAPI outer_QueryInterface(IUnknown *iface, REFIID riid, void **ppv) { if(IsEqualGUID(riid, &outer_test_iid)) { @@ -4460,8 +4499,14 @@ static void test_com_aggregation(void) START_TEST(webbrowser) { + HMODULE ieframe = LoadLibraryW(L"ieframe.dll"); + + pSetQueryNetSessionCount = (void*)GetProcAddress(ieframe, "SetQueryNetSessionCount"); + OleInitialize(NULL); + test_SetQueryNetSessionCount(); + container_hwnd = create_container_window(); trace("Testing WebBrowser (no download)...\n");

1 0

Nikolay Sivov : mf/session: Add a stub for IMFTopologyNodeAttributeEditor.
by Alexandre Julliard 29 Jan '21

29 Jan '21

Module: wine Branch: master Commit: 9446458f750d5d81bbc36a5067fdcac67153e9fe URL: https://source.winehq.org/git/wine.git/?a=commit;h=9446458f750d5d81bbc36a50… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Jan 29 15:10:02 2021 +0300 mf/session: Add a stub for IMFTopologyNodeAttributeEditor. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/session.c | 57 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ dlls/mf/tests/mf.c | 9 +++++++++ 2 files changed, 66 insertions(+) diff --git a/dlls/mf/session.c b/dlls/mf/session.c index af0407f6a0b..5034255339c 100644 --- a/dlls/mf/session.c +++ b/dlls/mf/session.c @@ -213,6 +213,7 @@ struct media_session IMFGetService IMFGetService_iface; IMFRateSupport IMFRateSupport_iface; IMFRateControl IMFRateControl_iface; + IMFTopologyNodeAttributeEditor IMFTopologyNodeAttributeEditor_iface; IMFAsyncCallback commands_callback; IMFAsyncCallback events_callback; IMFAsyncCallback sink_finalizer_callback; @@ -362,6 +363,11 @@ static struct media_session *impl_session_from_IMFRateControl(IMFRateControl *if return CONTAINING_RECORD(iface, struct media_session, IMFRateControl_iface); } +static struct media_session *impl_session_from_IMFTopologyNodeAttributeEditor(IMFTopologyNodeAttributeEditor *iface) +{ + return CONTAINING_RECORD(iface, struct media_session, IMFTopologyNodeAttributeEditor_iface); +} + static struct session_op *impl_op_from_IUnknown(IUnknown *iface) { return CONTAINING_RECORD(iface, struct session_op, IUnknown_iface); @@ -1999,6 +2005,10 @@ static HRESULT WINAPI session_get_service_GetService(IMFGetService *iface, REFGU { return IMFLocalMFTRegistration_QueryInterface(&local_mft_registration, riid, obj); } + else if (IsEqualGUID(service, &MF_TOPONODE_ATTRIBUTE_EDITOR_SERVICE)) + { + *obj = &session->IMFTopologyNodeAttributeEditor_iface; + } else if (IsEqualGUID(service, &MR_VIDEO_RENDER_SERVICE)) { IMFStreamSink *stream_sink; @@ -3566,6 +3576,52 @@ static const IMFRateControlVtbl session_rate_control_vtbl = session_rate_control_GetRate, }; +static HRESULT WINAPI node_attribute_editor_QueryInterface(IMFTopologyNodeAttributeEditor *iface, + REFIID riid, void **obj) +{ + TRACE("%p, %s, %p.\n", iface, debugstr_guid(riid), obj); + + if (IsEqualIID(riid, &IID_IMFTopologyNodeAttributeEditor) || + IsEqualIID(riid, &IID_IUnknown)) + { + *obj = iface; + IMFTopologyNodeAttributeEditor_AddRef(iface); + return S_OK; + } + + WARN("Unsupported interface %s.\n", debugstr_guid(riid)); + *obj = NULL; + return E_NOINTERFACE; +} + +static ULONG WINAPI node_attribute_editor_AddRef(IMFTopologyNodeAttributeEditor *iface) +{ + struct media_session *session = impl_session_from_IMFTopologyNodeAttributeEditor(iface); + return IMFMediaSession_AddRef(&session->IMFMediaSession_iface); +} + +static ULONG WINAPI node_attribute_editor_Release(IMFTopologyNodeAttributeEditor *iface) +{ + struct media_session *session = impl_session_from_IMFTopologyNodeAttributeEditor(iface); + return IMFMediaSession_Release(&session->IMFMediaSession_iface); +} + +static HRESULT WINAPI node_attribute_editor_UpdateNodeAttributes(IMFTopologyNodeAttributeEditor *iface, + TOPOID id, DWORD count, MFTOPONODE_ATTRIBUTE_UPDATE *updates) +{ + FIXME("%p, %s, %u, %p.\n", iface, wine_dbgstr_longlong(id), count, updates); + + return E_NOTIMPL; +} + +static const IMFTopologyNodeAttributeEditorVtbl node_attribute_editor_vtbl = +{ + node_attribute_editor_QueryInterface, + node_attribute_editor_AddRef, + node_attribute_editor_Release, + node_attribute_editor_UpdateNodeAttributes, +}; + /*********************************************************************** * MFCreateMediaSession (mf.@) */ @@ -3585,6 +3641,7 @@ HRESULT WINAPI MFCreateMediaSession(IMFAttributes *config, IMFMediaSession **ses object->IMFGetService_iface.lpVtbl = &session_get_service_vtbl; object->IMFRateSupport_iface.lpVtbl = &session_rate_support_vtbl; object->IMFRateControl_iface.lpVtbl = &session_rate_control_vtbl; + object->IMFTopologyNodeAttributeEditor_iface.lpVtbl = &node_attribute_editor_vtbl; object->commands_callback.lpVtbl = &session_commands_callback_vtbl; object->events_callback.lpVtbl = &session_events_callback_vtbl; object->sink_finalizer_callback.lpVtbl = &session_sink_finalizer_callback_vtbl; diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index 34090d0a9d4..846d311c877 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -1176,6 +1176,15 @@ static void test_media_session(void) check_interface(session, &IID_IMFGetService, TRUE); check_interface(session, &IID_IMFAttributes, FALSE); + check_interface(session, &IID_IMFTopologyNodeAttributeEditor, FALSE); + + hr = MFGetService((IUnknown *)session, &MF_TOPONODE_ATTRIBUTE_EDITOR_SERVICE, &IID_IMFTopologyNodeAttributeEditor, + (void **)&unk); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + check_interface(unk, &IID_IMFMediaSession, FALSE); + + IUnknown_Release(unk); hr = MFGetService((IUnknown *)session, &MF_RATE_CONTROL_SERVICE, &IID_IMFRateSupport, (void **)&rate_support); ok(hr == S_OK, "Failed to get rate support interface, hr %#x.\n", hr);

1 0

Nikolay Sivov : mfmediaengine: Use consistent format for traces.
by Alexandre Julliard 29 Jan '21

29 Jan '21

Module: wine Branch: master Commit: 21ae610d14f0d508c1b20c8af8516e118e00f4bc URL: https://source.winehq.org/git/wine.git/?a=commit;h=21ae610d14f0d508c1b20c8a… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Jan 29 15:10:01 2021 +0300 mfmediaengine: Use consistent format for traces. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfmediaengine/main.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/mfmediaengine/main.c b/dlls/mfmediaengine/main.c index 8c3b4f41229..65f207bd4b5 100644 --- a/dlls/mfmediaengine/main.c +++ b/dlls/mfmediaengine/main.c @@ -952,7 +952,7 @@ static const IMFAsyncCallbackVtbl media_engine_load_handler_vtbl = static HRESULT WINAPI media_engine_QueryInterface(IMFMediaEngine *iface, REFIID riid, void **obj) { - TRACE("(%p, %s, %p).\n", iface, debugstr_guid(riid), obj); + TRACE("%p, %s, %p.\n", iface, debugstr_guid(riid), obj); if (IsEqualIID(riid, &IID_IMFMediaEngine) || IsEqualIID(riid, &IID_IUnknown)) @@ -972,7 +972,7 @@ static ULONG WINAPI media_engine_AddRef(IMFMediaEngine *iface) struct media_engine *engine = impl_from_IMFMediaEngine(iface); ULONG refcount = InterlockedIncrement(&engine->refcount); - TRACE("(%p) ref=%u.\n", iface, refcount); + TRACE("%p, refcount %u.\n", iface, refcount); return refcount; } @@ -999,7 +999,7 @@ static ULONG WINAPI media_engine_Release(IMFMediaEngine *iface) struct media_engine *engine = impl_from_IMFMediaEngine(iface); ULONG refcount = InterlockedDecrement(&engine->refcount); - TRACE("(%p) ref=%u.\n", iface, refcount); + TRACE("%p, refcount %u.\n", iface, refcount); if (!refcount) free_media_engine(engine); @@ -1978,7 +1978,7 @@ static IMFMediaEngineClassFactory media_engine_factory = { &media_engine_factory static HRESULT WINAPI classfactory_QueryInterface(IClassFactory *iface, REFIID riid, void **obj) { - TRACE("(%s, %p).\n", debugstr_guid(riid), obj); + TRACE("%s, %p.\n", debugstr_guid(riid), obj); if (IsEqualGUID(riid, &IID_IClassFactory) || IsEqualGUID(riid, &IID_IUnknown)) @@ -2005,7 +2005,7 @@ static ULONG WINAPI classfactory_Release(IClassFactory *iface) static HRESULT WINAPI classfactory_CreateInstance(IClassFactory *iface, IUnknown *outer, REFIID riid, void **obj) { - TRACE("(%p, %s, %p).\n", outer, debugstr_guid(riid), obj); + TRACE("%p, %s, %p.\n", outer, debugstr_guid(riid), obj); *obj = NULL; @@ -2034,7 +2034,7 @@ static IClassFactory classfactory = { &class_factory_vtbl }; HRESULT WINAPI DllGetClassObject(REFCLSID clsid, REFIID riid, void **obj) { - TRACE("(%s, %s, %p).\n", debugstr_guid(clsid), debugstr_guid(riid), obj); + TRACE("%s, %s, %p.\n", debugstr_guid(clsid), debugstr_guid(riid), obj); if (IsEqualGUID(clsid, &CLSID_MFMediaEngineClassFactory)) return IClassFactory_QueryInterface(&classfactory, riid, obj);

1 0

Nikolay Sivov : mfmediaengine: Force returned playback position after presentation ends.
by Alexandre Julliard 29 Jan '21

29 Jan '21

Module: wine Branch: master Commit: 35569903876e4893d3430d734442cba759d63f1d URL: https://source.winehq.org/git/wine.git/?a=commit;h=35569903876e4893d3430d73… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Jan 29 15:10:00 2021 +0300 mfmediaengine: Force returned playback position after presentation ends. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfmediaengine/main.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/dlls/mfmediaengine/main.c b/dlls/mfmediaengine/main.c index 42aa8a6e92a..8c3b4f41229 100644 --- a/dlls/mfmediaengine/main.c +++ b/dlls/mfmediaengine/main.c @@ -1214,7 +1214,11 @@ static double WINAPI media_engine_GetCurrentTime(IMFMediaEngine *iface) TRACE("%p.\n", iface); EnterCriticalSection(&engine->cs); - if (SUCCEEDED(IMFPresentationClock_GetTime(engine->clock, &clocktime))) + if (engine->flags & FLAGS_ENGINE_IS_ENDED) + { + ret = engine->duration; + } + else if (SUCCEEDED(IMFPresentationClock_GetTime(engine->clock, &clocktime))) { ret = (double)clocktime / 10000000.0; }

1 0

Nikolay Sivov : mfmediaengine: Set "ended" state when session presentation ends.
by Alexandre Julliard 29 Jan '21

29 Jan '21

Module: wine Branch: master Commit: 67815c2f6236b65656eb8500cbd11d4b4c9eedff URL: https://source.winehq.org/git/wine.git/?a=commit;h=67815c2f6236b65656eb8500… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Jan 29 15:09:59 2021 +0300 mfmediaengine: Set "ended" state when session presentation ends. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfmediaengine/main.c | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/dlls/mfmediaengine/main.c b/dlls/mfmediaengine/main.c index f9872f43a3b..42aa8a6e92a 100644 --- a/dlls/mfmediaengine/main.c +++ b/dlls/mfmediaengine/main.c @@ -96,6 +96,7 @@ enum media_engine_flags FLAGS_ENGINE_HAS_AUDIO = 0x800, FLAGS_ENGINE_HAS_VIDEO = 0x1000, FLAGS_ENGINE_FIRST_FRAME = 0x2000, + FLAGS_ENGINE_IS_ENDED = 0x4000, }; struct video_frame @@ -634,6 +635,7 @@ static HRESULT WINAPI media_engine_session_events_Invoke(IMFAsyncCallback *iface EnterCriticalSection(&engine->cs); media_engine_set_flag(engine, FLAGS_ENGINE_FIRST_FRAME, FALSE); + media_engine_set_flag(engine, FLAGS_ENGINE_IS_ENDED, TRUE); engine->video_frame.pts = MINLONGLONG; LeaveCriticalSection(&engine->cs); @@ -1347,9 +1349,16 @@ static HRESULT WINAPI media_engine_GetSeekable(IMFMediaEngine *iface, IMFMediaTi static BOOL WINAPI media_engine_IsEnded(IMFMediaEngine *iface) { - FIXME("(%p): stub.\n", iface); + struct media_engine *engine = impl_from_IMFMediaEngine(iface); + BOOL value; - return FALSE; + TRACE("%p.\n", iface); + + EnterCriticalSection(&engine->cs); + value = !!(engine->flags & FLAGS_ENGINE_IS_ENDED); + LeaveCriticalSection(&engine->cs); + + return value; } static BOOL WINAPI media_engine_GetAutoPlay(IMFMediaEngine *iface) @@ -1419,7 +1428,7 @@ static HRESULT WINAPI media_engine_Play(IMFMediaEngine *iface) if (!(engine->flags & FLAGS_ENGINE_WAITING)) { - media_engine_set_flag(engine, FLAGS_ENGINE_PAUSED, FALSE); + media_engine_set_flag(engine, FLAGS_ENGINE_PAUSED | FLAGS_ENGINE_IS_ENDED, FALSE); IMFMediaEngineNotify_EventNotify(engine->callback, MF_MEDIA_ENGINE_EVENT_PLAY, 0, 0); var.vt = VT_EMPTY; @@ -1445,7 +1454,7 @@ static HRESULT WINAPI media_engine_Pause(IMFMediaEngine *iface) if (!(engine->flags & FLAGS_ENGINE_PAUSED)) { - media_engine_set_flag(engine, FLAGS_ENGINE_WAITING, FALSE); + media_engine_set_flag(engine, FLAGS_ENGINE_WAITING | FLAGS_ENGINE_IS_ENDED, FALSE); media_engine_set_flag(engine, FLAGS_ENGINE_PAUSED, TRUE); IMFMediaEngineNotify_EventNotify(engine->callback, MF_MEDIA_ENGINE_EVENT_TIMEUPDATE, 0, 0);

1 0

Nikolay Sivov : mfmediaengine: Use existing helper to update engine state flags.
by Alexandre Julliard 29 Jan '21

29 Jan '21

Module: wine Branch: master Commit: 85a62b3657fa473c2e012e882e891df3256755e1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=85a62b3657fa473c2e012e88… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Jan 29 15:09:58 2021 +0300 mfmediaengine: Use existing helper to update engine state flags. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfmediaengine/main.c | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/dlls/mfmediaengine/main.c b/dlls/mfmediaengine/main.c index 2bf7cf45da1..f9872f43a3b 100644 --- a/dlls/mfmediaengine/main.c +++ b/dlls/mfmediaengine/main.c @@ -822,10 +822,8 @@ static HRESULT media_engine_create_topology(struct media_engine *engine, IMFMedi return E_UNEXPECTED; } - if (sd_video) - engine->flags |= FLAGS_ENGINE_HAS_VIDEO; - if (sd_audio) - engine->flags |= FLAGS_ENGINE_HAS_AUDIO; + media_engine_set_flag(engine, FLAGS_ENGINE_HAS_VIDEO, !!sd_video); + media_engine_set_flag(engine, FLAGS_ENGINE_HAS_AUDIO, !!sd_audio); /* Assume live source if duration was not provided. */ if (SUCCEEDED(IMFPresentationDescriptor_GetUINT64(pd, &MF_PD_DURATION, &duration))) @@ -1421,13 +1419,13 @@ static HRESULT WINAPI media_engine_Play(IMFMediaEngine *iface) if (!(engine->flags & FLAGS_ENGINE_WAITING)) { - engine->flags &= ~FLAGS_ENGINE_PAUSED; + media_engine_set_flag(engine, FLAGS_ENGINE_PAUSED, FALSE); IMFMediaEngineNotify_EventNotify(engine->callback, MF_MEDIA_ENGINE_EVENT_PLAY, 0, 0); var.vt = VT_EMPTY; IMFMediaSession_Start(engine->session, &GUID_NULL, &var); - engine->flags |= FLAGS_ENGINE_WAITING; + media_engine_set_flag(engine, FLAGS_ENGINE_WAITING, TRUE); } IMFMediaEngineNotify_EventNotify(engine->callback, MF_MEDIA_ENGINE_EVENT_WAITING, 0, 0); @@ -1447,8 +1445,8 @@ static HRESULT WINAPI media_engine_Pause(IMFMediaEngine *iface) if (!(engine->flags & FLAGS_ENGINE_PAUSED)) { - engine->flags &= ~FLAGS_ENGINE_WAITING; - engine->flags |= FLAGS_ENGINE_PAUSED; + media_engine_set_flag(engine, FLAGS_ENGINE_WAITING, FALSE); + media_engine_set_flag(engine, FLAGS_ENGINE_PAUSED, TRUE); IMFMediaEngineNotify_EventNotify(engine->callback, MF_MEDIA_ENGINE_EVENT_TIMEUPDATE, 0, 0); IMFMediaEngineNotify_EventNotify(engine->callback, MF_MEDIA_ENGINE_EVENT_PAUSE, 0, 0); @@ -1623,7 +1621,7 @@ static HRESULT WINAPI media_engine_Shutdown(IMFMediaEngine *iface) hr = MF_E_SHUTDOWN; else { - engine->flags |= FLAGS_ENGINE_SHUT_DOWN; + media_engine_set_flag(engine, FLAGS_ENGINE_SHUT_DOWN, TRUE); IMFMediaSession_Shutdown(engine->session); } LeaveCriticalSection(&engine->cs); @@ -1794,7 +1792,7 @@ static HRESULT WINAPI media_engine_grabber_callback_OnProcessSample(IMFSampleGra if (!(engine->flags & FLAGS_ENGINE_FIRST_FRAME)) { IMFMediaEngineNotify_EventNotify(engine->callback, MF_MEDIA_ENGINE_EVENT_FIRSTFRAMEREADY, 0, 0); - engine->flags |= FLAGS_ENGINE_FIRST_FRAME; + media_engine_set_flag(engine, FLAGS_ENGINE_FIRST_FRAME, TRUE); } engine->video_frame.pts = sample_time;

1 0

Nikolay Sivov : mfmediaengine: Use presentation clock interface from the session.
by Alexandre Julliard 29 Jan '21

29 Jan '21

Module: wine Branch: master Commit: 39d177b88b77c63f476a995a655d471dd5852a7b URL: https://source.winehq.org/git/wine.git/?a=commit;h=39d177b88b77c63f476a995a… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Jan 29 15:09:57 2021 +0300 mfmediaengine: Use presentation clock interface from the session. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfmediaengine/main.c | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/dlls/mfmediaengine/main.c b/dlls/mfmediaengine/main.c index 6f6811ff9ea..2bf7cf45da1 100644 --- a/dlls/mfmediaengine/main.c +++ b/dlls/mfmediaengine/main.c @@ -126,7 +126,7 @@ struct media_engine MF_MEDIA_ENGINE_READY ready_state; MF_MEDIA_ENGINE_PRELOAD preload; IMFMediaSession *session; - IMFClock *clock; + IMFPresentationClock *clock; IMFSourceResolver *resolver; BSTR current_source; struct video_frame video_frame; @@ -982,7 +982,7 @@ static void free_media_engine(struct media_engine *engine) if (engine->callback) IMFMediaEngineNotify_Release(engine->callback); if (engine->clock) - IMFClock_Release(engine->clock); + IMFPresentationClock_Release(engine->clock); if (engine->session) IMFMediaSession_Release(engine->session); if (engine->attributes) @@ -1208,16 +1208,14 @@ static BOOL WINAPI media_engine_IsSeeking(IMFMediaEngine *iface) static double WINAPI media_engine_GetCurrentTime(IMFMediaEngine *iface) { struct media_engine *engine = impl_from_IMFMediaEngine(iface); - LONGLONG clocktime; double ret = 0.0; - MFTIME systime; + MFTIME clocktime; TRACE("%p.\n", iface); EnterCriticalSection(&engine->cs); - if (SUCCEEDED(IMFClock_GetCorrelatedTime(engine->clock, 0, &clocktime, &systime))) + if (SUCCEEDED(IMFPresentationClock_GetTime(engine->clock, &clocktime))) { - /* Assume 100ns clock. */ ret = (double)clocktime / 10000000.0; } LeaveCriticalSection(&engine->cs); @@ -1854,6 +1852,7 @@ static HRESULT init_media_engine(DWORD flags, IMFAttributes *attributes, struct { DXGI_FORMAT output_format; UINT64 playback_hwnd; + IMFClock *clock; HRESULT hr; engine->IMFMediaEngine_iface.lpVtbl = &media_engine_vtbl; @@ -1877,7 +1876,12 @@ static HRESULT init_media_engine(DWORD flags, IMFAttributes *attributes, struct if (FAILED(hr = MFCreateMediaSession(NULL, &engine->session))) return hr; - if (FAILED(hr = IMFMediaSession_GetClock(engine->session, &engine->clock))) + if (FAILED(hr = IMFMediaSession_GetClock(engine->session, &clock))) + return hr; + + hr = IMFClock_QueryInterface(clock, &IID_IMFPresentationClock, (void **)&engine->clock); + IMFClock_Release(clock); + if (FAILED(hr)) return hr; if (FAILED(hr = IMFMediaSession_BeginGetEvent(engine->session, &engine->session_events, NULL)))

1 0

Nikolay Sivov : mf/tests: Use interface check helper more.
by Alexandre Julliard 29 Jan '21

29 Jan '21

Module: wine Branch: master Commit: be3bab5efbcef1470468b982f342d401af8047c5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=be3bab5efbcef1470468b982… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Jan 29 15:09:56 2021 +0300 mf/tests: Use interface check helper more. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/tests/mf.c | 22 ++++++++-------------- 1 file changed, 8 insertions(+), 14 deletions(-) diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index 8272064466f..34090d0a9d4 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -1154,7 +1154,6 @@ static void test_session_events(IMFMediaSession *session) static void test_media_session(void) { IMFRateControl *rate_control, *rate_control2; - IMFLocalMFTRegistration *local_reg; MFCLOCK_PROPERTIES clock_props; IMFRateSupport *rate_support; IMFAttributes *attributes; @@ -1163,7 +1162,6 @@ static void test_media_session(void) IMFShutdown *shutdown; PROPVARIANT propvar; DWORD status, caps; - IMFGetService *gs; IMFClock *clock; IUnknown *unk; HRESULT hr; @@ -1176,23 +1174,19 @@ static void test_media_session(void) hr = MFCreateMediaSession(NULL, &session); ok(hr == S_OK, "Failed to create media session, hr %#x.\n", hr); - hr = IMFMediaSession_QueryInterface(session, &IID_IMFAttributes, (void **)&unk); - ok(hr == E_NOINTERFACE, "Unexpected hr %#x.\n", hr); + check_interface(session, &IID_IMFGetService, TRUE); + check_interface(session, &IID_IMFAttributes, FALSE); - hr = IMFMediaSession_QueryInterface(session, &IID_IMFGetService, (void **)&gs); - ok(hr == S_OK, "Failed to get interface, hr %#x.\n", hr); - - hr = IMFGetService_GetService(gs, &MF_RATE_CONTROL_SERVICE, &IID_IMFRateSupport, (void **)&rate_support); + hr = MFGetService((IUnknown *)session, &MF_RATE_CONTROL_SERVICE, &IID_IMFRateSupport, (void **)&rate_support); ok(hr == S_OK, "Failed to get rate support interface, hr %#x.\n", hr); - hr = IMFGetService_GetService(gs, &MF_RATE_CONTROL_SERVICE, &IID_IMFRateControl, (void **)&rate_control); + hr = MFGetService((IUnknown *)session, &MF_RATE_CONTROL_SERVICE, &IID_IMFRateControl, (void **)&rate_control); ok(hr == S_OK, "Failed to get rate control interface, hr %#x.\n", hr); - hr = IMFGetService_GetService(gs, &MF_LOCAL_MFT_REGISTRATION_SERVICE, &IID_IMFLocalMFTRegistration, - (void **)&local_reg); + hr = MFGetService((IUnknown *)session, &MF_LOCAL_MFT_REGISTRATION_SERVICE, &IID_IMFLocalMFTRegistration, (void **)&unk); ok(hr == S_OK || broken(hr == E_NOINTERFACE) /* Vista */, "Failed to get registration service, hr %#x.\n", hr); if (SUCCEEDED(hr)) - IMFLocalMFTRegistration_Release(local_reg); + IUnknown_Release(unk); hr = IMFRateSupport_QueryInterface(rate_support, &IID_IMFMediaSession, (void **)&unk); ok(hr == S_OK, "Failed to get session interface, hr %#x.\n", hr); @@ -1220,6 +1214,8 @@ static void test_media_session(void) hr = IMFMediaSession_GetClock(session, &clock); ok(hr == S_OK, "Failed to get clock, hr %#x.\n", hr); + check_interface(clock, &IID_IMFPresentationClock, TRUE); + hr = IMFClock_QueryInterface(clock, &IID_IMFRateControl, (void **)&rate_control2); ok(hr == S_OK, "Failed to get rate control, hr %#x.\n", hr); @@ -1241,8 +1237,6 @@ todo_wine IMFRateControl_Release(rate_control); IMFRateSupport_Release(rate_support); - IMFGetService_Release(gs); - IMFMediaSession_Release(session); hr = MFCreateMediaSession(NULL, &session);

1 0

Alexandre Julliard : ntdll: Support the NtCreateDebugObject() flags.
by Alexandre Julliard 29 Jan '21

29 Jan '21

Module: wine Branch: master Commit: 964772bc8ea04fb445843b13f4d1f2e297002d4c URL: https://source.winehq.org/git/wine.git/?a=commit;h=964772bc8ea04fb445843b13… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jan 29 12:26:17 2021 +0100 ntdll: Support the NtCreateDebugObject() flags. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/debugger.c | 74 ++++++++++++++++++++++++++++++++++++++++++ dlls/ntdll/process.c | 2 +- dlls/ntdll/unix/sync.c | 3 ++ include/wine/server_protocol.h | 4 ++- include/winternl.h | 2 ++ server/debugger.c | 21 ++++++------ server/protocol.def | 1 + server/request.h | 3 +- server/trace.c | 1 + 9 files changed, 98 insertions(+), 13 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=964772bc8ea04fb44584…

1 0

Alexandre Julliard : ntdll: Implement DbgUiConnectToDbg().
by Alexandre Julliard 29 Jan '21

29 Jan '21

Module: wine Branch: master Commit: a24e330b203a6b37987633ba03fc3b2e1c3a004f URL: https://source.winehq.org/git/wine.git/?a=commit;h=a24e330b203a6b37987633ba… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jan 28 11:20:38 2021 +0100 ntdll: Implement DbgUiConnectToDbg(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/ntdll.spec | 2 +- dlls/ntdll/process.c | 16 ++++++++++++++++ include/winternl.h | 1 + 3 files changed, 18 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 285b719f2d5..740030f2066 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -34,7 +34,7 @@ @ stub DbgPrompt # @ stub DbgQueryDebugFilterState # @ stub DbgSetDebugFilterState -@ stub DbgUiConnectToDbg +@ stdcall DbgUiConnectToDbg() @ stub DbgUiContinue @ stub DbgUiConvertStateChangeStructure # @ stub DbgUiDebugActiveProcess diff --git a/dlls/ntdll/process.c b/dlls/ntdll/process.c index d8280277418..c52f00d123e 100644 --- a/dlls/ntdll/process.c +++ b/dlls/ntdll/process.c @@ -134,6 +134,22 @@ void WINAPI DbgUiSetThreadDebugObject( HANDLE handle ) NtCurrentTeb()->DbgSsReserved[1] = handle; } +/*********************************************************************** + * DbgUiConnectToDbg (NTDLL.@) + */ +NTSTATUS WINAPI DbgUiConnectToDbg(void) +{ + HANDLE handle; + NTSTATUS status; + OBJECT_ATTRIBUTES attr = { sizeof(attr) }; + + if (DbgUiGetThreadDebugObject()) return STATUS_SUCCESS; /* already connected */ + + status = NtCreateDebugObject( &handle, DEBUG_ALL_ACCESS, &attr, 0 ); + if (!status) DbgUiSetThreadDebugObject( handle ); + return status; +} + /*********************************************************************** * DbgUiRemoteBreakin (NTDLL.@) */ diff --git a/include/winternl.h b/include/winternl.h index ac63567dad3..fc4792a194a 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -3020,6 +3020,7 @@ typedef struct _PS_CREATE_INFO NTSYSAPI void WINAPI DbgBreakPoint(void); NTSYSAPI NTSTATUS WINAPIV DbgPrint(LPCSTR fmt, ...); NTSYSAPI NTSTATUS WINAPIV DbgPrintEx(ULONG iComponentId, ULONG Level, LPCSTR fmt, ...); +NTSYSAPI NTSTATUS WINAPI DbgUiConnectToDbg(void); NTSYSAPI HANDLE WINAPI DbgUiGetThreadDebugObject(void); NTSYSAPI NTSTATUS WINAPI DbgUiIssueRemoteBreakin(HANDLE); NTSYSAPI void WINAPI DbgUiRemoteBreakin(void*);

1 0

Alexandre Julliard : ntdll: Implement DbgUiGet/SetThreadDebugObject().
by Alexandre Julliard 29 Jan '21

29 Jan '21

Module: wine Branch: master Commit: f7c48da359a7b83e6a0ef35fdea89fcc613a48b0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f7c48da359a7b83e6a0ef35f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jan 28 11:17:45 2021 +0100 ntdll: Implement DbgUiGet/SetThreadDebugObject(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/ntdll.spec | 4 ++-- dlls/ntdll/process.c | 16 ++++++++++++++++ include/winternl.h | 2 ++ 3 files changed, 20 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 2f1d4904111..285b719f2d5 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -38,10 +38,10 @@ @ stub DbgUiContinue @ stub DbgUiConvertStateChangeStructure # @ stub DbgUiDebugActiveProcess -# @ stub DbgUiGetThreadDebugObject +@ stdcall DbgUiGetThreadDebugObject() @ stdcall DbgUiIssueRemoteBreakin(long) @ stdcall DbgUiRemoteBreakin(ptr) -# @ stub DbgUiSetThreadDebugObject +@ stdcall DbgUiSetThreadDebugObject(long) # @ stub DbgUiStopDebugging @ stub DbgUiWaitStateChange @ stdcall DbgUserBreakPoint() diff --git a/dlls/ntdll/process.c b/dlls/ntdll/process.c index 4cf83753a79..d8280277418 100644 --- a/dlls/ntdll/process.c +++ b/dlls/ntdll/process.c @@ -118,6 +118,22 @@ NTSTATUS WINAPI RtlCreateUserProcess( UNICODE_STRING *path, ULONG attributes, &create_info, attr ); } +/*********************************************************************** + * DbgUiGetThreadDebugObject (NTDLL.@) + */ +HANDLE WINAPI DbgUiGetThreadDebugObject(void) +{ + return NtCurrentTeb()->DbgSsReserved[1]; +} + +/*********************************************************************** + * DbgUiSetThreadDebugObject (NTDLL.@) + */ +void WINAPI DbgUiSetThreadDebugObject( HANDLE handle ) +{ + NtCurrentTeb()->DbgSsReserved[1] = handle; +} + /*********************************************************************** * DbgUiRemoteBreakin (NTDLL.@) */ diff --git a/include/winternl.h b/include/winternl.h index 6de71e0e206..ac63567dad3 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -3020,8 +3020,10 @@ typedef struct _PS_CREATE_INFO NTSYSAPI void WINAPI DbgBreakPoint(void); NTSYSAPI NTSTATUS WINAPIV DbgPrint(LPCSTR fmt, ...); NTSYSAPI NTSTATUS WINAPIV DbgPrintEx(ULONG iComponentId, ULONG Level, LPCSTR fmt, ...); +NTSYSAPI HANDLE WINAPI DbgUiGetThreadDebugObject(void); NTSYSAPI NTSTATUS WINAPI DbgUiIssueRemoteBreakin(HANDLE); NTSYSAPI void WINAPI DbgUiRemoteBreakin(void*); +NTSYSAPI void WINAPI DbgUiSetThreadDebugObject(HANDLE); NTSYSAPI void WINAPI DbgUserBreakPoint(void); NTSYSAPI NTSTATUS WINAPI LdrAccessResource(HMODULE,const IMAGE_RESOURCE_DATA_ENTRY*,void**,PULONG); NTSYSAPI NTSTATUS WINAPI LdrAddDllDirectory(const UNICODE_STRING*,void**);

1 0

Zebediah Figura : kernel32: Implement SetProcessDEPPolicy().
by Alexandre Julliard 29 Jan '21

29 Jan '21

Module: wine Branch: master Commit: b62921245238412709d4e9f8a3548d37864d0d5d URL: https://source.winehq.org/git/wine.git/?a=commit;h=b62921245238412709d4e9f8… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Jan 28 22:08:22 2021 -0600 kernel32: Implement SetProcessDEPPolicy(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/process.c | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c index 227d49ea37e..085fff1454e 100644 --- a/dlls/kernel32/process.c +++ b/dlls/kernel32/process.c @@ -562,11 +562,19 @@ DEP_SYSTEM_POLICY_TYPE WINAPI GetSystemDEPPolicy(void) /********************************************************************** * SetProcessDEPPolicy (KERNEL32.@) */ -BOOL WINAPI SetProcessDEPPolicy(DWORD newDEP) +BOOL WINAPI SetProcessDEPPolicy( DWORD flags ) { - FIXME("(%d): stub\n", newDEP); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return FALSE; + ULONG dep_flags = 0; + + TRACE("%#x\n", flags); + + if (flags & PROCESS_DEP_ENABLE) + dep_flags |= MEM_EXECUTE_OPTION_DISABLE | MEM_EXECUTE_OPTION_PERMANENT; + if (flags & PROCESS_DEP_DISABLE_ATL_THUNK_EMULATION) + dep_flags |= MEM_EXECUTE_OPTION_DISABLE_THUNK_EMULATION; + + return set_ntstatus( NtSetInformationProcess( GetCurrentProcess(), ProcessExecuteFlags, + &dep_flags, sizeof(dep_flags) ) ); } /**********************************************************************

1 0

Zebediah Figura : kernel32: Implement GetSystemDEPPolicy().
by Alexandre Julliard 29 Jan '21

29 Jan '21

Module: wine Branch: master Commit: 246e2356e5a178ca7e56d350cbc5cdaecc8538ab URL: https://source.winehq.org/git/wine.git/?a=commit;h=246e2356e5a178ca7e56d350… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Jan 28 22:08:21 2021 -0600 kernel32: Implement GetSystemDEPPolicy(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/process.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c index 92582ae31de..227d49ea37e 100644 --- a/dlls/kernel32/process.c +++ b/dlls/kernel32/process.c @@ -34,6 +34,7 @@ #include "wincon.h" #include "kernel_private.h" #include "psapi.h" +#include "ddk/wdm.h" #include "wine/exception.h" #include "wine/server.h" #include "wine/asm.h" @@ -41,6 +42,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(process); +static const struct _KUSER_SHARED_DATA *user_shared_data = (struct _KUSER_SHARED_DATA *)0x7ffe0000; + typedef struct { LPSTR lpEnvAddress; @@ -553,8 +556,7 @@ DWORD WINAPI WTSGetActiveConsoleSessionId(void) */ DEP_SYSTEM_POLICY_TYPE WINAPI GetSystemDEPPolicy(void) { - FIXME("stub\n"); - return OptIn; + return user_shared_data->NXSupportPolicy; } /**********************************************************************

1 0

Zebediah Figura : wineboot: Set the NXSupportPolicy member of the user shared data to NX_SUPPORT_POLICY_OPTIN.
by Alexandre Julliard 29 Jan '21

29 Jan '21

Module: wine Branch: master Commit: b3d00c3340e5a0d19d0b708a1c434b1ccb1bc04d URL: https://source.winehq.org/git/wine.git/?a=commit;h=b3d00c3340e5a0d19d0b708a… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Jan 28 22:08:20 2021 -0600 wineboot: Set the NXSupportPolicy member of the user shared data to NX_SUPPORT_POLICY_OPTIN. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/wineboot/wineboot.c | 1 + 1 file changed, 1 insertion(+) diff --git a/programs/wineboot/wineboot.c b/programs/wineboot/wineboot.c index 05a5ee6aa62..9427448b612 100644 --- a/programs/wineboot/wineboot.c +++ b/programs/wineboot/wineboot.c @@ -291,6 +291,7 @@ static void create_user_shared_data(void) data->NtMinorVersion = version.dwMinorVersion; data->SuiteMask = version.wSuiteMask; data->NumberOfPhysicalPages = sbi.MmNumberOfPhysicalPages; + data->NXSupportPolicy = NX_SUPPORT_POLICY_OPTIN; wcscpy( data->NtSystemRoot, L"C:\\windows" ); features = data->ProcessorFeatures;

1 0

Zebediah Figura : winegstreamer: Don't force activate_mode() onto a Wine thread.
by Alexandre Julliard 29 Jan '21

29 Jan '21

Module: wine Branch: master Commit: 8c13dde595b0841198a7d17bfc21c2997dde53b1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8c13dde595b0841198a7d17b… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Jan 28 18:40:16 2021 -0600 winegstreamer: Don't force activate_mode() onto a Wine thread. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/gst_cbs.c | 14 -------------- dlls/winegstreamer/gst_cbs.h | 2 -- dlls/winegstreamer/gstdemux.c | 8 +------- 3 files changed, 1 insertion(+), 23 deletions(-) diff --git a/dlls/winegstreamer/gst_cbs.c b/dlls/winegstreamer/gst_cbs.c index 5267091c5e1..90c34b1cb39 100644 --- a/dlls/winegstreamer/gst_cbs.c +++ b/dlls/winegstreamer/gst_cbs.c @@ -147,20 +147,6 @@ void existing_new_pad_wrapper(GstElement *bin, GstPad *pad, gpointer user) call_cb(&cbdata); } -gboolean activate_mode_wrapper(GstPad *pad, GstObject *parent, GstPadMode mode, gboolean activate) -{ - struct cb_data cbdata = { ACTIVATE_MODE }; - - cbdata.u.activate_mode_data.pad = pad; - cbdata.u.activate_mode_data.parent = parent; - cbdata.u.activate_mode_data.mode = mode; - cbdata.u.activate_mode_data.activate = activate; - - call_cb(&cbdata); - - return cbdata.u.activate_mode_data.ret; -} - gboolean query_sink_wrapper(GstPad *pad, GstObject *parent, GstQuery *query) { struct cb_data cbdata = { QUERY_SINK }; diff --git a/dlls/winegstreamer/gst_cbs.h b/dlls/winegstreamer/gst_cbs.h index 4afde78ba7d..cbd9a630885 100644 --- a/dlls/winegstreamer/gst_cbs.h +++ b/dlls/winegstreamer/gst_cbs.h @@ -31,7 +31,6 @@ typedef enum { enum CB_TYPE { EXISTING_NEW_PAD, - ACTIVATE_MODE, QUERY_SINK, GSTDEMUX_MAX, BYTESTREAM_WRAPPER_PULL, @@ -114,7 +113,6 @@ void perform_cb_gstdemux(struct cb_data *data) DECLSPEC_HIDDEN; void perform_cb_media_source(struct cb_data *data) DECLSPEC_HIDDEN; void existing_new_pad_wrapper(GstElement *bin, GstPad *pad, gpointer user) DECLSPEC_HIDDEN; -gboolean activate_mode_wrapper(GstPad *pad, GstObject *parent, GstPadMode mode, gboolean activate) DECLSPEC_HIDDEN; GstFlowReturn got_data_wrapper(GstPad *pad, GstObject *parent, GstBuffer *buf) DECLSPEC_HIDDEN; void Gstreamer_transform_pad_added_wrapper(GstElement *filter, GstPad *pad, gpointer user) DECLSPEC_HIDDEN; gboolean query_sink_wrapper(GstPad *pad, GstObject *parent, GstQuery *query) DECLSPEC_HIDDEN; diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index 5747cce1dd2..ea6808ec113 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -1581,7 +1581,7 @@ static HRESULT GST_Connect(struct parser *This, IPin *pConnectPin) This->my_src = gst_pad_new_from_static_template(&src_template, "quartz-src"); gst_pad_set_getrange_function(This->my_src, request_buffer_src); gst_pad_set_query_function(This->my_src, query_function); - gst_pad_set_activatemode_function(This->my_src, activate_mode_wrapper); + gst_pad_set_activatemode_function(This->my_src, activate_mode); gst_pad_set_event_function(This->my_src, event_src); gst_pad_set_element_private (This->my_src, This); @@ -2511,12 +2511,6 @@ void perform_cb_gstdemux(struct cb_data *cbdata) existing_new_pad(data->element, data->pad, data->user); break; } - case ACTIVATE_MODE: - { - struct activate_mode_data *data = &cbdata->u.activate_mode_data; - cbdata->u.activate_mode_data.ret = activate_mode(data->pad, data->parent, data->mode, data->activate); - break; - } case QUERY_SINK: { struct query_sink_data *data = &cbdata->u.query_sink_data;

1 0

Zebediah Figura : winegstreamer: Avoid using Wine debug functions in activate_mode().
by Alexandre Julliard 29 Jan '21

29 Jan '21

Module: wine Branch: master Commit: 1dc7015cdbcc863a57c89cc81b94440c10686da5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1dc7015cdbcc863a57c89cc8… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Jan 28 18:40:15 2021 -0600 winegstreamer: Avoid using Wine debug functions in activate_mode(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/gstdemux.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index e7178bb4dfc..5747cce1dd2 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -1422,7 +1422,6 @@ static gboolean activate_push(GstPad *pad, gboolean activate) struct parser *This = gst_pad_get_element_private(pad); if (!activate) { - TRACE("Deactivating\n"); if (This->push_thread) { pthread_join(This->push_thread, NULL); This->push_thread = 0; @@ -1432,7 +1431,6 @@ static gboolean activate_push(GstPad *pad, gboolean activate) } else if (!This->push_thread) { int ret; - TRACE("Activating\n"); if ((ret = pthread_create(&This->push_thread, NULL, push_data, This))) { GST_ERROR("Failed to create push thread: %s", strerror(errno)); @@ -1447,7 +1445,7 @@ static gboolean activate_mode(GstPad *pad, GstObject *parent, GstPadMode mode, g { struct parser *filter = gst_pad_get_element_private(pad); - TRACE("%s source pad for filter %p in %s mode.\n", + GST_DEBUG("%s source pad for filter %p in %s mode.", activate ? "Activating" : "Deactivating", filter, gst_pad_mode_get_name(mode)); switch (mode) {

1 0

Zebediah Figura : winegstreamer: Don't grab filter_cs in activate_push().
by Alexandre Julliard 29 Jan '21

29 Jan '21

Module: wine Branch: master Commit: 8e84f16066568e1a24f6eff1a8137acfe4f68ed2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8e84f16066568e1a24f6eff1… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Jan 28 18:40:14 2021 -0600 winegstreamer: Don't grab filter_cs in activate_push(). There's no good reason to do this; we're not protecting anything that isn't already protected by GStreamer locks. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/gstdemux.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index b2a20934837..e7178bb4dfc 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -1421,7 +1421,6 @@ static gboolean activate_push(GstPad *pad, gboolean activate) { struct parser *This = gst_pad_get_element_private(pad); - EnterCriticalSection(&This->filter.filter_cs); if (!activate) { TRACE("Deactivating\n"); if (This->push_thread) { @@ -1441,7 +1440,6 @@ static gboolean activate_push(GstPad *pad, gboolean activate) return FALSE; } } - LeaveCriticalSection(&This->filter.filter_cs); return TRUE; }

1 0

Zebediah Figura : winegstreamer: Do not flush the upstream source pin in activate_push().
by Alexandre Julliard 29 Jan '21

29 Jan '21

Module: wine Branch: master Commit: 5482400a4edb57985be313a68ea9b6406f26ae4f URL: https://source.winehq.org/git/wine.git/?a=commit;h=5482400a4edb57985be313a6… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Jan 28 18:40:13 2021 -0600 winegstreamer: Do not flush the upstream source pin in activate_push(). We don't do this in pull mode (and in general never have; avidemux and wavparse are two examples of GStreamer elements that don't flush the upstream pad when deactivating). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/gstdemux.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index a4d49c75a1b..b2a20934837 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -1424,12 +1424,10 @@ static gboolean activate_push(GstPad *pad, gboolean activate) EnterCriticalSection(&This->filter.filter_cs); if (!activate) { TRACE("Deactivating\n"); - IAsyncReader_BeginFlush(This->reader); if (This->push_thread) { pthread_join(This->push_thread, NULL); This->push_thread = 0; } - IAsyncReader_EndFlush(This->reader); if (This->filter.state == State_Stopped) This->nextofs = This->start; } else if (!This->push_thread) {

1 0

Brendan Shanks : loader: On Mac, reserve an area starting at 4GB to force Rosetta's allocations higher.
by Alexandre Julliard 29 Jan '21

29 Jan '21

Module: wine Branch: master Commit: 307f5d00f17d71fe0030acb6ba9f28c3c9d76615 URL: https://source.winehq.org/git/wine.git/?a=commit;h=307f5d00f17d71fe0030acb6… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Thu Jan 28 14:52:46 2021 -0800 loader: On Mac, reserve an area starting at 4GB to force Rosetta's allocations higher. On Apple Silicon, Rosetta allocates memory starting at 0x100000000 (the 4GB line) before the preloader runs. The .NET 3.5 installer and DirectX Jun2010 redistributable both contain non-relocatable EXEs with that base address, which fail to run. The workaround is to create an empty linker section at that address, which is mapped by the kernel before Rosetta runs and forces Rosetta's allocations higher in memory. The linker section runs from 0x100000000-0x114000000. Rosetta's allocations are ~132MB, and should end below 0x120000000. This is not an exact science: a non-relocatable EXE with base address between 0x114000000-0x120000000 will fail to run. If one is discovered, the section size will need to be changed. Signed-off-by: Brendan Shanks <bshanks(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 +- configure.ac | 2 +- loader/preloader_mac.c | 16 ++++++++++++++++ 3 files changed, 18 insertions(+), 2 deletions(-) diff --git a/configure b/configure index 4cb23101f4c..42596bbb9c8 100755 --- a/configure +++ b/configure @@ -8727,7 +8727,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu WINELOADER_LDFLAGS="-Wl,-pie,-pagezero_size,0x1000,-sectcreate,__TEXT,__info_plist,loader/wine_info.plist" wine_can_build_preloader=yes - WINEPRELOADER_LDFLAGS="-nostartfiles -nodefaultlibs -e _start -ldylib1.o -Wl,-image_base,0x7d400000,-pagezero_size,0x1000,-sectcreate,__TEXT,__info_plist,loader/wine_info.plist" + WINEPRELOADER_LDFLAGS="-nostartfiles -nodefaultlibs -e _start -ldylib1.o -Wl,-image_base,0x7d400000,-pagezero_size,0x1000,-sectcreate,__TEXT,__info_plist,loader/wine_info.plist,-segaddr,WINE_4GB_RESERVE,0x100000000" { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -Wl,-no_new_main -e _main" >&5 $as_echo_n "checking whether the compiler supports -Wl,-no_new_main -e _main... " >&6; } if ${ac_cv_cflags__Wl__no_new_main__e__main+:} false; then : diff --git a/configure.ac b/configure.ac index 0f8b9f6c080..a9003523700 100644 --- a/configure.ac +++ b/configure.ac @@ -753,7 +753,7 @@ case $host_os in WINELOADER_LDFLAGS="-Wl,-pie,-pagezero_size,0x1000,-sectcreate,__TEXT,__info_plist,loader/wine_info.plist" wine_can_build_preloader=yes - WINEPRELOADER_LDFLAGS="-nostartfiles -nodefaultlibs -e _start -ldylib1.o -Wl,-image_base,0x7d400000,-pagezero_size,0x1000,-sectcreate,__TEXT,__info_plist,loader/wine_info.plist" + WINEPRELOADER_LDFLAGS="-nostartfiles -nodefaultlibs -e _start -ldylib1.o -Wl,-image_base,0x7d400000,-pagezero_size,0x1000,-sectcreate,__TEXT,__info_plist,loader/wine_info.plist,-segaddr,WINE_4GB_RESERVE,0x100000000" WINE_TRY_CFLAGS([-Wl,-no_new_main -e _main], [WINEPRELOADER_LDFLAGS="-Wl,-no_new_main $WINEPRELOADER_LDFLAGS" WINE_TRY_CFLAGS([-Wl,-no_new_main -e _main -nostartfiles -nodefaultlibs],, diff --git a/loader/preloader_mac.c b/loader/preloader_mac.c index d86675538bb..fc07b7da0ed 100644 --- a/loader/preloader_mac.c +++ b/loader/preloader_mac.c @@ -54,6 +54,17 @@ #include "wine/asm.h" #include "main.h" +/* Rosetta on Apple Silicon allocates memory starting at 0x100000000 (the 4GB line) + * before the preloader runs, which prevents any nonrelocatable EXEs with that + * base address from running. + * + * This empty linker section forces Rosetta's allocations (currently ~132 MB) + * to start at 0x114000000, and they should end below 0x120000000. + */ +#if defined(__x86_64__) +__asm__(".zerofill WINE_4GB_RESERVE,WINE_4GB_RESERVE,___wine_4gb_reserve,0x14000000"); +#endif + #ifndef LC_MAIN #define LC_MAIN 0x80000028 struct entry_point_command @@ -79,6 +90,7 @@ static struct wine_preload_info preload_info[] = { (void *)0x000000010000, 0x00100000 }, /* DOS area */ { (void *)0x000000110000, 0x67ef0000 }, /* low memory area */ { (void *)0x00007ff00000, 0x000f0000 }, /* shared user data */ + { (void *)0x000100000000, 0x14000000 }, /* WINE_4GB_RESERVE section */ { (void *)0x7ffd00000000, 0x01ff0000 }, /* top-down allocations + virtual heap */ #endif /* __i386__ */ { 0, 0 }, /* PE exe range set with WINEPRELOADRESERVE */ @@ -395,6 +407,10 @@ static int preloader_overlaps_range( const void *start, const void *end ) struct target_segment_command *seg = (struct target_segment_command*)cmd; const void *seg_start = (const void*)(seg->vmaddr + slide); const void *seg_end = (const char*)seg_start + seg->vmsize; + static const char reserved_segname[] = "WINE_4GB_RESERVE"; + + if (!wld_strncmp( seg->segname, reserved_segname, sizeof(reserved_segname)-1 )) + continue; if (end > seg_start && start <= seg_end) {

1 0

Brendan Shanks : loader: On Mac, move the top-down allocations area down to avoid Rosetta regions.
by Alexandre Julliard 29 Jan '21

29 Jan '21

Module: wine Branch: master Commit: 720611e28e750b42c7b8d7a2b72047e3027c1ec5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=720611e28e750b42c7b8d7a2… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Thu Jan 28 14:52:45 2021 -0800 loader: On Mac, move the top-down allocations area down to avoid Rosetta regions. On Apple Silicon, Rosetta's shared cache starts at 0x7ffe00000000 and the runtime is mapped below that. Put the top-down allocation area below the runtime with plenty of room to spare. Signed-off-by: Brendan Shanks <bshanks(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- loader/preloader_mac.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/loader/preloader_mac.c b/loader/preloader_mac.c index 43dc6b2b7e6..d86675538bb 100644 --- a/loader/preloader_mac.c +++ b/loader/preloader_mac.c @@ -79,7 +79,7 @@ static struct wine_preload_info preload_info[] = { (void *)0x000000010000, 0x00100000 }, /* DOS area */ { (void *)0x000000110000, 0x67ef0000 }, /* low memory area */ { (void *)0x00007ff00000, 0x000f0000 }, /* shared user data */ - { (void *)0x7ffef0000000, 0x01ff0000 }, /* top-down allocations + virtual heap */ + { (void *)0x7ffd00000000, 0x01ff0000 }, /* top-down allocations + virtual heap */ #endif /* __i386__ */ { 0, 0 }, /* PE exe range set with WINEPRELOADRESERVE */ { 0, 0 } /* end of list */

1 0

Rémi Bernon : include: Add IWMPMedia3 interface to wmp.idl.
by Alexandre Julliard 29 Jan '21

29 Jan '21

Module: wine Branch: master Commit: 4b74eb09a6ebca81c79cce84a67a28ef995df7e0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4b74eb09a6ebca81c79cce84… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Jan 28 19:14:53 2021 +0100 include: Add IWMPMedia3 interface to wmp.idl. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wmp.idl | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/include/wmp.idl b/include/wmp.idl index 2a438b00ce7..ac2fa27effc 100644 --- a/include/wmp.idl +++ b/include/wmp.idl @@ -855,6 +855,21 @@ library WMPLib { HRESULT error([out, retval] IWMPErrorItem **out); } + [ + odl, + uuid(f118efc7-f03a-4fb4-99c9-1c02a5c1065b), + dual, + oleautomation + ] + interface IWMPMedia3 : IWMPMedia2 + { + [id(0x0301)] + HRESULT getAttributeCountByType([in] BSTR type, [in] BSTR language, [out, retval] long *out); + + [id(0x0302)] + HRESULT getItemInfoByType([in] BSTR type, [in] BSTR language, [in] long index, [out, retval] VARIANT *out); + } + [ odl, uuid(a12dcf7d-14ab-4c1b-a8cd-63909f06025b), @@ -1486,7 +1501,7 @@ library WMPLib { interface IWMPDVD; interface IWMPControls2; interface IWMPMedia2; - /* interface IWMPMedia3; */ + interface IWMPMedia3; /* interface IWMPMetadataPicture; */ /* interface IWMPMetadataText; */ /* interface IWMPSettings2; */

1 0

Rémi Bernon : include: Add IWMPMedia2 interface to wmp.idl.
by Alexandre Julliard 29 Jan '21

29 Jan '21

Module: wine Branch: master Commit: 90f0542f4341a38b82061f2ffde6e910fcdab514 URL: https://source.winehq.org/git/wine.git/?a=commit;h=90f0542f4341a38b82061f2f… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Jan 28 19:14:52 2021 +0100 include: Add IWMPMedia2 interface to wmp.idl. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wmp.idl | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/include/wmp.idl b/include/wmp.idl index b845865103d..2a438b00ce7 100644 --- a/include/wmp.idl +++ b/include/wmp.idl @@ -843,6 +843,18 @@ library WMPLib { HRESULT customUrl([out, retval] BSTR *pbstrCustomUrl); } + [ + odl, + uuid(ab7c88bb-143e-4ea4-acc3-e4350b2106c3), + dual, + oleautomation + ] + interface IWMPMedia2 : IWMPMedia + { + [id(0x0300), propget] + HRESULT error([out, retval] IWMPErrorItem **out); + } + [ odl, uuid(a12dcf7d-14ab-4c1b-a8cd-63909f06025b), @@ -1473,7 +1485,7 @@ library WMPLib { interface IWMPClosedCaption; interface IWMPDVD; interface IWMPControls2; - /* interface IWMPMedia2; */ + interface IWMPMedia2; /* interface IWMPMedia3; */ /* interface IWMPMetadataPicture; */ /* interface IWMPMetadataText; */

1 0

Rémi Bernon : include: Add IWmpControls2 interface to wmp.idl.
by Alexandre Julliard 29 Jan '21

29 Jan '21

Module: wine Branch: master Commit: 6eb546c12ca8fe576d764caa3b3bfdc04bb154f7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6eb546c12ca8fe576d764caa… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Jan 28 19:14:51 2021 +0100 include: Add IWmpControls2 interface to wmp.idl. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wmp.idl | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/include/wmp.idl b/include/wmp.idl index 8a146bdbea9..b845865103d 100644 --- a/include/wmp.idl +++ b/include/wmp.idl @@ -360,6 +360,18 @@ library WMPLib { HRESULT playItem([in] IWMPMedia *pIWMPMedia); } + [ + odl, + uuid(6f030d25-0890-480f-9775-1f7e40ab5b8e), + dual, + oleautomation + ] + interface IWMPControls2 : IWMPControls + { + [id(0x0040)] + HRESULT step([in] long lStep); + } + [ odl, uuid(cbb92747-741f-44fe-ab5b-f1a48f3b2a59), @@ -1460,7 +1472,7 @@ library WMPLib { /* interface IWMPErrorItem2; */ interface IWMPClosedCaption; interface IWMPDVD; - /* interface IWMPControls2; */ + interface IWMPControls2; /* interface IWMPMedia2; */ /* interface IWMPMedia3; */ /* interface IWMPMetadataPicture; */

1 0

Rémi Bernon : include: Add IWMPRemoteMediaServices interface to wmp.idl.
by Alexandre Julliard 29 Jan '21

29 Jan '21

Module: wine Branch: master Commit: af1181bbde5d6ef67f39d1a3ce58f400af0fb91c URL: https://source.winehq.org/git/wine.git/?a=commit;h=af1181bbde5d6ef67f39d1a3… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Jan 28 19:14:50 2021 +0100 include: Add IWMPRemoteMediaServices interface to wmp.idl. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wmp.idl | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/include/wmp.idl b/include/wmp.idl index 442b7021383..8a146bdbea9 100644 --- a/include/wmp.idl +++ b/include/wmp.idl @@ -360,6 +360,22 @@ library WMPLib { HRESULT playItem([in] IWMPMedia *pIWMPMedia); } + [ + odl, + uuid(cbb92747-741f-44fe-ab5b-f1a48f3b2a59), + oleautomation + ] + interface IWMPRemoteMediaServices : IUnknown + { + HRESULT GetServiceType([out, retval] BSTR *type); + + HRESULT GetApplicationName([out, retval] BSTR *name); + + HRESULT GetScriptableObject([out, retval] BSTR *name, [out, retval] IDispatch **out); + + HRESULT GetCustomUIMode([out, retval] BSTR *file); + } + [ odl, uuid(9104d1ab-80c9-4fed-abf0-2e6417a6df14),

1 0

Matteo Bruni : vkd3d-compiler: Update usage message for the -x option.
by Alexandre Julliard 29 Jan '21

29 Jan '21

Module: vkd3d Branch: master Commit: abe7051e99e79d18c10351aa4917cce317825031 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=abe7051e99e79d18c10351a… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Thu Jan 28 18:43:44 2021 +0100 vkd3d-compiler: Update usage message for the -x option. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/vkd3d-compiler/main.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/programs/vkd3d-compiler/main.c b/programs/vkd3d-compiler/main.c index e98e713..fb19a70 100644 --- a/programs/vkd3d-compiler/main.c +++ b/programs/vkd3d-compiler/main.c @@ -178,8 +178,10 @@ static void print_usage(const char *program_name) " -p, --profile=<name> Specify the target shader profile for HLSL shaders.\n" " --strip-debug Strip debug information from the output.\n" " -V, --version Display version information and exit.\n" - " -x <type> Specify the type of the source. Valid values are\n" - " 'dxbc-tpf' and 'none'.\n" + " -x <type> Specify the type of the source. Use --print-source-types\n" + " to list valid source types. The default source type is\n" + " 'dxbc-tpf' for compile operations, and 'hlsl' for\n" + " preprocess operations.\n" " -- Stop option processing. Any subsequent argument is\n" " interpreted as a filename.\n" "\n"

1 0

Matteo Bruni : vkd3d-compiler: Set default source type before handling --print-target-types.
by Alexandre Julliard 29 Jan '21

29 Jan '21

Module: vkd3d Branch: master Commit: 5399f6fcc6cbf77a25b860eee9e500539df4fab6 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=5399f6fcc6cbf77a25b860e… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Thu Jan 28 18:43:43 2021 +0100 vkd3d-compiler: Set default source type before handling --print-target-types. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/vkd3d-compiler/main.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/programs/vkd3d-compiler/main.c b/programs/vkd3d-compiler/main.c index 94cce20..e98e713 100644 --- a/programs/vkd3d-compiler/main.c +++ b/programs/vkd3d-compiler/main.c @@ -480,14 +480,14 @@ static bool parse_command_line(int argc, char **argv, struct options *options) } } - if (options->print_target_types) - return true; - if (options->source_type == VKD3D_SHADER_SOURCE_NONE) options->source_type = options->preprocess_only ? VKD3D_SHADER_SOURCE_HLSL : VKD3D_SHADER_SOURCE_DXBC_TPF; if (options->target_type == VKD3D_SHADER_TARGET_NONE && !options->preprocess_only) options->target_type = VKD3D_SHADER_TARGET_SPIRV_BINARY; + if (options->print_target_types) + return true; + if (!options->preprocess_only && !validate_target_type(options->source_type, options->target_type)) { fprintf(stderr, "Target type '%s' is invalid for source type '%s'.\n",

1 0

Zebediah Figura : vkd3d-shader: Import the HLSL compiler from Wine.
by Alexandre Julliard 29 Jan '21

29 Jan '21

Module: vkd3d Branch: master Commit: b523122ef3698c620a705d99aab2e6ba66877e87 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=b523122ef3698c620a705d9… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Jan 27 10:29:44 2021 -0600 vkd3d-shader: Import the HLSL compiler from Wine. This corresponds to Wine commit 9f9fec18799bf59df6211b7294f8d338caa7f4db. Note that for the moment, compilation messages have not been ported. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- Makefile.am | 16 +- libs/vkd3d-shader/hlsl.c | 1672 +++++++++++++++++ libs/vkd3d-shader/hlsl.h | 644 +++++++ libs/vkd3d-shader/hlsl.l | 288 +++ libs/vkd3d-shader/hlsl.y | 2961 ++++++++++++++++++++++++++++++ libs/vkd3d-shader/trace.c | 9 + libs/vkd3d-shader/vkd3d_shader_main.c | 13 +- libs/vkd3d-shader/vkd3d_shader_private.h | 9 + 8 files changed, 5609 insertions(+), 3 deletions(-) Diff: https://source.winehq.org/git/vkd3d.git/?a=commitdiff;h=b523122ef3698c620a7…

1 0

Francois Gouget : winetest/dissect: Improve the documentation of the missing start line handling.
by Alexandre Julliard 29 Jan '21

29 Jan '21

Module: tools Branch: master Commit: 7846c95f79bdbde997f62a6ae5a5facdbeb50186 URL: https://source.winehq.org/git/tools.git/?a=commit;h=7846c95f79bdbde997f62a6… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Jan 29 06:20:10 2021 +0100 winetest/dissect: Improve the documentation of the missing start line handling. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- winetest/dissect | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/winetest/dissect b/winetest/dissect index e9729db..27bcf17 100755 --- a/winetest/dissect +++ b/winetest/dissect @@ -717,23 +717,28 @@ while ($line = <IN>) { if ($l_dll ne $dll or $l_unit ne $unit) { - # First close the current test unit taking into account - # it may have been polluted by the new one. + # Warn about the missing start line in the current test unit box. add_test_line("end", "The $l_dll:$l_unit start line is missing (or it is garbled)"); $extra_failures++; + + # And close the current test unit taking into account + # it may have been polluted by the new one. $broken = 1; close_test_unit(0); - # Then switch to the new one, warning it's missing a start line, - # and that its results may be inconsistent. + # Then switch to the new test unit, not for the past lines, but for + # those before the next 'start' line. This 'new' test unit may have + # inconsistent results too. ($dll, $unit, $source, $rev) = ($l_dll, $l_unit, "-", "-"); %units = ($unit => 1); $units_re = $unit; + $broken = 1; $testbox = create_test_unit_box(); + # Finally, warn about the missing start line in the new test unit + # box. add_test_line("end", "The $l_dll:$l_unit start line is missing (or it is garbled)"); $extra_failures++; - $broken = 1; } my $class = $l_rc ? "failed" : "";

1 0

Francois Gouget : testbot/LogUtils: Fix handling of new test units with no start line.
by Alexandre Julliard 29 Jan '21

29 Jan '21

Module: tools Branch: master Commit: feb1102cc2ed2eb592f1c3ea6300723024ba01e7 URL: https://source.winehq.org/git/tools.git/?a=commit;h=feb1102cc2ed2eb592f1c3e… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Jan 29 06:20:01 2021 +0100 testbot/LogUtils: Fix handling of new test units with no start line. Create a real new test unit object so $Cur->{LineFailures} is not counted multiple times. This matches the winetest parser behavior. Improve the documentation. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/LogUtils.pm | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/testbot/lib/WineTestBot/LogUtils.pm b/testbot/lib/WineTestBot/LogUtils.pm index 1b4ee7a..15ec31a 100644 --- a/testbot/lib/WineTestBot/LogUtils.pm +++ b/testbot/lib/WineTestBot/LogUtils.pm @@ -675,11 +675,14 @@ sub ParseWineTestReport($$$) $Cur->{IsBroken} = 1; _CloseTestUnit($LogInfo, $Cur, 0); - # Then switch to the new one, warning it's missing a start line, - # and that its results may be inconsistent. - ($Cur->{Dll}, $Cur->{Unit}) = ($Dll, $Unit); - _AddExtra($LogInfo, "had no start line (or it is garbled)", $Cur); + # Then switch to the new test unit, not for the past lines, but for + # those before the next 'start' line. This 'new' test unit may have + # inconsistent results too so set IsBroken. + $Cur = _NewCurrentUnit($Dll, $Unit); $Cur->{IsBroken} = 1; + + # Finally, warn about the missing start line. + _AddExtra($LogInfo, "had no start line (or it is garbled)", $Cur); } if ($Rc == 258)

1 0

Francois Gouget : testbot/TestWTBS: Automatically check the 'Task:' build and wine lines.
by Alexandre Julliard 29 Jan '21

29 Jan '21

Module: tools Branch: master Commit: 6e74b064f686a77b36341f72eec86c33acf86c5b URL: https://source.winehq.org/git/tools.git/?a=commit;h=6e74b064f686a77b36341f7… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Jan 29 05:03:04 2021 +0100 testbot/TestWTBS: Automatically check the 'Task:' build and wine lines. The automatic checks only cover the simple cases which is the majority, thus allowing to simplify the TestWTBS directives. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/tests/TestWTBS | 37 +++++++++++++++++++++++++++++++++---- 1 file changed, 33 insertions(+), 4 deletions(-) diff --git a/testbot/tests/TestWTBS b/testbot/tests/TestWTBS index 6f78406..bc4e0d9 100755 --- a/testbot/tests/TestWTBS +++ b/testbot/tests/TestWTBS @@ -362,14 +362,43 @@ sub LoadTestInfo($) foreach my $TaskType (@$TaskTypes) { my $TaskInfo = $TestInfo->{$TaskType}; - if (!defined $TaskInfo->{$Field}) - { - $TaskInfo->{$Field} = $SrcVal; - } + next if (defined $TaskInfo->{$Field}); + # Copy arrays to avoid side-effects when adding built-in defaults + $TaskInfo->{$Field} = ref($SrcVal) eq "ARRAY" ? [ @$SrcVal ] : $SrcVal; } } } + # Automatically check the Task: lines in simple cases + # Make sure no test is run for build tasks + my $GrepV = ($TestInfo->{build}->{"report.GrepV"} ||= []); + push @$GrepV, '.'; + $GrepV = ($TestInfo->{build}->{"log.GrepV"} ||= []); + push @$GrepV, '^Task: tests$'; + if (($TestInfo->{build}->{Status} || "") =~ /^bad(?:build|patch)$/ or + $TestInfo->{build}->{HasTimeout}) + { + push @$GrepV, '^Task: ok$'; + } + else + { + my $Grep = ($TestInfo->{build}->{"log.Grep"} ||= []); + push @$Grep, '^Task: ok$'; + } + + # Note: Depending on where the timeout occurs, the wine task log may or + # may not have a 'Task: ok' line. + if (($TestInfo->{wine}->{Status} || "") eq "completed" and + !$TestInfo->{wine}->{HasTimeout}) + { + my $Grep = ($TestInfo->{wine}->{"log.Grep"} ||= []); + if (CheckValue($TestInfo->{wine}->{TestUnits})) + { + push @$Grep, '^Task: tests$'; + } + push @$Grep, '^Task: ok$'; + } + # Validate and fix the Grep* fields foreach my $GrepType ("Grep", "GrepV") {

1 0

Floris Renaud : documentation: Add Dutch README translation.
by Alexandre Julliard 28 Jan '21

28 Jan '21

Module: wine Branch: master Commit: f72ef20e88fba67254caf0124ab8713e3d15fa2a URL: https://source.winehq.org/git/wine.git/?a=commit;h=f72ef20e88fba67254caf012… Author: Floris Renaud <jkfloris(a)dds.nl> Date: Thu Jan 28 13:40:03 2021 +0100 documentation: Add Dutch README translation. Signed-off-by: Floris Renaud <jkfloris(a)dds.nl> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- documentation/README.nl | 181 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 181 insertions(+) diff --git a/documentation/README.nl b/documentation/README.nl new file mode 100644 index 00000000000..2b54c33b5dc --- /dev/null +++ b/documentation/README.nl @@ -0,0 +1,181 @@ +1. INTRODUCTIE + +Wine is een programma wat het mogelijk maakt om Microsoft Windows +programma's (waaronder uitvoerbare DOS, Windows 3.x, Win32 en Win64 +bestanden) op Unix uit te voeren. Het bestaat uit een programma- +lader die het Microsoft Windows binaire bestand laadt en uitvoert. +Een bibliotheek (Winelib genaamd) die de Windows API aanroepen laat +uitvoeren door overeenkomstige Unix, X11 of Mac varianten. Deze +bibliotheek kan ook worden gebruikt om Windows code om te zetten in +echte Unix uitvoerbare bestanden. + +Wine is vrije software, uitgebracht onder de GNU LGPL. Zie het +LICENCE bestand voor meer informatie. + + +2. SNEL AAN DE SLAG + +Voer in de hoofdmap van de Wine broncode (waar het README bestand staat), +het volgende uit: + +./configure +make + +Installeer daarna Wine met: + +make install + +Of voer Wine uit in de map waarin die gebouwd is: + +./wine notepad + +Programma's kunnen uitgevoerd worden met "wine programma". Lees voor meer +informatie en het oplossingen van problemen de rest van dit bestand, de +man pagina's van Wine en vooral de overvloed aan informatie op +https://winehq.org . + + +3. BENODIGDHEDEN + +Om Wine te kunnen compileren en uit te voeren, is één van het volgende +besturingssystemen nodig: + + Linux versie 2.0.36 of nieuwer + FreeBSD 8.0 of nieuwer + Solaris x86 9 of nieuwer + NetBSD-current + Mac OS X 10.8 of nieuwer + +Omdat Wine threadondersteuning op kernelniveau vereist, worden alleen de +bovenstaande besturingssystemen ondersteund. Andere besturingssystemen +die threadondersteuning op kernelniveau hebben, kunnen mogelijk in de +toekomst ook ondersteund worden. + +FreeBSD informatie: + Over het algemeen werkt Wine niet goed op versies die ouder zijn dan + FreeBSD 8.0. Zie https://wiki.freebsd.org/Wine voor meer informatie. + +Solaris informatie: + Hoogst waarschijnlijk moet Wine gebouwd worden met de GNU toolchain + (gcc, gas, enz.). Waarschuwing: het installeren van gas houdt *niet* + in dat het gebruikt wordt door gcc. Hercompileren van gcc nadat gas + is geïnstalleerd of symbolische verwijzingen maken voor cc, as en + ld naar de gnu-tools is waarschijnlijk noodzakelijk. + +NetBSD informatie: + Zorg er voor dat de volgende opties aan staan in de kernel: USER_LDT, + SYSVSHM, SYSVSEM, en SYSVMSG. + +Mac OS X informatie: + Xcode/Xcode Command Line Tools of Apple cctools zijn nodig. De minimale + vereisten om Wine te kunnen compileren zijn clang 3.8 met MacOSX10.10.sdk + en mingw-w64 v8. MacOSX10.14.sdk en nieuwer kunnen alleen wine64 bouwen. + +Ondersteunde bestandssystemen: + Wine zou op de meeste bestandssystemen uitgevoerd moeten kunnen worden. + Er zijn enkele compatibiliteitsproblemen bekend met bestanden die via + Samba worden benaderd. Ook heeft NTFS niet alle bestandssysteemopties die + nodig zijn met sommige programma's. Een oorspronkelijk Unix + bestandssysteem wordt aangeraden. + +Basis benodigdheden: + De X11-ontwikkel-bestanden moeten geïnstalleerd zijn. (Voor Debian is dat + pakket xorg-dev in RedHat is dit libX11-devel). + + Natuurlijk is ook "make" nodig. (Hoogst waarschijnlijk GNU make.) + + Ook zijn bison en flex versie 2.5.33 of nieuwer nodig. + +Optionele bibliotheken: + Tijdens het uitvoeren van ./configure wordt er aangegeven of de optionele + bibliotheken zijn gevonden op het systeem. Bekijk + https://wiki.winehq.org/Building_Wine voor meer informatie over welke + pakketten er geïnstalleerd zouden moeten worden. Op 64-bit systemen + moeten ook de 32-bit versies van deze pakketten geïnstalleerd worden. + + +4. COMPILEREN + +Om Wine te bouwen, voer het volgende uit: + +./configure +make + +Hiermee wordt het programma "wine" en talrijke ondersteunende bibliotheken +en uitvoerbare bestanden gemaakt. Het programma "wine" laadt en voert de +uitvoerbare Windows bestanden uit. +De bibliotheek "libwine" ("Winelib") kan worden gebruikt om Windows +broncode te compileren en te linken in Unix. + +Voor alle opties tijdens het compileren, voer ./configure --help uit. + +Voor meer informatie bekijk: https://wiki.winehq.org/Building_Wine + + +5. SETUP + +Wanneer Wine goed in elkaar is gezet, kan Wine geïnstalleerd worden met +"make install". Deze opdracht installeert het uitvoerbare wine bestand, +de bibliotheken, de Wine man pagina's en alle andere benodigde bestanden. + +Vergeet niet om eerst elke tegenstrijdige Wine installatie te verwijderen. +Dit kan voor de installatie met "dpkg -r wine", "rpm -e wine" of met +"make uninstall" + +Eenmaal geïnstalleerd, kan het configuratie programma "winecfg" worden +uitgevoerd. Bekijk de Support pagina op https://www.winehq.org/ voor +configuratiehints. + + +6. PROGRAMMA'S UITVOEREN + +Bij het gebruiken van Wine kan het gehele pad naar het uitvoerbare bestand +worden gebruikt of alleen de bestandsnaam. + +Voorbeeld: het Kladblok (Notepad) uitvoeren: + + wine notepad (gebruikt het zoek-pad, zoals in het register is + wine notepad.exe opgegeven, om het bestand te vinden) + + wine c:\\windows\\notepad.exe (met een DOS bestandsnaam constructie) + + wine ~/.wine/drive_c/windows/notepad.exe (een Unix constructie) + + wine notepad.exe readme.txt (een programma met parameters) + +Wine is niet perfect. Dus sommige programma's kunnen crashen. Als dat +gebeurd komt er een logboek van de crash. Deze kan bijgevoegd worden als de +fout wordt gerapporteerd. + + +7. MEER INFORMATIE + +WWW: Een grote verscheidenheid aan informatie voor Wine is beschikbaar + gemaakt door WineHQ op https://www.winehq.org/ : verschillende + handleidingen, programma database, bug tracking. Dit is + waarschijnlijk de beste plek om te beginnen. + +FAQ: Veel vragen over Wine zijn te vinden op https://www.winehq.org/FAQ + +Wiki: De Wine-Wiki staat op https://wiki.winehq.org + +Mail-lijsten: + Er zijn meerdere mail-lijsten voor gebruikers en ontwikkelaars van + Wine. Bekijk https://www.winehq.org/forums voor meer informatie. + +Fouten: Op https://bugs.winehq.org kunnen fouten gemeld worden aan de Wine + Bugzilla. Doorzoek eerst de database van bugzilla om te kijken of + de fout al bekend of gerepareerd is voordat de fout gemeld wordt. + +IRC: Online hulp is beschikbaar in kanaal #WineHQ op irc.freenode.net + +Git: De huidige ontwikkeling van Wine is beschikbaar op Git. Bezoek + https://www.winehq.org/git voor meer informatie. + +Om iets toe te voegen aan de volgende uitgave van Wine of om een fout op te +lossen, stuur een patch (de voorkeur heeft een git-format-patch) naar de +wine-devel(a)winehq.org lijst. + +-- +Alexandre Julliard +julliard(a)winehq.org

1 0

Floris Renaud : documentation: Change obsolete Debian and Red Hat packages.
by Alexandre Julliard 28 Jan '21

28 Jan '21

Module: wine Branch: master Commit: 8c65205d2245e83b00c62911469b082fd3689143 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8c65205d2245e83b00c62911… Author: Floris Renaud <jkfloris(a)dds.nl> Date: Thu Jan 28 13:32:40 2021 +0100 documentation: Change obsolete Debian and Red Hat packages. xlib6g-dev on Debian and XFree86-devel on Red Hat no longer exist. Replaced with: xorg-dev (Debian) and libX11-devel (Red Hat) Signed-off-by: Floris Renaud <jkfloris(a)dds.nl> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- README | 2 +- documentation/README.de | 2 +- documentation/README.es | 2 +- documentation/README.fi | 4 ++-- documentation/README.fr | 4 ++-- documentation/README.hu | 2 +- documentation/README.it | 2 +- documentation/README.ja | 2 +- documentation/README.ko | 4 ++-- documentation/README.no | 4 ++-- documentation/README.pt | 2 +- documentation/README.pt_br | 2 +- documentation/README.ru | 2 +- documentation/README.sv | 4 ++-- documentation/README.tr | 2 +- documentation/README.uk | 2 +- documentation/README.zh_cn | 6 ++---- 17 files changed, 23 insertions(+), 25 deletions(-) diff --git a/README b/README index 21ab6f23b20..7d834db0a8f 100644 --- a/README +++ b/README @@ -75,7 +75,7 @@ Supported file systems: Basic requirements: You need to have the X11 development include files installed - (called xlib6g-dev in Debian and XFree86-devel in Red Hat). + (called xorg-dev in Debian and libX11-devel in Red Hat). Of course you also need "make" (most likely GNU make). diff --git a/documentation/README.de b/documentation/README.de index b30575a356d..be8c033dba5 100644 --- a/documentation/README.de +++ b/documentation/README.de @@ -80,7 +80,7 @@ Unterstützte Dateisysteme: Grundsätzliche Voraussetzungen: Sie müssen die Entwicklungsdateien für X11 installiert haben - (Debian nennt diese xlib6g-dev, Red Hat XFree86-devel). + (Debian nennt diese xorg-dev, Red Hat libX11-devel). Selbstverständlich benötigen Sie auch "make" (höchstwahrscheinlich GNU make). diff --git a/documentation/README.es b/documentation/README.es index 8068217ebcd..19b43dd02ec 100644 --- a/documentation/README.es +++ b/documentation/README.es @@ -68,7 +68,7 @@ Sistemas de ficheros soportados: Requisitos básicos: Necesitará tener instalados los archivos include X11 para desarrollo - (llamados xlib6g-dev en Debian y XFree86-devel en RedHat). + (llamados xorg-dev en Debian y libX11-devel en RedHat). Además necesitará "make" (preferiblemente GNU make). diff --git a/documentation/README.fi b/documentation/README.fi index b2c6524548e..13af44b1e9b 100644 --- a/documentation/README.fi +++ b/documentation/README.fi @@ -71,8 +71,8 @@ Tuetut tiedostojärjestelmät: on suotavaa. Perusvaatimukset: - Koneella täytyy olla X11:n kehitystiedostot (Debianissa xlib6g-dev, - Red Hatissa XFree86-devel). + Koneella täytyy olla X11:n kehitystiedostot (Debianissa xorg-dev, + Red Hatissa libX11-devel). Luonnollisesti myös make (yleensä GNU make) on tarpeen. diff --git a/documentation/README.fr b/documentation/README.fr index 28729a5b41e..2105502cf55 100644 --- a/documentation/README.fr +++ b/documentation/README.fr @@ -74,8 +74,8 @@ Systèmes de fichiers pris en charge : est recommandée. Configuration de base requise : - Les fichiers d'en-tête de X11 (appelés xlib6g-dev sous Debian et - XFree86-devel sous Red Hat) doivent être installés. + Les fichiers d'en-tête de X11 (appelés xorg-dev sous Debian et + libX11-devel sous Red Hat) doivent être installés. Bien entendu, vous aurez besoin du programme « make » (très probablement GNU make). diff --git a/documentation/README.hu b/documentation/README.hu index f672dea43d2..e28c534c51e 100644 --- a/documentation/README.hu +++ b/documentation/README.hu @@ -73,7 +73,7 @@ Támogatott fájlrendszerek: Alap követelmények: Önnek fel kell telepítenie az X11 fejlesztõi fájlokat - (xlib6g-dev néven van a Debianban és XFree86-devel néven a Red Hat-ben). + (xorg-dev néven van a Debianban és libX11-devel néven a Red Hat-ben). Fordítási eszköz követelmények: x86 rendszereken gcc >= 2.7.2 szükséges. diff --git a/documentation/README.it b/documentation/README.it index ecb4aed75e8..68f0df1f75f 100644 --- a/documentation/README.it +++ b/documentation/README.it @@ -68,7 +68,7 @@ File system supportati: Requisiti basilari: Devono essere installati i file include di sviluppo di X11 - (chiamato xlib6g-dev in Debian e XFree86-devel in Red Hat). + (chiamato xorg-dev in Debian e libX11-devel in Red Hat). Ovviamente necessario anche "make" (possibilmente GNU make). diff --git a/documentation/README.ja b/documentation/README.ja index ea584853db1..72e1ce2fe46 100644 --- a/documentation/README.ja +++ b/documentation/README.ja @@ -77,7 +77,7 @@ Mac OS X情報: 基本的な要件: X11開発includeファイルをインストールする必要があります。 - （Debianではxlib6g-devでRed HatではXFree86-develと呼ばれます。[訳注: 最近の + （Debianではxorg-devでRed HatではlibX11-develと呼ばれます。[訳注: 最近のディストリビューションでは別のパッケージで置き換えられています]）もちろん"make"も必要です（大概はGNU make）。 diff --git a/documentation/README.ko b/documentation/README.ko index a22cc1ea149..17fcfee318a 100644 --- a/documentation/README.ko +++ b/documentation/README.ko @@ -72,8 +72,8 @@ Mac OS X 정보: 기본 요구 사항: - X11 개발용 헤더 파일이 설치되어 있어야 합니다 (데비안에서는 xlib6g-dev, - 레드햇에서는 XFree86-devel이란 패키지명으로 되어 있습니다). + X11 개발용 헤더 파일이 설치되어 있어야 합니다 (데비안에서는 xorg-dev, + 레드햇에서는 libX11-devel이란 패키지명으로 되어 있습니다). 당연히 "make" 프로그램도 필요합니다 (대부분 GNU make 사용). diff --git a/documentation/README.no b/documentation/README.no index 14d7ebcd498..a25b47f7fce 100644 --- a/documentation/README.no +++ b/documentation/README.no @@ -64,8 +64,8 @@ Støttede filsystemer: programmer trenger. Det anbefales å bruke et ekte Unix-filsystem. Basiskrav: - Inkluderingsfilene for X11 må være installert (kalt «xlib6g-dev» i - Debian og «XFree86-devel» i RedHat). + Inkluderingsfilene for X11 må være installert (kalt «xorg-dev» i + Debian og «libX11-devel» i RedHat). Du må selvfølgelig også ha «make», sannsynligvis «GNU make». diff --git a/documentation/README.pt b/documentation/README.pt index 848d2d2eb26..256eb2310c0 100644 --- a/documentation/README.pt +++ b/documentation/README.pt @@ -73,7 +73,7 @@ possa escrever. Requisitos básicos: Tu precisas de ter instalados os fucheiros de include do X11 development -(chamados xlib6g-dev em Debian e Xfree86-devel no RedHat). +(chamados xorg-dev em Debian e libX11-devel no RedHat). Requisitos para as ferramentas de construção: Em sistemas x86 o gcc >= 2.7.2 é requerido. diff --git a/documentation/README.pt_br b/documentation/README.pt_br index 05a3d037bd5..a8025b55ac0 100644 --- a/documentation/README.pt_br +++ b/documentation/README.pt_br @@ -68,7 +68,7 @@ Sistemas de arquivo suportados: Requisitos básicos: Você necessita ter instalados os arquivos de inclusão para desenvolvimento - do X11 (chamados de xlib6g-dev no Debian e XFree86-devel no RedHat). + do X11 (chamados de xorg-dev no Debian e libX11-devel no RedHat). Obviamente você também irá precisar do "make" (comumente o GNU make). diff --git a/documentation/README.ru b/documentation/README.ru index f3328edd13a..78ee9a50959 100644 --- a/documentation/README.ru +++ b/documentation/README.ru @@ -66,7 +66,7 @@ Mac OS X: Базовые требования: У вас должны быть установлены заголовочные файлы X11 - (xlib6g-dev в Debian и XFree86-devel в Red Hat). + (xorg-dev в Debian и libX11-devel в Red Hat). Разумеется, вам необходим «make» (лучше всего использовать GNU make). diff --git a/documentation/README.sv b/documentation/README.sv index b68e6997d92..be017d40d7f 100644 --- a/documentation/README.sv +++ b/documentation/README.sv @@ -70,8 +70,8 @@ Stödda filsystem: program. Det rekommenderas att använda ett riktigt Unix-filsystem. Grundläggande krav: - Utvecklingsfilerna för X11 måste vara installerade (de kallas xlib6g-dev i - Debian och XFree86-devel i Red Hat). + Utvecklingsfilerna för X11 måste vara installerade (de kallas xorg-dev i + Debian och libX11-devel i Red Hat). Du måste givetvis också ha "make" (mest troligt "GNU make"). diff --git a/documentation/README.tr b/documentation/README.tr index 28b17b8c377..ae145171269 100644 --- a/documentation/README.tr +++ b/documentation/README.tr @@ -69,7 +69,7 @@ Desteklenen dosya sistemleri: Temel gereksinimler: X11 geliştirme dosyalarının kurulu olması gereklidir. - (Debian'da xlib6g-dev, Red Hat'da XFree86-devel adlı paketler). + (Debian'da xorg-dev, Red Hat'da libX11-devel adlı paketler). "make" komutuna kesinlikle ihtiyacınız vardır. (çoğunlukla GNU make) diff --git a/documentation/README.uk b/documentation/README.uk index a70e4979f11..8fea73571af 100644 --- a/documentation/README.uk +++ b/documentation/README.uk @@ -70,7 +70,7 @@ Mac OS X: Базові вимоги: У вас повинні бути встановлені файли заголовків X11 - (Xlib6g-dev в Debian та XFree86-devel в Red Hat). + (xorg-dev в Debian та libX11-devel в Red Hat). Звісно, вам потрібен "make" (краще всього використовувати GNU make). diff --git a/documentation/README.zh_cn b/documentation/README.zh_cn index 963b15720b0..934079fdef4 100644 --- a/documentation/README.zh_cn +++ b/documentation/README.zh_cn @@ -63,10 +63,8 @@ Mac OS X 信息: 文件系统。基本要求： - 您需要安装 X11 开发用头文件（在 Debian 中可能被称为 xlib6g-dev - ，在 Red Hat 中可能被称为 XFree86-devel [译注：在新版本的 Linux - 发行版中可能有其它名称，例如使用替代 Xlib 的 XCB library，此时 - Debian 的包名称应为 libxcb1-dev]）。 + 您需要安装 X11 开发用头文件（在 Debian 中可能被称为 xorg-dev + ，在 Red Hat 中可能被称为 libX11-devel）。当然您同样需要“make”工具（一般应当为 GNU make）。

1 0

Damjan Jovanovic : secur32: Implement the SECPKG_ATTR_UNIQUE_BINDINGS context attribute.
by Alexandre Julliard 28 Jan '21

28 Jan '21

Module: wine Branch: master Commit: de9238962c237f0d4463199a0a1f9f6b6835aed5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=de9238962c237f0d4463199a… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Thu Jan 28 19:02:39 2021 +0200 secur32: Implement the SECPKG_ATTR_UNIQUE_BINDINGS context attribute. .NET's System.Data.SqlClient needs this to connect to MSSQL Server. Signed-off-by: Damjan Jovanovic <damjan.jov(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/secur32/schannel.c | 7 +++++++ dlls/secur32/schannel_gnutls.c | 37 +++++++++++++++++++++++++++++++++++++ dlls/secur32/schannel_macosx.c | 7 +++++++ dlls/secur32/secur32_priv.h | 2 ++ dlls/secur32/tests/schannel.c | 26 ++++++++++++++++++++++++++ 5 files changed, 79 insertions(+) diff --git a/dlls/secur32/schannel.c b/dlls/secur32/schannel.c index e76a3e46c34..2d135a85227 100644 --- a/dlls/secur32/schannel.c +++ b/dlls/secur32/schannel.c @@ -1115,6 +1115,11 @@ static SECURITY_STATUS SEC_ENTRY schan_QueryContextAttributesW( memcpy(p, hash, hash_size); return SEC_E_OK; } + case SECPKG_ATTR_UNIQUE_BINDINGS: + { + SecPkgContext_Bindings *bindings = buffer; + return schan_imp_get_unique_channel_binding(ctx->session, bindings); + } case SECPKG_ATTR_APPLICATION_PROTOCOL: { SecPkgContext_ApplicationProtocol *protocol = buffer; @@ -1154,6 +1159,8 @@ static SECURITY_STATUS SEC_ENTRY schan_QueryContextAttributesA( return schan_QueryContextAttributesW(context_handle, attribute, buffer); case SECPKG_ATTR_ENDPOINT_BINDINGS: return schan_QueryContextAttributesW(context_handle, attribute, buffer); + case SECPKG_ATTR_UNIQUE_BINDINGS: + return schan_QueryContextAttributesW(context_handle, attribute, buffer); case SECPKG_ATTR_APPLICATION_PROTOCOL: return schan_QueryContextAttributesW(context_handle, attribute, buffer); diff --git a/dlls/secur32/schannel_gnutls.c b/dlls/secur32/schannel_gnutls.c index 784c1ffe6e8..e342df3874d 100644 --- a/dlls/secur32/schannel_gnutls.c +++ b/dlls/secur32/schannel_gnutls.c @@ -95,6 +95,7 @@ MAKE_FUNCPTR(gnutls_record_get_max_size); MAKE_FUNCPTR(gnutls_record_recv); MAKE_FUNCPTR(gnutls_record_send); MAKE_FUNCPTR(gnutls_server_name_set); +MAKE_FUNCPTR(gnutls_session_channel_binding); MAKE_FUNCPTR(gnutls_transport_get_ptr); MAKE_FUNCPTR(gnutls_transport_set_errno); MAKE_FUNCPTR(gnutls_transport_set_ptr); @@ -507,6 +508,41 @@ SECURITY_STATUS schan_imp_get_connection_info(schan_imp_session session, return SEC_E_OK; } +SECURITY_STATUS schan_imp_get_unique_channel_binding(schan_imp_session session, + SecPkgContext_Bindings *bindings) +{ + static const char prefix[] = "tls-unique:"; + gnutls_datum_t datum; + int rc; + SECURITY_STATUS ret; + char *p; + gnutls_session_t s = (gnutls_session_t)session; + + rc = pgnutls_session_channel_binding(s, GNUTLS_CB_TLS_UNIQUE, &datum); + if (rc) + { + pgnutls_perror(rc); + return SEC_E_INTERNAL_ERROR; + } + + bindings->BindingsLength = sizeof(SEC_CHANNEL_BINDINGS) + sizeof(prefix)-1 + datum.size; + bindings->Bindings = heap_alloc_zero(bindings->BindingsLength); + if (!bindings->Bindings) + ret = SEC_E_INSUFFICIENT_MEMORY; + else + { + bindings->Bindings->cbApplicationDataLength = sizeof(prefix)-1 + datum.size; + bindings->Bindings->dwApplicationDataOffset = sizeof(SEC_CHANNEL_BINDINGS); + p = (char*)(bindings->Bindings+1); + memcpy(p, prefix, sizeof(prefix)-1); + p += sizeof(prefix)-1; + memcpy(p, datum.data, datum.size); + ret = SEC_E_OK; + } + free(datum.data); + return ret; +} + ALG_ID schan_imp_get_key_signature_algorithm(schan_imp_session session) { gnutls_session_t s = (gnutls_session_t)session; @@ -1032,6 +1068,7 @@ BOOL schan_imp_init(void) LOAD_FUNCPTR(gnutls_record_recv); LOAD_FUNCPTR(gnutls_record_send); LOAD_FUNCPTR(gnutls_server_name_set) + LOAD_FUNCPTR(gnutls_session_channel_binding) LOAD_FUNCPTR(gnutls_transport_get_ptr) LOAD_FUNCPTR(gnutls_transport_set_errno) LOAD_FUNCPTR(gnutls_transport_set_ptr) diff --git a/dlls/secur32/schannel_macosx.c b/dlls/secur32/schannel_macosx.c index d725c9d22c2..6e6296722cc 100644 --- a/dlls/secur32/schannel_macosx.c +++ b/dlls/secur32/schannel_macosx.c @@ -1039,6 +1039,13 @@ SECURITY_STATUS schan_imp_get_connection_info(schan_imp_session session, return SEC_E_OK; } +SECURITY_STATUS schan_imp_get_unique_channel_binding(schan_imp_session session, + SecPkgContext_Bindings *bindings) +{ + FIXME("SECPKG_ATTR_UNIQUE_BINDINGS is unsupported on MacOS\n"); + return SEC_E_UNSUPPORTED_FUNCTION; +} + #ifndef HAVE_SSLCOPYPEERCERTIFICATES static void schan_imp_cf_release(const void *arg, void *ctx) { diff --git a/dlls/secur32/secur32_priv.h b/dlls/secur32/secur32_priv.h index c34d1d32566..ce8d55d1eb6 100644 --- a/dlls/secur32/secur32_priv.h +++ b/dlls/secur32/secur32_priv.h @@ -237,6 +237,8 @@ extern unsigned int schan_imp_get_max_message_size(schan_imp_session session) DE extern ALG_ID schan_imp_get_key_signature_algorithm(schan_imp_session session) DECLSPEC_HIDDEN; extern SECURITY_STATUS schan_imp_get_connection_info(schan_imp_session session, SecPkgContext_ConnectionInfo *info) DECLSPEC_HIDDEN; +extern SECURITY_STATUS schan_imp_get_unique_channel_binding(schan_imp_session session, + SecPkgContext_Bindings *bindings) DECLSPEC_HIDDEN; extern SECURITY_STATUS schan_imp_get_session_peer_certificate(schan_imp_session session, HCERTSTORE, PCCERT_CONTEXT *cert) DECLSPEC_HIDDEN; extern SECURITY_STATUS schan_imp_send(schan_imp_session session, const void *buffer, diff --git a/dlls/secur32/tests/schannel.c b/dlls/secur32/tests/schannel.c index 30022437bc0..99adf0bbc19 100644 --- a/dlls/secur32/tests/schannel.c +++ b/dlls/secur32/tests/schannel.c @@ -925,6 +925,32 @@ todo_wine win_skip("SECPKG_ATTR_ENDPOINT_BINDINGS not supported\n"); } + status = pQueryContextAttributesA(&context, SECPKG_ATTR_UNIQUE_BINDINGS, &bindings); + ok(status == SEC_E_OK || broken(status == SEC_E_UNSUPPORTED_FUNCTION), + "QueryContextAttributesW(SECPKG_ATTR_UNIQUE_BINDINGS) failed: %08x\n", status); + if(status == SEC_E_OK) { + const char *p; + static const char prefix[] = "tls-unique:"; + + ok(bindings.BindingsLength > sizeof(*bindings.Bindings) + sizeof(prefix)-1, + "bindings.BindingsLength = %u\n", bindings.BindingsLength); + ok(!bindings.Bindings->dwInitiatorAddrType, "dwInitiatorAddrType = %x\n", bindings.Bindings->dwInitiatorAddrType); + ok(!bindings.Bindings->cbInitiatorLength, "cbInitiatorLength = %x\n", bindings.Bindings->cbInitiatorLength); + ok(!bindings.Bindings->dwInitiatorOffset, "dwInitiatorOffset = %x\n", bindings.Bindings->dwInitiatorOffset); + ok(!bindings.Bindings->dwAcceptorAddrType, "dwAcceptorAddrType = %x\n", bindings.Bindings->dwAcceptorAddrType); + ok(!bindings.Bindings->cbAcceptorLength, "cbAcceptorLength = %x\n", bindings.Bindings->cbAcceptorLength); + ok(!bindings.Bindings->dwAcceptorOffset, "dwAcceptorOffset = %x\n", bindings.Bindings->dwAcceptorOffset); + ok(sizeof(*bindings.Bindings) + bindings.Bindings->cbApplicationDataLength == bindings.BindingsLength, + "cbApplicationDataLength = %x\n", bindings.Bindings->cbApplicationDataLength); + ok(bindings.Bindings->dwApplicationDataOffset == sizeof(*bindings.Bindings), + "dwApplicationDataOffset = %x\n", bindings.Bindings->dwApplicationDataOffset); + p = (const char*)(bindings.Bindings+1); + ok(!memcmp(p, prefix, sizeof(prefix)-1), "wrong prefix\n"); + FreeContextBuffer(bindings.Bindings); + } else { + win_skip("SECPKG_ATTR_UNIQUE_BINDINGS not supported\n"); + } + CertFreeCertificateContext(cert); }

1 0

Alexandre Julliard : server: Store a debug object instead of a debugger thread in the process.
by Alexandre Julliard 28 Jan '21

28 Jan '21

Module: wine Branch: master Commit: faa9f5be5994ec2cc66aa6624cf7cae0de41da70 URL: https://source.winehq.org/git/wine.git/?a=commit;h=faa9f5be5994ec2cc66aa662… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jan 28 11:06:09 2021 +0100 server: Store a debug object instead of a debugger thread in the process. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/debugger.c | 72 ++++++++++++++++++++++--------------------------------- server/process.c | 35 ++++++++++----------------- server/process.h | 7 +++--- 3 files changed, 44 insertions(+), 70 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=faa9f5be5994ec2cc66a…

1 0

Alexandre Julliard : server: Don't store the debugger thread in debug events.
by Alexandre Julliard 28 Jan '21

28 Jan '21

Module: wine Branch: master Commit: aec961e5292b6fdddcfca9b6b6637517f1320cdd URL: https://source.winehq.org/git/wine.git/?a=commit;h=aec961e5292b6fdddcfca9b6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jan 28 10:02:36 2021 +0100 server: Don't store the debugger thread in debug events. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/debugger.c | 30 ++++++++++-------------------- 1 file changed, 10 insertions(+), 20 deletions(-) diff --git a/server/debugger.c b/server/debugger.c index 8930a5a535a..8906a044842 100644 --- a/server/debugger.c +++ b/server/debugger.c @@ -46,7 +46,6 @@ struct debug_event struct object obj; /* object header */ struct list entry; /* entry in event queue */ struct thread *sender; /* thread which sent this event */ - struct thread *debugger; /* debugger thread receiving the event */ struct file *file; /* file object for events that need one */ enum debug_event_state state; /* event state */ int status; /* continuation status */ @@ -240,11 +239,8 @@ static void unlink_event( struct debug_obj *debug_obj, struct debug_event *event } /* link an event at the end of the queue */ -static void link_event( struct debug_event *event ) +static void link_event( struct debug_obj *debug_obj, struct debug_event *event ) { - struct debug_obj *debug_obj = event->debugger->debug_obj; - - assert( debug_obj ); grab_object( event ); list_add_tail( &debug_obj->event_queue, &event->entry ); if (!event->sender->process->debug_event) @@ -257,11 +253,8 @@ static void link_event( struct debug_event *event ) } /* resume a delayed debug event already in the queue */ -static void resume_event( struct debug_event *event ) +static void resume_event( struct debug_obj *debug_obj, struct debug_event *event ) { - struct debug_obj *debug_obj = event->debugger->debug_obj; - - assert( debug_obj ); event->state = EVENT_QUEUED; if (!event->sender->process->debug_event) { @@ -272,11 +265,8 @@ static void resume_event( struct debug_event *event ) } /* delay a debug event already in the queue to be replayed when thread wakes up */ -static void delay_event( struct debug_event *event ) +static void delay_event( struct debug_obj *debug_obj, struct debug_event *event ) { - struct debug_obj *debug_obj = event->debugger->debug_obj; - - assert( debug_obj ); event->state = EVENT_DELAYED; if (event->sender->process->debug_event == event) event->sender->process->debug_event = NULL; } @@ -318,7 +308,6 @@ static void debug_event_destroy( struct object *obj ) if (event->file) release_object( event->file ); release_object( event->sender ); - release_object( event->debugger ); } static void debug_obj_dump( struct object *obj, int verbose ) @@ -397,14 +386,14 @@ static int continue_debug_event( struct process *process, struct thread *thread, if (event->sender != thread) continue; if (thread->suspend) { - delay_event( event ); + delay_event( debug_obj, event ); resume_process( process ); } else if (event->state == EVENT_SENT) { assert( event->sender->process->debug_event == event ); event->sender->process->debug_event = NULL; - resume_event( event ); + resume_event( debug_obj, event ); return 1; } } @@ -446,7 +435,6 @@ static struct debug_event *alloc_debug_event( struct thread *thread, int code, c if (!(event = alloc_object( &debug_event_ops ))) return NULL; event->state = EVENT_QUEUED; event->sender = (struct thread *)grab_object( thread ); - event->debugger = (struct thread *)grab_object( debugger ); event->file = NULL; memset( &event->data, 0, sizeof(event->data) ); @@ -460,10 +448,11 @@ void generate_debug_event( struct thread *thread, int code, const void *arg ) { if (thread->process->debugger) { + struct debug_obj *debug_obj = thread->process->debugger->debug_obj; struct debug_event *event = alloc_debug_event( thread, code, arg ); if (event) { - link_event( event ); + link_event( debug_obj, event ); suspend_process( thread->process ); release_object( event ); } @@ -483,7 +472,7 @@ void resume_delayed_debug_events( struct thread *thread ) { if (event->sender != thread) continue; if (event->state != EVENT_DELAYED) continue; - resume_event( event ); + resume_event( debugger->debug_obj, event ); suspend_process( thread->process ); } } @@ -740,6 +729,7 @@ DECL_HANDLER(queue_exception_event) if (current->process->debugger) { debug_event_t data; + struct debug_obj *debug_obj = current->process->debugger->debug_obj; struct debug_event *event; struct thread *thread = current; @@ -763,7 +753,7 @@ DECL_HANDLER(queue_exception_event) { if ((reply->handle = alloc_handle( thread->process, event, SYNCHRONIZE, 0 ))) { - link_event( event ); + link_event( debug_obj, event ); suspend_process( thread->process ); } release_object( event );

1 0

Alexandre Julliard : server: Allocate handles only when returning the debug event to the client.
by Alexandre Julliard 28 Jan '21

28 Jan '21

Module: wine Branch: master Commit: 3eb95048f488617dd121b43d6fae07f287794870 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3eb95048f488617dd121b43d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jan 28 09:45:32 2021 +0100 server: Allocate handles only when returning the debug event to the client. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/debugger.c | 120 +++++++++++++++++++----------------------------------- 1 file changed, 41 insertions(+), 79 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=3eb95048f488617dd121…

1 0

Brendan Shanks : winemac.drv: Handle non-PCI GPUs correctly.
by Alexandre Julliard 28 Jan '21

28 Jan '21

Module: wine Branch: master Commit: 5fbd40520d9a1505764b9e7b86f01d663b3aa391 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5fbd40520d9a1505764b9e7b… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Wed Jan 27 11:16:47 2021 -0800 winemac.drv: Handle non-PCI GPUs correctly. Signed-off-by: Brendan Shanks <bshanks(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winemac.drv/cocoa_display.m | 22 +++++++++++++++------- 1 file changed, 15 insertions(+), 7 deletions(-) diff --git a/dlls/winemac.drv/cocoa_display.m b/dlls/winemac.drv/cocoa_display.m index 2e50b67c7d1..7cc6f981fee 100644 --- a/dlls/winemac.drv/cocoa_display.m +++ b/dlls/winemac.drv/cocoa_display.m @@ -183,7 +183,9 @@ done: /*********************************************************************** * macdrv_get_gpu_info_from_entry * - * Starting from entry, search upwards to find the PCI GPU. And get GPU information from the PCI GPU entry. + * Starting from entry (which must be the GPU or a child below the GPU), + * search upwards to find the IOPCIDevice and get information from it. + * In case the GPU is not a PCI device, get properties from 'entry'. * * Returns non-zero value on failure. */ @@ -193,18 +195,21 @@ static int macdrv_get_gpu_info_from_entry(struct macdrv_gpu* gpu, io_registry_en io_registry_entry_t gpu_entry; kern_return_t result; int ret = -1; - char buffer[64]; NSAutoreleasePool* pool = [[NSAutoreleasePool alloc] init]; gpu_entry = entry; - while (![@"IOPCIDevice" isEqualToString:[(NSString*)IOObjectCopyClass(gpu_entry) autorelease]] - || get_entry_property_string(gpu_entry, CFSTR("IOName"), buffer, sizeof(buffer)) - || strcmp(buffer, "display")) + while (![@"IOPCIDevice" isEqualToString:[(NSString*)IOObjectCopyClass(gpu_entry) autorelease]]) { result = IORegistryEntryGetParentEntry(gpu_entry, kIOServicePlane, &parent_entry); if (gpu_entry != entry) IOObjectRelease(gpu_entry); - if (result != kIOReturnSuccess) + if (result == kIOReturnNoDevice) + { + /* If no IOPCIDevice node is found, get properties from the given entry. */ + gpu_entry = entry; + break; + } + else if (result != kIOReturnSuccess) { [pool release]; return ret; @@ -404,6 +409,7 @@ static int macdrv_get_gpus_from_iokit(struct macdrv_gpu** new_gpus, int* count) int integrated_index = -1; int primary_index = 0; int gpu_count = 0; + char buffer[64]; int ret = -1; int i; @@ -417,7 +423,9 @@ static int macdrv_get_gpus_from_iokit(struct macdrv_gpu** new_gpus, int* count) while ((entry = IOIteratorNext(iterator))) { - if (!macdrv_get_gpu_info_from_entry(&gpus[gpu_count], entry)) + if (!get_entry_property_string(entry, CFSTR("IOName"), buffer, sizeof(buffer)) && + !strcmp(buffer, "display") && + !macdrv_get_gpu_info_from_entry(&gpus[gpu_count], entry)) { gpu_count++; assert(gpu_count < MAX_GPUS);

1 0

Brendan Shanks : winemac.drv: Use Metal to get a display's GPU info if possible.
by Alexandre Julliard 28 Jan '21

28 Jan '21

Module: wine Branch: master Commit: ae319caa3bf97b0ab688b1f44418dfd9d522f115 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ae319caa3bf97b0ab688b1f4… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Wed Jan 27 11:16:46 2021 -0800 winemac.drv: Use Metal to get a display's GPU info if possible. Fixes an Apple Silicon issue where CGDisplayIOServicePort() returns a fake AMD GPU "compatibility" node rather than the real GPU node. Signed-off-by: Brendan Shanks <bshanks(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winemac.drv/cocoa_display.m | 39 ++++++++++++++++++++++++++++++++++++--- 1 file changed, 36 insertions(+), 3 deletions(-) diff --git a/dlls/winemac.drv/cocoa_display.m b/dlls/winemac.drv/cocoa_display.m index e769772feaa..2e50b67c7d1 100644 --- a/dlls/winemac.drv/cocoa_display.m +++ b/dlls/winemac.drv/cocoa_display.m @@ -330,6 +330,27 @@ done: return ret; } +/*********************************************************************** + * macdrv_get_gpu_info_from_display_id_using_metal + * + * Get GPU information for a CG display id using Metal. + * + * Returns non-zero value on failure. + */ +static int macdrv_get_gpu_info_from_display_id_using_metal(struct macdrv_gpu* gpu, CGDirectDisplayID display_id) +{ + id<MTLDevice> device; + int ret = -1; + NSAutoreleasePool* pool = [[NSAutoreleasePool alloc] init]; + + device = [CGDirectDisplayCopyCurrentMetalDevice(display_id) autorelease]; + if (device && [device respondsToSelector:@selector(registryID)]) + ret = macdrv_get_gpu_info_from_registry_id(gpu, device.registryID); + + [pool release]; + return ret; +} + #else static int macdrv_get_gpus_from_metal(struct macdrv_gpu** new_gpus, int* count) @@ -337,20 +358,32 @@ static int macdrv_get_gpus_from_metal(struct macdrv_gpu** new_gpus, int* count) return -1; } +static int macdrv_get_gpu_info_from_display_id_using_metal(struct macdrv_gpu* gpu, CGDirectDisplayID display_id) +{ + return -1; +} + #endif /*********************************************************************** * macdrv_get_gpu_info_from_display_id * * Get GPU information from a display id. - * This is a fallback for 32bit build or older Mac OS version where Metal is unavailable. * * Returns non-zero value on failure. */ static int macdrv_get_gpu_info_from_display_id(struct macdrv_gpu* gpu, CGDirectDisplayID display_id) { - io_registry_entry_t entry = CGDisplayIOServicePort(display_id); - return macdrv_get_gpu_info_from_entry(gpu, entry); + int ret; + io_registry_entry_t entry; + + ret = macdrv_get_gpu_info_from_display_id_using_metal(gpu, display_id); + if (ret) + { + entry = CGDisplayIOServicePort(display_id); + ret = macdrv_get_gpu_info_from_entry(gpu, entry); + } + return ret; } /***********************************************************************

1 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits January 2021