March 2012 - Wine-commits - list.winehq.org

Henri Verbeet : ddraw: Don' t return a pointer to the implementation in IDirectDrawClassFactoryImpl_QueryInterface ().
by Alexandre Julliard 14 Mar '12

14 Mar '12

Module: wine Branch: master Commit: 2071026acd64c418d6535cfff5476e6e09e61f27 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2071026acd64c418d6535cfff… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Mar 13 20:31:36 2012 +0100 ddraw: Don't return a pointer to the implementation in IDirectDrawClassFactoryImpl_QueryInterface(). --- dlls/ddraw/main.c | 7 +++---- 1 files changed, 3 insertions(+), 4 deletions(-) diff --git a/dlls/ddraw/main.c b/dlls/ddraw/main.c index c58ba44..400bb30 100644 --- a/dlls/ddraw/main.c +++ b/dlls/ddraw/main.c @@ -545,19 +545,18 @@ static inline IClassFactoryImpl *impl_from_IClassFactory(IClassFactory *iface) static HRESULT WINAPI IDirectDrawClassFactoryImpl_QueryInterface(IClassFactory *iface, REFIID riid, void **obj) { - IClassFactoryImpl *This = impl_from_IClassFactory(iface); - TRACE("iface %p, riid %s, object %p.\n", iface, debugstr_guid(riid), obj); if (IsEqualGUID(riid, &IID_IUnknown) || IsEqualGUID(riid, &IID_IClassFactory)) { IClassFactory_AddRef(iface); - *obj = This; + *obj = iface; return S_OK; } - WARN("(%p)->(%s,%p),not found\n",This,debugstr_guid(riid),obj); + WARN("%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid(riid)); + return E_NOINTERFACE; }

1 0

Henri Verbeet : ddraw: Get rid of IDirect3DLightImpl.
by Alexandre Julliard 14 Mar '12

14 Mar '12

Module: wine Branch: master Commit: 7b918934e687ec159a1ea03242097314fe061b38 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7b918934e687ec159a1ea0324… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Mar 13 20:31:37 2012 +0100 ddraw: Get rid of IDirect3DLightImpl. --- dlls/ddraw/ddraw.c | 2 +- dlls/ddraw/ddraw_private.h | 11 +++---- dlls/ddraw/light.c | 71 ++++++++++++++++++++++--------------------- dlls/ddraw/viewport.c | 20 ++++++------ 4 files changed, 52 insertions(+), 52 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=7b918934e687ec159a1ea…

1 0

Vincent Povirk : gdiplus: Fill path gradients with a solid color.
by Alexandre Julliard 14 Mar '12

14 Mar '12

Module: wine Branch: master Commit: 703b31b2e8c5e212f6445c8d7c0a666e73b3820c URL: http://source.winehq.org/git/wine.git/?a=commit;h=703b31b2e8c5e212f6445c8d7… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Mon Feb 20 17:08:05 2012 -0600 gdiplus: Fill path gradients with a solid color. --- dlls/gdiplus/graphics.c | 140 +++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 140 insertions(+), 0 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index ddae06e..72c6f01 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -875,6 +875,11 @@ static ARGB resample_bitmap_pixel(GDIPCONST GpRect *src_rect, LPBYTE bits, UINT } } +static REAL intersect_line_scanline(const GpPointF *p1, const GpPointF *p2, REAL y) +{ + return (p1->X - p2->X) * (p2->Y - y) / (p2->Y - p1->Y) + p2->X; +} + static INT brush_can_fill_path(GpBrush *brush) { switch (brush->bt) @@ -958,6 +963,7 @@ static INT brush_can_fill_pixels(GpBrush *brush) case BrushTypeHatchFill: case BrushTypeLinearGradient: case BrushTypeTextureFill: + case BrushTypePathGradient: return 1; default: return 0; @@ -1173,6 +1179,140 @@ static GpStatus brush_fill_pixels(GpGraphics *graphics, GpBrush *brush, return stat; } + case BrushTypePathGradient: + { + GpPathGradient *fill = (GpPathGradient*)brush; + GpPath *flat_path; + GpMatrix *world_to_device; + GpStatus stat; + int i, figure_start=0; + GpPointF start_point, end_point, center_point; + BYTE type; + REAL min_yf, max_yf, line1_xf, line2_xf; + INT min_y, max_y, min_x, max_x; + INT x, y; + + stat = GdipClonePath(fill->path, &flat_path); + + if (stat != Ok) + return stat; + + stat = get_graphics_transform(graphics, CoordinateSpaceDevice, + CoordinateSpaceWorld, &world_to_device); + if (stat == Ok) + { + stat = GdipTransformPath(flat_path, world_to_device); + + if (stat == Ok) + { + center_point = fill->center; + stat = GdipTransformMatrixPoints(world_to_device, &center_point, 1); + } + + if (stat == Ok) + stat = GdipFlattenPath(flat_path, NULL, 0.5); + + GdipDeleteMatrix(world_to_device); + } + + if (stat != Ok) + { + GdipDeletePath(flat_path); + return stat; + } + + for (i=0; i<flat_path->pathdata.Count; i++) + { + int start_center_line=0, end_center_line=0; + int seen_start=0, seen_end=0, seen_center=0; + + type = flat_path->pathdata.Types[i]; + + if ((type&PathPointTypePathTypeMask) == PathPointTypeStart) + figure_start = i; + + start_point = flat_path->pathdata.Points[i]; + + if ((type&PathPointTypeCloseSubpath) == PathPointTypeCloseSubpath || i+1 >= flat_path->pathdata.Count) + end_point = flat_path->pathdata.Points[figure_start]; + else if ((flat_path->pathdata.Types[i+1] & PathPointTypePathTypeMask) == PathPointTypeLine) + end_point = flat_path->pathdata.Points[i+1]; + else + continue; + + min_yf = center_point.Y; + if (min_yf > start_point.Y) min_yf = start_point.Y; + if (min_yf > end_point.Y) min_yf = end_point.Y; + + if (min_yf < fill_area->Y) + min_y = fill_area->Y; + else + min_y = (INT)ceil(min_yf); + + max_yf = center_point.Y; + if (max_yf < start_point.Y) max_yf = start_point.Y; + if (max_yf < end_point.Y) max_yf = end_point.Y; + + if (max_yf > fill_area->Y + fill_area->Height) + max_y = fill_area->Y + fill_area->Height; + else + max_y = (INT)ceil(max_yf); + + for (y=min_y; y<max_y; y++) + { + REAL yf = (REAL)y; + + if (!seen_start && yf >= start_point.Y) + { + seen_start = 1; + start_center_line ^= 1; + } + if (!seen_end && yf >= end_point.Y) + { + seen_end = 1; + end_center_line ^= 1; + } + if (!seen_center && yf >= center_point.Y) + { + seen_center = 1; + start_center_line ^= 1; + end_center_line ^= 1; + } + + if (start_center_line) + line1_xf = intersect_line_scanline(&start_point, &center_point, yf); + else + line1_xf = intersect_line_scanline(&start_point, &end_point, yf); + + if (end_center_line) + line2_xf = intersect_line_scanline(&end_point, &center_point, yf); + else + line2_xf = intersect_line_scanline(&start_point, &end_point, yf); + + if (line1_xf < line2_xf) + { + min_x = (INT)ceil(line1_xf); + max_x = (INT)ceil(line2_xf); + } + else + { + min_x = (INT)ceil(line2_xf); + max_x = (INT)ceil(line1_xf); + } + + if (min_x < fill_area->X) + min_x = fill_area->X; + if (max_x > fill_area->X + fill_area->Width) + max_x = fill_area->X + fill_area->Width; + + for (x=min_x; x<max_x; x++) + argb_pixels[(x-fill_area->X) + (y-fill_area->Y)*cdwStride] = fill->centercolor; + } + } + + GdipDeletePath(flat_path); + return stat; + } default: return NotImplemented; }

1 0

Vincent Povirk : gdiplus: Do some actual color blending when drawing path gradients.
by Alexandre Julliard 14 Mar '12

14 Mar '12

Module: wine Branch: master Commit: 5ed5daf4da747a20979d107fa9efd73f0a45a555 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5ed5daf4da747a20979d107fa… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed Feb 22 15:10:04 2012 -0600 gdiplus: Do some actual color blending when drawing path gradients. --- dlls/gdiplus/graphics.c | 18 +++++++++++++++++- 1 files changed, 17 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 72c6f01..56a61a7 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -1191,6 +1191,7 @@ static GpStatus brush_fill_pixels(GpGraphics *graphics, GpBrush *brush, REAL min_yf, max_yf, line1_xf, line2_xf; INT min_y, max_y, min_x, max_x; INT x, y; + ARGB outer_color=0xffffffff; stat = GdipClonePath(fill->path, &flat_path); @@ -1225,6 +1226,7 @@ static GpStatus brush_fill_pixels(GpGraphics *graphics, GpBrush *brush, { int start_center_line=0, end_center_line=0; int seen_start=0, seen_end=0, seen_center=0; + REAL center_distance; type = flat_path->pathdata.Types[i]; @@ -1258,6 +1260,10 @@ static GpStatus brush_fill_pixels(GpGraphics *graphics, GpBrush *brush, else max_y = (INT)ceil(max_yf); + /* This is proportional to the distance from start-end line to center point. */ + center_distance = (end_point.Y - start_point.Y) * (start_point.X - center_point.X) + + (end_point.X - start_point.X) * (center_point.Y - start_point.Y); + for (y=min_y; y<max_y; y++) { REAL yf = (REAL)y; @@ -1306,7 +1312,17 @@ static GpStatus brush_fill_pixels(GpGraphics *graphics, GpBrush *brush, max_x = fill_area->X + fill_area->Width; for (x=min_x; x<max_x; x++) - argb_pixels[(x-fill_area->X) + (y-fill_area->Y)*cdwStride] = fill->centercolor; + { + REAL distance; + + distance = (end_point.Y - start_point.Y) * (start_point.X - (REAL)x) + + (end_point.X - start_point.X) * (yf - start_point.Y); + + distance = distance / center_distance; + + argb_pixels[(x-fill_area->X) + (y-fill_area->Y)*cdwStride] = + blend_colors(outer_color, fill->centercolor, distance); + } } }

1 0

Vincent Povirk : gdiplus: Add fixme' s for unimplemented path gradient features.
by Alexandre Julliard 14 Mar '12

14 Mar '12

Module: wine Branch: master Commit: 5d64f16bec4786dc2d47ea988b4d0d731f53c661 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5d64f16bec4786dc2d47ea988… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed Feb 22 15:24:20 2012 -0600 gdiplus: Add fixme's for unimplemented path gradient features. --- dlls/gdiplus/graphics.c | 14 ++++++++++++++ 1 files changed, 14 insertions(+), 0 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 56a61a7..67361a2 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -1193,6 +1193,20 @@ static GpStatus brush_fill_pixels(GpGraphics *graphics, GpBrush *brush, INT x, y; ARGB outer_color=0xffffffff; + if (fill->focus.X != 0.0 || fill->focus.Y != 0.0) + { + static int once; + if (!once++) + FIXME("path gradient focus not implemented\n"); + } + + if (fill->gamma) + { + static int once; + if (!once++) + FIXME("path gradient gamma correction not implemented\n"); + } + stat = GdipClonePath(fill->path, &flat_path); if (stat != Ok)

1 0

Vincent Povirk : gdiplus: Add test for GdipGetPathGradientSurroundColorsWithCount.
by Alexandre Julliard 14 Mar '12

14 Mar '12

Module: wine Branch: master Commit: b54d38a5364eca3baf8ff5831a354f4ef6f7f96f URL: http://source.winehq.org/git/wine.git/?a=commit;h=b54d38a5364eca3baf8ff5831… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed Feb 22 16:09:29 2012 -0600 gdiplus: Add test for GdipGetPathGradientSurroundColorsWithCount. --- dlls/gdiplus/tests/brush.c | 82 ++++++++++++++++++++++++++++++++++++++++---- 1 files changed, 75 insertions(+), 7 deletions(-) diff --git a/dlls/gdiplus/tests/brush.c b/dlls/gdiplus/tests/brush.c index 726e855..68b8881 100644 --- a/dlls/gdiplus/tests/brush.c +++ b/dlls/gdiplus/tests/brush.c @@ -773,22 +773,59 @@ static void test_gradientsurroundcolorcount(void) { GpStatus status; GpPathGradient *grad; - ARGB *color; - INT count = 3; + ARGB color[3]; + INT count; status = GdipCreatePathGradient(blendcount_ptf, 2, WrapModeClamp, &grad); expect(Ok, status); - color = GdipAlloc(sizeof(ARGB[3])); + count = 0; + status = GdipGetPathGradientSurroundColorCount(grad, &count); + todo_wine expect(Ok, status); + todo_wine expect(2, count); + + color[0] = color[1] = color[2] = 0xdeadbeef; + count = 3; + status = GdipGetPathGradientSurroundColorsWithCount(grad, color, &count); + todo_wine expect(Ok, status); + todo_wine expect(1, count); + todo_wine expect(0xffffffff, color[0]); + todo_wine expect(0xffffffff, color[1]); + expect(0xdeadbeef, color[2]); + + color[0] = color[1] = color[2] = 0xdeadbeef; + count = 2; + status = GdipGetPathGradientSurroundColorsWithCount(grad, color, &count); + todo_wine expect(Ok, status); + todo_wine expect(1, count); + todo_wine expect(0xffffffff, color[0]); + todo_wine expect(0xffffffff, color[1]); + expect(0xdeadbeef, color[2]); + + color[0] = color[1] = color[2] = 0xdeadbeef; + count = 1; + status = GdipGetPathGradientSurroundColorsWithCount(grad, color, &count); + expect(InvalidParameter, status); + expect(1, count); + expect(0xdeadbeef, color[0]); + expect(0xdeadbeef, color[1]); + expect(0xdeadbeef, color[2]); + + color[0] = color[1] = color[2] = 0xdeadbeef; + count = 0; + status = GdipGetPathGradientSurroundColorsWithCount(grad, color, &count); + expect(InvalidParameter, status); + expect(0, count); + expect(0xdeadbeef, color[0]); + expect(0xdeadbeef, color[1]); + expect(0xdeadbeef, color[2]); + count = 3; status = GdipSetPathGradientSurroundColorsWithCount(grad, color, &count); expect(InvalidParameter, status); - GdipFree(color); count = 2; - color = GdipAlloc(sizeof(ARGB[2])); - color[0] = 0x00ff0000; color[1] = 0x0000ff00; @@ -820,7 +857,38 @@ static void test_gradientsurroundcolorcount(void) todo_wine expect(Ok, status); todo_wine expect(2, count); - GdipFree(color); + color[0] = color[1] = color[2] = 0xdeadbeef; + count = 2; + status = GdipGetPathGradientSurroundColorsWithCount(grad, color, &count); + todo_wine expect(Ok, status); + expect(2, count); + todo_wine expect(0x00ff0000, color[0]); + todo_wine expect(0x0000ff00, color[1]); + expect(0xdeadbeef, color[2]); + + GdipDeleteBrush((GpBrush*)grad); + + status = GdipCreatePathGradient(getbounds_ptf, 3, WrapModeClamp, &grad); + expect(Ok, status); + + color[0] = color[1] = color[2] = 0xdeadbeef; + count = 3; + status = GdipGetPathGradientSurroundColorsWithCount(grad, color, &count); + todo_wine expect(Ok, status); + todo_wine expect(1, count); + todo_wine expect(0xffffffff, color[0]); + todo_wine expect(0xffffffff, color[1]); + todo_wine expect(0xffffffff, color[2]); + + color[0] = color[1] = color[2] = 0xdeadbeef; + count = 2; + status = GdipGetPathGradientSurroundColorsWithCount(grad, color, &count); + expect(InvalidParameter, status); + expect(2, count); + expect(0xdeadbeef, color[0]); + expect(0xdeadbeef, color[1]); + expect(0xdeadbeef, color[2]); + GdipDeleteBrush((GpBrush*)grad); }

1 0

Vincent Povirk : gdiplus: Don' t add control points to the result in GdipFlattenPath.
by Alexandre Julliard 14 Mar '12

14 Mar '12

Module: wine Branch: master Commit: 1f6f84c7bb21875ab9d356ba4fc8f6699da7df47 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1f6f84c7bb21875ab9d356ba4… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed Feb 29 13:35:28 2012 -0600 gdiplus: Don't add control points to the result in GdipFlattenPath. --- dlls/gdiplus/graphicspath.c | 9 +-------- 1 files changed, 1 insertions(+), 8 deletions(-) diff --git a/dlls/gdiplus/graphicspath.c b/dlls/gdiplus/graphicspath.c index 120802c..131477e 100644 --- a/dlls/gdiplus/graphicspath.c +++ b/dlls/gdiplus/graphicspath.c @@ -1207,14 +1207,7 @@ GpStatus WINGDIPAPI GdipFlattenPath(GpPath *path, GpMatrix* matrix, REAL flatnes continue; } - /* Bezier curve always stored as 4 points */ - if((path->pathdata.Types[i-1] & PathPointTypePathTypeMask) != PathPointTypeStart){ - type = (path->pathdata.Types[i] & ~PathPointTypePathTypeMask) | PathPointTypeLine; - if(!add_path_list_node(node, pt.X, pt.Y, type)) - goto memout; - - node = node->next; - } + /* Bezier curve */ /* test for closed figure */ if(path->pathdata.Types[i+1] & PathPointTypeCloseSubpath){

1 0

Nicolas Le Cam : msvcp90/tests: Don't redefine __thiscall.
by Alexandre Julliard 14 Mar '12

14 Mar '12

Module: wine Branch: master Commit: 99db789eda402ab3665b2f66b09de720ef102e5c URL: http://source.winehq.org/git/wine.git/?a=commit;h=99db789eda402ab3665b2f66b… Author: Nicolas Le Cam <niko.lecam(a)gmail.com> Date: Thu Mar 1 22:18:33 2012 +0100 msvcp90/tests: Don't redefine __thiscall. --- dlls/msvcp90/tests/misc.c | 1 + dlls/msvcp90/tests/string.c | 1 + 2 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/msvcp90/tests/misc.c b/dlls/msvcp90/tests/misc.c index 688f344..e7f88c5 100644 --- a/dlls/msvcp90/tests/misc.c +++ b/dlls/msvcp90/tests/misc.c @@ -60,6 +60,7 @@ static char* (__cdecl *p_Copy_s)(char*, size_t, const char*, size_t); static unsigned short (__cdecl *p_wctype)(const char*); static MSVCP__Ctypevec (__cdecl *p__Getctype)(void); +#undef __thiscall #ifdef __i386__ #define __thiscall __stdcall #else diff --git a/dlls/msvcp90/tests/string.c b/dlls/msvcp90/tests/string.c index 6857dee..8bc5f18 100644 --- a/dlls/msvcp90/tests/string.c +++ b/dlls/msvcp90/tests/string.c @@ -52,6 +52,7 @@ static void* (__cdecl *p_set_invalid_parameter_handler)(void*); static basic_string_char* (__cdecl *p_basic_string_char_concatenate)(basic_string_char*, const basic_string_char*, const basic_string_char*); static basic_string_char* (__cdecl *p_basic_string_char_concatenate_cstr)(basic_string_char*, const basic_string_char*, const char*); +#undef __thiscall #ifdef __i386__ #define __thiscall __stdcall #else

1 0

Nikolay Sivov : msxml3: Implement getValue() for MXAttributes.
by Alexandre Julliard 14 Mar '12

14 Mar '12

Module: wine Branch: master Commit: 4cddf045fc6e7b7c4aaaf39db2d3b91a7e7004ed URL: http://source.winehq.org/git/wine.git/?a=commit;h=4cddf045fc6e7b7c4aaaf39db… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Mar 14 09:21:05 2012 +0300 msxml3: Implement getValue() for MXAttributes. --- dlls/msxml3/mxwriter.c | 18 ++++++++++++++---- dlls/msxml3/tests/saxreader.c | 37 +++++++++++++++++++++++++++++++++++++ 2 files changed, 51 insertions(+), 4 deletions(-) diff --git a/dlls/msxml3/mxwriter.c b/dlls/msxml3/mxwriter.c index f749eb5..b28bd19 100644 --- a/dlls/msxml3/mxwriter.c +++ b/dlls/msxml3/mxwriter.c @@ -1819,12 +1819,22 @@ static HRESULT WINAPI SAXAttributes_getTypeFromQName(ISAXAttributes *iface, cons return E_NOTIMPL; } -static HRESULT WINAPI SAXAttributes_getValue(ISAXAttributes *iface, int nIndex, const WCHAR ** pValue, - int * nValue) +static HRESULT WINAPI SAXAttributes_getValue(ISAXAttributes *iface, int index, const WCHAR **value, + int *len) { mxattributes *This = impl_from_ISAXAttributes( iface ); - FIXME("(%p)->(%d %p %p): stub\n", This, nIndex, pValue, nValue); - return E_NOTIMPL; + + TRACE("(%p)->(%d %p %p)\n", This, index, value, len); + + if (index >= This->length) return E_INVALIDARG; + + if ((!value || !len) && (This->class_version == MSXML_DEFAULT || This->class_version == MSXML3)) + return E_POINTER; + + *value = This->attr[index].value; + *len = SysStringLen(This->attr[index].value); + + return S_OK; } static HRESULT WINAPI SAXAttributes_getValueFromName(ISAXAttributes *iface, const WCHAR * pUri, diff --git a/dlls/msxml3/tests/saxreader.c b/dlls/msxml3/tests/saxreader.c index 8b0a3c4..95c7787 100644 --- a/dlls/msxml3/tests/saxreader.c +++ b/dlls/msxml3/tests/saxreader.c @@ -3298,6 +3298,7 @@ static void test_mxattr_addAttribute(void) { ISAXAttributes *saxattr; IMXAttributes *mxattr; + const WCHAR *value; HRESULT hr; int len; @@ -3328,10 +3329,46 @@ static void test_mxattr_addAttribute(void) EXPECT_HR(hr, S_OK); ok(len == 0, "got %d\n", len); + hr = ISAXAttributes_getValue(saxattr, 0, &value, &len); + EXPECT_HR(hr, E_INVALIDARG); + + hr = ISAXAttributes_getValue(saxattr, 0, NULL, &len); + EXPECT_HR(hr, E_INVALIDARG); + + hr = ISAXAttributes_getValue(saxattr, 0, &value, NULL); + EXPECT_HR(hr, E_INVALIDARG); + + hr = ISAXAttributes_getValue(saxattr, 0, NULL, NULL); + EXPECT_HR(hr, E_INVALIDARG); + hr = IMXAttributes_addAttribute(mxattr, _bstr_(table->uri), _bstr_(table->local), _bstr_(table->qname), _bstr_(table->type), _bstr_(table->value)); ok(hr == table->hr, "%d: got 0x%08x, expected 0x%08x\n", i, hr, table->hr); + if (hr == S_OK) + { + /* SAXAttributes40 and SAXAttributes60 both crash on this test */ + if (IsEqualGUID(table->clsid, &CLSID_SAXAttributes) || + IsEqualGUID(table->clsid, &CLSID_SAXAttributes30)) + { + hr = ISAXAttributes_getValue(saxattr, 0, NULL, &len); + EXPECT_HR(hr, E_POINTER); + + hr = ISAXAttributes_getValue(saxattr, 0, &value, NULL); + EXPECT_HR(hr, E_POINTER); + + hr = ISAXAttributes_getValue(saxattr, 0, NULL, NULL); + EXPECT_HR(hr, E_POINTER); + } + + len = -1; + hr = ISAXAttributes_getValue(saxattr, 0, &value, &len); + EXPECT_HR(hr, S_OK); + ok(!lstrcmpW(_bstr_(table->value), value), "%d: got %s, expected %s\n", i, wine_dbgstr_w(value), + table->value); + ok(lstrlenW(value) == len, "%d: got wrong value length %d\n", i, len); + } + len = -1; hr = ISAXAttributes_getLength(saxattr, &len); EXPECT_HR(hr, S_OK);

1 0

Nikolay Sivov : msxml3: Implement getType() for MXAttributes.
by Alexandre Julliard 14 Mar '12

14 Mar '12

Module: wine Branch: master Commit: 69bc0966458d0e22b7f3aed4ae3cc549f4a8da18 URL: http://source.winehq.org/git/wine.git/?a=commit;h=69bc0966458d0e22b7f3aed4a… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Mar 14 11:44:34 2012 +0300 msxml3: Implement getType() for MXAttributes. --- dlls/msxml3/mxwriter.c | 20 +++++++++++++++----- dlls/msxml3/tests/saxreader.c | 38 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 53 insertions(+), 5 deletions(-) diff --git a/dlls/msxml3/mxwriter.c b/dlls/msxml3/mxwriter.c index b28bd19..86c0da0 100644 --- a/dlls/msxml3/mxwriter.c +++ b/dlls/msxml3/mxwriter.c @@ -1612,7 +1612,7 @@ static HRESULT WINAPI MXAttributes_addAttribute(IMXAttributes *iface, attr->qname = SysAllocString(QName); attr->local = SysAllocString(localName); attr->uri = SysAllocString(uri); - attr->type = SysAllocString(type); + attr->type = SysAllocString(type ? type : emptyW); attr->value = SysAllocString(value); This->length++; @@ -1794,12 +1794,22 @@ static HRESULT WINAPI SAXAttributes_getIndexFromQName(ISAXAttributes *iface, con return E_NOTIMPL; } -static HRESULT WINAPI SAXAttributes_getType(ISAXAttributes *iface, int nIndex, const WCHAR ** pType, - int * pTypeLength) +static HRESULT WINAPI SAXAttributes_getType(ISAXAttributes *iface, int index, const WCHAR **type, + int *len) { mxattributes *This = impl_from_ISAXAttributes( iface ); - FIXME("(%p)->(%d %p %p): stub\n", This, nIndex, pType, pTypeLength); - return E_NOTIMPL; + + TRACE("(%p)->(%d %p %p)\n", This, index, type, len); + + if (index >= This->length) return E_INVALIDARG; + + if ((!type || !len) && (This->class_version == MSXML_DEFAULT || This->class_version == MSXML3)) + return E_POINTER; + + *type = This->attr[index].type; + *len = SysStringLen(This->attr[index].type); + + return S_OK; } static HRESULT WINAPI SAXAttributes_getTypeFromName(ISAXAttributes *iface, const WCHAR * pUri, int nUri, diff --git a/dlls/msxml3/tests/saxreader.c b/dlls/msxml3/tests/saxreader.c index 95c7787..ccd690a 100644 --- a/dlls/msxml3/tests/saxreader.c +++ b/dlls/msxml3/tests/saxreader.c @@ -3341,6 +3341,18 @@ static void test_mxattr_addAttribute(void) hr = ISAXAttributes_getValue(saxattr, 0, NULL, NULL); EXPECT_HR(hr, E_INVALIDARG); + hr = ISAXAttributes_getType(saxattr, 0, &value, &len); + EXPECT_HR(hr, E_INVALIDARG); + + hr = ISAXAttributes_getType(saxattr, 0, NULL, &len); + EXPECT_HR(hr, E_INVALIDARG); + + hr = ISAXAttributes_getType(saxattr, 0, &value, NULL); + EXPECT_HR(hr, E_INVALIDARG); + + hr = ISAXAttributes_getType(saxattr, 0, NULL, NULL); + EXPECT_HR(hr, E_INVALIDARG); + hr = IMXAttributes_addAttribute(mxattr, _bstr_(table->uri), _bstr_(table->local), _bstr_(table->qname), _bstr_(table->type), _bstr_(table->value)); ok(hr == table->hr, "%d: got 0x%08x, expected 0x%08x\n", i, hr, table->hr); @@ -3359,6 +3371,15 @@ static void test_mxattr_addAttribute(void) hr = ISAXAttributes_getValue(saxattr, 0, NULL, NULL); EXPECT_HR(hr, E_POINTER); + + hr = ISAXAttributes_getType(saxattr, 0, NULL, &len); + EXPECT_HR(hr, E_POINTER); + + hr = ISAXAttributes_getType(saxattr, 0, &value, NULL); + EXPECT_HR(hr, E_POINTER); + + hr = ISAXAttributes_getType(saxattr, 0, NULL, NULL); + EXPECT_HR(hr, E_POINTER); } len = -1; @@ -3367,6 +3388,23 @@ static void test_mxattr_addAttribute(void) ok(!lstrcmpW(_bstr_(table->value), value), "%d: got %s, expected %s\n", i, wine_dbgstr_w(value), table->value); ok(lstrlenW(value) == len, "%d: got wrong value length %d\n", i, len); + + len = -1; + value = (void*)0xdeadbeef; + hr = ISAXAttributes_getType(saxattr, 0, &value, &len); + EXPECT_HR(hr, S_OK); + + if (table->type) + { + ok(!lstrcmpW(_bstr_(table->type), value), "%d: got %s, expected %s\n", i, wine_dbgstr_w(value), + table->type); + ok(lstrlenW(value) == len, "%d: got wrong type value length %d\n", i, len); + } + else + { + ok(*value == 0, "%d: got type value %s\n", i, wine_dbgstr_w(value)); + ok(len == 0, "%d: got wrong type value length %d\n", i, len); + } } len = -1;

1 0