October 2011 - Wine-Commits

Aric Stewart : user32: Handle PosFromChar if the string is empty and so we have no ssa.
by Alexandre Julliard Oct. 28, 2011

Oct. 28, 2011

Module: wine Branch: master Commit: 820460fccecb3eb25e983a85088ed8c9ec2b785f URL: http://source.winehq.org/git/wine.git/?a=commit;h=820460fccecb3eb25e983a850… Author: Aric Stewart <aric(a)codeweavers.com> Date: Thu Oct 27 13:38:00 2011 -0500 user32: Handle PosFromChar if the string is empty and so we have no ssa. --- dlls/user32/edit.c | 24 +++++++++++++++++------- 1 files changed, 17 insertions(+), 7 deletions(-) diff --git a/dlls/user32/edit.c b/dlls/user32/edit.c index f8cf757..71df7e6 100644 --- a/dlls/user32/edit.c +++ b/dlls/user32/edit.c @@ -1069,11 +1069,16 @@ static LRESULT EDIT_EM_PosFromChar(EDITSTATE *es, INT index, BOOL after_wrap) EDIT_UpdateUniscribeData(es, NULL, 0); if (es->x_offset) { - if (es->x_offset>= get_text_length(es)) + if (es->x_offset >= get_text_length(es)) { - const SIZE *size; - size = ScriptString_pSize(es->ssa); - xoff = size->cx; + if (es->ssa) + { + const SIZE *size; + size = ScriptString_pSize(es->ssa); + xoff = size->cx; + } + else + xoff = 0; } ScriptStringCPtoX(es->ssa, es->x_offset, FALSE, &xoff); } @@ -1081,9 +1086,14 @@ static LRESULT EDIT_EM_PosFromChar(EDITSTATE *es, INT index, BOOL after_wrap) { if (index >= get_text_length(es)) { - const SIZE *size; - size = ScriptString_pSize(es->ssa); - xi = size->cx; + if (es->ssa) + { + const SIZE *size; + size = ScriptString_pSize(es->ssa); + xi = size->cx; + } + else + xi = 0; } else ScriptStringCPtoX(es->ssa, index, FALSE, &xi);

1 0

Alexandre Julliard : gdi32: Fix a misplaced release_dc_ptr call.
by Alexandre Julliard Oct. 28, 2011

Oct. 28, 2011

Module: wine Branch: master Commit: 26aaaa1269b1055935b65164759375477113a148 URL: http://source.winehq.org/git/wine.git/?a=commit;h=26aaaa1269b1055935b651647… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Oct 28 11:29:34 2011 +0200 gdi32: Fix a misplaced release_dc_ptr call. --- dlls/gdi32/font.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index 44f1af4..10a7f1d 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -653,8 +653,8 @@ static INT FONT_EnumFontFamiliesEx( HDC hDC, LPLOGFONTW plf, FONTENUMPROCW efpro fe.unicode = unicode; fe.hdc = hDC; ret = physdev->funcs->pEnumFonts( physdev, plf, FONT_EnumInstance, (LPARAM)&fe ); + release_dc_ptr( dc ); } - release_dc_ptr( dc ); return ret; }

1 0

Aric Stewart : usp10: Sinhala does glyph props like Indic languages.
by Alexandre Julliard Oct. 28, 2011

Oct. 28, 2011

Module: wine Branch: master Commit: 89a53d6f814f648bd784e0f45ff0ea6157c685da URL: http://source.winehq.org/git/wine.git/?a=commit;h=89a53d6f814f648bd784e0f45… Author: Aric Stewart <aric(a)codeweavers.com> Date: Thu Oct 27 13:38:25 2011 -0500 usp10: Sinhala does glyph props like Indic languages. --- dlls/usp10/shape.c | 8 +++++++- 1 files changed, 7 insertions(+), 1 deletions(-) diff --git a/dlls/usp10/shape.c b/dlls/usp10/shape.c index 779e8f6..7464b4a 100644 --- a/dlls/usp10/shape.c +++ b/dlls/usp10/shape.c @@ -61,6 +61,7 @@ static void ShapeCharGlyphProp_Arabic( HDC hdc, ScriptCache *psc, SCRIPT_ANALYSI static void ShapeCharGlyphProp_Thai( HDC hdc, ScriptCache *psc, SCRIPT_ANALYSIS *psa, const WCHAR* pwcChars, const INT cChars, const WORD* pwGlyphs, const INT cGlyphs, WORD *pwLogClust, SCRIPT_CHARPROP *pCharProp, SCRIPT_GLYPHPROP *pGlyphProp ); static void ShapeCharGlyphProp_None( HDC hdc, ScriptCache *psc, SCRIPT_ANALYSIS *psa, const WCHAR* pwcChars, const INT cChars, const WORD* pwGlyphs, const INT cGlyphs, WORD *pwLogClust, SCRIPT_CHARPROP *pCharProp, SCRIPT_GLYPHPROP *pGlyphProp ); static void ShapeCharGlyphProp_Tibet( HDC hdc, ScriptCache *psc, SCRIPT_ANALYSIS *psa, const WCHAR* pwcChars, const INT cChars, const WORD* pwGlyphs, const INT cGlyphs, WORD *pwLogClust, SCRIPT_CHARPROP *pCharProp, SCRIPT_GLYPHPROP *pGlyphProp ); +static void ShapeCharGlyphProp_Sinhala( HDC hdc, ScriptCache *psc, SCRIPT_ANALYSIS *psa, const WCHAR* pwcChars, const INT cChars, const WORD* pwGlyphs, const INT cGlyphs, WORD *pwLogClust, SCRIPT_CHARPROP *pCharProp, SCRIPT_GLYPHPROP *pGlyphProp ); static void ShapeCharGlyphProp_Devanagari( HDC hdc, ScriptCache *psc, SCRIPT_ANALYSIS *psa, const WCHAR* pwcChars, const INT cChars, const WORD* pwGlyphs, const INT cGlyphs, WORD *pwLogClust, SCRIPT_CHARPROP *pCharProp, SCRIPT_GLYPHPROP *pGlyphProp ); static void ShapeCharGlyphProp_Bengali( HDC hdc, ScriptCache *psc, SCRIPT_ANALYSIS *psa, const WCHAR* pwcChars, const INT cChars, const WORD* pwGlyphs, const INT cGlyphs, WORD *pwLogClust, SCRIPT_CHARPROP *pCharProp, SCRIPT_GLYPHPROP *pGlyphProp ); static void ShapeCharGlyphProp_Gurmukhi( HDC hdc, ScriptCache *psc, SCRIPT_ANALYSIS *psa, const WCHAR* pwcChars, const INT cChars, const WORD* pwGlyphs, const INT cGlyphs, WORD *pwLogClust, SCRIPT_CHARPROP *pCharProp, SCRIPT_GLYPHPROP *pGlyphProp ); @@ -553,7 +554,7 @@ static const ScriptShapeData ShapingData[] = {{ standard_features, 2}, NULL, "cyrl", "", NULL, NULL}, {{ standard_features, 2}, NULL, "armn", "", NULL, NULL}, {{ standard_features, 2}, NULL, "geor", "", NULL, NULL}, - {{ sinhala_features, 3}, NULL, "sinh", "", ContextualShape_Sinhala, NULL}, + {{ sinhala_features, 3}, NULL, "sinh", "", ContextualShape_Sinhala, ShapeCharGlyphProp_Sinhala}, {{ tibetan_features, 2}, NULL, "tibt", "", NULL, ShapeCharGlyphProp_Tibet}, {{ tibetan_features, 2}, NULL, "tibt", "", NULL, ShapeCharGlyphProp_Tibet}, {{ tibetan_features, 2}, NULL, "phag", "", ContextualShape_Phags_pa, ShapeCharGlyphProp_Thai}, @@ -3281,6 +3282,11 @@ static void ShapeCharGlyphProp_BaseIndic( HDC hdc, ScriptCache *psc, SCRIPT_ANAL HeapFree(GetProcessHeap(), 0, syllables); } +static void ShapeCharGlyphProp_Sinhala( HDC hdc, ScriptCache *psc, SCRIPT_ANALYSIS *psa, const WCHAR* pwcChars, const INT cChars, const WORD* pwGlyphs, const INT cGlyphs, WORD *pwLogClust, SCRIPT_CHARPROP *pCharProp, SCRIPT_GLYPHPROP *pGlyphProp ) +{ + ShapeCharGlyphProp_BaseIndic(hdc, psc, psa, pwcChars, cChars, pwGlyphs, cGlyphs, pwLogClust, pCharProp, pGlyphProp, sinhala_lex); +} + static void ShapeCharGlyphProp_Devanagari( HDC hdc, ScriptCache *psc, SCRIPT_ANALYSIS *psa, const WCHAR* pwcChars, const INT cChars, const WORD* pwGlyphs, const INT cGlyphs, WORD *pwLogClust, SCRIPT_CHARPROP *pCharProp, SCRIPT_GLYPHPROP *pGlyphProp ) { ShapeCharGlyphProp_BaseIndic(hdc, psc, psa, pwcChars, cChars, pwGlyphs, cGlyphs, pwLogClust, pCharProp, pGlyphProp, devanagari_lex);

1 0

Aric Stewart : user32: Improvement for performance in soft linebreaking.
by Alexandre Julliard Oct. 28, 2011

Oct. 28, 2011

Module: wine Branch: master Commit: c83841ca0e08902bad88d1d9c3e04db8b3097bcd URL: http://source.winehq.org/git/wine.git/?a=commit;h=c83841ca0e08902bad88d1d9c… Author: Aric Stewart <aric(a)codeweavers.com> Date: Thu Oct 27 13:38:15 2011 -0500 user32: Improvement for performance in soft linebreaking. --- dlls/user32/edit.c | 10 ++++++++-- 1 files changed, 8 insertions(+), 2 deletions(-) diff --git a/dlls/user32/edit.c b/dlls/user32/edit.c index 71df7e6..bfee8f5 100644 --- a/dlls/user32/edit.c +++ b/dlls/user32/edit.c @@ -602,15 +602,20 @@ static void EDIT_BuildLineDefs_ML(EDITSTATE *es, INT istart, INT iend, INT delta if (!(es->style & ES_AUTOHSCROLL)) { if (current_line->width > fw) { - INT prev; + INT prev, next; int w; const SIZE *sz; + float d; prev = current_line->net_length - 1; w = current_line->net_length; + d = (float)current_line->width/(float)fw; + if (d > 1.2) d -= 0.2; + next = prev/d; + if (next >= prev) next = prev-1; do { prev = EDIT_CallWordBreakProc(es, current_position - es->text, - prev-1, current_line->net_length, WB_LEFT); + next, current_line->net_length, WB_LEFT); current_line->net_length = prev; EDIT_InvalidateUniscribeData_linedef(current_line); EDIT_UpdateUniscribeData_linedef(es, NULL, current_line); @@ -619,6 +624,7 @@ static void EDIT_BuildLineDefs_ML(EDITSTATE *es, INT istart, INT iend, INT delta current_line->width = sz->cx; else prev = 0; + next = prev - 1; } while (prev && current_line->width > fw); current_line->net_length = w;

1 0

Frédéric Delanoy : cmd: Make 'if errorlevel' only recognize integer values.
by Alexandre Julliard Oct. 28, 2011

Oct. 28, 2011

Module: wine Branch: master Commit: 45c1dff5521a71d09c368ed3216f21eea71ee10d URL: http://source.winehq.org/git/wine.git/?a=commit;h=45c1dff5521a71d09c368ed32… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Wed Oct 26 16:57:52 2011 +0200 cmd: Make 'if errorlevel' only recognize integer values. --- programs/cmd/builtins.c | 9 ++++++++- programs/cmd/tests/test_builtins.cmd | 6 ++++++ programs/cmd/tests/test_builtins.cmd.exp | 2 ++ 3 files changed, 16 insertions(+), 1 deletions(-) diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c index 721fb02..22e0342 100644 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -1513,7 +1513,14 @@ void WCMD_if (WCHAR *p, CMD_LIST **cmdList) { WINE_TRACE("Condition: %s\n", wine_dbgstr_w(condition)); if (!lstrcmpiW (condition, errlvlW)) { - test = (errorlevel >= atoiW(WCMD_parameter(p, 1+negate, NULL, NULL))); + WCHAR *param = WCMD_parameter(p, 1+negate, NULL, NULL); + WCHAR *endptr; + long int param_int = strtolW(param, &endptr, 10); + if (*endptr) { + WCMD_output_stderr(WCMD_LoadMessage(WCMD_SYNTAXERR)); + return; + } + test = ((long int)errorlevel >= param_int); WCMD_parameter(p, 2+negate, &command, NULL); } else if (!lstrcmpiW (condition, existW)) { diff --git a/programs/cmd/tests/test_builtins.cmd b/programs/cmd/tests/test_builtins.cmd index 02e264d..a56d0a3 100644 --- a/programs/cmd/tests/test_builtins.cmd +++ b/programs/cmd/tests/test_builtins.cmd @@ -1485,10 +1485,16 @@ call :setError 1 echo %ErrorLevel% if errorlevel 2 echo errorlevel too high, bad if errorlevel 1 echo errorlevel just right, good +if errorlevel 01 echo errorlevel with leading zero just right, good +if errorlevel -1 echo errorlevel with negative number OK +if errorlevel 0x1 echo hexa should not be recognized! +if errorlevel 1a echo invalid error level recognized! call :setError 0 echo abc%ErrorLevel%def if errorlevel 1 echo errorlevel nonzero, bad if not errorlevel 1 echo errorlevel zero, good +if not errorlevel 0x1 echo hexa should not be recognized! +if not errorlevel 1a echo invalid error level recognized! rem Now verify that setting a real variable hides its magic variable set errorlevel=7 echo %ErrorLevel% should be 7 diff --git a/programs/cmd/tests/test_builtins.cmd.exp b/programs/cmd/tests/test_builtins.cmd.exp index 20e5d12..7a0eec3 100644 --- a/programs/cmd/tests/test_builtins.cmd.exp +++ b/programs/cmd/tests/test_builtins.cmd.exp @@ -792,6 +792,8 @@ localval 9009 1 errorlevel just right, good +errorlevel with leading zero just right, good +errorlevel with negative number OK abc0def(a)or_broken@abc1def errorlevel zero, good(a)or_broken@errorlevel nonzero, bad 7 should be 7

1 0

Austin English : winex11: Only declare the winediag debug channel if OpenGL is enabled.
by Alexandre Julliard Oct. 28, 2011

Oct. 28, 2011

Module: wine Branch: master Commit: abfb9211c8ce3c2f770c4a4df9fa7cd49e0cd4b4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=abfb9211c8ce3c2f770c4a4df… Author: Austin English <austinenglish(a)gmail.com> Date: Thu Oct 27 13:17:34 2011 -0500 winex11: Only declare the winediag debug channel if OpenGL is enabled. --- dlls/winex11.drv/opengl.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c index 78a717d..0d4d822 100644 --- a/dlls/winex11.drv/opengl.c +++ b/dlls/winex11.drv/opengl.c @@ -42,10 +42,11 @@ #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(wgl); -WINE_DECLARE_DEBUG_CHANNEL(winediag); #ifdef SONAME_LIBGL +WINE_DECLARE_DEBUG_CHANNEL(winediag); + #undef APIENTRY #undef CALLBACK #undef WINAPI

1 0

Henri Verbeet : ddraw: Only update primary_lock when we' re actually locking the frontbuffer.
by Alexandre Julliard Oct. 27, 2011

Oct. 27, 2011

Module: wine Branch: master Commit: 38abddca68c2cb7ef8ed35bc2332a2f3baa15a1e URL: http://source.winehq.org/git/wine.git/?a=commit;h=38abddca68c2cb7ef8ed35bc2… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Oct 27 17:06:24 2011 +0200 ddraw: Only update primary_lock when we're actually locking the frontbuffer. This fixes a regression introduced by commit 8330558e125c9073068ffbd7741f1128c17c1e08. --- dlls/ddraw/surface.c | 15 +++++++++------ 1 files changed, 9 insertions(+), 6 deletions(-) diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index de32103..9f85153 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -972,12 +972,15 @@ static HRESULT surface_lock(IDirectDrawSurfaceImpl *This, } } - if (Flags & DDLOCK_READONLY) - memset(&This->ddraw->primary_lock, 0, sizeof(This->ddraw->primary_lock)); - else if (Rect) - This->ddraw->primary_lock = *Rect; - else - SetRect(&This->ddraw->primary_lock, 0, 0, This->surface_desc.dwWidth, This->surface_desc.dwHeight); + if (This->surface_desc.ddsCaps.dwCaps & DDSCAPS_FRONTBUFFER) + { + if (Flags & DDLOCK_READONLY) + memset(&This->ddraw->primary_lock, 0, sizeof(This->ddraw->primary_lock)); + else if (Rect) + This->ddraw->primary_lock = *Rect; + else + SetRect(&This->ddraw->primary_lock, 0, 0, This->surface_desc.dwWidth, This->surface_desc.dwHeight); + } /* Override the memory area. The pitch should be set already. Strangely windows * does not set the LPSURFACE flag on locked surfaces !?!.

1 0

Henri Verbeet : wined3d: Use the correct pitch in surface_upload_data().
by Alexandre Julliard Oct. 27, 2011

Oct. 27, 2011

Module: wine Branch: master Commit: 61550ff1decf346692deb6ae7c908926015789ca URL: http://source.winehq.org/git/wine.git/?a=commit;h=61550ff1decf346692deb6ae7… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Oct 27 17:06:23 2011 +0200 wined3d: Use the correct pitch in surface_upload_data(). This fixes a regression introduced by commit 2da4f87a7e7551f17cd650ef6d8596f595efc13b. --- dlls/wined3d/surface.c | 17 +++++++++-------- 1 files changed, 9 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 0bee46d..91c0f60 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -2412,14 +2412,14 @@ static void surface_download_data(struct wined3d_surface *surface, const struct * correct texture. */ /* Context activation is done by the caller. */ static void surface_upload_data(const struct wined3d_surface *surface, const struct wined3d_gl_info *gl_info, - const struct wined3d_format *format, const RECT *src_rect, UINT src_w, const POINT *dst_point, + const struct wined3d_format *format, const RECT *src_rect, UINT src_pitch, const POINT *dst_point, BOOL srgb, const struct wined3d_bo_address *data) { UINT update_w = src_rect->right - src_rect->left; UINT update_h = src_rect->bottom - src_rect->top; - TRACE("surface %p, gl_info %p, format %s, src_rect %s, src_w %u, dst_point %p, srgb %#x, data {%#x:%p}.\n", - surface, gl_info, debug_d3dformat(format->id), wine_dbgstr_rect(src_rect), src_w, + TRACE("surface %p, gl_info %p, format %s, src_rect %s, src_pitch %u, dst_point %s, srgb %#x, data {%#x:%p}.\n", + surface, gl_info, debug_d3dformat(format->id), wine_dbgstr_rect(src_rect), src_pitch, wine_dbgstr_point(dst_point), srgb, data->buffer_object, data->addr); if (format->heightscale != 1.0f && format->heightscale != 0.0f) @@ -2437,7 +2437,6 @@ static void surface_upload_data(const struct wined3d_surface *surface, const str { UINT row_length = wined3d_format_calculate_size(format, 1, update_w, 1); UINT row_count = (update_h + format->block_height - 1) / format->block_height; - UINT src_pitch = wined3d_format_calculate_size(format, 1, src_w, 1); const BYTE *addr = data->addr; GLenum internal; @@ -2480,14 +2479,14 @@ static void surface_upload_data(const struct wined3d_surface *surface, const str { const BYTE *addr = data->addr; - addr += src_rect->top * src_w * format->byte_count; + addr += src_rect->top * src_pitch; addr += src_rect->left * format->byte_count; TRACE("glTexSubImage2D, target %#x, level %d, x %d, y %d, w %d, h %d, format %#x, type %#x, addr %p.\n", surface->texture_target, surface->texture_level, dst_point->x, dst_point->y, update_w, update_h, format->glFormat, format->glType, addr); - glPixelStorei(GL_UNPACK_ROW_LENGTH, src_w); + glPixelStorei(GL_UNPACK_ROW_LENGTH, src_pitch / format->byte_count); glTexSubImage2D(surface->texture_target, surface->texture_level, dst_point->x, dst_point->y, update_w, update_h, format->glFormat, format->glType, addr); glPixelStorei(GL_UNPACK_ROW_LENGTH, 0); @@ -2530,6 +2529,7 @@ HRESULT surface_upload_from_surface(struct wined3d_surface *dst_surface, const P CONVERT_TYPES convert; UINT dst_w, dst_h; UINT src_w, src_h; + UINT src_pitch; POINT p; RECT r; @@ -2620,8 +2620,9 @@ HRESULT surface_upload_from_surface(struct wined3d_surface *dst_surface, const P data.buffer_object = src_surface->pbo; data.addr = src_surface->resource.allocatedMemory; + src_pitch = wined3d_surface_get_pitch(src_surface); - surface_upload_data(dst_surface, gl_info, src_format, src_rect, src_w, dst_point, FALSE, &data); + surface_upload_data(dst_surface, gl_info, src_format, src_rect, src_pitch, dst_point, FALSE, &data); invalidate_active_texture(dst_surface->resource.device, context); @@ -6177,7 +6178,7 @@ static HRESULT surface_load_texture(struct wined3d_surface *surface, data.buffer_object = surface->flags & SFLAG_PBO ? surface->pbo : 0; data.addr = mem; - surface_upload_data(surface, gl_info, &format, &src_rect, width, &dst_point, srgb, &data); + surface_upload_data(surface, gl_info, &format, &src_rect, src_pitch, &dst_point, srgb, &data); context_release(context);

1 0

Henri Verbeet : wined3d: Make the device parameter to wined3d_event_query_test() const.
by Alexandre Julliard Oct. 27, 2011

Oct. 27, 2011

Module: wine Branch: master Commit: eebad6a17aebebecea9dc09f9be4699f0a10e750 URL: http://source.winehq.org/git/wine.git/?a=commit;h=eebad6a17aebebecea9dc09f9… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Oct 27 17:06:27 2011 +0200 wined3d: Make the device parameter to wined3d_event_query_test() const. --- dlls/wined3d/query.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/query.c b/dlls/wined3d/query.c index b26fc26..ae03479 100644 --- a/dlls/wined3d/query.c +++ b/dlls/wined3d/query.c @@ -36,7 +36,7 @@ void wined3d_event_query_destroy(struct wined3d_event_query *query) } static enum wined3d_event_query_result wined3d_event_query_test(const struct wined3d_event_query *query, - struct wined3d_device *device) + const struct wined3d_device *device) { struct wined3d_context *context; const struct wined3d_gl_info *gl_info;

1 0

Nikolay Sivov : msxml3: Block attempt to modify namespace definition with setAttribute().
by Alexandre Julliard Oct. 27, 2011

Oct. 27, 2011

Module: wine Branch: master Commit: fe1f692d91498b221e32b55313a30d4fe7da316e URL: http://source.winehq.org/git/wine.git/?a=commit;h=fe1f692d91498b221e32b5531… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Oct 27 20:30:45 2011 +0400 msxml3: Block attempt to modify namespace definition with setAttribute(). --- dlls/msxml3/element.c | 20 ++++++++- dlls/msxml3/tests/domdoc.c | 99 +++++++++++++++++++++++++++++++++++++++----- 2 files changed, 106 insertions(+), 13 deletions(-) diff --git a/dlls/msxml3/element.c b/dlls/msxml3/element.c index 6cd3a6d..834f39b 100644 --- a/dlls/msxml3/element.c +++ b/dlls/msxml3/element.c @@ -1097,8 +1097,8 @@ static HRESULT WINAPI domelem_setAttribute( BSTR name, VARIANT value) { domelem *This = impl_from_IXMLDOMElement( iface ); + xmlChar *xml_name, *xml_value, *local, *prefix; xmlNodePtr element; - xmlChar *xml_name, *xml_value; HRESULT hr; VARIANT var; @@ -1119,7 +1119,23 @@ static HRESULT WINAPI domelem_setAttribute( xml_name = xmlchar_from_wchar( name ); xml_value = xmlchar_from_wchar( V_BSTR(&var) ); - if(!xmlSetNsProp(element, NULL, xml_name, xml_value)) + if ((local = xmlSplitQName2(xml_name, &prefix))) + { + static const xmlChar* xmlnsA = (const xmlChar*)"xmlns"; + xmlNsPtr ns = NULL; + + /* it's not allowed to modify existing namespace definition */ + if (xmlStrEqual(prefix, xmlnsA)) + ns = xmlSearchNs(element->doc, element, local); + + xmlFree(prefix); + xmlFree(local); + + if (ns) + return xmlStrEqual(ns->href, xml_value) ? S_OK : E_INVALIDARG; + } + + if (!xmlSetNsProp(element, NULL, xml_name, xml_value)) hr = E_FAIL; heap_free(xml_value); diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index 0acfa25..62ccb4e 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -6995,19 +6995,22 @@ static void test_testTransforms(void) static void test_Namespaces(void) { + static const CHAR szNamespacesXML[] = + "<?xml version=\"1.0\"?>\n" + "<XMI xmi.version=\"1.1\" xmlns:Model=\"http://omg.org/mof.Model/1.3\">" + " <XMI.content>" + " <Model:Package name=\"WinePackage\" />" + " </XMI.content>" + "</XMI>"; + IXMLDOMDocument *doc; - IXMLDOMNode *pNode; + IXMLDOMElement *elem; + IXMLDOMNode *node; IXMLDOMNode *pNode2 = NULL; VARIANT_BOOL bSucc; + VARIANT var; HRESULT hr; BSTR str; - static const CHAR szNamespacesXML[] = -"<?xml version=\"1.0\"?>\n" -"<XMI xmi.version=\"1.1\" xmlns:Model=\"http://omg.org/mof.Model/1.3\">" -" <XMI.content>" -" <Model:Package name=\"WinePackage\" />" -" </XMI.content>" -"</XMI>"; doc = create_document(&IID_IXMLDOMDocument); if (!doc) return; @@ -7016,11 +7019,11 @@ static void test_Namespaces(void) ok(hr == S_OK, "ret %08x\n", hr ); ok(bSucc == VARIANT_TRUE, "Expected VARIANT_TRUE got VARIANT_FALSE\n"); - hr = IXMLDOMDocument_selectSingleNode(doc, _bstr_("//XMI.content"), &pNode ); + hr = IXMLDOMDocument_selectSingleNode(doc, _bstr_("//XMI.content"), &node ); ok(hr == S_OK, "ret %08x\n", hr ); if(hr == S_OK) { - hr = IXMLDOMNode_get_firstChild( pNode, &pNode2 ); + hr = IXMLDOMNode_get_firstChild( node, &pNode2 ); ok( hr == S_OK, "ret %08x\n", hr ); ok( pNode2 != NULL, "pNode2 == NULL\n"); @@ -7050,11 +7053,85 @@ static void test_Namespaces(void) SysFreeString(str); IXMLDOMNode_Release(pNode2); - IXMLDOMNode_Release(pNode); + IXMLDOMNode_Release(node); } IXMLDOMDocument_Release(doc); + /* create on element and try to alter namespace after that */ + doc = create_document(&IID_IXMLDOMDocument); + if (!doc) return; + + V_VT(&var) = VT_I2; + V_I2(&var) = NODE_ELEMENT; + + hr = IXMLDOMDocument_createNode(doc, var, _bstr_("ns:elem"), _bstr_("ns/uri"), &node); + EXPECT_HR(hr, S_OK); + + hr = IXMLDOMDocument_appendChild(doc, node, NULL); + EXPECT_HR(hr, S_OK); + + hr = IXMLDOMDocument_get_documentElement(doc, &elem); + EXPECT_HR(hr, S_OK); + + V_VT(&var) = VT_BSTR; + V_BSTR(&var) = _bstr_("ns/uri2"); + + hr = IXMLDOMElement_setAttribute(elem, _bstr_("xmlns:ns"), var); + EXPECT_HR(hr, E_INVALIDARG); + + V_VT(&var) = VT_BSTR; + V_BSTR(&var) = _bstr_("ns/uri"); + + hr = IXMLDOMElement_setAttribute(elem, _bstr_("xmlns:ns"), var); + EXPECT_HR(hr, S_OK); + + hr = IXMLDOMElement_get_xml(elem, &str); + EXPECT_HR(hr, S_OK); + ok(!lstrcmpW(str, _bstr_("<ns:elem xmlns:ns=\"ns/uri\"/>")), "got element %s\n", wine_dbgstr_w(str)); + SysFreeString(str); + + IXMLDOMElement_Release(elem); + IXMLDOMDocument_Release(doc); + + /* create on element and try to alter namespace after that */ + doc = create_document_version(60, &IID_IXMLDOMDocument); + if (!doc) return; + + V_VT(&var) = VT_I2; + V_I2(&var) = NODE_ELEMENT; + + hr = IXMLDOMDocument_createNode(doc, var, _bstr_("ns:elem"), _bstr_("ns/uri"), &node); + EXPECT_HR(hr, S_OK); + + hr = IXMLDOMDocument_appendChild(doc, node, NULL); + EXPECT_HR(hr, S_OK); + + hr = IXMLDOMDocument_get_documentElement(doc, &elem); + EXPECT_HR(hr, S_OK); + + /* try same prefix, different uri */ + V_VT(&var) = VT_BSTR; + V_BSTR(&var) = _bstr_("ns/uri2"); + + hr = IXMLDOMElement_setAttribute(elem, _bstr_("xmlns:ns"), var); + EXPECT_HR(hr, E_INVALIDARG); + + /* try same prefix and uri */ + V_VT(&var) = VT_BSTR; + V_BSTR(&var) = _bstr_("ns/uri"); + + hr = IXMLDOMElement_setAttribute(elem, _bstr_("xmlns:ns"), var); + EXPECT_HR(hr, S_OK); + + hr = IXMLDOMElement_get_xml(elem, &str); + EXPECT_HR(hr, S_OK); + ok(!lstrcmpW(str, _bstr_("<ns:elem xmlns:ns=\"ns/uri\"/>")), "got element %s\n", wine_dbgstr_w(str)); + SysFreeString(str); + + IXMLDOMElement_Release(elem); + IXMLDOMDocument_Release(doc); + free_bstrs(); }

1 0