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

Austin English : ntdll: Add WinSqmEndSession/WinSqmStartSession stubs.
by Alexandre Julliard 01 Jun '16

01 Jun '16

Module: wine Branch: master Commit: 4f3607f7547d8b803adfceca41afcb11b30116ec URL: http://source.winehq.org/git/wine.git/?a=commit;h=4f3607f7547d8b803adfceca4… Author: Austin English <austinenglish(a)gmail.com> Date: Wed Jun 1 09:00:07 2016 +0200 ntdll: Add WinSqmEndSession/WinSqmStartSession stubs. Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/misc.c | 22 +++++++++++++++++++++- dlls/ntdll/ntdll.spec | 2 ++ 2 files changed, 23 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/misc.c b/dlls/ntdll/misc.c index 0f6c5df..f540c4b 100644 --- a/dlls/ntdll/misc.c +++ b/dlls/ntdll/misc.c @@ -27,6 +27,8 @@ #include <sys/utsname.h> #endif +#include "ntstatus.h" +#define WIN32_NO_STATUS #include "wine/library.h" #include "wine/debug.h" #include "ntdll_misc.h" @@ -329,16 +331,34 @@ void * __cdecl _lfind( const void *key, const void *base, unsigned int *nmemb, return NULL; } +/****************************************************************************** + * WinSqmEndSession (NTDLL.@) + */ +NTSTATUS WINAPI WinSqmEndSession(HANDLE session) +{ + FIXME("(%p): stub\n", session); + return STATUS_NOT_IMPLEMENTED; +} + /********************************************************************* * WinSqmIsOptedIn (NTDLL.@) */ BOOL WINAPI WinSqmIsOptedIn(void) { - FIXME("() stub\n"); + FIXME("(): stub\n"); return FALSE; } /****************************************************************************** + * WinSqmStartSession (NTDLL.@) + */ +HANDLE WINAPI WinSqmStartSession(GUID *sessionguid, DWORD sessionid, DWORD unknown1) +{ + FIXME("(%p, 0x%x, 0x%x): stub\n", sessionguid, sessionid, unknown1); + return INVALID_HANDLE_VALUE; +} + +/****************************************************************************** * EtwRegisterTraceGuidsW (NTDLL.@) * * Register an event trace provider and the event trace classes that it uses diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index a7256c4..4737b06 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -1011,7 +1011,9 @@ @ stdcall TpWaitForWait(ptr long) @ stdcall TpWaitForWork(ptr long) @ stdcall -ret64 VerSetConditionMask(int64 long long) +@ stdcall WinSqmEndSession(long) @ stdcall WinSqmIsOptedIn() +@ stdcall WinSqmStartSession(ptr long long) @ stdcall ZwAcceptConnectPort(ptr long ptr long long ptr) NtAcceptConnectPort @ stdcall ZwAccessCheck(ptr long long ptr ptr ptr ptr ptr) NtAccessCheck @ stdcall ZwAccessCheckAndAuditAlarm(ptr long ptr ptr ptr long ptr long ptr ptr ptr) NtAccessCheckAndAuditAlarm

1 0

Józef Kucia : wined3d: Use pure integer vertex attributes for SM4+ shaders.
by Alexandre Julliard 01 Jun '16

01 Jun '16

Module: wine Branch: master Commit: 4dfd79d336902f98eafd4c77dc2a0a8381fa033e URL: http://source.winehq.org/git/wine.git/?a=commit;h=4dfd79d336902f98eafd4c77d… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue May 31 23:29:50 2016 +0200 wined3d: Use pure integer vertex attributes for SM4+ shaders. 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/directx.c | 2 ++ dlls/wined3d/glsl_shader.c | 33 +++++++++++++++++++++++++++ dlls/wined3d/shader.c | 4 ++-- dlls/wined3d/state.c | 56 ++++++++++++++++++++++++++-------------------- include/wine/wined3d.h | 9 +++++++- 5 files changed, 77 insertions(+), 27 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=4dfd79d336902f98eafd4…

1 0

Józef Kucia : d3d11/tests: Add test for input assembler.
by Alexandre Julliard 01 Jun '16

01 Jun '16

Module: wine Branch: master Commit: 846b3ac60c39e364b86e5933fb81915d7195695b URL: http://source.winehq.org/git/wine.git/?a=commit;h=846b3ac60c39e364b86e5933f… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue May 31 23:29:51 2016 +0200 d3d11/tests: Add test for input assembler. 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/d3d11/tests/d3d11.c | 358 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 358 insertions(+) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=846b3ac60c39e364b86e5…

1 0

Józef Kucia : d3d10core/tests: Add test for input assembler.
by Alexandre Julliard 01 Jun '16

01 Jun '16

Module: wine Branch: master Commit: 40e36b79eee80d777fa1f083172d72689a80e51b URL: http://source.winehq.org/git/wine.git/?a=commit;h=40e36b79eee80d777fa1f0831… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue May 31 23:29:52 2016 +0200 d3d10core/tests: Add test for input assembler. 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/d3d10core/tests/device.c | 356 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 356 insertions(+) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=40e36b79eee80d777fa1f…

1 0

Józef Kucia : wined3d: Add ARB_explicit_attrib_location extension.
by Alexandre Julliard 01 Jun '16

01 Jun '16

Module: wine Branch: master Commit: a0658efb61490ffce9ed1581ff2c2ea0b770e933 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a0658efb61490ffce9ed1581f… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue May 31 23:29:53 2016 +0200 wined3d: Add ARB_explicit_attrib_location extension. 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/directx.c | 2 ++ dlls/wined3d/wined3d_gl.h | 1 + 2 files changed, 3 insertions(+) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index c7bd3d4..fbfbb49 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -117,6 +117,7 @@ static const struct wined3d_extension_map gl_extension_map[] = {"GL_ARB_draw_elements_base_vertex", ARB_DRAW_ELEMENTS_BASE_VERTEX }, {"GL_ARB_draw_instanced", ARB_DRAW_INSTANCED }, {"GL_ARB_ES2_compatibility", ARB_ES2_COMPATIBILITY }, + {"GL_ARB_explicit_attrib_location", ARB_EXPLICIT_ATTRIB_LOCATION }, {"GL_ARB_fragment_program", ARB_FRAGMENT_PROGRAM }, {"GL_ARB_fragment_shader", ARB_FRAGMENT_SHADER }, {"GL_ARB_framebuffer_object", ARB_FRAMEBUFFER_OBJECT }, @@ -3513,6 +3514,7 @@ static BOOL wined3d_adapter_init_gl_caps(struct wined3d_adapter *adapter, DWORD {ARB_VERTEX_ARRAY_BGRA, MAKEDWORD_VERSION(3, 2)}, {ARB_BLEND_FUNC_EXTENDED, MAKEDWORD_VERSION(3, 3)}, + {ARB_EXPLICIT_ATTRIB_LOCATION, MAKEDWORD_VERSION(3, 3)}, {ARB_INSTANCED_ARRAYS, MAKEDWORD_VERSION(3, 3)}, {ARB_SAMPLER_OBJECTS, MAKEDWORD_VERSION(3, 3)}, {ARB_SHADER_BIT_ENCODING, MAKEDWORD_VERSION(3, 3)}, diff --git a/dlls/wined3d/wined3d_gl.h b/dlls/wined3d/wined3d_gl.h index 46df6ee..aa39d07 100644 --- a/dlls/wined3d/wined3d_gl.h +++ b/dlls/wined3d/wined3d_gl.h @@ -53,6 +53,7 @@ enum wined3d_gl_extension ARB_DRAW_ELEMENTS_BASE_VERTEX, ARB_DRAW_INSTANCED, ARB_ES2_COMPATIBILITY, + ARB_EXPLICIT_ATTRIB_LOCATION, ARB_FRAGMENT_PROGRAM, ARB_FRAGMENT_SHADER, ARB_FRAMEBUFFER_OBJECT,

1 0

Józef Kucia : wined3d: Use ARB_explicit_attrib_location to pre-assign vertex attribute locations.
by Alexandre Julliard 01 Jun '16

01 Jun '16

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

Julian Rüger : po: Update German translation.
by Alexandre Julliard 01 Jun '16

01 Jun '16

Module: wine Branch: master Commit: 947fbfee68ef517e1c191bd6833d80c717ea530d URL: http://source.winehq.org/git/wine.git/?a=commit;h=947fbfee68ef517e1c191bd68… Author: Julian Rüger <jr98(a)gmx.net> Date: Wed Jun 1 11:19:34 2016 +0200 po: Update German translation. Signed-off-by: Julian Rüger <jr98(a)gmx.net> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/de.po | 23 ++++++++++++++--------- 1 file changed, 14 insertions(+), 9 deletions(-) diff --git a/po/de.po b/po/de.po index ef6db29..d8f4c6f 100644 --- a/po/de.po +++ b/po/de.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: http://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2016-05-10 18:09+0200\n" +"PO-Revision-Date: 2016-06-01 11:19+0200\n" "Last-Translator: Julian Rüger\n" "Language-Team: German\n" "Language: de\n" @@ -11626,6 +11626,15 @@ msgid "" " REG [operation] /?\n" "\n" msgstr "" +"Aufruf:\n" +" REG [Operation] [Parameter]\n" +"\n" +"Unterstützte Operationen:\n" +" ADD | DELETE | QUERY\n" +"\n" +"Hilfe für eine spezifische Operation:\n" +" REG [Operation] /?\n" +"\n" #: reg.rc:36 msgid "" @@ -11729,24 +11738,20 @@ msgid "Search complete. Number of matches found: %1!d!\n" msgstr "Suche abgeschlossen. Gefundene Übereinstimmungen: %1!d!\n" #: reg.rc:61 -#, fuzzy -#| msgid "reg: Invalid key name\n" msgid "reg: Invalid syntax. " -msgstr "reg: Ungültiger Schlüsselname\n" +msgstr "reg: Ungültige Syntax. " #: reg.rc:62 -#, fuzzy -#| msgid "uninstaller: Invalid option [%1]\n" msgid "reg: Invalid option [%1]. " -msgstr "Uninstaller: Ungültige Option [%1]\n" +msgstr "reg: Ungültige Option [%1]. " #: reg.rc:63 msgid "Type \"REG /?\" for help.\n" -msgstr "" +msgstr "Geben Sie \"REG /?\" ein, um Hilfe zu erhalten.\n" #: reg.rc:64 msgid "Type \"REG %1 /?\" for help.\n" -msgstr "" +msgstr "Geben Sie \"REG %1 /?\" ein, um Hilfe zu erhalten.\n" #: regedit.rc:34 msgid "&Registry"

1 0

Hans Leidekker : webservices: Add support for encoded UTF-8 characters in WsDecodeUrl.
by Alexandre Julliard 01 Jun '16

01 Jun '16

Module: wine Branch: master Commit: 20686f47af224e9b5d56909213aa3670cdcf75c0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=20686f47af224e9b5d5690921… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Jun 1 12:37:19 2016 +0200 webservices: Add support for encoded UTF-8 characters in WsDecodeUrl. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/tests/url.c | 7 ++- dlls/webservices/url.c | 106 ++++++++++++++++++++++++++++++------------- 2 files changed, 79 insertions(+), 34 deletions(-) diff --git a/dlls/webservices/tests/url.c b/dlls/webservices/tests/url.c index 3e11b5c..82059a0 100644 --- a/dlls/webservices/tests/url.c +++ b/dlls/webservices/tests/url.c @@ -54,8 +54,10 @@ static void test_WsDecodeUrl(void) '%','2','0','2',0}; static WCHAR url26[] = {'h','t','t','p',':','/','/','h','o','s','t','#','f','r','a','g', '%','2','0','2',0}; + static WCHAR url27[] = {'h','t','t','p',':','/','/','h','o','s','t','/','%','c','3','%','a','b','/',0}; static WCHAR host2[] = {'h','o','s','t',' ','2'}; static WCHAR path2[] = {'/','p','a','t','h',' ','2'}; + static WCHAR path3[] = {'/',0xeb,'/'}; static WCHAR query2[] = {'q','u','e','r','y',' ','2'}; static WCHAR frag2[] = {'f','r','a','g',' ','2'}; static const struct @@ -103,8 +105,9 @@ static void test_WsDecodeUrl(void) url22 + 12, 4 }, { url23, S_OK, WS_URL_HTTP_SCHEME_TYPE, host2, 6, 80 }, { url24, S_OK, WS_URL_HTTP_SCHEME_TYPE, url24 + 7, 4, 80, NULL, 0, path2, 7 }, - { url25, S_OK, WS_URL_HTTP_SCHEME_TYPE, url24 + 7, 4, 80, NULL, 0, NULL, 0, query2, 7 }, - { url26, S_OK, WS_URL_HTTP_SCHEME_TYPE, url24 + 7, 4, 80, NULL, 0, NULL, 0, NULL, 0, frag2, 6 }, + { url25, S_OK, WS_URL_HTTP_SCHEME_TYPE, url25 + 7, 4, 80, NULL, 0, NULL, 0, query2, 7 }, + { url26, S_OK, WS_URL_HTTP_SCHEME_TYPE, url26 + 7, 4, 80, NULL, 0, NULL, 0, NULL, 0, frag2, 6 }, + { url27, S_OK, WS_URL_HTTP_SCHEME_TYPE, url27 + 7, 4, 80, NULL, 0, path3, 3 }, }; WS_HEAP *heap; WS_STRING str; diff --git a/dlls/webservices/url.c b/dlls/webservices/url.c index 6951cd6..d28c669 100644 --- a/dlls/webservices/url.c +++ b/dlls/webservices/url.c @@ -71,11 +71,36 @@ static USHORT default_port( WS_URL_SCHEME_TYPE scheme ) } } +static unsigned char *strdup_utf8( const WCHAR *str, ULONG len, ULONG *ret_len ) +{ + unsigned char *ret; + *ret_len = WideCharToMultiByte( CP_UTF8, 0, str, len, NULL, 0, NULL, NULL ); + if ((ret = heap_alloc( *ret_len ))) + WideCharToMultiByte( CP_UTF8, 0, str, len, (char *)ret, *ret_len, NULL, NULL ); + return ret; +} + +static inline int url_decode_byte( char c1, char c2 ) +{ + int ret; + + if (c1 >= '0' && c1 <= '9') ret = (c1 - '0') * 16; + else if (c1 >= 'a' && c1 <= 'f') ret = (c1 - 'a' + 10) * 16; + else ret = (c1 - 'A' + 10) * 16; + + if (c2 >= '0' && c2 <= '9') ret += c2 - '0'; + else if (c2 >= 'a' && c2 <= 'f') ret += c2 - 'a' + 10; + else ret += c2 - 'A' + 10; + + return ret; +} + static WCHAR *url_decode( WCHAR *str, ULONG len, WS_HEAP *heap, ULONG *ret_len ) { WCHAR *p = str, *q, *ret; - BOOL decode = FALSE; - ULONG i, val; + BOOL decode = FALSE, convert = FALSE; + ULONG i, len_utf8, len_left; + unsigned char *utf8, *r; *ret_len = len; for (i = 0; i < len; i++, p++) @@ -84,36 +109,62 @@ static WCHAR *url_decode( WCHAR *str, ULONG len, WS_HEAP *heap, ULONG *ret_len ) if (p[0] == '%' && isxdigitW( p[1] ) && isxdigitW( p[2] )) { decode = TRUE; + if (url_decode_byte( p[1], p[2] ) > 159) + { + convert = TRUE; + break; + } *ret_len -= 2; } } if (!decode) return str; - - if (!(q = ret = ws_alloc( heap, *ret_len * sizeof(WCHAR) ))) return NULL; - p = str; - while (len) + if (!convert) { - if (len >= 3 && p[0] == '%' && isxdigitW( p[1] ) && isxdigitW( p[2] )) + if (!(q = ret = ws_alloc( heap, *ret_len * sizeof(WCHAR) ))) return NULL; + p = str; + while (len) { - if (p[1] >= '0' && p[1] <= '9') val = (p[1] - '0') * 16; - else if (p[1] >= 'a' && p[1] <= 'f') val = (p[1] - 'a') * 16; - else val = (p[1] - 'A') * 16; - - if (p[2] >= '0' && p[2] <= '9') val += p[2] - '0'; - else if (p[1] >= 'a' && p[1] <= 'f') val += p[2] - 'a'; - else val += p[1] - 'A'; - - *q++ = val; - p += 3; - len -= 3; + if (len >= 3 && p[0] == '%' && isxdigitW( p[1] ) && isxdigitW( p[2] )) + { + *q++ = url_decode_byte( p[1], p[2] ); + p += 3; + len -= 3; + } + else + { + *q++ = *p++; + len -= 1; + } } - else + return ret; + } + + if (!(r = utf8 = strdup_utf8( str, len, &len_utf8 ))) return NULL; + len_left = len_utf8; + while (len_left) + { + if (len_left >= 3 && r[0] == '%' && isxdigit( r[1] ) && isxdigit( r[2] )) { - *q++ = *p++; - len -= 1; + r[0] = url_decode_byte( r[1], r[2] ); + len_left -= 3; + memmove( r + 1, r + 3, len_left ); + len_utf8 -= 2; } + else len_left -= 1; + r++; + } + + if (!(*ret_len = MultiByteToWideChar( CP_UTF8, MB_ERR_INVALID_CHARS, (char *)utf8, + len_utf8, NULL, 0 ))) + { + WARN( "invalid UTF-8 sequence\n" ); + heap_free( utf8 ); + return NULL; } + if ((ret = ws_alloc( heap, *ret_len * sizeof(WCHAR) ))) + MultiByteToWideChar( CP_UTF8, 0, (char *)utf8, len_utf8, ret, *ret_len ); + heap_free( utf8 ); return ret; } @@ -276,20 +327,11 @@ static inline ULONG escape_size( unsigned char ch, const char *except ) } } -static char *strdup_utf8( const WCHAR *str, ULONG len, ULONG *ret_len ) -{ - char *ret; - *ret_len = WideCharToMultiByte( CP_UTF8, 0, str, len, NULL, 0, NULL, NULL ); - if ((ret = heap_alloc( *ret_len ))) - WideCharToMultiByte( CP_UTF8, 0, str, len, ret, *ret_len, NULL, NULL ); - return ret; -} - static HRESULT url_encode_size( const WCHAR *str, ULONG len, const char *except, ULONG *ret_len ) { ULONG i, len_utf8; BOOL convert = FALSE; - char *utf8; + unsigned char *utf8; *ret_len = 0; for (i = 0; i < len; i++) @@ -339,7 +381,7 @@ static HRESULT url_encode( const WCHAR *str, ULONG len, WCHAR *buf, const char * ULONG i, len_utf8, len_enc; BOOL convert = FALSE; WCHAR *p = buf; - char *utf8; + unsigned char *utf8; *ret_len = 0; for (i = 0; i < len; i++)

1 0

Nikolay Sivov : msxml3/schema: Support element nodes in add().
by Alexandre Julliard 01 Jun '16

01 Jun '16

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

Huw Davies : include: Add flags for the EM_AUTOURLDETECT message.
by Alexandre Julliard 01 Jun '16

01 Jun '16

Module: wine Branch: master Commit: 0bdf9e5817497784bf9a791c4fe34fc73b7af5f1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0bdf9e5817497784bf9a791c4… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Jun 1 12:35:36 2016 +0100 include: Add flags for the EM_AUTOURLDETECT message. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/richedit.h | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/include/richedit.h b/include/richedit.h index ce2c145..f0ae57e 100644 --- a/include/richedit.h +++ b/include/richedit.h @@ -1070,6 +1070,14 @@ typedef struct _settextex { #define ST_NEWCHARS 0x00000004 #define ST_UNICODE 0x00000008 +/* Flags for EM_AUTOURLDETECT message */ +#define AURL_ENABLEURL 0x00000001 +#define AURL_ENABLEMAILADDR 0x00000002 +#define AURL_ENABLETELNO 0x00000004 +#define AURL_ENABLEEAURLS 0x00000008 +#define AURL_ENABLEDRIVELETTERS 0x00000010 +#define AURL_DISABLEMIXEDLGC 0x00000020 + #ifdef __cplusplus } #endif

1 0