June 2016 - Wine-Commits - list.winehq.org

Andrew Eikum : xaudio2: Implement GetVoiceDetails for source and submix voices.
by Alexandre Julliard June 2, 2016

June 2, 2016

Module: wine Branch: master Commit: e733770416f42789f7b96b74505a9dc71e282ee4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e733770416f42789f7b96b745… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Wed Jun 1 15:09:05 2016 -0500 xaudio2: Implement GetVoiceDetails for source and submix voices. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xaudio2_7/compat.c | 447 ++++++++++++++++++++++++++++++++++++++-- dlls/xaudio2_7/tests/xaudio2.c | 68 ++++++ dlls/xaudio2_7/xaudio_dll.c | 23 +++ dlls/xaudio2_7/xaudio_private.h | 8 + include/xaudio2.idl | 116 ++++++++++- 5 files changed, 645 insertions(+), 17 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e733770416f42789f7b96…

1 0

Hadrien Boizard : winegstreamer: Use BOOL type where appropriate.
by Alexandre Julliard June 2, 2016

June 2, 2016

Module: wine Branch: master Commit: 68e45dd4d0021bff92fb26951fd30b4828558ba2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=68e45dd4d0021bff92fb26951… Author: Hadrien Boizard <h.boizard(a)laposte.net> Date: Tue May 31 17:41:33 2016 +0200 winegstreamer: Use BOOL type where appropriate. Signed-off-by: Hadrien Boizard <h.boizard(a)laposte.net> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/gstdemux.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index d71225d..92804e3 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -84,7 +84,7 @@ struct GSTOutPin { GstPad *their_src; GstPad *my_sink; GstBufferPool *gstpool; - int isaud, isvid; + BOOL isaud, isvid; AM_MEDIA_TYPE * pmt; HANDLE caps_event; GstSegment *segment; @@ -783,7 +783,7 @@ static void init_new_decoded_pad(GstElement *bin, GstPad *pad, GSTImpl *This) GstPad *mypad; GSTOutPin *pin; int ret; - int isvid = 0, isaud = 0; + BOOL isvid = FALSE, isaud = FALSE; gchar my_name[1024]; TRACE("%p %p %p\n", This, bin, pad); @@ -809,9 +809,9 @@ static void init_new_decoded_pad(GstElement *bin, GstPad *pad, GSTImpl *This) gst_pad_set_query_function(mypad, query_sink_wrapper); if (!strcmp(typename, "audio/x-raw")) { - isaud = 1; + isaud = TRUE; } else if (!strcmp(typename, "video/x-raw")) { - isvid = 1; + isvid = TRUE; } else { FIXME("Unknown type \'%s\'\n", typename); return;

1 0

Francois Gouget : imm32/tests: Spelling fix.
by Alexandre Julliard June 2, 2016

June 2, 2016

Module: wine Branch: master Commit: 09a401e2a89057ba2660cc9ddac72d67796e27f7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=09a401e2a89057ba2660cc9dd… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Jun 1 16:29:53 2016 +0200 imm32/tests: Spelling fix. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/imm32/tests/imm32.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/imm32/tests/imm32.c b/dlls/imm32/tests/imm32.c index fa6ae62..c7ae168 100644 --- a/dlls/imm32/tests/imm32.c +++ b/dlls/imm32/tests/imm32.c @@ -976,7 +976,7 @@ static DWORD WINAPI test_default_ime_window_cancel_cb(void *arg) WS_OVERLAPPEDWINDOW | visible, CW_USEDEFAULT, CW_USEDEFAULT, 240, 120, NULL, NULL, GetModuleHandleW(NULL), NULL); - ok(hwnd1 == NULL, "creation suceeded, got %p\n", hwnd1); + ok(hwnd1 == NULL, "creation succeeded, got %p\n", hwnd1); ok(!get_ime_window(), "Expected no IME windows\n"); test_phase = CREATE_CANCEL; @@ -984,7 +984,7 @@ static DWORD WINAPI test_default_ime_window_cancel_cb(void *arg) WS_OVERLAPPEDWINDOW | visible, CW_USEDEFAULT, CW_USEDEFAULT, 240, 120, NULL, NULL, GetModuleHandleW(NULL), NULL); - ok(hwnd1 == NULL, "creation suceeded, got %p\n", hwnd1); + ok(hwnd1 == NULL, "creation succeeded, got %p\n", hwnd1); ok(!get_ime_window(), "Expected no IME windows\n"); test_phase = FIRST_WINDOW;

1 0

Alistair Leslie-Hughes : inetcomm: Add missing default properties.
by Alexandre Julliard June 2, 2016

June 2, 2016

Module: wine Branch: master Commit: 943b376dbae0e9a6b99845948443e24e2e1fb5c6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=943b376dbae0e9a6b99845948… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Jun 1 06:06:30 2016 +0000 inetcomm: Add missing default properties. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/inetcomm/mimeole.c | 95 ++++++++++++++++++++++++++++++++++++++----------- 1 file changed, 75 insertions(+), 20 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=943b376dbae0e9a6b9984…

1 0

Andrew Eikum : xaudio2: Shut down OpenAL in the correct order.
by Alexandre Julliard June 2, 2016

June 2, 2016

Module: wine Branch: master Commit: b77ec00f1c68c083c9ab0bb3b9fc26755d8084c1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b77ec00f1c68c083c9ab0bb3b… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Wed Jun 1 14:51:50 2016 -0500 xaudio2: Shut down OpenAL in the correct order. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xaudio2_7/xaudio_dll.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/xaudio2_7/xaudio_dll.c b/dlls/xaudio2_7/xaudio_dll.c index 1393599..acad6e1 100644 --- a/dlls/xaudio2_7/xaudio_dll.c +++ b/dlls/xaudio2_7/xaudio_dll.c @@ -963,12 +963,12 @@ static void WINAPI XA2M_DestroyVoice(IXAudio2MasteringVoice *iface) IAudioClient_Release(This->aclient); This->aclient = NULL; - alcCloseDevice(This->al_device); - This->al_device = NULL; - alcDestroyContext(This->al_ctx); This->al_ctx = NULL; + alcCloseDevice(This->al_device); + This->al_device = NULL; + LeaveCriticalSection(&This->lock); }

1 0

Michael Stefaniuc : riched20/tests: Use EqualRect() instead of open coding it.
by Alexandre Julliard June 2, 2016

June 2, 2016

Module: wine Branch: master Commit: b0104692ac9bffa89452e22ff776fb83056ba59f URL: http://source.winehq.org/git/wine.git/?a=commit;h=b0104692ac9bffa89452e22ff… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Jun 2 13:41:21 2016 +0200 riched20/tests: Use EqualRect() instead of open coding it. Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/tests/editor.c | 54 ++++++++++++-------------------------------- 1 file changed, 14 insertions(+), 40 deletions(-) diff --git a/dlls/riched20/tests/editor.c b/dlls/riched20/tests/editor.c index 2fd9c99..92af700 100644 --- a/dlls/riched20/tests/editor.c +++ b/dlls/riched20/tests/editor.c @@ -7050,9 +7050,7 @@ static void test_format_rect(void) expected.left += 1; expected.right -= 1; SendMessageA(hwnd, EM_GETRECT, 0, (LPARAM)&rc); - ok(rc.top == expected.top && rc.left == expected.left && - rc.bottom == expected.bottom && rc.right == expected.right, - "rect a(t=%d, l=%d, b=%d, r=%d) != e(t=%d, l=%d, b=%d, r=%d)\n", + ok(EqualRect(&rc, &expected), "rect a(t=%d, l=%d, b=%d, r=%d) != e(t=%d, l=%d, b=%d, r=%d)\n", rc.top, rc.left, rc.bottom, rc.right, expected.top, expected.left, expected.bottom, expected.right); @@ -7071,8 +7069,7 @@ static void test_format_rect(void) expected.bottom = min(clientRect.bottom, rc.bottom); expected.right = min(clientRect.right, rc.right); SendMessageA(hwnd, EM_GETRECT, 0, (LPARAM)&rc); - ok(rc.top == expected.top && rc.left == expected.left && - rc.bottom == expected.bottom && rc.right == expected.right, + ok(EqualRect(&rc, &expected), "[n=%d] rect a(t=%d, l=%d, b=%d, r=%d) != e(t=%d, l=%d, b=%d, r=%d)\n", n, rc.top, rc.left, rc.bottom, rc.right, expected.top, expected.left, expected.bottom, expected.right); @@ -7082,9 +7079,7 @@ static void test_format_rect(void) SendMessageA(hwnd, EM_SETRECT, 0, (LPARAM)&rc); expected = clientRect; SendMessageA(hwnd, EM_GETRECT, 0, (LPARAM)&rc); - ok(rc.top == expected.top && rc.left == expected.left && - rc.bottom == expected.bottom && rc.right == expected.right, - "rect a(t=%d, l=%d, b=%d, r=%d) != e(t=%d, l=%d, b=%d, r=%d)\n", + ok(EqualRect(&rc, &expected), "rect a(t=%d, l=%d, b=%d, r=%d) != e(t=%d, l=%d, b=%d, r=%d)\n", rc.top, rc.left, rc.bottom, rc.right, expected.top, expected.left, expected.bottom, expected.right); @@ -7094,9 +7089,7 @@ static void test_format_rect(void) ok(options & ECO_SELECTIONBAR, "EM_SETOPTIONS failed to add selectionbar.\n"); expected.left += 8; /* selection bar width */ SendMessageA(hwnd, EM_GETRECT, 0, (LPARAM)&rc); - ok(rc.top == expected.top && rc.left == expected.left && - rc.bottom == expected.bottom && rc.right == expected.right, - "rect a(t=%d, l=%d, b=%d, r=%d) != e(t=%d, l=%d, b=%d, r=%d)\n", + ok(EqualRect(&rc, &expected), "rect a(t=%d, l=%d, b=%d, r=%d) != e(t=%d, l=%d, b=%d, r=%d)\n", rc.top, rc.left, rc.bottom, rc.right, expected.top, expected.left, expected.bottom, expected.right); @@ -7104,9 +7097,7 @@ static void test_format_rect(void) SendMessageA(hwnd, EM_SETRECT, 0, (LPARAM)&rc); expected = clientRect; SendMessageA(hwnd, EM_GETRECT, 0, (LPARAM)&rc); - ok(rc.top == expected.top && rc.left == expected.left && - rc.bottom == expected.bottom && rc.right == expected.right, - "rect a(t=%d, l=%d, b=%d, r=%d) != e(t=%d, l=%d, b=%d, r=%d)\n", + ok(EqualRect(&rc, &expected), "rect a(t=%d, l=%d, b=%d, r=%d) != e(t=%d, l=%d, b=%d, r=%d)\n", rc.top, rc.left, rc.bottom, rc.right, expected.top, expected.left, expected.bottom, expected.right); @@ -7117,9 +7108,7 @@ static void test_format_rect(void) ok(!(options & ECO_SELECTIONBAR), "EM_SETOPTIONS failed to remove selectionbar.\n"); expected.left -= 8; /* selection bar width */ SendMessageA(hwnd, EM_GETRECT, 0, (LPARAM)&rc); - ok(rc.top == expected.top && rc.left == expected.left && - rc.bottom == expected.bottom && rc.right == expected.right, - "rect a(t=%d, l=%d, b=%d, r=%d) != e(t=%d, l=%d, b=%d, r=%d)\n", + ok(EqualRect(&rc, &expected), "rect a(t=%d, l=%d, b=%d, r=%d) != e(t=%d, l=%d, b=%d, r=%d)\n", rc.top, rc.left, rc.bottom, rc.right, expected.top, expected.left, expected.bottom, expected.right); @@ -7128,8 +7117,7 @@ static void test_format_rect(void) SendMessageA(hwnd, EM_SETRECT, 0, (LPARAM)&rc); expected = clientRect; SendMessageA(hwnd, EM_GETRECT, 0, (LPARAM)&rc); - ok(rc.top == expected.top && rc.left == expected.left && - rc.bottom == expected.bottom && rc.right == expected.right, + ok(EqualRect(&rc, &expected), "[n=%d] rect a(t=%d, l=%d, b=%d, r=%d) != e(t=%d, l=%d, b=%d, r=%d)\n", n, rc.top, rc.left, rc.bottom, rc.right, expected.top, expected.left, expected.bottom, expected.right); @@ -7144,9 +7132,7 @@ static void test_format_rect(void) expected = rc; SendMessageA(hwnd, EM_SETRECT, 1, (LPARAM)&rc); SendMessageA(hwnd, EM_GETRECT, 0, (LPARAM)&rc); - ok(rc.top == expected.top && rc.left == expected.left && - rc.bottom == expected.bottom && rc.right == expected.right, - "rect a(t=%d, l=%d, b=%d, r=%d) != e(t=%d, l=%d, b=%d, r=%d)\n", + ok(EqualRect(&rc, &expected), "rect a(t=%d, l=%d, b=%d, r=%d) != e(t=%d, l=%d, b=%d, r=%d)\n", rc.top, rc.left, rc.bottom, rc.right, expected.top, expected.left, expected.bottom, expected.right); @@ -7159,9 +7145,7 @@ static void test_format_rect(void) expected = rc; SendMessageA(hwnd, EM_SETRECT, 1, (LPARAM)&rc); SendMessageA(hwnd, EM_GETRECT, 0, (LPARAM)&rc); - ok(rc.top == expected.top && rc.left == expected.left && - rc.bottom == expected.bottom && rc.right == expected.right, - "rect a(t=%d, l=%d, b=%d, r=%d) != e(t=%d, l=%d, b=%d, r=%d)\n", + ok(EqualRect(&rc, &expected), "rect a(t=%d, l=%d, b=%d, r=%d) != e(t=%d, l=%d, b=%d, r=%d)\n", rc.top, rc.left, rc.bottom, rc.right, expected.top, expected.left, expected.bottom, expected.right); @@ -7176,9 +7160,7 @@ static void test_format_rect(void) expected.left += 1; expected.right -= 1; SendMessageA(hwnd, EM_GETRECT, 0, (LPARAM)&rc); - ok(rc.top == expected.top && rc.left == expected.left && - rc.bottom == expected.bottom && rc.right == expected.right, - "rect a(t=%d, l=%d, b=%d, r=%d) != e(t=%d, l=%d, b=%d, r=%d)\n", + ok(EqualRect(&rc, &expected), "rect a(t=%d, l=%d, b=%d, r=%d) != e(t=%d, l=%d, b=%d, r=%d)\n", rc.top, rc.left, rc.bottom, rc.right, expected.top, expected.left, expected.bottom, expected.right); @@ -7189,9 +7171,7 @@ static void test_format_rect(void) expected.left += 1; expected.right -= 1; SendMessageA(hwnd, EM_GETRECT, 0, (LPARAM)&rc); - ok(rc.top == expected.top && rc.left == expected.left && - rc.bottom == expected.bottom && rc.right == expected.right, - "rect a(t=%d, l=%d, b=%d, r=%d) != e(t=%d, l=%d, b=%d, r=%d)\n", + ok(EqualRect(&rc, &expected), "rect a(t=%d, l=%d, b=%d, r=%d) != e(t=%d, l=%d, b=%d, r=%d)\n", rc.top, rc.left, rc.bottom, rc.right, expected.top, expected.left, expected.bottom, expected.right); @@ -7202,9 +7182,7 @@ static void test_format_rect(void) expected.left += 1; expected.right -= 1; SendMessageA(hwnd, EM_GETRECT, 0, (LPARAM)&rc); - ok(rc.top == expected.top && rc.left == expected.left && - rc.bottom == expected.bottom && rc.right == expected.right, - "rect a(t=%d, l=%d, b=%d, r=%d) != e(t=%d, l=%d, b=%d, r=%d)\n", + ok(EqualRect(&rc, &expected), "rect a(t=%d, l=%d, b=%d, r=%d) != e(t=%d, l=%d, b=%d, r=%d)\n", rc.top, rc.left, rc.bottom, rc.right, expected.top, expected.left, expected.bottom, expected.right); @@ -7223,9 +7201,7 @@ static void test_format_rect(void) expected.top += 1; expected.right -= 1; SendMessageA(hwnd, EM_GETRECT, 0, (LPARAM)&rc); - ok(rc.top == expected.top && rc.left == expected.left && - rc.bottom == expected.bottom && rc.right == expected.right, - "rect a(t=%d, l=%d, b=%d, r=%d) != e(t=%d, l=%d, b=%d, r=%d)\n", + ok(EqualRect(&rc, &expected), "rect a(t=%d, l=%d, b=%d, r=%d) != e(t=%d, l=%d, b=%d, r=%d)\n", rc.top, rc.left, rc.bottom, rc.right, expected.top, expected.left, expected.bottom, expected.right); @@ -7240,9 +7216,7 @@ static void test_format_rect(void) expected.right += 1; SendMessageA(hwnd, EM_SETRECT, 0, (LPARAM)&rc); SendMessageA(hwnd, EM_GETRECT, 0, (LPARAM)&rc); - ok(rc.top == expected.top && rc.left == expected.left && - rc.bottom == expected.bottom && rc.right == expected.right, - "rect a(t=%d, l=%d, b=%d, r=%d) != e(t=%d, l=%d, b=%d, r=%d)\n", + ok(EqualRect(&rc, &expected), "rect a(t=%d, l=%d, b=%d, r=%d) != e(t=%d, l=%d, b=%d, r=%d)\n", rc.top, rc.left, rc.bottom, rc.right, expected.top, expected.left, expected.bottom, expected.right);

1 0

Nikolay Sivov : msxml3/schema: Support element nodes in add().
by Alexandre Julliard June 1, 2016

June 1, 2016

Module: wine Branch: master Commit: 1140291adc537121422e5d4184a0502d6e368d2d URL: http://source.winehq.org/git/wine.git/?a=commit;h=1140291adc537121422e5d418… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Jun 1 14:33:20 2016 +0300 msxml3/schema: Support element nodes in add(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msxml3/schema.c | 25 ++++++++++++++++++++++++- 1 file changed, 24 insertions(+), 1 deletion(-) diff --git a/dlls/msxml3/schema.c b/dlls/msxml3/schema.c index f92130a..30272cb 100644 --- a/dlls/msxml3/schema.c +++ b/dlls/msxml3/schema.c @@ -1247,7 +1247,30 @@ static HRESULT WINAPI schema_cache_add(IXMLDOMSchemaCollection2* iface, BSTR uri IUnknown_QueryInterface(V_UNKNOWN(&var), &IID_IXMLDOMNode, (void**)&domnode); if (domnode) - doc = xmlNodePtr_from_domnode(domnode, XML_DOCUMENT_NODE)->doc; + { + DOMNodeType type; + + IXMLDOMNode_get_nodeType(domnode, &type); + switch (type) + { + case NODE_ELEMENT: + { + IXMLDOMDocument *domdoc; + VARIANT_BOOL b; + BSTR xml; + + IXMLDOMNode_get_xml(domnode, &xml); + DOMDocument_create(This->version, (void**)&domdoc); + IXMLDOMDocument_loadXML(domdoc, xml, &b); + SysFreeString(xml); + doc = xmlNodePtr_from_domnode((IXMLDOMNode*)domdoc, XML_DOCUMENT_NODE)->doc; + break; + } + default: + doc = xmlNodePtr_from_domnode(domnode, XML_DOCUMENT_NODE)->doc; + break; + } + } if (!doc) {

1 0

Józef Kucia : wined3d: Use ARB_explicit_attrib_location to pre-assign vertex attribute locations.
by Alexandre Julliard June 1, 2016

June 1, 2016

Module: wine Branch: master Commit: 519d459b72d6f549f8f33a3e2fbbfab0407f9b67 URL: http://source.winehq.org/git/wine.git/?a=commit;h=519d459b72d6f549f8f33a3e2… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue May 31 23:29:54 2016 +0200 wined3d: Use ARB_explicit_attrib_location to pre-assign vertex attribute locations. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/glsl_shader.c | 123 +++++++++++++++++++++++++++------------------ include/wine/wined3d.h | 7 +-- 2 files changed, 77 insertions(+), 53 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index c8c8cc2..e5a0e69 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -1584,6 +1584,11 @@ static BOOL needs_legacy_glsl_syntax(const struct wined3d_gl_info *gl_info) return gl_info->supported[WINED3D_GL_LEGACY_CONTEXT]; } +static BOOL shader_glsl_use_explicit_attrib_location(const struct wined3d_gl_info *gl_info) +{ + return !needs_legacy_glsl_syntax(gl_info) && gl_info->supported[ARB_EXPLICIT_ATTRIB_LOCATION]; +} + static const char *get_attribute_keyword(const struct wined3d_gl_info *gl_info) { return needs_legacy_glsl_syntax(gl_info) ? "attribute" : "in"; @@ -1715,6 +1720,46 @@ static void shader_glsl_declare_typed_vertex_attribute(struct wined3d_string_buf index, scalar_type, scalar_type, index); } +static void shader_glsl_declare_generic_vertex_attribute(struct wined3d_string_buffer *buffer, + const struct wined3d_gl_info *gl_info, const struct wined3d_shader_signature_element *e) +{ + unsigned int index = e->register_idx; + + if (e->sysval_semantic == WINED3D_SV_VERTEX_ID) + { + shader_addline(buffer, "vec4 vs_in%u = vec4(intBitsToFloat(gl_VertexID), 0.0, 0.0, 0.0);\n", + index); + return; + } + if (e->sysval_semantic == WINED3D_SV_INSTANCE_ID) + { + shader_addline(buffer, "vec4 vs_in%u = vec4(intBitsToFloat(gl_InstanceID), 0.0, 0.0, 0.0);\n", + index); + return; + } + + if (shader_glsl_use_explicit_attrib_location(gl_info)) + shader_addline(buffer, "layout(location = %u) ", index); + + switch (e->component_type) + { + case WINED3D_TYPE_UINT: + shader_glsl_declare_typed_vertex_attribute(buffer, gl_info, "uvec", "uint", index); + break; + case WINED3D_TYPE_INT: + shader_glsl_declare_typed_vertex_attribute(buffer, gl_info, "ivec", "int", index); + break; + + default: + FIXME("Unhandled type %#x.\n", e->component_type); + /* Fall through. */ + case WINED3D_TYPE_UNKNOWN: + case WINED3D_TYPE_FLOAT: + shader_addline(buffer, "%s vec4 vs_in%u;\n", get_attribute_keyword(gl_info), index); + break; + } +} + /** Generate the variable & register declarations for the GLSL output target */ static void shader_generate_glsl_declarations(const struct wined3d_context *context, struct wined3d_string_buffer *buffer, const struct wined3d_shader *shader, @@ -1964,34 +2009,7 @@ static void shader_generate_glsl_declarations(const struct wined3d_context *cont if (version->type == WINED3D_SHADER_TYPE_VERTEX) { for (i = 0; i < shader->input_signature.element_count; ++i) - { - const struct wined3d_shader_signature_element *e = &shader->input_signature.elements[i]; - if (e->sysval_semantic == WINED3D_SV_VERTEX_ID) - { - shader_addline(buffer, "vec4 %s_in%u = vec4(intBitsToFloat(gl_VertexID), 0.0, 0.0, 0.0);\n", - prefix, e->register_idx); - } - else if (e->sysval_semantic == WINED3D_SV_INSTANCE_ID) - { - shader_addline(buffer, "vec4 %s_in%u = vec4(intBitsToFloat(gl_InstanceID), 0.0, 0.0, 0.0);\n", - prefix, e->register_idx); - } - else if (e->component_type == WINED3D_TYPE_UINT) - { - shader_glsl_declare_typed_vertex_attribute(buffer, gl_info, "uvec", "uint", e->register_idx); - } - else if (e->component_type == WINED3D_TYPE_INT) - { - shader_glsl_declare_typed_vertex_attribute(buffer, gl_info, "ivec", "int", e->register_idx); - } - else - { - if (e->component_type && e->component_type != WINED3D_TYPE_FLOAT) - FIXME("Unhandled type %#x.\n", e->component_type); - shader_addline(buffer, "%s vec4 %s_in%u;\n", - get_attribute_keyword(gl_info), prefix, e->register_idx); - } - } + shader_glsl_declare_generic_vertex_attribute(buffer, gl_info, &shader->input_signature.elements[i]); if (vs_args->point_size && !vs_args->per_vertex_point_size) { @@ -5809,6 +5827,8 @@ static GLuint shader_glsl_generate_vshader(const struct wined3d_context *context if (gl_info->supported[ARB_DRAW_INSTANCED]) shader_addline(buffer, "#extension GL_ARB_draw_instanced : enable\n"); + if (gl_info->supported[ARB_EXPLICIT_ATTRIB_LOCATION]) + shader_addline(buffer, "#extension GL_ARB_explicit_attrib_location : enable\n"); if (gl_info->supported[ARB_SHADER_BIT_ENCODING]) shader_addline(buffer, "#extension GL_ARB_shader_bit_encoding : enable\n"); if (gl_info->supported[ARB_TEXTURE_QUERY_LEVELS]) @@ -7605,33 +7625,36 @@ static void set_glsl_shader_program(const struct wined3d_context *context, const attribs_map = (1u << WINED3D_FFP_ATTRIBS_COUNT) - 1; } - /* Bind vertex attributes to a corresponding index number to match - * the same index numbers as ARB_vertex_programs (makes loading - * vertex attributes simpler). With this method, we can use the - * exact same code to load the attributes later for both ARB and - * GLSL shaders. - * - * We have to do this here because we need to know the Program ID - * in order to make the bindings work, and it has to be done prior - * to linking the GLSL program. */ - tmp_name = string_buffer_get(&priv->string_buffers); - for (i = 0; attribs_map; attribs_map >>= 1, ++i) + if (!shader_glsl_use_explicit_attrib_location(gl_info)) { - if (!(attribs_map & 1)) - continue; - - string_buffer_sprintf(tmp_name, "vs_in%u", i); - GL_EXTCALL(glBindAttribLocation(program_id, i, tmp_name->buffer)); - if (vshader && vshader->reg_maps.shader_version.major >= 4) + /* Bind vertex attributes to a corresponding index number to match + * the same index numbers as ARB_vertex_programs (makes loading + * vertex attributes simpler). With this method, we can use the + * exact same code to load the attributes later for both ARB and + * GLSL shaders. + * + * We have to do this here because we need to know the Program ID + * in order to make the bindings work, and it has to be done prior + * to linking the GLSL program. */ + tmp_name = string_buffer_get(&priv->string_buffers); + for (i = 0; attribs_map; attribs_map >>= 1, ++i) { - string_buffer_sprintf(tmp_name, "vs_in_uint%u", i); - GL_EXTCALL(glBindAttribLocation(program_id, i, tmp_name->buffer)); - string_buffer_sprintf(tmp_name, "vs_in_int%u", i); + if (!(attribs_map & 1)) + continue; + + string_buffer_sprintf(tmp_name, "vs_in%u", i); GL_EXTCALL(glBindAttribLocation(program_id, i, tmp_name->buffer)); + if (vshader && vshader->reg_maps.shader_version.major >= 4) + { + string_buffer_sprintf(tmp_name, "vs_in_uint%u", i); + GL_EXTCALL(glBindAttribLocation(program_id, i, tmp_name->buffer)); + string_buffer_sprintf(tmp_name, "vs_in_int%u", i); + GL_EXTCALL(glBindAttribLocation(program_id, i, tmp_name->buffer)); + } } + checkGLcall("glBindAttribLocation"); + string_buffer_release(&priv->string_buffers, tmp_name); } - checkGLcall("glBindAttribLocation"); - string_buffer_release(&priv->string_buffers, tmp_name); if (gshader) { diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 19ad6d5..2481743 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -765,9 +765,10 @@ enum wined3d_sysval_semantic enum wined3d_component_type { - WINED3D_TYPE_UINT = 1, - WINED3D_TYPE_INT = 2, - WINED3D_TYPE_FLOAT = 3, + WINED3D_TYPE_UNKNOWN = 0, + WINED3D_TYPE_UINT = 1, + WINED3D_TYPE_INT = 2, + WINED3D_TYPE_FLOAT = 3, }; enum wined3d_scanline_ordering

1 0

Huw Davies : riched20: Add support for quoting urls with spaces within '<' '>'.
by Alexandre Julliard June 1, 2016

June 1, 2016

Module: wine Branch: master Commit: 03fa4cfaffd4c10f56a2f8bfd383f4eaf67d364c URL: http://source.winehq.org/git/wine.git/?a=commit;h=03fa4cfaffd4c10f56a2f8bfd… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Jun 1 12:35:38 2016 +0100 riched20: Add support for quoting urls with spaces within '<' '>'. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/editor.c | 31 +++++++++++++++++++++++++++---- 1 file changed, 27 insertions(+), 4 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index d4ca570..a07dd7f 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -5038,8 +5038,8 @@ static BOOL ME_FindNextURLCandidate(ME_TextEditor *editor, ME_Cursor *candidate_min, ME_Cursor *candidate_max) { - ME_Cursor cursor = *start, neutral_end; - BOOL candidateStarted = FALSE; + ME_Cursor cursor = *start, neutral_end, space_end; + BOOL candidateStarted = FALSE, quoted = FALSE; WCHAR c; while (nChars > 0) @@ -5060,9 +5060,11 @@ static BOOL ME_FindNextURLCandidate(ME_TextEditor *editor, *candidate_min = cursor; candidateStarted = TRUE; neutral_end.pPara = NULL; + space_end.pPara = NULL; cursor.nOffset++; break; } + quoted = (c == '<'); cursor.nOffset++; } } @@ -5074,9 +5076,28 @@ static BOOL ME_FindNextURLCandidate(ME_TextEditor *editor, { c = str[cursor.nOffset]; if (isspaceW( c )) - goto done; + { + if (quoted && c != '\r') + { + if (!space_end.pPara) + { + if (neutral_end.pPara) + space_end = neutral_end; + else + space_end = cursor; + } + } + else + goto done; + } else if (isurlneutral( c )) { + if (quoted && c == '>') + { + neutral_end.pPara = NULL; + space_end.pPara = NULL; + goto done; + } if (!neutral_end.pPara) neutral_end = cursor; } @@ -5095,7 +5116,9 @@ static BOOL ME_FindNextURLCandidate(ME_TextEditor *editor, done: if (candidateStarted) { - if (neutral_end.pPara) + if (space_end.pPara) + *candidate_max = space_end; + else if (neutral_end.pPara) *candidate_max = neutral_end; else *candidate_max = cursor;

1 0

Huw Davies : riched20: Fix URL auto-detection to handle 'neutral' characters.
by Alexandre Julliard June 1, 2016

June 1, 2016

Module: wine Branch: master Commit: ea1e44e4f698b278e3e980914188f414630bfc31 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ea1e44e4f698b278e3e980914… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Jun 1 12:35:37 2016 +0100 riched20: Fix URL auto-detection to handle 'neutral' characters. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/editor.c | 124 ++++++++++++++++++++----------------------- dlls/riched20/tests/editor.c | 77 +++++++++++++++++++++++++++ 2 files changed, 136 insertions(+), 65 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 85395e7..d4ca570 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -5005,10 +5005,24 @@ LRESULT WINAPI REExtendedRegisterClass(void) return result; } -static BOOL isurlspecial(WCHAR c) +static int wchar_comp( const void *key, const void *elem ) { - static const WCHAR special_chars[] = {'.','/','%','@','*','|','\\','+','#',0}; - return strchrW( special_chars, c ) != NULL; + return *(const WCHAR *)key - *(const WCHAR *)elem; +} + +/* neutral characters end the url if the next non-neutral character is a space character, + otherwise they are included in the url. */ +static BOOL isurlneutral( WCHAR c ) +{ + /* NB this list is sorted */ + static const WCHAR neutral_chars[] = {'!','\"','\'','(',')',',','-','.',':',';','<','>','?','[',']','{','}'}; + + /* Some shortcuts */ + if (isalnum( c )) return FALSE; + if (c > neutral_chars[sizeof(neutral_chars) / sizeof(neutral_chars[0]) - 1]) return FALSE; + + return !!bsearch( &c, neutral_chars, sizeof(neutral_chars) / sizeof(neutral_chars[0]), + sizeof(c), wchar_comp ); } /** @@ -5024,87 +5038,67 @@ static BOOL ME_FindNextURLCandidate(ME_TextEditor *editor, ME_Cursor *candidate_min, ME_Cursor *candidate_max) { - ME_Cursor cursor = *start; - BOOL foundColon = FALSE; + ME_Cursor cursor = *start, neutral_end; BOOL candidateStarted = FALSE; - WCHAR lastAcceptedChar = '\0'; + WCHAR c; while (nChars > 0) { - WCHAR *strStart = get_text( &cursor.pRun->member.run, 0 ); - WCHAR *str = strStart + cursor.nOffset; - int nLen = cursor.pRun->member.run.len - cursor.nOffset; - nChars -= nLen; + WCHAR *str = get_text( &cursor.pRun->member.run, 0 ); + int run_len = cursor.pRun->member.run.len; + + nChars -= run_len - cursor.nOffset; - if (~cursor.pRun->member.run.nFlags & MERF_ENDPARA) + /* Find start of candidate */ + if (!candidateStarted) { - /* Find start of candidate */ - if (!candidateStarted) + while (cursor.nOffset < run_len) { - while (nLen) + c = str[cursor.nOffset]; + if (!isspaceW( c ) && !isurlneutral( c )) { - nLen--; - if (isalnumW(*str) || isurlspecial(*str)) - { - cursor.nOffset = str - strStart; - *candidate_min = cursor; - candidateStarted = TRUE; - lastAcceptedChar = *str++; - break; - } - str++; + *candidate_min = cursor; + candidateStarted = TRUE; + neutral_end.pPara = NULL; + cursor.nOffset++; + break; } + cursor.nOffset++; } + } - /* Find end of candidate */ - if (candidateStarted) { - while (nLen) + /* Find end of candidate */ + if (candidateStarted) + { + while (cursor.nOffset < run_len) + { + c = str[cursor.nOffset]; + if (isspaceW( c )) + goto done; + else if (isurlneutral( c )) { - nLen--; - if (*str == ':' && !foundColon) { - foundColon = TRUE; - } else if (!isalnumW(*str) && !isurlspecial(*str)) { - cursor.nOffset = str - strStart; - if (lastAcceptedChar == ':') - ME_MoveCursorChars(editor, &cursor, -1); - *candidate_max = cursor; - return TRUE; - } - lastAcceptedChar = *str++; + if (!neutral_end.pPara) + neutral_end = cursor; } - } - } else { - /* End of paragraph: skip it if before candidate span, or terminates - current active span */ - if (candidateStarted) { - if (lastAcceptedChar == ':') - ME_MoveCursorChars(editor, &cursor, -1); - *candidate_max = cursor; - return TRUE; - } - } + else + neutral_end.pPara = NULL; - /* Reaching this point means no span was found, so get next span */ - if (!ME_NextRun(&cursor.pPara, &cursor.pRun)) { - if (candidateStarted) { - /* There are no further runs, so take end of text as end of candidate */ - cursor.nOffset = str - strStart; - if (lastAcceptedChar == ':') - ME_MoveCursorChars(editor, &cursor, -1); - *candidate_max = cursor; - return TRUE; + cursor.nOffset++; } - *candidate_max = *candidate_min = cursor; - return FALSE; } + cursor.nOffset = 0; + if (!ME_NextRun(&cursor.pPara, &cursor.pRun)) + goto done; } - if (candidateStarted) { - /* There are no further runs, so take end of text as end of candidate */ - if (lastAcceptedChar == ':') - ME_MoveCursorChars(editor, &cursor, -1); - *candidate_max = cursor; +done: + if (candidateStarted) + { + if (neutral_end.pPara) + *candidate_max = neutral_end; + else + *candidate_max = cursor; return TRUE; } *candidate_max = *candidate_min = cursor; diff --git a/dlls/riched20/tests/editor.c b/dlls/riched20/tests/editor.c index fd00487..2fd9c99 100644 --- a/dlls/riched20/tests/editor.c +++ b/dlls/riched20/tests/editor.c @@ -1781,6 +1781,7 @@ static void test_EM_AUTOURLDETECT(void) "This is some text with #X on it", "This is some text with @X on it", "This is some text with \\X on it", + "This is some text with _X on it", }; /* All of these cause the URL detection to be extended by one more byte, thus demonstrating that the tested character is considered as part @@ -1794,6 +1795,33 @@ static void test_EM_AUTOURLDETECT(void) "This is some text with X# on it", "This is some text with X@ on it", "This is some text with X\\ on it", + "This is some text with X_ on it", + }; + /* These delims act as neutral breaks. Whether the url is ended + or not depends on the next non-neutral character. We'll test + with Y unchanged, in which case the url should include the + deliminator and the Y. We'll also test with the Y changed + to a space, in which case the url stops before the + deliminator. */ + const char * templates_neutral_delim[] = { + "This is some text with X-Y on it", + "This is some text with X--Y on it", + "This is some text with X!Y on it", + "This is some text with X[Y on it", + "This is some text with X]Y on it", + "This is some text with X{Y on it", + "This is some text with X}Y on it", + "This is some text with X(Y on it", + "This is some text with X)Y on it", + "This is some text with X\"Y on it", + "This is some text with X;Y on it", + "This is some text with X:Y on it", + "This is some text with X'Y on it", + "This is some text with X?Y on it", + "This is some text with X<Y on it", + "This is some text with X>Y on it", + "This is some text with X.Y on it", + "This is some text with X,Y on it", }; char buffer[1024]; @@ -1974,6 +2002,55 @@ static void test_EM_AUTOURLDETECT(void) } } + for (j = 0; j < sizeof(templates_neutral_delim) / sizeof(const char *); j++) { + char * at_pos, * end_pos; + int at_offset; + int end_offset; + + if (!urls[i].is_url) continue; + + at_pos = strchr(templates_neutral_delim[j], 'X'); + at_offset = at_pos - templates_neutral_delim[j]; + memcpy(buffer, templates_neutral_delim[j], at_offset); + buffer[at_offset] = '\0'; + strcat(buffer, urls[i].text); + strcat(buffer, templates_neutral_delim[j] + at_offset + 1); + + end_pos = strchr(buffer, 'Y'); + end_offset = end_pos - buffer; + + SendMessageA(hwndRichEdit, EM_AUTOURLDETECT, TRUE, 0); + SendMessageA(hwndRichEdit, WM_SETTEXT, 0, (LPARAM)buffer); + + /* This assumes no templates start with the URL itself, and that they + have at least two characters before the URL text */ + ok(!check_CFE_LINK_selection(hwndRichEdit, 0, 1), + "CFE_LINK incorrectly set in (%d-%d), text: %s\n", 0, 1, buffer); + ok(!check_CFE_LINK_selection(hwndRichEdit, at_offset -2, at_offset -1), + "CFE_LINK incorrectly set in (%d-%d), text: %s\n", at_offset -2, at_offset -1, buffer); + ok(!check_CFE_LINK_selection(hwndRichEdit, at_offset -1, at_offset), + "CFE_LINK incorrectly set in (%d-%d), text: %s\n", at_offset -1, at_offset, buffer); + + ok(check_CFE_LINK_selection(hwndRichEdit, at_offset, at_offset +1), + "CFE_LINK not set in (%d-%d), text: %s\n", at_offset, at_offset +1, buffer); + ok(check_CFE_LINK_selection(hwndRichEdit, end_offset -1, end_offset), + "CFE_LINK not set in (%d-%d), text: %s\n", end_offset -1, end_offset, buffer); + ok(check_CFE_LINK_selection(hwndRichEdit, end_offset, end_offset +1), + "CFE_LINK not set in (%d-%d), text: %s\n", end_offset, end_offset +1, buffer); + + *end_pos = ' '; + + SendMessageA(hwndRichEdit, EM_AUTOURLDETECT, TRUE, 0); + SendMessageA(hwndRichEdit, WM_SETTEXT, 0, (LPARAM)buffer); + + ok(check_CFE_LINK_selection(hwndRichEdit, at_offset, at_offset +1), + "CFE_LINK not set in (%d-%d), text: %s\n", at_offset, at_offset +1, buffer); + ok(!check_CFE_LINK_selection(hwndRichEdit, end_offset -1, end_offset), + "CFE_LINK set in (%d-%d), text: %s\n", end_offset -1, end_offset, buffer); + ok(!check_CFE_LINK_selection(hwndRichEdit, end_offset, end_offset +1), + "CFE_LINK set in (%d-%d), text: %s\n", end_offset, end_offset +1, buffer); + } + DestroyWindow(hwndRichEdit); hwndRichEdit = NULL; }

1 0