winehq.org
Sign In
Sign Up
Sign In
Sign Up
Manage this list
×
Keyboard Shortcuts
Thread View
j
: Next unread message
k
: Previous unread message
j a
: Jump to all threads
j l
: Jump to MailingList overview
2025
June
May
April
March
February
January
2024
December
November
October
September
August
July
June
May
April
March
February
January
2023
December
November
October
September
August
July
June
May
April
March
February
January
2022
December
November
October
September
August
July
June
May
April
March
February
January
2021
December
November
October
September
August
July
June
May
April
March
February
January
2020
December
November
October
September
August
July
June
May
April
March
February
January
2019
December
November
October
September
August
July
June
May
April
March
February
January
2018
December
November
October
September
August
July
June
May
April
March
February
January
2017
December
November
October
September
August
July
June
May
April
March
February
January
2016
December
November
October
September
August
July
June
May
April
March
February
January
2015
December
November
October
September
August
July
June
May
April
March
February
January
2014
December
November
October
September
August
July
June
May
April
March
February
January
2013
December
November
October
September
August
July
June
May
April
March
February
January
2012
December
November
October
September
August
July
June
May
April
March
February
January
2011
December
November
October
September
August
July
June
May
April
March
February
January
2010
December
November
October
September
August
July
June
May
April
March
February
January
2009
December
November
October
September
August
July
June
May
April
March
February
January
2008
December
November
October
September
August
July
June
May
April
March
February
January
2007
December
November
October
September
August
July
June
May
April
March
February
January
2006
December
November
October
September
August
July
June
May
April
March
February
January
2005
December
November
October
September
August
July
June
May
April
March
February
January
2004
December
November
October
September
August
July
June
May
April
March
February
January
2003
December
November
October
September
August
July
June
May
April
March
February
January
2002
December
November
October
September
August
July
June
May
April
March
February
January
2001
December
November
October
September
August
July
June
May
April
March
February
List overview
wine-devel
July 2020
----- 2025 -----
June 2025
May 2025
April 2025
March 2025
February 2025
January 2025
----- 2024 -----
December 2024
November 2024
October 2024
September 2024
August 2024
July 2024
June 2024
May 2024
April 2024
March 2024
February 2024
January 2024
----- 2023 -----
December 2023
November 2023
October 2023
September 2023
August 2023
July 2023
June 2023
May 2023
April 2023
March 2023
February 2023
January 2023
----- 2022 -----
December 2022
November 2022
October 2022
September 2022
August 2022
July 2022
June 2022
May 2022
April 2022
March 2022
February 2022
January 2022
----- 2021 -----
December 2021
November 2021
October 2021
September 2021
August 2021
July 2021
June 2021
May 2021
April 2021
March 2021
February 2021
January 2021
----- 2020 -----
December 2020
November 2020
October 2020
September 2020
August 2020
July 2020
June 2020
May 2020
April 2020
March 2020
February 2020
January 2020
----- 2019 -----
December 2019
November 2019
October 2019
September 2019
August 2019
July 2019
June 2019
May 2019
April 2019
March 2019
February 2019
January 2019
----- 2018 -----
December 2018
November 2018
October 2018
September 2018
August 2018
July 2018
June 2018
May 2018
April 2018
March 2018
February 2018
January 2018
----- 2017 -----
December 2017
November 2017
October 2017
September 2017
August 2017
July 2017
June 2017
May 2017
April 2017
March 2017
February 2017
January 2017
----- 2016 -----
December 2016
November 2016
October 2016
September 2016
August 2016
July 2016
June 2016
May 2016
April 2016
March 2016
February 2016
January 2016
----- 2015 -----
December 2015
November 2015
October 2015
September 2015
August 2015
July 2015
June 2015
May 2015
April 2015
March 2015
February 2015
January 2015
----- 2014 -----
December 2014
November 2014
October 2014
September 2014
August 2014
July 2014
June 2014
May 2014
April 2014
March 2014
February 2014
January 2014
----- 2013 -----
December 2013
November 2013
October 2013
September 2013
August 2013
July 2013
June 2013
May 2013
April 2013
March 2013
February 2013
January 2013
----- 2012 -----
December 2012
November 2012
October 2012
September 2012
August 2012
July 2012
June 2012
May 2012
April 2012
March 2012
February 2012
January 2012
----- 2011 -----
December 2011
November 2011
October 2011
September 2011
August 2011
July 2011
June 2011
May 2011
April 2011
March 2011
February 2011
January 2011
----- 2010 -----
December 2010
November 2010
October 2010
September 2010
August 2010
July 2010
June 2010
May 2010
April 2010
March 2010
February 2010
January 2010
----- 2009 -----
December 2009
November 2009
October 2009
September 2009
August 2009
July 2009
June 2009
May 2009
April 2009
March 2009
February 2009
January 2009
----- 2008 -----
December 2008
November 2008
October 2008
September 2008
August 2008
July 2008
June 2008
May 2008
April 2008
March 2008
February 2008
January 2008
----- 2007 -----
December 2007
November 2007
October 2007
September 2007
August 2007
July 2007
June 2007
May 2007
April 2007
March 2007
February 2007
January 2007
----- 2006 -----
December 2006
November 2006
October 2006
September 2006
August 2006
July 2006
June 2006
May 2006
April 2006
March 2006
February 2006
January 2006
----- 2005 -----
December 2005
November 2005
October 2005
September 2005
August 2005
July 2005
June 2005
May 2005
April 2005
March 2005
February 2005
January 2005
----- 2004 -----
December 2004
November 2004
October 2004
September 2004
August 2004
July 2004
June 2004
May 2004
April 2004
March 2004
February 2004
January 2004
----- 2003 -----
December 2003
November 2003
October 2003
September 2003
August 2003
July 2003
June 2003
May 2003
April 2003
March 2003
February 2003
January 2003
----- 2002 -----
December 2002
November 2002
October 2002
September 2002
August 2002
July 2002
June 2002
May 2002
April 2002
March 2002
February 2002
January 2002
----- 2001 -----
December 2001
November 2001
October 2001
September 2001
August 2001
July 2001
June 2001
May 2001
April 2001
March 2001
February 2001
wine-devel@winehq.org
75 participants
841 discussions
Start a n
N
ew thread
[PATCH vkd3d 5/5] vkd3d-shader: Trace messages in vkd3d_shader_compile().
by Henri Verbeet
28 Jul '20
28 Jul '20
Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- libs/vkd3d-shader/vkd3d_shader_main.c | 1 + 1 file changed, 1 insertion(+) diff --git a/libs/vkd3d-shader/vkd3d_shader_main.c b/libs/vkd3d-shader/vkd3d_shader_main.c index c001883..5597992 100644 --- a/libs/vkd3d-shader/vkd3d_shader_main.c +++ b/libs/vkd3d-shader/vkd3d_shader_main.c @@ -308,6 +308,7 @@ int vkd3d_shader_compile(const struct vkd3d_shader_compile_info *compile_info, if (!vkd3d_shader_message_context_init(&
…
[View More]
amp;message_context, compile_info->log_level, compile_info->source_name)) return VKD3D_ERROR; ret = vkd3d_shader_parser_init(&parser, &compile_info->source, &message_context); + vkd3d_shader_message_context_trace_messages(&message_context); if (messages) { vkd3d_shader_free_messages(*messages); -- 2.11.0
[View Less]
1
0
0
0
[PATCH vkd3d 4/5] vkd3d-shader: Trace messages in vkd3d_shader_scan_dxbc().
by Henri Verbeet
28 Jul '20
28 Jul '20
Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- libs/vkd3d-shader/vkd3d_shader_main.c | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/libs/vkd3d-shader/vkd3d_shader_main.c b/libs/vkd3d-shader/vkd3d_shader_main.c index e4f14a7..c001883 100644 --- a/libs/vkd3d-shader/vkd3d_shader_main.c +++ b/libs/vkd3d-shader/vkd3d_shader_main.c @@ -100,6 +100,23 @@ static int VKD3D_PRINTF_FUNC(2, 3) vkd3d_string_buffer_printf(struct vkd3d_strin return
…
[View More]
ret; } +static void vkd3d_string_buffer_trace_(const struct vkd3d_string_buffer *buffer, const char *function) +{ + const char *p, *q; + + if (!TRACE_ON()) + return; + + for (p = buffer->buffer; *p; p = q) + { + if (!(q = strstr(p, "\n"))) + q = p + strlen(p); + else + ++q; + vkd3d_dbg_printf(VKD3D_DBG_LEVEL_TRACE, function, "%.*s", (int)(q - p), p); + } +} + bool vkd3d_shader_message_context_init(struct vkd3d_shader_message_context *context, enum vkd3d_shader_log_level log_level, const char *source_name) { @@ -116,6 +133,14 @@ void vkd3d_shader_message_context_cleanup(struct vkd3d_shader_message_context *c vkd3d_string_buffer_cleanup(&context->messages); } +#define vkd3d_shader_message_context_trace_messages(context) \ + vkd3d_shader_message_context_trace_messages_(context, __FUNCTION__) +static void vkd3d_shader_message_context_trace_messages_(const struct vkd3d_shader_message_context *context, + const char *function) +{ + vkd3d_string_buffer_trace_(&context->messages, function); +} + static char *vkd3d_shader_message_context_copy_messages(struct vkd3d_shader_message_context *context) { char *messages; @@ -580,6 +605,7 @@ int vkd3d_shader_scan_dxbc(const struct vkd3d_shader_code *dxbc, if (!vkd3d_shader_message_context_init(&message_context, VKD3D_SHADER_LOG_INFO, NULL)) return VKD3D_ERROR; ret = vkd3d_shader_parser_init(&parser, dxbc, &message_context); + vkd3d_shader_message_context_trace_messages(&message_context); if (messages && !(*messages = vkd3d_shader_message_context_copy_messages(&message_context))) ret = VKD3D_ERROR_OUT_OF_MEMORY; vkd3d_shader_message_context_cleanup(&message_context); -- 2.11.0
[View Less]
1
0
0
0
[PATCH vkd3d 3/5] vkd3d-shader: Trace the shader in vkd3d_shader_scan_dxbc().
by Henri Verbeet
28 Jul '20
28 Jul '20
Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- libs/vkd3d-shader/vkd3d_shader_main.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libs/vkd3d-shader/vkd3d_shader_main.c b/libs/vkd3d-shader/vkd3d_shader_main.c index 7548b90..e4f14a7 100644 --- a/libs/vkd3d-shader/vkd3d_shader_main.c +++ b/libs/vkd3d-shader/vkd3d_shader_main.c @@ -295,9 +295,6 @@ int vkd3d_shader_compile(const struct vkd3d_shader_compile_info *compile_info,
…
[View More]
vkd3d_shader_dump_shader(parser.shader_version.type, &compile_info->source); - if (TRACE_ON()) - vkd3d_shader_trace(parser.data); - if (!(spirv_compiler = vkd3d_dxbc_compiler_create(&parser.shader_version, &parser.shader_desc, compile_info, &scan_info))) { @@ -589,6 +586,9 @@ int vkd3d_shader_scan_dxbc(const struct vkd3d_shader_code *dxbc, if (ret < 0) return ret; + if (TRACE_ON()) + vkd3d_shader_trace(parser.data); + memset(scan_info, 0, sizeof(*scan_info)); memset(&context, 0, sizeof(context)); -- 2.11.0
[View Less]
1
0
0
0
[PATCH vkd3d 2/5] vkd3d-shader: Also copy the terminator in vkd3d_shader_message_context_copy_messages().
by Henri Verbeet
28 Jul '20
28 Jul '20
Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- libs/vkd3d-shader/vkd3d_shader_main.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libs/vkd3d-shader/vkd3d_shader_main.c b/libs/vkd3d-shader/vkd3d_shader_main.c index c7161e4..7548b90 100644 --- a/libs/vkd3d-shader/vkd3d_shader_main.c +++ b/libs/vkd3d-shader/vkd3d_shader_main.c @@ -120,8 +120,8 @@ static char *vkd3d_shader_message_context_copy_messages(struct vkd3d_shader_mess { char *messages;
…
[View More]
- if ((messages = vkd3d_malloc(context->messages.content_size))) - memcpy(messages, context->messages.buffer, context->messages.content_size); + if ((messages = vkd3d_malloc(context->messages.content_size + 1))) + memcpy(messages, context->messages.buffer, context->messages.content_size + 1); return messages; } -- 2.11.0
[View Less]
1
0
0
0
[PATCH vkd3d 1/5] vkd3d: Add trailing newlines to error messages in vkd3d_uav_clear_state_init().
by Henri Verbeet
28 Jul '20
28 Jul '20
Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- libs/vkd3d/state.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libs/vkd3d/state.c b/libs/vkd3d/state.c index 55cb389..316132b 100644 --- a/libs/vkd3d/state.c +++ b/libs/vkd3d/state.c @@ -2953,14 +2953,14 @@ HRESULT vkd3d_uav_clear_state_init(struct vkd3d_uav_clear_state *state, struct d if (FAILED(hr = vkd3d_create_descriptor_set_layout(device, 0, 1, &set_binding, set_layouts[i].
…
[View More]
set_layout))) { - ERR("Failed to create descriptor set layout %u, hr %#x.", i, hr); + ERR("Failed to create descriptor set layout %u, hr %#x.\n", i, hr); goto fail; } if (FAILED(hr = vkd3d_create_pipeline_layout(device, 1, set_layouts[i].set_layout, 1, &push_constant_range, set_layouts[i].pipeline_layout))) { - ERR("Failed to create pipeline layout %u, hr %#x.", i, hr); + ERR("Failed to create pipeline layout %u, hr %#x.\n", i, hr); goto fail; } } @@ -2986,7 +2986,7 @@ HRESULT vkd3d_uav_clear_state_init(struct vkd3d_uav_clear_state *state, struct d if (FAILED(hr = vkd3d_create_compute_pipeline(device, &pipelines[i].code, &shader_interface, *pipelines[i].pipeline_layout, pipelines[i].pipeline))) { - ERR("Failed to create compute pipeline %u, hr %#x.", i, hr); + ERR("Failed to create compute pipeline %u, hr %#x.\n", i, hr); goto fail; } } -- 2.11.0
[View Less]
1
0
0
0
[PATCH v2 2/2] wbemprox: Support retrieving more than one object in IEnumWbemClassObject::Next().
by Hans Leidekker
28 Jul '20
28 Jul '20
From: Gijs Vermeulen <gijsvrm(a)gmail.com> Patch by GitHub user pnevmoslon with some modifications. Fixes gamepad support in Mortal Kombat 11. v2: Release allocated objects on error. Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/wbemprox/class.c | 23 ++++++++++++++--------- dlls/wbemprox/tests/query.c | 12 ++++++------ 2 files changed, 20 insertions(+), 15 deletions(-) diff --git a/dlls/
…
[View More]
wbemprox/class.c b/dlls/wbemprox/class.c index ba7720b098..db6017e0c9 100644 --- a/dlls/wbemprox/class.c +++ b/dlls/wbemprox/class.c @@ -116,24 +116,29 @@ static HRESULT WINAPI enum_class_object_Next( struct table *table; static int once = 0; HRESULT hr; + ULONG i, j; TRACE("%p, %d, %u, %p, %p\n", iface, lTimeout, uCount, apObjects, puReturned); - if (!uCount) return WBEM_S_FALSE; if (!apObjects || !puReturned) return WBEM_E_INVALID_PARAMETER; if (lTimeout != WBEM_INFINITE && !once++) FIXME("timeout not supported\n"); *puReturned = 0; - if (ec->index >= view->result_count) return WBEM_S_FALSE; - table = get_view_table( view, ec->index ); - hr = create_class_object( table->name, iface, ec->index, NULL, apObjects ); - if (hr != S_OK) return hr; + for (i = 0; i < uCount; i++) + { + if (ec->index >= view->result_count) return WBEM_S_FALSE; + table = get_view_table( view, ec->index ); + hr = create_class_object( table->name, iface, ec->index, NULL, &apObjects[i] ); + if (hr != S_OK) + { + for (j = 0; j < i; j++) IWbemClassObject_Release( apObjects[j] ); + return hr; + } + ec->index++; + (*puReturned)++; + } - ec->index++; - *puReturned = 1; - if (ec->index == view->result_count && uCount > 1) return WBEM_S_FALSE; - if (uCount > 1) return WBEM_S_TIMEDOUT; return WBEM_S_NO_ERROR; } diff --git a/dlls/wbemprox/tests/query.c b/dlls/wbemprox/tests/query.c index e99e221c30..e48722f3bc 100644 --- a/dlls/wbemprox/tests/query.c +++ b/dlls/wbemprox/tests/query.c @@ -181,8 +181,8 @@ static void test_IEnumWbemClassObject_Next( IWbemServices *services ) count = 2; hr = IEnumWbemClassObject_Next( result, 10000, 0, &obj1, &count ); - todo_wine ok( hr == S_OK, "got %08x\n", hr ); - todo_wine ok( count == 0, "expected 0, got %u\n", count ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( count == 0, "expected 0, got %u\n", count ); for (;;) { @@ -199,8 +199,8 @@ static void test_IEnumWbemClassObject_Next( IWbemServices *services ) count = 0; hr = IEnumWbemClassObject_Next( result, 10000, num_objects, obj, &count ); - todo_wine ok( hr == S_OK, "got %08x\n", hr ); - todo_wine ok( count == num_objects, "expected %u, got %u\n", num_objects, count ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( count == num_objects, "expected %u, got %u\n", num_objects, count ); for (i = 0; i < count; i++) IWbemClassObject_Release( obj[i] ); @@ -210,8 +210,8 @@ static void test_IEnumWbemClassObject_Next( IWbemServices *services ) count = 0; hr = IEnumWbemClassObject_Next( result, 10000, num_objects + 1, obj, &count ); - todo_wine ok( hr == S_FALSE, "got %08x\n", hr ); - todo_wine ok( count == num_objects, "expected %u, got %u\n", num_objects, count ); + ok( hr == S_FALSE, "got %08x\n", hr ); + ok( count == num_objects, "expected %u, got %u\n", num_objects, count ); for (i = 0; i < count; i++) IWbemClassObject_Release( obj[i] ); -- 2.27.0
[View Less]
1
0
0
0
[PATCH v2 1/2] wbemprox/tests: Add IEnumWbemClassObject::Next() tests.
by Hans Leidekker
28 Jul '20
28 Jul '20
From: Gijs Vermeulen <gijsvrm(a)gmail.com> Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/wbemprox/tests/query.c | 66 +++++++++++++++++++++++++++++++++++++ 1 file changed, 66 insertions(+) diff --git a/dlls/wbemprox/tests/query.c b/dlls/wbemprox/tests/query.c index 73740f18c8..e99e221c30 100644 --- a/dlls/wbemprox/tests/query.c +++ b/dlls/wbemprox/tests/query.c @@ -25,6 +25,7 @@ #include "initguid.h" #
…
[View More]
include "objidl.h" #include "wbemcli.h" +#include "wine/heap.h" #include "wine/test.h" static HRESULT exec_query( IWbemServices *services, const WCHAR *str, IEnumWbemClassObject **result ) @@ -158,6 +159,70 @@ static void test_associators( IWbemServices *services ) } } +static void test_IEnumWbemClassObject_Next( IWbemServices *services ) +{ + BSTR wql = SysAllocString( L"wql" ), query = SysAllocString( L"SELECT * FROM Win32_IP4RouteTable" ); + IWbemClassObject **obj, *obj1; + IEnumWbemClassObject *result; + DWORD count, num_objects = 0; + HRESULT hr; + int i; + + hr = IWbemServices_ExecQuery( services, wql, query, 0, NULL, &result ); + ok( hr == S_OK, "got %08x\n", hr ); + + count = 2; + hr = IEnumWbemClassObject_Next( result, 10000, 1, NULL, &count ); + ok( hr == WBEM_E_INVALID_PARAMETER, "got %08x\n", hr ); + ok( count == 2, "expected 0, got %u\n", count ); + + hr = IEnumWbemClassObject_Next( result, 10000, 1, &obj1, NULL ); + ok( hr == WBEM_E_INVALID_PARAMETER, "got %08x\n", hr ); + + count = 2; + hr = IEnumWbemClassObject_Next( result, 10000, 0, &obj1, &count ); + todo_wine ok( hr == S_OK, "got %08x\n", hr ); + todo_wine ok( count == 0, "expected 0, got %u\n", count ); + + for (;;) + { + hr = IEnumWbemClassObject_Next( result, 10000, 1, &obj1, &count ); + if (hr != S_OK) break; + num_objects++; + IWbemClassObject_Release(obj1); + } + + hr = IEnumWbemClassObject_Reset( result ); + ok( hr == S_OK, "got %08x\n", hr ); + + obj = heap_alloc( num_objects * sizeof( IWbemClassObject * ) ); + + count = 0; + hr = IEnumWbemClassObject_Next( result, 10000, num_objects, obj, &count ); + todo_wine ok( hr == S_OK, "got %08x\n", hr ); + todo_wine ok( count == num_objects, "expected %u, got %u\n", num_objects, count ); + + for (i = 0; i < count; i++) + IWbemClassObject_Release( obj[i] ); + + hr = IEnumWbemClassObject_Reset( result ); + ok( hr == S_OK, "got %08x\n", hr ); + + count = 0; + hr = IEnumWbemClassObject_Next( result, 10000, num_objects + 1, obj, &count ); + todo_wine ok( hr == S_FALSE, "got %08x\n", hr ); + todo_wine ok( count == num_objects, "expected %u, got %u\n", num_objects, count ); + + for (i = 0; i < count; i++) + IWbemClassObject_Release( obj[i] ); + + heap_free( obj ); + + IEnumWbemClassObject_Release( result ); + SysFreeString( query ); + SysFreeString( wql ); +} + static void _check_property( ULONG line, IWbemClassObject *obj, const WCHAR *prop, VARTYPE vartype, CIMTYPE cimtype ) { CIMTYPE type = 0xdeadbeef; @@ -1636,6 +1701,7 @@ START_TEST(query) ok( hr == S_OK, "failed to set proxy blanket %08x\n", hr ); test_GetNames( services ); + test_IEnumWbemClassObject_Next( services ); test_associators( services ); test_notification_query_async( services ); test_query_async( services ); -- 2.27.0
[View Less]
1
0
0
0
[PATCH 1/2] wbemprox/tests: Add IEnumWbemClassObject::Next() tests.
by Gijs Vermeulen
28 Jul '20
28 Jul '20
Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> --- dlls/wbemprox/tests/query.c | 66 +++++++++++++++++++++++++++++++++++++ 1 file changed, 66 insertions(+) diff --git a/dlls/wbemprox/tests/query.c b/dlls/wbemprox/tests/query.c index 73740f18c8..e99e221c30 100644 --- a/dlls/wbemprox/tests/query.c +++ b/dlls/wbemprox/tests/query.c @@ -25,6 +25,7 @@ #include "initguid.h" #include "objidl.h" #include "wbemcli.h" +#include "wine/heap.h" #include "wine/test.h" static HRESULT
…
[View More]
exec_query( IWbemServices *services, const WCHAR *str, IEnumWbemClassObject **result ) @@ -158,6 +159,70 @@ static void test_associators( IWbemServices *services ) } } +static void test_IEnumWbemClassObject_Next( IWbemServices *services ) +{ + BSTR wql = SysAllocString( L"wql" ), query = SysAllocString( L"SELECT * FROM Win32_IP4RouteTable" ); + IWbemClassObject **obj, *obj1; + IEnumWbemClassObject *result; + DWORD count, num_objects = 0; + HRESULT hr; + int i; + + hr = IWbemServices_ExecQuery( services, wql, query, 0, NULL, &result ); + ok( hr == S_OK, "got %08x\n", hr ); + + count = 2; + hr = IEnumWbemClassObject_Next( result, 10000, 1, NULL, &count ); + ok( hr == WBEM_E_INVALID_PARAMETER, "got %08x\n", hr ); + ok( count == 2, "expected 0, got %u\n", count ); + + hr = IEnumWbemClassObject_Next( result, 10000, 1, &obj1, NULL ); + ok( hr == WBEM_E_INVALID_PARAMETER, "got %08x\n", hr ); + + count = 2; + hr = IEnumWbemClassObject_Next( result, 10000, 0, &obj1, &count ); + todo_wine ok( hr == S_OK, "got %08x\n", hr ); + todo_wine ok( count == 0, "expected 0, got %u\n", count ); + + for (;;) + { + hr = IEnumWbemClassObject_Next( result, 10000, 1, &obj1, &count ); + if (hr != S_OK) break; + num_objects++; + IWbemClassObject_Release(obj1); + } + + hr = IEnumWbemClassObject_Reset( result ); + ok( hr == S_OK, "got %08x\n", hr ); + + obj = heap_alloc( num_objects * sizeof( IWbemClassObject * ) ); + + count = 0; + hr = IEnumWbemClassObject_Next( result, 10000, num_objects, obj, &count ); + todo_wine ok( hr == S_OK, "got %08x\n", hr ); + todo_wine ok( count == num_objects, "expected %u, got %u\n", num_objects, count ); + + for (i = 0; i < count; i++) + IWbemClassObject_Release( obj[i] ); + + hr = IEnumWbemClassObject_Reset( result ); + ok( hr == S_OK, "got %08x\n", hr ); + + count = 0; + hr = IEnumWbemClassObject_Next( result, 10000, num_objects + 1, obj, &count ); + todo_wine ok( hr == S_FALSE, "got %08x\n", hr ); + todo_wine ok( count == num_objects, "expected %u, got %u\n", num_objects, count ); + + for (i = 0; i < count; i++) + IWbemClassObject_Release( obj[i] ); + + heap_free( obj ); + + IEnumWbemClassObject_Release( result ); + SysFreeString( query ); + SysFreeString( wql ); +} + static void _check_property( ULONG line, IWbemClassObject *obj, const WCHAR *prop, VARTYPE vartype, CIMTYPE cimtype ) { CIMTYPE type = 0xdeadbeef; @@ -1636,6 +1701,7 @@ START_TEST(query) ok( hr == S_OK, "failed to set proxy blanket %08x\n", hr ); test_GetNames( services ); + test_IEnumWbemClassObject_Next( services ); test_associators( services ); test_notification_query_async( services ); test_query_async( services ); -- 2.27.0
[View Less]
1
1
0
0
[PATCH] qdvd: Add a stub IDvdInfo2 interface.
by Gijs Vermeulen
28 Jul '20
28 Jul '20
Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> --- dlls/qdvd/navigator.c | 436 ++++++++++++++++++++++++++++++++++++ dlls/qdvd/tests/navigator.c | 2 +- 2 files changed, 437 insertions(+), 1 deletion(-) diff --git a/dlls/qdvd/navigator.c b/dlls/qdvd/navigator.c index 00cb0af995..3686e9e794 100644 --- a/dlls/qdvd/navigator.c +++ b/dlls/qdvd/navigator.c @@ -27,6 +27,7 @@ struct navigator { struct strmbase_filter filter; IDvdControl2 IDvdControl2_iface; +
…
[View More]
IDvdInfo2 IDvdInfo2_iface; }; static inline struct navigator *impl_from_strmbase_filter(struct strmbase_filter *filter) @@ -40,6 +41,8 @@ static HRESULT navigator_query_interface(struct strmbase_filter *iface, REFIID i if (IsEqualGUID(iid, &IID_IDvdControl2)) *out = &filter->IDvdControl2_iface; + else if ((IsEqualGUID(iid, &IID_IDvdInfo2))) + *out = &filter->IDvdInfo2_iface; else return E_NOINTERFACE; @@ -504,6 +507,438 @@ static const struct IDvdControl2Vtbl dvd_control2_vtbl = dvd_control2_SelectDefaultSubpictureLanguage, }; +static struct navigator *impl_from_IDvdInfo2(IDvdInfo2 *iface) +{ + return CONTAINING_RECORD(iface, struct navigator, IDvdInfo2_iface); +} + +static HRESULT WINAPI dvd_info2_QueryInterface(IDvdInfo2 *iface, REFIID iid, void **out) +{ + struct navigator *filter = impl_from_IDvdInfo2(iface); + return IUnknown_QueryInterface(filter->filter.outer_unk, iid, out); +} + +static ULONG WINAPI dvd_info2_AddRef(IDvdInfo2 *iface) +{ + struct navigator *filter = impl_from_IDvdInfo2(iface); + return IUnknown_AddRef(filter->filter.outer_unk); +} + +static ULONG WINAPI dvd_info2_Release(IDvdInfo2 *iface) +{ + struct navigator *filter = impl_from_IDvdInfo2(iface); + return IUnknown_Release(filter->filter.outer_unk); +} + +static HRESULT WINAPI dvd_info2_GetCurrentDomain(IDvdInfo2 *iface, DVD_DOMAIN *domain) +{ + struct navigator *filter = impl_from_IDvdInfo2(iface); + + FIXME("filter %p, domain %p.\n", filter, domain); + + return E_NOTIMPL; +} + +static HRESULT WINAPI dvd_info2_GetCurrentLocation(IDvdInfo2 *iface, DVD_PLAYBACK_LOCATION2 *location) +{ + struct navigator *filter = impl_from_IDvdInfo2(iface); + + FIXME("filter %p, location %p.\n", filter, location); + + return E_NOTIMPL; +} + +static HRESULT WINAPI dvd_info2_GetTotalTitleTime(IDvdInfo2 *iface, DVD_HMSF_TIMECODE *time, ULONG *flags) +{ + struct navigator *filter = impl_from_IDvdInfo2(iface); + + FIXME("filter %p, time %p, flags %p.\n", filter, time, flags); + + return E_NOTIMPL; +} + +static HRESULT WINAPI dvd_info2_GetCurrentButton(IDvdInfo2 *iface, ULONG *count, ULONG *current) +{ + struct navigator *filter = impl_from_IDvdInfo2(iface); + + FIXME("filter %p, count %p, current %p.\n", filter, count, current); + + return E_NOTIMPL; +} + +static HRESULT WINAPI dvd_info2_GetCurrentAngle(IDvdInfo2 *iface, ULONG *count, ULONG *current) +{ + struct navigator *filter = impl_from_IDvdInfo2(iface); + + FIXME("filter %p, count %p, current %p.\n", filter, count, current); + + return E_NOTIMPL; +} + +static HRESULT WINAPI dvd_info2_GetCurrentAudio(IDvdInfo2 *iface, ULONG *count, ULONG *current) +{ + struct navigator *filter = impl_from_IDvdInfo2(iface); + + FIXME("filter %p, count %p, current %p.\n", filter, count, current); + + return E_NOTIMPL; +} + +static HRESULT WINAPI dvd_info2_GetCurrentSubpicture(IDvdInfo2 *iface, ULONG *count, ULONG *current, BOOL *enable) +{ + struct navigator *filter = impl_from_IDvdInfo2(iface); + + FIXME("filter %p, count %p, current %p, enable %p.\n", filter, count, current, enable); + + return E_NOTIMPL; +} + +static HRESULT WINAPI dvd_info2_GetCurrentUOPS(IDvdInfo2 *iface, ULONG *uops) +{ + struct navigator *filter = impl_from_IDvdInfo2(iface); + + FIXME("filter %p, uops %p.\n", filter, uops); + + return E_NOTIMPL; +} + +static HRESULT WINAPI dvd_info2_GetAllSPRMs(IDvdInfo2 *iface, SPRMARRAY *regs) +{ + struct navigator *filter = impl_from_IDvdInfo2(iface); + + FIXME("filter %p, regs %p.\n", filter, regs); + + return E_NOTIMPL; +} + +static HRESULT WINAPI dvd_info2_GetAllGPRMs(IDvdInfo2 *iface, GPRMARRAY *regs) +{ + struct navigator *filter = impl_from_IDvdInfo2(iface); + + FIXME("filter %p, regs %p.\n", filter, regs); + + return E_NOTIMPL; +} + +static HRESULT WINAPI dvd_info2_GetAudioLanguage(IDvdInfo2 *iface, ULONG stream, LCID *language) +{ + struct navigator *filter = impl_from_IDvdInfo2(iface); + + FIXME("filter %p, stream %u, language %p.\n", filter, stream, language); + + return E_NOTIMPL; +} + +static HRESULT WINAPI dvd_info2_GetSubpictureLanguage(IDvdInfo2 *iface, ULONG stream, LCID *language) +{ + struct navigator *filter = impl_from_IDvdInfo2(iface); + + FIXME("filter %p, stream %u, language %p.\n", filter, stream, language); + + return E_NOTIMPL; +} + +static HRESULT WINAPI dvd_info2_GetTitleAttributes(IDvdInfo2 *iface, ULONG index, + DVD_MenuAttributes *menu, DVD_TitleAttributes *title) +{ + struct navigator *filter = impl_from_IDvdInfo2(iface); + + FIXME("filter %p, index %u, menu %p, title %p.\n", filter, index, menu, title); + + return E_NOTIMPL; +} + +static HRESULT WINAPI dvd_info2_GetVMGAttributes(IDvdInfo2 *iface, DVD_MenuAttributes *attr) +{ + struct navigator *filter = impl_from_IDvdInfo2(iface); + + FIXME("filter %p, attr %p.\n", filter, attr); + + return E_NOTIMPL; +} + +static HRESULT WINAPI dvd_info2_GetVideoAttributes(IDvdInfo2 *iface, DVD_VideoAttributes *attr) +{ + struct navigator *filter = impl_from_IDvdInfo2(iface); + + FIXME("filter %p, attr %p.\n", filter, attr); + + return E_NOTIMPL; +} + +static HRESULT WINAPI dvd_info2_GetAudioAttributes(IDvdInfo2 *iface, ULONG stream, DVD_AudioAttributes *attr) +{ + struct navigator *filter = impl_from_IDvdInfo2(iface); + + FIXME("filter %p, stream %u, attr %p.\n", filter, stream, attr); + + return E_NOTIMPL; +} + +static HRESULT WINAPI dvd_info2_GetKaraokeAttributes(IDvdInfo2 *iface, ULONG stream, DVD_KaraokeAttributes *attr) +{ + struct navigator *filter = impl_from_IDvdInfo2(iface); + + FIXME("filter %p, stream %u, attr %p.\n", filter, stream, attr); + + return E_NOTIMPL; +} + +static HRESULT WINAPI dvd_info2_GetSubpictureAttributes(IDvdInfo2 *iface, ULONG stream, + DVD_SubpictureAttributes *attr) +{ + struct navigator *filter = impl_from_IDvdInfo2(iface); + + FIXME("filter %p, stream %u, attr %p.\n", filter, stream, attr); + + return E_NOTIMPL; +} + +static HRESULT WINAPI dvd_info2_GetCurrentVolumeInfo(IDvdInfo2 *iface, ULONG *volume_count, ULONG *current, + DVD_DISC_SIDE *side, ULONG *title_count) +{ + struct navigator *filter = impl_from_IDvdInfo2(iface); + + FIXME("filter %p, volume_count %p, current %p, side %p, title_count %p.\n", + filter, volume_count, current, side, title_count); + + return E_NOTIMPL; +} + +static HRESULT WINAPI dvd_info2_GetDVDTextNumberOfLanguages(IDvdInfo2 *iface, ULONG *count) +{ + struct navigator *filter = impl_from_IDvdInfo2(iface); + + FIXME("filter %p, count %p.\n", filter, count); + + return E_NOTIMPL; +} + +static HRESULT WINAPI dvd_info2_GetDVDTextLanguageInfo(IDvdInfo2 *iface, ULONG index, ULONG *string_count, + LCID *language, enum DVD_TextCharSet *character_set) +{ + struct navigator *filter = impl_from_IDvdInfo2(iface); + + FIXME("filter %p, index %u, string_count %p, language %p, character_set %p.\n", + filter, index, string_count, language, character_set); + + return E_NOTIMPL; +} + +static HRESULT WINAPI dvd_info2_GetDVDTextStringAsNative(IDvdInfo2 *iface, ULONG lang_index, ULONG string_index, + BYTE *string, ULONG size, ULONG *ret_size, enum DVD_TextStringType *type) +{ + struct navigator *filter = impl_from_IDvdInfo2(iface); + + FIXME("filter %p, lang_index %u, string_index %u, string %p, size %u, ret_size %p, type %p.\n", + filter, lang_index, string_index, string, size, ret_size, type); + + return E_NOTIMPL; +} + +static HRESULT WINAPI dvd_info2_GetDVDTextStringAsUnicode(IDvdInfo2 *iface, ULONG lang_index, ULONG string_index, + WCHAR *string, ULONG size, ULONG *ret_size, enum DVD_TextStringType *type) +{ + struct navigator *filter = impl_from_IDvdInfo2(iface); + + FIXME("filter %p, lang_index %u, string_index %u, string %p, size %u, ret_size %p, type %p.\n", + filter, lang_index, string_index, string, size, ret_size, type); + + return E_NOTIMPL; +} + +static HRESULT WINAPI dvd_info2_GetPlayerParentalLevel(IDvdInfo2 *iface, ULONG *level, BYTE country_code[2]) +{ + struct navigator *filter = impl_from_IDvdInfo2(iface); + + FIXME("filter %p, level %p, country_code %p.\n", filter, level, country_code); + + return E_NOTIMPL; +} + +static HRESULT WINAPI dvd_info2_GetNumberOfChapters(IDvdInfo2 *iface, ULONG title, ULONG *count) +{ + struct navigator *filter = impl_from_IDvdInfo2(iface); + + FIXME("filter %p, title %u, count %p.\n", filter, title, count); + + return E_NOTIMPL; +} + +static HRESULT WINAPI dvd_info2_GetTitleParentalLevels(IDvdInfo2 *iface, ULONG title, ULONG *levels) +{ + struct navigator *filter = impl_from_IDvdInfo2(iface); + + FIXME("filter %p, title %u, levels %p.\n", filter, title, levels); + + return E_NOTIMPL; +} + +static HRESULT WINAPI dvd_info2_GetDVDDirectory(IDvdInfo2 *iface, WCHAR *path, ULONG size, ULONG *ret_size) +{ + struct navigator *filter = impl_from_IDvdInfo2(iface); + + FIXME("filter %p, path %p, size %u, ret_size %p.\n", filter, path, size, ret_size); + + return E_NOTIMPL; +} + +static HRESULT WINAPI dvd_info2_IsAudioStreamEnabled(IDvdInfo2 *iface, ULONG stream, BOOL *enable) +{ + struct navigator *filter = impl_from_IDvdInfo2(iface); + + FIXME("filter %p, stream %u, enable %p.\n", filter, stream, enable); + + return E_NOTIMPL; +} + +static HRESULT WINAPI dvd_info2_GetDiscID(IDvdInfo2 *iface, const WCHAR *path, ULONGLONG *id) +{ + struct navigator *filter = impl_from_IDvdInfo2(iface); + + FIXME("filter %p, path %s, id %p.\n", filter, debugstr_w(path), id); + + return E_NOTIMPL; +} + +static HRESULT WINAPI dvd_info2_GetState(IDvdInfo2 *iface, IDvdState **state) +{ + struct navigator *filter = impl_from_IDvdInfo2(iface); + + FIXME("filter %p, state %p.\n", filter, state); + + return E_NOTIMPL; +} + +static HRESULT WINAPI dvd_info2_GetMenuLanguages(IDvdInfo2 *iface, LCID *languages, ULONG count, ULONG *ret_count) +{ + struct navigator *filter = impl_from_IDvdInfo2(iface); + + FIXME("filter %p, languages %p, count %u, ret_count %p.\n", filter, languages, count, ret_count); + + return E_NOTIMPL; +} + +static HRESULT WINAPI dvd_info2_GetButtonAtPosition(IDvdInfo2 *iface, POINT point, ULONG *button) +{ + struct navigator *filter = impl_from_IDvdInfo2(iface); + + FIXME("filter %p, point %s, button %p.\n", filter, wine_dbgstr_point(&point), button); + + return E_NOTIMPL; +} + +static HRESULT WINAPI dvd_info2_GetCmdFromEvent(IDvdInfo2 *iface, LONG_PTR param, IDvdCmd **cmd) +{ + struct navigator *filter = impl_from_IDvdInfo2(iface); + + FIXME("filter %p, param %#lx, cmd %p.\n", filter, param, cmd); + + return E_NOTIMPL; +} + +static HRESULT WINAPI dvd_info2_GetDefaultMenuLanguage(IDvdInfo2 *iface, LCID *language) +{ + struct navigator *filter = impl_from_IDvdInfo2(iface); + + FIXME("filter %p, language %p.\n", filter, language); + + return E_NOTIMPL; +} + +static HRESULT WINAPI dvd_info2_GetDefaultAudioLanguage(IDvdInfo2 *iface, LCID *language, + DVD_AUDIO_LANG_EXT *extension) +{ + struct navigator *filter = impl_from_IDvdInfo2(iface); + + FIXME("filter %p, language %p, extension %p.\n", filter, language, extension); + + return E_NOTIMPL; +} + +static HRESULT WINAPI dvd_info2_SelectDefaultSubpictureLanguage(IDvdInfo2 *iface, LCID *language, + DVD_SUBPICTURE_LANG_EXT *extension) +{ + struct navigator *filter = impl_from_IDvdInfo2(iface); + + FIXME("filter %p, language %p, extension %p.\n", filter, language, extension); + + return E_NOTIMPL; +} + +static HRESULT WINAPI dvd_info2_GetDecoderCaps(IDvdInfo2 *iface, DVD_DECODER_CAPS *caps) +{ + struct navigator *filter = impl_from_IDvdInfo2(iface); + + FIXME("filter %p, caps %p.\n", filter, caps); + + return E_NOTIMPL; +} + +static HRESULT WINAPI dvd_info2_GetButtonRect(IDvdInfo2 *iface, ULONG button, RECT *rect) +{ + struct navigator *filter = impl_from_IDvdInfo2(iface); + + FIXME("filter %p, button %u, rect %p.\n", filter, button, rect); + + return E_NOTIMPL; +} + +static HRESULT WINAPI dvd_info2_IsSubpictureStreamEnabled(IDvdInfo2 *iface, ULONG stream, BOOL *enable) +{ + struct navigator *filter = impl_from_IDvdInfo2(iface); + + FIXME("filter %p, stream %u, enable %p.\n", filter, stream, enable); + + return E_NOTIMPL; +} + +static const struct IDvdInfo2Vtbl dvd_info2_vtbl = +{ + dvd_info2_QueryInterface, + dvd_info2_AddRef, + dvd_info2_Release, + dvd_info2_GetCurrentDomain, + dvd_info2_GetCurrentLocation, + dvd_info2_GetTotalTitleTime, + dvd_info2_GetCurrentButton, + dvd_info2_GetCurrentAngle, + dvd_info2_GetCurrentAudio, + dvd_info2_GetCurrentSubpicture, + dvd_info2_GetCurrentUOPS, + dvd_info2_GetAllSPRMs, + dvd_info2_GetAllGPRMs, + dvd_info2_GetAudioLanguage, + dvd_info2_GetSubpictureLanguage, + dvd_info2_GetTitleAttributes, + dvd_info2_GetVMGAttributes, + dvd_info2_GetVideoAttributes, + dvd_info2_GetAudioAttributes, + dvd_info2_GetKaraokeAttributes, + dvd_info2_GetSubpictureAttributes, + dvd_info2_GetCurrentVolumeInfo, + dvd_info2_GetDVDTextNumberOfLanguages, + dvd_info2_GetDVDTextLanguageInfo, + dvd_info2_GetDVDTextStringAsNative, + dvd_info2_GetDVDTextStringAsUnicode, + dvd_info2_GetPlayerParentalLevel, + dvd_info2_GetNumberOfChapters, + dvd_info2_GetTitleParentalLevels, + dvd_info2_GetDVDDirectory, + dvd_info2_IsAudioStreamEnabled, + dvd_info2_GetDiscID, + dvd_info2_GetState, + dvd_info2_GetMenuLanguages, + dvd_info2_GetButtonAtPosition, + dvd_info2_GetCmdFromEvent, + dvd_info2_GetDefaultMenuLanguage, + dvd_info2_GetDefaultAudioLanguage, + dvd_info2_SelectDefaultSubpictureLanguage, + dvd_info2_GetDecoderCaps, + dvd_info2_GetButtonRect, + dvd_info2_IsSubpictureStreamEnabled +}; + HRESULT navigator_create(IUnknown *outer, IUnknown **out) { struct navigator *object; @@ -513,6 +948,7 @@ HRESULT navigator_create(IUnknown *outer, IUnknown **out) strmbase_filter_init(&object->filter, outer, &CLSID_DVDNavigator, &filter_ops); object->IDvdControl2_iface.lpVtbl = &dvd_control2_vtbl; + object->IDvdInfo2_iface.lpVtbl = &dvd_info2_vtbl; TRACE("Created DVD Navigator filter %p.\n", object); *out = &object->filter.IUnknown_inner; diff --git a/dlls/qdvd/tests/navigator.c b/dlls/qdvd/tests/navigator.c index db2ba392dc..51999065cf 100644 --- a/dlls/qdvd/tests/navigator.c +++ b/dlls/qdvd/tests/navigator.c @@ -62,7 +62,7 @@ static void test_interfaces(void) todo_wine check_interface(filter, &IID_IDvdControl, TRUE); check_interface(filter, &IID_IDvdControl2, TRUE); todo_wine check_interface(filter, &IID_IDvdInfo, TRUE); - todo_wine check_interface(filter, &IID_IDvdInfo2, TRUE); + check_interface(filter, &IID_IDvdInfo2, TRUE); check_interface(filter, &IID_IMediaFilter, TRUE); check_interface(filter, &IID_IPersist, TRUE); todo_wine check_interface(filter, &IID_ISpecifyPropertyPages, TRUE); -- 2.27.0
[View Less]
1
0
0
0
0001-server-Fix-some-alt-hotkeys-dont-work-if-the-msg-par
by yaoyongjie@uniontech.com
28 Jul '20
28 Jul '20
yaoyongjie(a)uniontech.com
1
0
0
0
← Newer
1
...
9
10
11
12
13
14
15
...
85
Older →
Jump to page:
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
Results per page:
10
25
50
100
200