December 2017 - Wine-commits

Hans Leidekker : webservices: Implement WS_REPEATING_ELEMENT_CHOICE_FIELD_MAPPING in the writer.
by Alexandre Julliard 08 Dec '17

08 Dec '17

Module: wine Branch: master Commit: ca0b46a10c80c56bfaf7007476fa9f5f31f60cb4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ca0b46a10c80c56bfaf700747… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Dec 8 15:49:39 2017 +0100 webservices: Implement WS_REPEATING_ELEMENT_CHOICE_FIELD_MAPPING in the writer. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/tests/writer.c | 106 ++++++++++++++++++++++++++++++++++++++++ dlls/webservices/writer.c | 80 +++++++++++++++++------------- 2 files changed, 151 insertions(+), 35 deletions(-) diff --git a/dlls/webservices/tests/writer.c b/dlls/webservices/tests/writer.c index 79b60d1..15d4569 100644 --- a/dlls/webservices/tests/writer.c +++ b/dlls/webservices/tests/writer.c @@ -4544,6 +4544,111 @@ static void test_text_types_binary(void) WsFreeWriter( writer ); } +static void test_repeating_element_choice(void) +{ + static const WCHAR testW[] = {'t','e','s','t',0}; + static WS_XML_STRING str_ns = {0, NULL}, str_a = {1, (BYTE *)"a"}, str_b = {1, (BYTE *)"b"}; + static WS_XML_STRING str_s = {1, (BYTE *)"s"}, str_t = {1, (BYTE *)"t"}; + HRESULT hr; + WS_XML_WRITER *writer; + WS_UNION_DESCRIPTION u; + WS_UNION_FIELD_DESCRIPTION f, f2, *fields[2]; + WS_FIELD_DESCRIPTION f_items, *fields_items[1]; + WS_STRUCT_DESCRIPTION s; + enum choice {CHOICE_A, CHOICE_B, CHOICE_NONE}; + struct item + { + enum choice choice; + union + { + const WCHAR *a; + UINT32 b; + } value; + } items[2]; + struct test + { + struct item *items; + ULONG count; + } test; + + hr = WsCreateWriter( NULL, 0, &writer, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + memset( &f, 0, sizeof(f) ); + f.value = CHOICE_A; + f.field.mapping = WS_ELEMENT_FIELD_MAPPING; + f.field.localName = &str_a; + f.field.ns = &str_ns; + f.field.type = WS_WSZ_TYPE; + f.field.offset = FIELD_OFFSET(struct item, value.a); + fields[0] = &f; + + memset( &f2, 0, sizeof(f2) ); + f2.value = CHOICE_B; + f2.field.mapping = WS_ELEMENT_FIELD_MAPPING; + f2.field.localName = &str_b; + f2.field.ns = &str_ns; + f2.field.type = WS_UINT32_TYPE; + f2.field.offset = FIELD_OFFSET(struct item, value.b); + fields[1] = &f2; + + memset( &u, 0, sizeof(u) ); + u.size = sizeof(struct item); + u.alignment = TYPE_ALIGNMENT(struct item); + u.fields = fields; + u.fieldCount = 2; + u.enumOffset = FIELD_OFFSET(struct item, choice); + u.noneEnumValue = CHOICE_NONE; + + memset( &f_items, 0, sizeof(f_items) ); + f_items.mapping = WS_REPEATING_ELEMENT_CHOICE_FIELD_MAPPING; + f_items.localName = &str_t; + f_items.ns = &str_ns; + f_items.type = WS_UNION_TYPE; + f_items.typeDescription = &u; + f_items.countOffset = FIELD_OFFSET(struct test, count); + fields_items[0] = &f_items; + + memset( &s, 0, sizeof(s) ); + s.size = sizeof(struct test); + s.alignment = TYPE_ALIGNMENT(struct test); + s.fields = fields_items; + s.fieldCount = 1; + s.typeLocalName = &str_s; + s.typeNs = &str_ns; + + items[0].choice = CHOICE_A; + items[0].value.a = testW; + items[1].choice = CHOICE_B; + items[1].value.b = 1; + test.items = items; + test.count = 2; + + hr = set_output( writer ); + ok( hr == S_OK, "got %08x\n", hr ); + hr = WsWriteType( writer, WS_ELEMENT_CONTENT_TYPE_MAPPING, WS_STRUCT_TYPE, &s, + WS_WRITE_REQUIRED_VALUE, &test, sizeof(test), NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + check_output( writer, "<t><a>test</a><b>1</b></t>", __LINE__ ); + + items[0].choice = CHOICE_NONE; + hr = set_output( writer ); + ok( hr == S_OK, "got %08x\n", hr ); + hr = WsWriteType( writer, WS_ELEMENT_CONTENT_TYPE_MAPPING, WS_STRUCT_TYPE, &s, + WS_WRITE_REQUIRED_VALUE, &test, sizeof(test), NULL ); + ok( hr == WS_E_INVALID_FORMAT, "got %08x\n", hr ); + + test.count = 0; + hr = set_output( writer ); + ok( hr == S_OK, "got %08x\n", hr ); + hr = WsWriteType( writer, WS_ELEMENT_CONTENT_TYPE_MAPPING, WS_STRUCT_TYPE, &s, + WS_WRITE_REQUIRED_VALUE, &test, sizeof(test), NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + check_output( writer, "<t/>", __LINE__ ); + + WsFreeWriter( writer ); +} + START_TEST(writer) { test_WsCreateWriter(); @@ -4586,4 +4691,5 @@ START_TEST(writer) test_dictionary(); test_union_type(); test_text_types_binary(); + test_repeating_element_choice(); } diff --git a/dlls/webservices/writer.c b/dlls/webservices/writer.c index 8738f4c..4b24663 100644 --- a/dlls/webservices/writer.c +++ b/dlls/webservices/writer.c @@ -3492,6 +3492,7 @@ static WS_WRITE_OPTION get_field_write_option( WS_TYPE type, ULONG options ) case WS_XML_QNAME_TYPE: case WS_STRUCT_TYPE: case WS_ENUM_TYPE: + case WS_UNION_TYPE: if (options & (WS_FIELD_OPTIONAL|WS_FIELD_NILLABLE)) return WS_WRITE_NILLABLE_VALUE; return WS_WRITE_REQUIRED_VALUE; @@ -3506,42 +3507,11 @@ static WS_WRITE_OPTION get_field_write_option( WS_TYPE type, ULONG options ) } } +static HRESULT write_type_field( struct writer *, const WS_FIELD_DESCRIPTION *, const char *, ULONG ); + static HRESULT write_type( struct writer *, WS_TYPE_MAPPING, WS_TYPE, const void *, WS_WRITE_OPTION, const void *, ULONG ); -static HRESULT write_type_repeating_element( struct writer *writer, const WS_FIELD_DESCRIPTION *desc, - const char *buf, ULONG count ) -{ - HRESULT hr = S_OK; - ULONG i, size, offset = 0; - WS_WRITE_OPTION option; - - if (!(option = get_field_write_option( desc->type, desc->options ))) return E_INVALIDARG; - - /* wrapper element */ - if (desc->localName && ((hr = write_element_node( writer, NULL, desc->localName, desc->ns )) != S_OK)) - return hr; - - if (option == WS_WRITE_REQUIRED_VALUE || option == WS_WRITE_NILLABLE_VALUE) - size = get_type_size( desc->type, desc->typeDescription ); - else - size = sizeof(const void *); - - for (i = 0; i < count; i++) - { - if ((hr = write_element_node( writer, NULL, desc->itemLocalName, desc->itemNs )) != S_OK) return hr; - if ((hr = write_type( writer, WS_ELEMENT_TYPE_MAPPING, desc->type, desc->typeDescription, option, - buf + offset, size )) != S_OK) return hr; - if ((hr = write_endelement_node( writer )) != S_OK) return hr; - offset += size; - } - - if (desc->localName) hr = write_endelement_node( writer ); - return hr; -} - -static HRESULT write_type_field( struct writer *, const WS_FIELD_DESCRIPTION *, const char *, ULONG ); - static HRESULT write_type_union( struct writer *writer, const WS_UNION_DESCRIPTION *desc, WS_WRITE_OPTION option, const void *value, ULONG size ) { @@ -3581,6 +3551,45 @@ static HRESULT write_type_union( struct writer *writer, const WS_UNION_DESCRIPTI return E_INVALIDARG; } +static HRESULT write_type_array( struct writer *writer, const WS_FIELD_DESCRIPTION *desc, const char *buf, + ULONG count ) +{ + HRESULT hr = S_OK; + ULONG i, size, offset = 0; + WS_WRITE_OPTION option; + + if (!(option = get_field_write_option( desc->type, desc->options ))) return E_INVALIDARG; + + /* wrapper element */ + if (desc->localName && ((hr = write_element_node( writer, NULL, desc->localName, desc->ns )) != S_OK)) + return hr; + + if (option == WS_WRITE_REQUIRED_VALUE || option == WS_WRITE_NILLABLE_VALUE) + size = get_type_size( desc->type, desc->typeDescription ); + else + size = sizeof(const void *); + + for (i = 0; i < count; i++) + { + if (desc->type == WS_UNION_TYPE) + { + if ((hr = write_type_union( writer, desc->typeDescription, option, buf + offset, size )) != S_OK) + return hr; + } + else + { + if ((hr = write_element_node( writer, NULL, desc->itemLocalName, desc->itemNs )) != S_OK) return hr; + if ((hr = write_type( writer, WS_ELEMENT_TYPE_MAPPING, desc->type, desc->typeDescription, option, + buf + offset, size )) != S_OK) return hr; + if ((hr = write_endelement_node( writer )) != S_OK) return hr; + } + offset += size; + } + + if (desc->localName) hr = write_endelement_node( writer ); + return hr; +} + static HRESULT write_type_field( struct writer *writer, const WS_FIELD_DESCRIPTION *desc, const char *buf, ULONG offset ) { @@ -3646,8 +3655,9 @@ static HRESULT write_type_field( struct writer *writer, const WS_FIELD_DESCRIPTI return write_type_union( writer, desc->typeDescription, option, ptr, size ); case WS_REPEATING_ELEMENT_FIELD_MAPPING: + case WS_REPEATING_ELEMENT_CHOICE_FIELD_MAPPING: count = *(const ULONG *)(buf + desc->countOffset); - return write_type_repeating_element( writer, desc, *(const char **)ptr, count ); + return write_type_array( writer, desc, *(const char **)ptr, count ); case WS_TEXT_FIELD_MAPPING: switch (writer->state) @@ -4713,7 +4723,7 @@ static ULONG get_array_len( const WS_PARAMETER_DESCRIPTION *params, ULONG count, static HRESULT write_param_array( struct writer *writer, const WS_FIELD_DESCRIPTION *desc, const void *value, ULONG len ) { - return write_type_repeating_element( writer, desc, value, len ); + return write_type_array( writer, desc, value, len ); } HRESULT write_input_params( WS_XML_WRITER *handle, const WS_ELEMENT_DESCRIPTION *desc,

1 0

Lauri Kenttä : readme: Move WineHQ URLs to https in translations.
by Alexandre Julliard 08 Dec '17

08 Dec '17

Module: wine Branch: master Commit: fad999e36746926e22bbb3cc4a9938a6c5d4ade2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fad999e36746926e22bbb3cc4… Author: Lauri Kenttä <lauri.kentta(a)gmail.com> Date: Thu Dec 7 17:00:34 2017 +0200 readme: Move WineHQ URLs to https in translations. Signed-off-by: Lauri Kenttä <lauri.kentta(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- documentation/README.de | 24 ++++++++++++------------ documentation/README.es | 22 +++++++++++----------- documentation/README.fi | 20 ++++++++++---------- documentation/README.fr | 24 ++++++++++++------------ documentation/README.hu | 14 +++++++------- documentation/README.it | 24 ++++++++++++------------ documentation/README.ja | 20 ++++++++++---------- documentation/README.ko | 16 ++++++++-------- documentation/README.no | 24 ++++++++++++------------ documentation/README.pt | 12 ++++++------ documentation/README.pt_br | 24 ++++++++++++------------ documentation/README.ru | 20 ++++++++++---------- documentation/README.tr | 22 +++++++++++----------- documentation/README.uk | 24 ++++++++++++------------ documentation/README.zh_cn | 24 ++++++++++++------------ 15 files changed, 157 insertions(+), 157 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=fad999e36746926e22bbb…

1 0

Matteo Bruni : d3dx9: Merge "main" source files.
by Alexandre Julliard 08 Dec '17

08 Dec '17

Module: wine Branch: master Commit: 6697de156e5adc0600fbfe92eb68af59b2a1b85a URL: http://source.winehq.org/git/wine.git/?a=commit;h=6697de156e5adc0600fbfe92e… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Thu Dec 7 22:56:13 2017 +0100 d3dx9: Merge "main" source files. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_24/Makefile.in | 3 +- dlls/d3dx9_24/d3dx9_24_main.c | 60 ------------------------ dlls/d3dx9_25/Makefile.in | 4 +- dlls/d3dx9_25/d3dx9_25_main.c | 60 ------------------------ dlls/d3dx9_26/Makefile.in | 3 +- dlls/d3dx9_26/d3dx9_26_main.c | 60 ------------------------ dlls/d3dx9_27/Makefile.in | 3 +- dlls/d3dx9_27/d3dx9_27_main.c | 60 ------------------------ dlls/d3dx9_28/Makefile.in | 4 +- dlls/d3dx9_28/d3dx9_28_main.c | 60 ------------------------ dlls/d3dx9_29/Makefile.in | 4 +- dlls/d3dx9_29/d3dx9_29_main.c | 60 ------------------------ dlls/d3dx9_30/Makefile.in | 3 +- dlls/d3dx9_30/d3dx9_30_main.c | 77 ------------------------------- dlls/d3dx9_31/Makefile.in | 3 +- dlls/d3dx9_31/d3dx9_31_main.c | 60 ------------------------ dlls/d3dx9_32/Makefile.in | 3 +- dlls/d3dx9_32/d3dx9_32_main.c | 61 ------------------------ dlls/d3dx9_33/Makefile.in | 3 +- dlls/d3dx9_33/d3dx9_33_main.c | 62 ------------------------- dlls/d3dx9_34/Makefile.in | 3 +- dlls/d3dx9_34/d3dx9_34_main.c | 60 ------------------------ dlls/d3dx9_35/Makefile.in | 3 +- dlls/d3dx9_35/d3dx9_35_main.c | 60 ------------------------ dlls/d3dx9_36/Makefile.in | 3 +- dlls/d3dx9_36/{d3dx9_36_main.c => main.c} | 22 ++++----- dlls/d3dx9_37/Makefile.in | 3 +- dlls/d3dx9_37/d3dx9_37_main.c | 60 ------------------------ dlls/d3dx9_38/Makefile.in | 3 +- dlls/d3dx9_38/d3dx9_38_main.c | 60 ------------------------ dlls/d3dx9_39/Makefile.in | 3 +- dlls/d3dx9_39/d3dx9_39_main.c | 60 ------------------------ dlls/d3dx9_40/Makefile.in | 3 +- dlls/d3dx9_40/d3dx9_40_main.c | 61 ------------------------ dlls/d3dx9_41/Makefile.in | 3 +- dlls/d3dx9_41/d3dx9_41_main.c | 61 ------------------------ dlls/d3dx9_42/Makefile.in | 3 +- dlls/d3dx9_42/d3dx9_42_main.c | 62 ------------------------- dlls/d3dx9_43/Makefile.in | 3 +- dlls/d3dx9_43/d3dx9_43_main.c | 61 ------------------------ include/d3dx9core.h | 4 +- 41 files changed, 51 insertions(+), 1203 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=6697de156e5adc0600fbf…

1 0

Matteo Bruni : d3dx9: Use the D3DCOMPILE_ENABLE_BACKWARDS_COMPATIBILITY flag when compiling ASCII effects.
by Alexandre Julliard 08 Dec '17

08 Dec '17

Module: wine Branch: master Commit: 3a5688a795532640bb32bd4c3e9961c6ab9f19fa URL: http://source.winehq.org/git/wine.git/?a=commit;h=3a5688a795532640bb32bd4c3… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Thu Dec 7 22:56:14 2017 +0100 d3dx9: Use the D3DCOMPILE_ENABLE_BACKWARDS_COMPATIBILITY flag when compiling ASCII effects. Some manual testing shows that the behavior changed with d3dx9_37. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/effect.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index ce2e5d8..f8c4803 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -6455,6 +6455,11 @@ static HRESULT d3dx9_base_effect_init(struct d3dx9_base_effect *base, char *skip_constants_buffer = NULL; const char **skip_constants = NULL; unsigned int skip_constants_count = 0; +#if D3DX_SDK_VERSION <= 36 + UINT compile_flags = D3DCOMPILE_ENABLE_BACKWARDS_COMPATIBILITY; +#else + UINT compile_flags = 0; +#endif unsigned int i, j; TRACE("base %p, data %p, data_size %lu, effect %p, pool %p, skip_constants %s.\n", @@ -6471,7 +6476,7 @@ static HRESULT d3dx9_base_effect_init(struct d3dx9_base_effect *base, { TRACE("HLSL ASCII effect, trying to compile it.\n"); hr = D3DCompile(data, data_size, NULL, defines, include, - "main", "fx_2_0", 0, eflags, &bytecode, &temp_errors); + "main", "fx_2_0", compile_flags, eflags, &bytecode, &temp_errors); if (FAILED(hr)) { WARN("Failed to compile ASCII effect.\n");

1 0

Matteo Bruni : d3dx9: Implement D3DXGetShader{Input|Output}Semantics().
by Alexandre Julliard 08 Dec '17

08 Dec '17

Module: wine Branch: master Commit: 50734ad54f4212b8e522d0acf7c616e51df19644 URL: http://source.winehq.org/git/wine.git/?a=commit;h=50734ad54f4212b8e522d0acf… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Thu Dec 7 22:56:15 2017 +0100 d3dx9: Implement D3DXGetShader{Input|Output}Semantics(). Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_24/d3dx9_24.spec | 4 +- dlls/d3dx9_25/d3dx9_25.spec | 4 +- dlls/d3dx9_26/d3dx9_26.spec | 4 +- dlls/d3dx9_27/d3dx9_27.spec | 4 +- dlls/d3dx9_28/d3dx9_28.spec | 4 +- dlls/d3dx9_29/d3dx9_29.spec | 4 +- dlls/d3dx9_30/d3dx9_30.spec | 4 +- dlls/d3dx9_31/d3dx9_31.spec | 4 +- dlls/d3dx9_32/d3dx9_32.spec | 4 +- dlls/d3dx9_33/d3dx9_33.spec | 4 +- dlls/d3dx9_34/d3dx9_34.spec | 4 +- dlls/d3dx9_35/d3dx9_35.spec | 4 +- dlls/d3dx9_36/d3dx9_36.spec | 4 +- dlls/d3dx9_36/shader.c | 246 ++++++++++++++++++++++++++++++++++++++++++++ dlls/d3dx9_37/d3dx9_37.spec | 4 +- dlls/d3dx9_38/d3dx9_38.spec | 4 +- dlls/d3dx9_39/d3dx9_39.spec | 4 +- dlls/d3dx9_40/d3dx9_40.spec | 4 +- dlls/d3dx9_41/d3dx9_41.spec | 4 +- dlls/d3dx9_42/d3dx9_42.spec | 4 +- dlls/d3dx9_43/d3dx9_43.spec | 4 +- 21 files changed, 286 insertions(+), 40 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=50734ad54f4212b8e522d…

1 0

Matteo Bruni : d3dx9/tests: Add a test for D3DXGetShader{Input|Output}Semantics().
by Alexandre Julliard 08 Dec '17

08 Dec '17

Module: wine Branch: master Commit: 72f3227d71bdfd14e70b194b2231015f6445931c URL: http://source.winehq.org/git/wine.git/?a=commit;h=72f3227d71bdfd14e70b194b2… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Thu Dec 7 22:56:16 2017 +0100 d3dx9/tests: Add a test for D3DXGetShader{Input|Output}Semantics(). Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/tests/shader.c | 163 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 163 insertions(+) diff --git a/dlls/d3dx9_36/tests/shader.c b/dlls/d3dx9_36/tests/shader.c index 4a7ae67..2f01a46 100644 --- a/dlls/d3dx9_36/tests/shader.c +++ b/dlls/d3dx9_36/tests/shader.c @@ -6489,6 +6489,168 @@ static void test_registerset_defaults(void) if (wnd) DestroyWindow(wnd); } +static void test_shader_semantics(void) +{ + static const DWORD invalid_1[] = + { + 0x00000200 + }, + invalid_2[] = + { + 0xfffe0400 + }, + invalid_3[] = + { + 0xfffe0000 + }, + vs_1_1[] = + { + 0xfffe0101, /* vs_1_1 */ + 0x0000001f, 0x80000000, 0x900f0000, /* dcl_position v0 */ + 0x0000001f, 0x80000003, 0x900f0001, /* dcl_normal v1 */ + 0x0000001f, 0x8001000a, 0x900f0002, /* dcl_color1 v2 */ + 0x0000001f, 0x80000005, 0x900f0003, /* dcl_texcoord0 v3 */ + 0x00000001, 0xc00f0000, 0x90e40000, /* mov oPos, v0 */ + 0x00000001, 0xd00f0001, 0x90e40002, /* mov oD1, v2 */ + 0x00000001, 0xe0070000, 0x90e40001, /* mov oT0.xyz, v1 */ + 0x00000001, 0xc00f0001, 0x90ff0002, /* mov oFog, v2.w */ + 0x00000001, 0xc00f0002, 0x90ff0001, /* mov oPts, v1.w */ + 0x0000ffff + }, + vs_2_0[] = + { + 0xfffe0200, /* vs_2_0 */ + 0x0200001f, 0x80000000, 0x900f0000, /* dcl_position v0 */ + 0x0200001f, 0x80000003, 0x900f0001, /* dcl_normal v1 */ + 0x0200001f, 0x8001000a, 0x900f0002, /* dcl_color1 v2 */ + 0x0200001f, 0x80000005, 0x900f0003, /* dcl_texcoord0 v3 */ + 0x02000001, 0xc00f0000, 0x90e40000, /* mov oPos, v0 */ + 0x02000001, 0xd00f0001, 0x90e40002, /* mov oD1, v2 */ + 0x02000001, 0xe0070000, 0x90e40003, /* mov oT0.xyz, v3 */ + 0x02000001, 0xc00f0001, 0x90ff0002, /* mov oFog, v2.w */ + 0x02000001, 0xc00f0002, 0x90ff0001, /* mov oPts, v1.w */ + 0x0000ffff + }, + vs_3_0[] = + { + 0xfffe0300, /* vs_3_0 */ + 0x0200001f, 0x80000000, 0x900f0000, /* dcl_position v0 */ + 0x0200001f, 0x80000003, 0x900f0001, /* dcl_normal v1 */ + 0x0200001f, 0x8001000a, 0x900f0002, /* dcl_color1 v2 */ + 0x0200001f, 0x80000005, 0x900f0003, /* dcl_texcoord0 v3 */ + 0x0200001f, 0x80000000, 0xe00f0000, /* dcl_position o0 */ + 0x0200001f, 0x8001000a, 0xe00f0001, /* dcl_color1 o1 */ + 0x0200001f, 0x80000005, 0xe00f0002, /* dcl_texcoord0 o2 */ + 0x0200001f, 0x8000000b, 0xe00f0003, /* dcl_fog o3 */ + 0x0200001f, 0x80000004, 0xe00f0004, /* dcl_psize o4 */ + 0x02000001, 0xe00f0000, 0x90e40000, /* mov o0, v0 */ + 0x02000001, 0xe00f0001, 0x90e40002, /* mov o1, v2 */ + 0x02000001, 0xe0070002, 0x90e40003, /* mov o2.xyz, v3 */ + 0x02000001, 0xe00f0003, 0x90ff0002, /* mov o3, v2.w */ + 0x02000001, 0xe00f0004, 0x90ff0001, /* mov o4, v1.w */ + 0x0000ffff + }, + ps_1_1[] = + { + 0xffff0101, /* ps_1_1 */ + 0x00000042, 0xb00f0000, /* tex t0 */ + 0x00000002, 0x800f0000, 0x90e40000, 0xb0e40000, /* add r0, v0, t0 */ + 0x0000ffff + }, + ps_2_0[] = + { + 0xffff0200, /* ps_2_0 */ + 0x0200001f, 0x80000000, 0x900f0000, /* dcl v0 */ + 0x0200001f, 0x80000000, 0xb00f0000, /* dcl t0 */ + 0x02000001, 0x800f0800, 0x90e40000, /* mov oC0, v0 */ + 0x0000ffff + }, + ps_3_0[] = + { + 0xffff0300, /* ps_3_0 */ + 0x0200001f, 0x8001000a, 0x900f0000, /* dcl_color1 v0 */ + 0x0200001f, 0x80000003, 0x900f0001, /* dcl_normal v1 */ + 0x0200001f, 0x80000005, 0x900f0002, /* dcl_texcoord0 v2 */ + 0x0200001f, 0x8000000b, 0x900f0003, /* dcl_fog v3 */ + 0x0200001f, 0x80000000, 0x90031000, /* dcl vPos.xy */ + 0x0200001f, 0x80000000, 0x900f1001, /* dcl vFace */ + 0x05000051, 0xa00f0000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, /* def c0, 0.0, 0.0, 0.0, 0.0 */ + 0x02000001, 0x800f0000, 0x90e40000, /* mov r0, v0 */ + 0x03000002, 0x800f0800, 0x80e40000, 0x90e40003, /* add oC0, r0, v3 */ + 0x02000001, 0x800f0001, 0x90e40001, /* mov r1, v1 */ + 0x03000005, 0x800f0801, 0x80e40001, 0x90e40002, /* mul oC1, r1, v2 */ + 0x02000001, 0x800f0802, 0x90441000, /* mov oC2, vPos.xyxy */ + 0x04000058, 0x800f0803, 0x90e41001, 0x90e40000, 0xa0e40000, /* cmp oC3, vFace, v0, c0 */ + 0x02000001, 0x900f0800, 0x90ff0001, /* mov oDepth, v1.w */ + 0x0000ffff + }; + static const struct + { + const DWORD *shader; + D3DXSEMANTIC expected_input[MAXD3DDECLLENGTH]; + D3DXSEMANTIC expected_output[MAXD3DDECLLENGTH]; + } + tests[] = + { + {vs_1_1, {{0, 0}, {3, 0}, {10, 1}, {5, 0}, {~0, ~0}}, {{5, 0}, {10, 1}, {0, 0}, {11, 0}, {4, 0}, {~0, ~0}}}, + {vs_2_0, {{0, 0}, {3, 0}, {10, 1}, {5, 0}, {~0, ~0}}, {{5, 0}, {10, 1}, {0, 0}, {11, 0}, {4, 0}, {~0, ~0}}}, + {vs_3_0, {{0, 0}, {3, 0}, {10, 1}, {5, 0}, {~0, ~0}}, {{0, 0}, {10, 1}, {5, 0}, {11, 0}, {4, 0}, {~0, ~0}}}, + {ps_1_1, {{5, 0}, {10, 0}, {~0, ~0}}, {{10, 0}, {~0, ~0}}}, + {ps_2_0, {{10, 0}, {5, 0}, {~0, ~0}}, {{10, 0}, {~0, ~0}}}, + {ps_3_0, {{10, 1}, {3,0}, {5, 0}, {11, 0}, {~0, ~0}}, {{10, 0}, {10, 1}, {10, 2}, {10, 3}, {12, 0}, {~0, ~0}}}, + }; + D3DXSEMANTIC semantics[MAXD3DDECLLENGTH]; + unsigned int count, count2; + unsigned int i, j; + HRESULT hr; + + hr = D3DXGetShaderInputSemantics(invalid_1, NULL, NULL); + ok(hr == D3DXERR_INVALIDDATA, "Unexpected hr %#x.\n", hr); + hr = D3DXGetShaderInputSemantics(invalid_2, NULL, NULL); + ok(hr == D3D_OK, "Unexpected hr %#x.\n", hr); + hr = D3DXGetShaderInputSemantics(invalid_3, NULL, NULL); + ok(hr == D3D_OK, "Unexpected hr %#x.\n", hr); + + hr = D3DXGetShaderInputSemantics(vs_1_1, NULL, NULL); + ok(hr == D3D_OK, "Unexpected hr %#x.\n", hr); + hr = D3DXGetShaderInputSemantics(vs_1_1, semantics, NULL); + ok(hr == D3D_OK, "Unexpected hr %#x.\n", hr); + + for (i = 0; i < sizeof(tests) / sizeof(tests[0]); ++i) + { + const DWORD *shader = tests[i].shader; + + hr = D3DXGetShaderInputSemantics(shader, NULL, &count); + ok(hr == D3D_OK, "Unexpected hr %#x.\n", hr); + hr = D3DXGetShaderInputSemantics(shader, semantics, &count2); + ok(hr == D3D_OK, "Unexpected hr %#x.\n", hr); + ok(count == count2, "Semantics count %u differs from previous count %u.\n", count2, count); + for (j = 0; j < count; ++j) + { + ok(semantics[j].Usage == tests[i].expected_input[j].Usage + && semantics[j].UsageIndex == tests[i].expected_input[j].UsageIndex, + "Unexpected semantic %u, %u, test %u, idx %u.\n", + semantics[j].Usage, semantics[j].UsageIndex, i, j); + } + ok(tests[i].expected_input[j].Usage == ~0 && tests[i].expected_input[j].UsageIndex == ~0, + "Unexpected semantics count %u.\n", count); + hr = D3DXGetShaderOutputSemantics(shader, NULL, &count); + ok(hr == D3D_OK, "Unexpected hr %#x.\n", hr); + hr = D3DXGetShaderOutputSemantics(shader, semantics, &count2); + ok(hr == D3D_OK, "Unexpected hr %#x.\n", hr); + ok(count == count2, "Semantics count %u differs from previous count %u.\n", count2, count); + for (j = 0; j < count; ++j) + { + ok(semantics[j].Usage == tests[i].expected_output[j].Usage + && semantics[j].UsageIndex == tests[i].expected_output[j].UsageIndex, + "Unexpected semantic %u, %u, test %u, idx %u.\n", + semantics[j].Usage, semantics[j].UsageIndex, i, j); + } + ok(tests[i].expected_output[j].Usage == ~0 && tests[i].expected_output[j].UsageIndex == ~0, + "Unexpected semantics count %u.\n", count); + } +} + START_TEST(shader) { test_get_shader_size(); @@ -6502,4 +6664,5 @@ START_TEST(shader) test_get_shader_constant_variables(); test_registerset(); test_registerset_defaults(); + test_shader_semantics(); }

1 0

Hans Leidekker : bcrypt: Add support for AES encryption on macOS.
by Alexandre Julliard 08 Dec '17

08 Dec '17

Module: wine Branch: master Commit: 20aaf167dd9f23fa68ff12984f24a2335dd94c03 URL: http://source.winehq.org/git/wine.git/?a=commit;h=20aaf167dd9f23fa68ff12984… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Dec 8 09:17:31 2017 +0100 bcrypt: Add support for AES encryption on macOS. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 +- configure.ac | 2 +- dlls/bcrypt/bcrypt_main.c | 139 +++++++++++++++++++++++++++++++++++++++++----- include/config.h.in | 4 +- 4 files changed, 128 insertions(+), 19 deletions(-) diff --git a/configure b/configure index 4704e16..5e1eeef 100755 --- a/configure +++ b/configure @@ -6910,7 +6910,7 @@ for ac_header in \ AudioUnit/AudioComponent.h \ CL/cl.h \ Carbon/Carbon.h \ - CommonCrypto/CommonDigest.h \ + CommonCrypto/CommonCryptor.h \ CoreAudio/CoreAudio.h \ CoreServices/CoreServices.h \ DiskArbitration/DiskArbitration.h \ diff --git a/configure.ac b/configure.ac index 69fad41..8d9ec29 100644 --- a/configure.ac +++ b/configure.ac @@ -396,7 +396,7 @@ AC_CHECK_HEADERS(\ AudioUnit/AudioComponent.h \ CL/cl.h \ Carbon/Carbon.h \ - CommonCrypto/CommonDigest.h \ + CommonCrypto/CommonCryptor.h \ CoreAudio/CoreAudio.h \ CoreServices/CoreServices.h \ DiskArbitration/DiskArbitration.h \ diff --git a/dlls/bcrypt/bcrypt_main.c b/dlls/bcrypt/bcrypt_main.c index 931db2b..765f758 100644 --- a/dlls/bcrypt/bcrypt_main.c +++ b/dlls/bcrypt/bcrypt_main.c @@ -21,9 +21,8 @@ #include "wine/port.h" #include <stdarg.h> -#ifdef HAVE_COMMONCRYPTO_COMMONDIGEST_H -#include <CommonCrypto/CommonDigest.h> -#include <CommonCrypto/CommonHMAC.h> +#ifdef HAVE_COMMONCRYPTO_COMMONCRYPTOR_H +#include <CommonCrypto/CommonCryptor.h> #elif defined(SONAME_LIBGNUTLS) #include <gnutls/gnutls.h> #include <gnutls/crypto.h> @@ -46,7 +45,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(bcrypt); static HINSTANCE instance; -#if defined(HAVE_GNUTLS_CIPHER_INIT) && !defined(HAVE_COMMONCRYPTO_COMMONDIGEST_H) +#if defined(HAVE_GNUTLS_CIPHER_INIT) && !defined(HAVE_COMMONCRYPTO_COMMONCRYPTOR_H) WINE_DECLARE_DEBUG_CHANNEL(winediag); static void *libgnutls_handle; @@ -121,7 +120,7 @@ static void gnutls_uninitialize(void) wine_dlclose( libgnutls_handle, NULL, 0 ); libgnutls_handle = NULL; } -#endif /* HAVE_GNUTLS_CIPHER_INIT && !HAVE_COMMONCRYPTO_COMMONDIGEST_H */ +#endif /* HAVE_GNUTLS_CIPHER_INIT && !HAVE_COMMONCRYPTO_COMMONCRYPTOR_H */ NTSTATUS WINAPI BCryptEnumAlgorithms(ULONG dwAlgOperations, ULONG *pAlgCount, BCRYPT_ALGORITHM_IDENTIFIER **ppAlgList, ULONG dwFlags) @@ -731,7 +730,16 @@ NTSTATUS WINAPI BCryptHash( BCRYPT_ALG_HANDLE algorithm, UCHAR *secret, ULONG se return BCryptDestroyHash( handle ); } -#if defined(HAVE_GNUTLS_CIPHER_INIT) && !defined(HAVE_COMMONCRYPTO_COMMONDIGEST_H) +#if defined(HAVE_GNUTLS_CIPHER_INIT) || defined(HAVE_COMMONCRYPTO_COMMONCRYPTOR_H) +static ULONG get_block_size( enum alg_id alg ) +{ + ULONG ret = 0, size = sizeof(ret); + get_alg_property( alg, BCRYPT_BLOCK_LENGTH, (UCHAR *)&ret, sizeof(ret), &size ); + return ret; +} +#endif + +#if defined(HAVE_GNUTLS_CIPHER_INIT) && !defined(HAVE_COMMONCRYPTO_COMMONCRYPTOR_H) struct key { struct object hdr; @@ -742,13 +750,6 @@ struct key ULONG secret_len; }; -static ULONG get_block_size( enum alg_id alg ) -{ - ULONG ret = 0, size = sizeof(ret); - get_alg_property( alg, BCRYPT_BLOCK_LENGTH, (UCHAR *)&ret, sizeof(ret), &size ); - return ret; -} - static NTSTATUS key_init( struct key *key, enum alg_id id, const UCHAR *secret, ULONG secret_len ) { UCHAR *buffer; @@ -858,6 +859,114 @@ static NTSTATUS key_destroy( struct key *key ) HeapFree( GetProcessHeap(), 0, key ); return STATUS_SUCCESS; } +#elif defined(HAVE_COMMONCRYPTO_COMMONCRYPTOR_H) +struct key +{ + struct object hdr; + enum alg_id alg_id; + ULONG block_size; + CCCryptorRef ref_encrypt; + CCCryptorRef ref_decrypt; + UCHAR *secret; + ULONG secret_len; +}; + +static NTSTATUS key_init( struct key *key, enum alg_id id, const UCHAR *secret, ULONG secret_len ) +{ + UCHAR *buffer; + + switch (id) + { + case ALG_ID_AES: + break; + + default: + FIXME( "algorithm %u not supported\n", id ); + return STATUS_NOT_SUPPORTED; + } + + if (!(key->block_size = get_block_size( id ))) return STATUS_INVALID_PARAMETER; + if (!(buffer = HeapAlloc( GetProcessHeap(), 0, secret_len ))) return STATUS_NO_MEMORY; + memcpy( buffer, secret, secret_len ); + + key->alg_id = id; + key->ref_encrypt = NULL; /* initialized on first use */ + key->ref_decrypt = NULL; + key->secret = buffer; + key->secret_len = secret_len; + + return STATUS_SUCCESS; +} + +static NTSTATUS key_set_params( struct key *key, UCHAR *iv, ULONG iv_len ) +{ + CCCryptorStatus status; + + if (key->ref_encrypt) + { + CCCryptorRelease( key->ref_encrypt ); + key->ref_encrypt = NULL; + } + if (key->ref_decrypt) + { + CCCryptorRelease( key->ref_decrypt ); + key->ref_decrypt = NULL; + } + + if ((status = CCCryptorCreateWithMode( kCCEncrypt, kCCModeCBC, kCCAlgorithmAES, ccNoPadding, iv, + key->secret, key->secret_len, NULL, 0, 0, 0, &key->ref_encrypt )) != kCCSuccess) + { + WARN( "CCCryptorCreateWithMode failed %d\n", status ); + return STATUS_INTERNAL_ERROR; + } + if ((status = CCCryptorCreateWithMode( kCCDecrypt, kCCModeCBC, kCCAlgorithmAES, ccNoPadding, iv, + key->secret, key->secret_len, NULL, 0, 0, 0, &key->ref_decrypt )) != kCCSuccess) + { + WARN( "CCCryptorCreateWithMode failed %d\n", status ); + CCCryptorRelease( key->ref_encrypt ); + key->ref_encrypt = NULL; + return STATUS_INTERNAL_ERROR; + } + + return STATUS_SUCCESS; +} + +static NTSTATUS key_encrypt( struct key *key, const UCHAR *input, ULONG input_len, UCHAR *output, + ULONG output_len ) +{ + CCCryptorStatus status; + + if ((status = CCCryptorUpdate( key->ref_encrypt, input, input_len, output, output_len, NULL )) != kCCSuccess) + { + WARN( "CCCryptorUpdate failed %d\n", status ); + return STATUS_INTERNAL_ERROR; + } + + return STATUS_SUCCESS; +} + +static NTSTATUS key_decrypt( struct key *key, const UCHAR *input, ULONG input_len, UCHAR *output, + ULONG output_len ) +{ + CCCryptorStatus status; + + if ((status = CCCryptorUpdate( key->ref_decrypt, input, input_len, output, output_len, NULL )) != kCCSuccess) + { + WARN( "CCCryptorUpdate failed %d\n", status ); + return STATUS_INTERNAL_ERROR; + } + + return STATUS_SUCCESS; +} + +static NTSTATUS key_destroy( struct key *key ) +{ + if (key->ref_encrypt) CCCryptorRelease( key->ref_encrypt ); + if (key->ref_decrypt) CCCryptorRelease( key->ref_decrypt ); + HeapFree( GetProcessHeap(), 0, key->secret ); + HeapFree( GetProcessHeap(), 0, key ); + return STATUS_SUCCESS; +} #else struct key { @@ -1066,14 +1175,14 @@ BOOL WINAPI DllMain( HINSTANCE hinst, DWORD reason, LPVOID reserved ) case DLL_PROCESS_ATTACH: instance = hinst; DisableThreadLibraryCalls( hinst ); -#if defined(HAVE_GNUTLS_CIPHER_INIT) && !defined(HAVE_COMMONCRYPTO_COMMONDIGEST_H) +#if defined(HAVE_GNUTLS_CIPHER_INIT) && !defined(HAVE_COMMONCRYPTO_COMMONCRYPTOR_H) gnutls_initialize(); #endif break; case DLL_PROCESS_DETACH: if (reserved) break; -#if defined(HAVE_GNUTLS_CIPHER_INIT) && !defined(HAVE_COMMONCRYPTO_COMMONDIGEST_H) +#if defined(HAVE_GNUTLS_CIPHER_INIT) && !defined(HAVE_COMMONCRYPTO_COMMONCRYPTOR_H) gnutls_uninitialize(); #endif break; diff --git a/include/config.h.in b/include/config.h.in index a6ec41b..aff5f35 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -89,8 +89,8 @@ /* Define to 1 if you have the <CL/cl.h> header file. */ #undef HAVE_CL_CL_H -/* Define to 1 if you have the <CommonCrypto/CommonDigest.h> header file. */ -#undef HAVE_COMMONCRYPTO_COMMONDIGEST_H +/* Define to 1 if you have the <CommonCrypto/CommonCryptor.h> header file. */ +#undef HAVE_COMMONCRYPTO_COMMONCRYPTOR_H /* Define to 1 if you have the <CoreAudio/CoreAudio.h> header file. */ #undef HAVE_COREAUDIO_COREAUDIO_H

1 0

Ken Thomases : winemac: Check the display link running state as well as the window count to decide whether to start /stop it.
by Alexandre Julliard 08 Dec '17

08 Dec '17

Module: wine Branch: master Commit: fd6f2a1781354a1a86a0469abd0766afd6304005 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fd6f2a1781354a1a86a0469ab… Author: Ken Thomases <ken(a)codeweavers.com> Date: Fri Dec 8 02:54:06 2017 -0600 winemac: Check the display link running state as well as the window count to decide whether to start/stop it. The display link may be stopped even if there are associated windows, due to idleness. So, it may need to be started when a window is added even if it's not the first window. Signed-off-by: Ken Thomases <ken(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winemac.drv/cocoa_window.m | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/winemac.drv/cocoa_window.m b/dlls/winemac.drv/cocoa_window.m index 65dc392..1b1d171 100644 --- a/dlls/winemac.drv/cocoa_window.m +++ b/dlls/winemac.drv/cocoa_window.m @@ -218,25 +218,25 @@ static CVReturn WineDisplayLinkCallback(CVDisplayLinkRef displayLink, const CVTi - (void) addWindow:(WineWindow*)window { - BOOL needsStart; + BOOL firstWindow; @synchronized(self) { - needsStart = !_windows.count; + firstWindow = !_windows.count; [_windows addObject:window]; } - if (needsStart) + if (firstWindow || !CVDisplayLinkIsRunning(_link)) CVDisplayLinkStart(_link); } - (void) removeWindow:(WineWindow*)window { - BOOL shouldStop = FALSE; + BOOL lastWindow = FALSE; @synchronized(self) { - BOOL wasRunning = _windows.count > 0; + BOOL hadWindows = _windows.count > 0; [_windows removeObject:window]; - if (wasRunning && !_windows.count) - shouldStop = TRUE; + if (hadWindows && !_windows.count) + lastWindow = TRUE; } - if (shouldStop) + if (lastWindow && CVDisplayLinkIsRunning(_link)) CVDisplayLinkStop(_link); }

1 0

Ken Thomases : winemac: Leave a window in auto-display mode when it doesn' t yet have a display link.
by Alexandre Julliard 08 Dec '17

08 Dec '17

Module: wine Branch: master Commit: 4e9c3444fb15f1d100ca6231e9c57d0ab3dccafb URL: http://source.winehq.org/git/wine.git/?a=commit;h=4e9c3444fb15f1d100ca6231e… Author: Ken Thomases <ken(a)codeweavers.com> Date: Fri Dec 8 02:54:07 2017 -0600 winemac: Leave a window in auto-display mode when it doesn't yet have a display link. This fixes an issue where some windows (on some systems) would never display their content area. If they had a title bar, they'd just display that and nothing else. Signed-off-by: Ken Thomases <ken(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winemac.drv/cocoa_window.m | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/winemac.drv/cocoa_window.m b/dlls/winemac.drv/cocoa_window.m index 1b1d171..03a9e78 100644 --- a/dlls/winemac.drv/cocoa_window.m +++ b/dlls/winemac.drv/cocoa_window.m @@ -2427,6 +2427,8 @@ static CVReturn WineDisplayLinkCallback(CVDisplayLinkRef displayLink, const CVTi _lastDisplayTime = now; } } + else + [self setAutodisplay:YES]; } [super setViewsNeedDisplay:value]; } @@ -2435,14 +2437,16 @@ static CVReturn WineDisplayLinkCallback(CVDisplayLinkRef displayLink, const CVTi { _lastDisplayTime = [[NSProcessInfo processInfo] systemUptime]; [super display]; - [self setAutodisplay:NO]; + if (_lastDisplayID) + [self setAutodisplay:NO]; } - (void) displayIfNeeded { _lastDisplayTime = [[NSProcessInfo processInfo] systemUptime]; [super displayIfNeeded]; - [self setAutodisplay:NO]; + if (_lastDisplayID) + [self setAutodisplay:NO]; } - (void) windowDidDrawContent

1 0

Ken Thomases : winemac: Stop the display link after 2 seconds of idleness, not the first time it's idle.
by Alexandre Julliard 08 Dec '17

08 Dec '17

Module: wine Branch: master Commit: 5f80cc43bfe3e741bdcbed744812472d5edd27c9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5f80cc43bfe3e741bdcbed744… Author: Ken Thomases <ken(a)codeweavers.com> Date: Fri Dec 8 02:54:08 2017 -0600 winemac: Stop the display link after 2 seconds of idleness, not the first time it's idle. Signed-off-by: Ken Thomases <ken(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winemac.drv/cocoa_window.m | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/dlls/winemac.drv/cocoa_window.m b/dlls/winemac.drv/cocoa_window.m index 03a9e78..991db57 100644 --- a/dlls/winemac.drv/cocoa_window.m +++ b/dlls/winemac.drv/cocoa_window.m @@ -166,6 +166,8 @@ static inline NSUInteger adjusted_modifiers_for_option_behavior(NSUInteger modif NSTimeInterval _actualRefreshPeriod; NSTimeInterval _nominalRefreshPeriod; + + NSTimeInterval _lastDisplayTime; } - (id) initWithDisplayID:(CGDirectDisplayID)displayID; @@ -224,7 +226,7 @@ static CVReturn WineDisplayLinkCallback(CVDisplayLinkRef displayLink, const CVTi [_windows addObject:window]; } if (firstWindow || !CVDisplayLinkIsRunning(_link)) - CVDisplayLinkStart(_link); + [self start]; } - (void) removeWindow:(WineWindow*)window @@ -256,7 +258,11 @@ static CVReturn WineDisplayLinkCallback(CVDisplayLinkRef displayLink, const CVTi anyDisplayed = YES; } } - if (!anyDisplayed) + + NSTimeInterval now = [[NSProcessInfo processInfo] systemUptime]; + if (anyDisplayed) + _lastDisplayTime = now; + else if (_lastDisplayTime + 2.0 < now) CVDisplayLinkStop(_link); }); [windows release]; @@ -279,6 +285,7 @@ static CVReturn WineDisplayLinkCallback(CVDisplayLinkRef displayLink, const CVTi - (void) start { + _lastDisplayTime = [[NSProcessInfo processInfo] systemUptime]; CVDisplayLinkStart(_link); }

1 0