October 2015 - Wine-commits

Józef Kucia : d3d11/tests: Port test_create_blend_state() from d3d10core.
by Alexandre Julliard 08 Oct '15

08 Oct '15

Module: wine Branch: master Commit: bd8a7f9e5dbd69a1de4c545042118eef6e1f3f2e URL: http://source.winehq.org/git/wine.git/?a=commit;h=bd8a7f9e5dbd69a1de4c54504… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Oct 8 02:55:57 2015 +0200 d3d11/tests: Port test_create_blend_state() from d3d10core. 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 | 228 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 228 insertions(+) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=bd8a7f9e5dbd69a1de4c5…

1 0

Joachim Priesner : mshtml: Treat "data:" as Gecko special URI scheme.
by Alexandre Julliard 08 Oct '15

08 Oct '15

Module: wine Branch: master Commit: e7fc477921543d58dfa31acf92c71179d24042d2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e7fc477921543d58dfa31acf9… Author: Joachim Priesner <joachim.priesner(a)web.de> Date: Mon Sep 28 15:45:20 2015 +0200 mshtml: Treat "data:" as Gecko special URI scheme. This enables loading of inline content specified as data: URI, such as background images. Signed-off-by: Joachim Priesner <joachim.priesner(a)web.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/nsio.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/mshtml/nsio.c b/dlls/mshtml/nsio.c index 45ad55f..c4efc5c 100644 --- a/dlls/mshtml/nsio.c +++ b/dlls/mshtml/nsio.c @@ -3545,7 +3545,7 @@ static nsresult NSAPI nsIOService_GetProtocolFlags(nsIIOService *iface, const ch static BOOL is_gecko_special_uri(const char *spec) { - static const char *special_schemes[] = {"chrome:", "jar:", "moz-safe-about", "resource:", "javascript:", "wyciwyg:"}; + static const char *special_schemes[] = {"chrome:", "data:", "jar:", "moz-safe-about", "resource:", "javascript:", "wyciwyg:"}; unsigned int i; for(i=0; i < sizeof(special_schemes)/sizeof(*special_schemes); i++) {

1 0

Thomas Faller : amstream: Fix use of uninitialized memory.
by Alexandre Julliard 08 Oct '15

08 Oct '15

Module: wine Branch: master Commit: 2fb791b0ebcdfbbebc20afb1dd1205d793617d1f URL: http://source.winehq.org/git/wine.git/?a=commit;h=2fb791b0ebcdfbbebc20afb1d… Author: Thomas Faller <tfaller1(a)gmx.de> Date: Mon Sep 28 18:16:57 2015 +0200 amstream: Fix use of uninitialized memory. --- dlls/amstream/mediastream.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/amstream/mediastream.c b/dlls/amstream/mediastream.c index 947be1e..79f9822 100644 --- a/dlls/amstream/mediastream.c +++ b/dlls/amstream/mediastream.c @@ -1003,6 +1003,7 @@ static HRESULT ddrawstreamsample_create(IDirectDrawMediaStream *parent, IDirectD desc.ddpfPixelFormat.dwBBitMask = 0x0000ff; desc.ddpfPixelFormat.dwRGBAlphaBitMask = 0; desc.ddsCaps.dwCaps = DDSCAPS_SYSTEMMEMORY|DDSCAPS_OFFSCREENPLAIN; + desc.lpSurface = NULL; hr = IDirectDraw_CreateSurface(ddraw, &desc, &object->surface, NULL); IDirectDraw_Release(ddraw);

1 0

Daniel Lehman : msxml3: Treat namespace as attribute in IXMLDOMElement:: getAttribute.
by Alexandre Julliard 08 Oct '15

08 Oct '15

Module: wine Branch: master Commit: a20d152282ece6bd28c407ea02cd3826592581ef URL: http://source.winehq.org/git/wine.git/?a=commit;h=a20d152282ece6bd28c407ea0… Author: Daniel Lehman <dlehman(a)esri.com> Date: Tue Aug 18 15:32:58 2015 -0700 msxml3: Treat namespace as attribute in IXMLDOMElement::getAttribute. Signed-off-by: Daniel Lehman <dlehman(a)esri.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msxml3/element.c | 25 ++++++++++++++++++++++- dlls/msxml3/tests/domdoc.c | 51 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 75 insertions(+), 1 deletion(-) diff --git a/dlls/msxml3/element.c b/dlls/msxml3/element.c index 38d3b47..6e00aa0 100644 --- a/dlls/msxml3/element.c +++ b/dlls/msxml3/element.c @@ -1203,7 +1203,9 @@ static HRESULT WINAPI domelem_getAttribute( domelem *This = impl_from_IXMLDOMElement( iface ); xmlNodePtr element; xmlChar *xml_name, *xml_value = NULL; + xmlChar *local, *prefix; HRESULT hr = S_FALSE; + xmlNsPtr ns; TRACE("(%p)->(%s %p)\n", This, debugstr_w(name), value); @@ -1222,7 +1224,28 @@ static HRESULT WINAPI domelem_getAttribute( if(!xmlValidateNameValue(xml_name)) hr = E_FAIL; else - xml_value = xmlGetNsProp(element, xml_name, NULL); + { + if ((local = xmlSplitQName2(xml_name, &prefix))) + { + if (xmlStrEqual(prefix, BAD_CAST "xmlns")) + { + ns = xmlSearchNs(element->doc, element, local); + if (ns) + xml_value = xmlStrdup(ns->href); + } + else + { + ns = xmlSearchNs(element->doc, element, prefix); + if (ns) + xml_value = xmlGetNsProp(element, local, ns->href); + } + + xmlFree(prefix); + xmlFree(local); + } + else + xml_value = xmlGetNsProp(element, xml_name, NULL); + } heap_free(xml_name); if(xml_value) diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index ff6783b..1afc894 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -10882,6 +10882,56 @@ static void test_getAttributeNode(void) free_bstrs(); } +static void test_getAttribute(void) +{ + IXMLDOMDocument *doc; + IXMLDOMElement *elem; + VARIANT_BOOL v; + VARIANT var; + HRESULT hr; + + doc = create_document(&IID_IXMLDOMDocument); + + hr = IXMLDOMDocument_loadXML(doc, _bstr_(szExampleXML), &v); + EXPECT_HR(hr, S_OK); + + hr = IXMLDOMDocument_get_documentElement(doc, &elem); + EXPECT_HR(hr, S_OK); + + VariantInit(&var); + hr = IXMLDOMElement_getAttribute( elem, _bstr_("xmlns:foo"), &var ); + EXPECT_HR(hr, S_OK); + ok( V_VT(&var) == VT_BSTR, "vt = %x\n", V_VT(&var)); + ok( !lstrcmpW(V_BSTR(&var), _bstr_("urn:uuid:86B2F87F-ACB6-45cd-8B77-9BDB92A01A29")), "wrong attr value: %s\n", wine_dbgstr_w(V_BSTR(&var))); + VariantClear(&var); + + hr = IXMLDOMElement_getAttribute( elem, _bstr_("a"), &var ); + EXPECT_HR(hr, S_OK); + ok( V_VT(&var) == VT_BSTR, "vt = %x\n", V_VT(&var)); + ok( !lstrcmpW(V_BSTR(&var), _bstr_("attr a")), "wrong attr value: %s\n", wine_dbgstr_w(V_BSTR(&var))); + VariantClear(&var); + + hr = IXMLDOMElement_getAttribute( elem, _bstr_("foo:b"), &var ); + EXPECT_HR(hr, S_OK); + ok( V_VT(&var) == VT_BSTR, "vt = %x\n", V_VT(&var)); + ok( !lstrcmpW(V_BSTR(&var), _bstr_("attr b")), "wrong attr value: %s\n", wine_dbgstr_w(V_BSTR(&var))); + VariantClear(&var); + + hr = IXMLDOMElement_getAttribute( elem, _bstr_("b"), &var ); + EXPECT_HR(hr, S_FALSE); + ok( V_VT(&var) == VT_NULL, "vt = %x\n", V_VT(&var)); + VariantClear(&var); + + hr = IXMLDOMElement_getAttribute( elem, _bstr_("non-existent"), &var ); + EXPECT_HR(hr, S_FALSE); + ok( V_VT(&var) == VT_NULL, "vt = %x\n", V_VT(&var)); + VariantClear(&var); + + IXMLDOMElement_Release(elem); + IXMLDOMDocument_Release(doc); + free_bstrs(); +} + typedef struct { DOMNodeType type; const char *name; @@ -12071,6 +12121,7 @@ START_TEST(domdoc) test_dispex(); test_parseerror(); test_getAttributeNode(); + test_getAttribute(); test_supporterrorinfo(); test_nodeValue(); test_get_namespaces();

1 0

Julian Rüger : German translation for release 1.7.52
by Jeremy Newman 07 Oct '15

07 Oct '15

Module: website Branch: master Commit: 4c974ba6666c56664cab0255b5f41454c3c0cde4 URL: http://source.winehq.org/git/website.git/?a=commit;h=4c974ba6666c56664cab02… Author: Julian Rüger <jr98(a)gmx.net> Date: Wed Oct 7 16:43:37 2015 +0200 German translation for release 1.7.52 Signed-off-by: Julian Rüger <jr98(a)gmx.net> Signed-off-by: Jeremy Newman <jnewman(a)codeweavers.com> --- news/de/2015100201.xml | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/news/de/2015100201.xml b/news/de/2015100201.xml new file mode 100644 index 0000000..361349e --- /dev/null +++ b/news/de/2015100201.xml @@ -0,0 +1,17 @@ +<news> +<date>2. Oktober 2015</date> +<title>Wine 1.7.52 freigegeben</title> +<body> + Die Entwicklungsversion 1.7.52 von Wine ist jetzt verfügbar. + <a href="{$root}/announce/1.7.52">Neuerungen (en)</a> in dieser Version: +<ul> + <li>Unicode-Daten auf den Stand von Unicode 8.0.0 aktualisiert.</li> + <li>Teilweise Implementierung der Webservices-DLL.</li> + <li>Zusätzliche Direct3D-11-Schnittstellen.</li> + <li>Einige zusätzliche Funktionen der C++-Laufzeit implementiert.</li> + <li>Der PostScript-Treiber gibt nun die Standardnamen von Glyphen aus.</li> + <li>Diverse Fehlerkorrekturen.</li> +</ul> +Der Quelltext ist ab sofort <a href="http://prdownloads.sourceforge.net/wine/wine-1.7.52.tar.bz2">verfügbar</a>. +Binärpakete werden gerade erstellt und stehen bald auf den jeweiligen <a href="{$root}/download">Downloadseiten</a> zur Verfügung. +</body></news>

1 0

Matteo Bruni : wined3d: Avoid reading uninitialized texcoord varyings in pixel shaders.
by Alexandre Julliard 07 Oct '15

07 Oct '15

Module: wine Branch: master Commit: 08b21528ed51d7ece92ea67fe0afe1d2a998c989 URL: http://source.winehq.org/git/wine.git/?a=commit;h=08b21528ed51d7ece92ea67fe… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Tue Oct 6 14:24:21 2015 +0200 wined3d: Avoid reading uninitialized texcoord varyings in pixel shaders. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/arb_program_shader.c | 2 +- dlls/wined3d/glsl_shader.c | 79 +++++++++++++++++++++------------------ dlls/wined3d/shader.c | 32 +++++++++++++++- dlls/wined3d/wined3d_private.h | 5 ++- 4 files changed, 77 insertions(+), 41 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=08b21528ed51d7ece92ea…

1 0

Matteo Bruni : wined3d: Output all the texture coordinates in the FFP replacement VS when there are enough varyings.
by Alexandre Julliard 07 Oct '15

07 Oct '15

Module: wine Branch: master Commit: 09eda02b6896f5fe4ca7db5e1c13cbc67f8118e8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=09eda02b6896f5fe4ca7db5e1… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Tue Oct 6 14:24:22 2015 +0200 wined3d: Output all the texture coordinates in the FFP replacement VS when there are enough varyings. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/glsl_shader.c | 12 ++++++------ dlls/wined3d/utils.c | 11 +++++++++-- dlls/wined3d/wined3d_private.h | 4 ++-- 3 files changed, 17 insertions(+), 10 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index f38111f..5dfe0fa 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -6803,7 +6803,7 @@ static void set_glsl_shader_program(const struct wined3d_context *context, const struct glsl_ffp_vertex_shader *ffp_shader; struct wined3d_ffp_vs_settings settings; - wined3d_ffp_get_vs_settings(state, &context->stream_info, &settings); + wined3d_ffp_get_vs_settings(context, state, &settings); ffp_shader = shader_glsl_find_ffp_vertex_shader(priv, gl_info, &settings); vs_id = ffp_shader->id; vs_list = &ffp_shader->linked_programs; @@ -7971,11 +7971,11 @@ static void glsl_vertex_pipe_vdecl(struct wined3d_context *context, context->constant_update_mask |= WINED3D_SHADER_CONST_FFP_TEXMATRIX; - /* Because of settings->texcoords, we have to always regenerate the - * vertex shader on a vdecl change. - * TODO: Just always output all the texcoords when there are enough - * varyings available to drop the dependency. */ - context->shader_update_mask |= 1u << WINED3D_SHADER_TYPE_VERTEX; + /* Because of settings->texcoords, we have to regenerate the vertex + * shader on a vdecl change if there aren't enough varyings to just + * always output all the texture coordinates. */ + if (gl_info->limits.glsl_varyings < wined3d_max_compat_varyings(gl_info)) + context->shader_update_mask |= 1u << WINED3D_SHADER_TYPE_VERTEX; if (use_ps(state) && state->shader[WINED3D_SHADER_TYPE_PIXEL]->reg_maps.shader_version.major == 1 diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 41e72fe..9c4fdd9 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -4825,9 +4825,12 @@ const struct wine_rb_functions wined3d_ffp_frag_program_rb_functions = ffp_frag_program_key_compare, }; -void wined3d_ffp_get_vs_settings(const struct wined3d_state *state, const struct wined3d_stream_info *si, - struct wined3d_ffp_vs_settings *settings) +void wined3d_ffp_get_vs_settings(const struct wined3d_context *context, + const struct wined3d_state *state, struct wined3d_ffp_vs_settings *settings) { + const struct wined3d_stream_info *si = &context->stream_info; + const struct wined3d_gl_info *gl_info = context->gl_info; + const struct wined3d_d3d_info *d3d_info = context->d3d_info; unsigned int coord_idx, i; if (si->position_transformed) @@ -4851,6 +4854,8 @@ void wined3d_ffp_get_vs_settings(const struct wined3d_state *state, const struct settings->texcoords |= 1u << i; settings->texgen[i] = state->texture_states[i][WINED3D_TSS_TEXCOORD_INDEX]; } + if (d3d_info->limits.varying_count >= wined3d_max_compat_varyings(gl_info)) + settings->texcoords = (1u << MAX_TEXTURES) - 1; return; } @@ -4900,6 +4905,8 @@ void wined3d_ffp_get_vs_settings(const struct wined3d_state *state, const struct settings->texcoords |= 1u << i; settings->texgen[i] = state->texture_states[i][WINED3D_TSS_TEXCOORD_INDEX]; } + if (d3d_info->limits.varying_count >= wined3d_max_compat_varyings(gl_info)) + settings->texcoords = (1u << MAX_TEXTURES) - 1; settings->light_type = 0; for (i = 0; i < MAX_ACTIVE_LIGHTS; ++i) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index d147199..3071726 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1939,8 +1939,8 @@ struct wined3d_ffp_vs_desc struct wined3d_ffp_vs_settings settings; }; -void wined3d_ffp_get_vs_settings(const struct wined3d_state *state, const struct wined3d_stream_info *si, - struct wined3d_ffp_vs_settings *settings) DECLSPEC_HIDDEN; +void wined3d_ffp_get_vs_settings(const struct wined3d_context *context, + const struct wined3d_state *state, struct wined3d_ffp_vs_settings *settings) DECLSPEC_HIDDEN; struct wined3d {

1 0

Matteo Bruni : wined3d: Initialize unwritten color varyings.
by Alexandre Julliard 07 Oct '15

07 Oct '15

Module: wine Branch: master Commit: 97ee9451edae82154b289cb57b46ef13aedd58b8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=97ee9451edae82154b289cb57… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Tue Oct 6 14:24:23 2015 +0200 wined3d: Initialize unwritten color varyings. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/glsl_shader.c | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 5dfe0fa..042cd03 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -4927,6 +4927,7 @@ static GLuint generate_param_reorder_function(struct shader_glsl_priv *priv, if (ps_major < 3) { + DWORD colors_written_mask[2] = {0}; DWORD texcoords_written_mask[MAX_TEXTURES] = {0}; if (!legacy_context) @@ -4949,7 +4950,7 @@ static GLuint generate_param_reorder_function(struct shader_glsl_priv *priv, write_mask = output->mask; shader_glsl_write_mask_to_str(write_mask, reg_mask); - if (shader_match_semantic(semantic_name, WINED3D_DECL_USAGE_COLOR)) + if (shader_match_semantic(semantic_name, WINED3D_DECL_USAGE_COLOR) && semantic_idx < 2) { if (!semantic_idx) shader_addline(buffer, "gl_FrontColor%s = vs_out[%u]%s;\n", @@ -4957,6 +4958,8 @@ static GLuint generate_param_reorder_function(struct shader_glsl_priv *priv, else if (semantic_idx == 1) shader_addline(buffer, "gl_FrontSecondaryColor%s = vs_out[%u]%s;\n", reg_mask, output->register_idx, reg_mask); + + colors_written_mask[semantic_idx] = write_mask; } else if (shader_match_semantic(semantic_name, WINED3D_DECL_USAGE_POSITION) && !semantic_idx) { @@ -4985,6 +4988,19 @@ static GLuint generate_param_reorder_function(struct shader_glsl_priv *priv, } } + for (i = 0; i < 2; ++i) + { + if (colors_written_mask[i] != WINED3DSP_WRITEMASK_ALL) + { + shader_glsl_write_mask_to_str(~colors_written_mask[i] & WINED3DSP_WRITEMASK_ALL, reg_mask); + if (!i) + shader_addline(buffer, "gl_FrontColor%s = vec4(1.0)%s;\n", + reg_mask, reg_mask); + else + shader_addline(buffer, "gl_FrontSecondaryColor%s = vec4(0.0)%s;\n", + reg_mask, reg_mask); + } + } for (i = 0; i < MAX_TEXTURES; ++i) { if (ps && !(ps->reg_maps.texcoord & (1u << i)))

1 0

Jonathan Vollebregt : reg: Simplify root key search.
by Alexandre Julliard 07 Oct '15

07 Oct '15

Module: wine Branch: master Commit: 60f599f58480ce154d2cc8ac843be92916657170 URL: http://source.winehq.org/git/wine.git/?a=commit;h=60f599f58480ce154d2cc8ac8… Author: Jonathan Vollebregt <jnvsor(a)gmail.com> Date: Sun Oct 4 21:14:46 2015 +0200 reg: Simplify root key search. Signed-off-by: Michel Zou <xantares09(a)hotmail.com> Signed-off-by: Stefan Dösinger <stefan(a)codeweavers.com> --- programs/reg/reg.c | 85 +++++++++++++++++++++++++++--------------------------- 1 file changed, 43 insertions(+), 42 deletions(-) diff --git a/programs/reg/reg.c b/programs/reg/reg.c index e4d121c..00eaab0 100644 --- a/programs/reg/reg.c +++ b/programs/reg/reg.c @@ -22,6 +22,32 @@ #define ARRAY_SIZE(A) (sizeof(A)/sizeof(*A)) +static const WCHAR short_hklm[] = {'H','K','L','M',0}; +static const WCHAR short_hkcu[] = {'H','K','C','U',0}; +static const WCHAR short_hkcr[] = {'H','K','C','R',0}; +static const WCHAR short_hku[] = {'H','K','U',0}; +static const WCHAR short_hkcc[] = {'H','K','C','C',0}; +static const WCHAR long_hklm[] = {'H','K','E','Y','_','L','O','C','A','L','_','M','A','C','H','I','N','E',0}; +static const WCHAR long_hkcu[] = {'H','K','E','Y','_','C','U','R','R','E','N','T','_','U','S','E','R',0}; +static const WCHAR long_hkcr[] = {'H','K','E','Y','_','C','L','A','S','S','E','S','_','R','O','O','T',0}; +static const WCHAR long_hku[] = {'H','K','E','Y','_','U','S','E','R','S',0}; +static const WCHAR long_hkcc[] = {'H','K','E','Y','_','C','U','R','R','E','N','T','_','C','O','N','F','I','G',0}; + +static const struct +{ + HKEY key; + const WCHAR *short_name; + const WCHAR *long_name; +} +root_rels[] = +{ + {HKEY_LOCAL_MACHINE, short_hklm, long_hklm}, + {HKEY_CURRENT_USER, short_hkcu, long_hkcu}, + {HKEY_CLASSES_ROOT, short_hkcr, long_hkcr}, + {HKEY_USERS, short_hku, long_hku}, + {HKEY_CURRENT_CONFIG, short_hkcc, long_hkcc}, +}; + static const WCHAR type_none[] = {'R','E','G','_','N','O','N','E',0}; static const WCHAR type_sz[] = {'R','E','G','_','S','Z',0}; static const WCHAR type_expand_sz[] = {'R','E','G','_','E','X','P','A','N','D','_','S','Z',0}; @@ -95,51 +121,26 @@ static int reg_message(int msg) return reg_printfW(formatW, msg_buffer); } -static int reg_StrCmpNIW(LPCWSTR str, LPCWSTR comp, int len) +static inline BOOL path_rootname_cmp(const WCHAR *input_path, const WCHAR *rootkey_name) { - int i; + DWORD length = strlenW(rootkey_name); - for (i = 0; i < len; i++) - { - if (!str[i]) - { - len = i + 1; - break; - } - } - - return CompareStringW(CP_ACP, NORM_IGNORECASE, str, len, comp, len) - CSTR_EQUAL; + return (!strncmpiW(input_path, rootkey_name, length) && + (input_path[length] == 0 || input_path[length] == '\\')); } -static HKEY get_rootkey(LPWSTR key) +static HKEY path_get_rootkey(const WCHAR *path) { - static const WCHAR szHKLM[] = {'H','K','L','M',0}; - static const WCHAR szHKEY_LOCAL_MACHINE[] = {'H','K','E','Y','_','L','O','C','A','L','_','M','A','C','H','I','N','E',0}; - static const WCHAR szHKCU[] = {'H','K','C','U',0}; - static const WCHAR szHKEY_CURRENT_USER[] = {'H','K','E','Y','_','C','U','R','R','E','N','T','_','U','S','E','R',0}; - static const WCHAR szHKCR[] = {'H','K','C','R',0}; - static const WCHAR szHKEY_CLASSES_ROOT[] = {'H','K','E','Y','_','C','L','A','S','S','E','S','_','R','O','O','T',0}; - static const WCHAR szHKU[] = {'H','K','U',0}; - static const WCHAR szHKEY_USERS[] = {'H','K','E','Y','_','U','S','E','R','S',0}; - static const WCHAR szHKCC[] = {'H','K','C','C',0}; - static const WCHAR szHKEY_CURRENT_CONFIG[] = {'H','K','E','Y','_','C','U','R','R','E','N','T','_','C','O','N','F','I','G',0}; - - if (!reg_StrCmpNIW(key, szHKLM, 4) || - !reg_StrCmpNIW(key, szHKEY_LOCAL_MACHINE, 18)) - return HKEY_LOCAL_MACHINE; - else if (!reg_StrCmpNIW(key, szHKCU, 4) || - !reg_StrCmpNIW(key, szHKEY_CURRENT_USER, 17)) - return HKEY_CURRENT_USER; - else if (!reg_StrCmpNIW(key, szHKCR, 4) || - !reg_StrCmpNIW(key, szHKEY_CLASSES_ROOT, 17)) - return HKEY_CLASSES_ROOT; - else if (!reg_StrCmpNIW(key, szHKU, 3) || - !reg_StrCmpNIW(key, szHKEY_USERS, 10)) - return HKEY_USERS; - else if (!reg_StrCmpNIW(key, szHKCC, 4) || - !reg_StrCmpNIW(key, szHKEY_CURRENT_CONFIG, 19)) - return HKEY_CURRENT_CONFIG; - else return NULL; + DWORD i; + + for (i = 0; i < ARRAY_SIZE(root_rels); i++) + { + if (path_rootname_cmp(path, root_rels[i].short_name) || + path_rootname_cmp(path, root_rels[i].long_name)) + return root_rels[i].key; + } + + return NULL; } static DWORD wchar_get_type(const WCHAR *type_name) @@ -280,7 +281,7 @@ static int reg_add(WCHAR *key_name, WCHAR *value_name, BOOL value_empty, } p++; - root = get_rootkey(key_name); + root = path_get_rootkey(key_name); if (!root) { reg_message(STRING_INVALID_KEY); @@ -350,7 +351,7 @@ static int reg_delete(WCHAR *key_name, WCHAR *value_name, BOOL value_empty, } p++; - root = get_rootkey(key_name); + root = path_get_rootkey(key_name); if (!root) { reg_message(STRING_INVALID_KEY);

1 0

Erich E. Hoover : ws2_32: Add stub for TransmitFile.
by Alexandre Julliard 07 Oct '15

07 Oct '15

Module: wine Branch: master Commit: 23c293ae4c9929a08fd122b64d928c2cfb37f2b7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=23c293ae4c9929a08fd122b64… Author: Erich E. Hoover <erich.e.hoover(a)gmail.com> Date: Thu Jan 16 17:52:50 2014 -0700 ws2_32: Add stub for TransmitFile. Signed-off-by: Erich E. Hoover <erich.e.hoover(a)wine-staging.com> --- dlls/ws2_32/socket.c | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 5098f85..4edb579 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -2725,6 +2725,19 @@ static BOOL WINAPI WS2_AcceptEx(SOCKET listener, SOCKET acceptor, PVOID dest, DW } /*********************************************************************** + * TransmitFile + */ +static BOOL WINAPI WS2_TransmitFile( SOCKET s, HANDLE h, DWORD file_bytes, DWORD bytes_per_send, + LPOVERLAPPED overlapped, LPTRANSMIT_FILE_BUFFERS buffers, + DWORD flags ) +{ + FIXME("(%lx, %p, %d, %d, %p, %p, %d): stub !\n", s, h, file_bytes, bytes_per_send, overlapped, + buffers, flags ); + WSASetLastError( WSAEOPNOTSUPP ); + return FALSE; +} + +/*********************************************************************** * GetAcceptExSockaddrs */ static void WINAPI WS2_GetAcceptExSockaddrs(PVOID buffer, DWORD data_size, DWORD local_size, DWORD remote_size, @@ -4430,7 +4443,8 @@ INT WINAPI WSAIoctl(SOCKET s, DWORD code, LPVOID in_buff, DWORD in_size, LPVOID } else if ( IsEqualGUID(&transmitfile_guid, in_buff) ) { - FIXME("SIO_GET_EXTENSION_FUNCTION_POINTER: unimplemented TransmitFile\n"); + *(LPFN_TRANSMITFILE *)out_buff = WS2_TransmitFile; + break; } else if ( IsEqualGUID(&transmitpackets_guid, in_buff) ) {

1 0