September 2014 - Wine-commits

Vincent Povirk : gdiplus: Skip resampling when drawing a bitmap with no scaling/rotation.
by Alexandre Julliard 18 Sep '14

18 Sep '14

Module: wine Branch: master Commit: 76a96b70f7379f28c12bbd8b7503f09231f93f90 URL: http://source.winehq.org/git/wine.git/?a=commit;h=76a96b70f7379f28c12bbd8b7… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed Sep 17 14:45:28 2014 -0500 gdiplus: Skip resampling when drawing a bitmap with no scaling/rotation. --- dlls/gdiplus/graphics.c | 96 ++++++++++++++++++++++++++++++------------------- 1 file changed, 59 insertions(+), 37 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 7ee46ee..8fef111 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -2857,6 +2857,7 @@ GpStatus WINGDIPAPI GdipDrawImagePointsRect(GpGraphics *graphics, GpImage *image else if (image->type == ImageTypeBitmap) { GpBitmap* bitmap = (GpBitmap*)image; + BOOL do_resampling = FALSE; BOOL use_software = FALSE; TRACE("graphics: %.2fx%.2f dpi, fmt %#x, scale %f, image: %.2fx%.2f dpi, fmt %#x, color %08x\n", @@ -2865,12 +2866,14 @@ GpStatus WINGDIPAPI GdipDrawImagePointsRect(GpGraphics *graphics, GpImage *image graphics->scale, image->xres, image->yres, bitmap->format, imageAttributes ? imageAttributes->outside_color : 0); - if (imageAttributes || graphics->alpha_hdc || - (graphics->image && graphics->image->type == ImageTypeBitmap) || - ptf[1].Y != ptf[0].Y || ptf[2].X != ptf[0].X || + if (ptf[1].Y != ptf[0].Y || ptf[2].X != ptf[0].X || ptf[1].X - ptf[0].X != srcwidth || ptf[2].Y - ptf[0].Y != srcheight || srcx < 0 || srcy < 0 || srcx + srcwidth > bitmap->width || srcy + srcheight > bitmap->height) + do_resampling = TRUE; + + if (imageAttributes || graphics->alpha_hdc || do_resampling || + (graphics->image && graphics->image->type == ImageTypeBitmap)) use_software = TRUE; if (use_software) @@ -2881,7 +2884,7 @@ GpStatus WINGDIPAPI GdipDrawImagePointsRect(GpGraphics *graphics, GpImage *image int i, x, y, src_stride, dst_stride; GpMatrix dst_to_src; REAL m11, m12, m21, m22, mdx, mdy; - LPBYTE src_data, dst_data; + LPBYTE src_data, dst_data, dst_dyn_data=NULL; BitmapData lockeddata; InterpolationMode interpolation = graphics->interpolation; PixelOffsetMode offset_mode = graphics->pixeloffset; @@ -2926,22 +2929,25 @@ GpStatus WINGDIPAPI GdipDrawImagePointsRect(GpGraphics *graphics, GpImage *image stat = GdipInvertMatrix(&dst_to_src); if (stat != Ok) return stat; - dst_data = GdipAlloc(sizeof(ARGB) * (dst_area.right - dst_area.left) * (dst_area.bottom - dst_area.top)); - if (!dst_data) return OutOfMemory; - - dst_stride = sizeof(ARGB) * (dst_area.right - dst_area.left); - - get_bitmap_sample_size(interpolation, imageAttributes->wrap, - bitmap, srcx, srcy, srcwidth, srcheight, &src_area); + if (do_resampling) + { + get_bitmap_sample_size(interpolation, imageAttributes->wrap, + bitmap, srcx, srcy, srcwidth, srcheight, &src_area); + } + else + { + /* Make sure src_area is equal in size to dst_area. */ + src_area.X = srcx + dst_area.left - pti[0].x; + src_area.Y = srcy + dst_area.top - pti[0].y; + src_area.Width = dst_area.right - dst_area.left; + src_area.Height = dst_area.bottom - dst_area.top; + } TRACE("src_area: %d x %d\n", src_area.Width, src_area.Height); src_data = GdipAlloc(sizeof(ARGB) * src_area.Width * src_area.Height); if (!src_data) - { - GdipFree(dst_data); return OutOfMemory; - } src_stride = sizeof(ARGB) * src_area.Width; /* Read the bits we need from the source bitmap into an ARGB buffer. */ @@ -2960,7 +2966,6 @@ GpStatus WINGDIPAPI GdipDrawImagePointsRect(GpGraphics *graphics, GpImage *image if (stat != Ok) { GdipFree(src_data); - GdipFree(dst_data); return stat; } @@ -2968,40 +2973,57 @@ GpStatus WINGDIPAPI GdipDrawImagePointsRect(GpGraphics *graphics, GpImage *image src_area.Width, src_area.Height, src_stride, ColorAdjustTypeBitmap); - /* Transform the bits as needed to the destination. */ - GdipTransformMatrixPoints(&dst_to_src, dst_to_src_points, 3); + if (do_resampling) + { + /* Transform the bits as needed to the destination. */ + dst_data = dst_dyn_data = GdipAlloc(sizeof(ARGB) * (dst_area.right - dst_area.left) * (dst_area.bottom - dst_area.top)); + if (!dst_data) + { + GdipFree(src_data); + return OutOfMemory; + } + + dst_stride = sizeof(ARGB) * (dst_area.right - dst_area.left); - x_dx = dst_to_src_points[1].X - dst_to_src_points[0].X; - x_dy = dst_to_src_points[1].Y - dst_to_src_points[0].Y; - y_dx = dst_to_src_points[2].X - dst_to_src_points[0].X; - y_dy = dst_to_src_points[2].Y - dst_to_src_points[0].Y; + GdipTransformMatrixPoints(&dst_to_src, dst_to_src_points, 3); - for (x=dst_area.left; x<dst_area.right; x++) - { - for (y=dst_area.top; y<dst_area.bottom; y++) + x_dx = dst_to_src_points[1].X - dst_to_src_points[0].X; + x_dy = dst_to_src_points[1].Y - dst_to_src_points[0].Y; + y_dx = dst_to_src_points[2].X - dst_to_src_points[0].X; + y_dy = dst_to_src_points[2].Y - dst_to_src_points[0].Y; + + for (x=dst_area.left; x<dst_area.right; x++) { - GpPointF src_pointf; - ARGB *dst_color; + for (y=dst_area.top; y<dst_area.bottom; y++) + { + GpPointF src_pointf; + ARGB *dst_color; - src_pointf.X = dst_to_src_points[0].X + x * x_dx + y * y_dx; - src_pointf.Y = dst_to_src_points[0].Y + x * x_dy + y * y_dy; + src_pointf.X = dst_to_src_points[0].X + x * x_dx + y * y_dx; + src_pointf.Y = dst_to_src_points[0].Y + x * x_dy + y * y_dy; - dst_color = (ARGB*)(dst_data + dst_stride * (y - dst_area.top) + sizeof(ARGB) * (x - dst_area.left)); + dst_color = (ARGB*)(dst_data + dst_stride * (y - dst_area.top) + sizeof(ARGB) * (x - dst_area.left)); - if (src_pointf.X >= srcx && src_pointf.X < srcx + srcwidth && src_pointf.Y >= srcy && src_pointf.Y < srcy+srcheight) - *dst_color = resample_bitmap_pixel(&src_area, src_data, bitmap->width, bitmap->height, &src_pointf, - imageAttributes, interpolation, offset_mode); - else - *dst_color = 0; + if (src_pointf.X >= srcx && src_pointf.X < srcx + srcwidth && src_pointf.Y >= srcy && src_pointf.Y < srcy+srcheight) + *dst_color = resample_bitmap_pixel(&src_area, src_data, bitmap->width, bitmap->height, &src_pointf, + imageAttributes, interpolation, offset_mode); + else + *dst_color = 0; + } } } - - GdipFree(src_data); + else + { + dst_data = src_data; + dst_stride = src_stride; + } stat = alpha_blend_pixels(graphics, dst_area.left, dst_area.top, dst_data, dst_area.right - dst_area.left, dst_area.bottom - dst_area.top, dst_stride); - GdipFree(dst_data); + GdipFree(src_data); + + GdipFree(dst_dyn_data); return stat; }

1 0

Vincent Povirk : gdiplus: Use integer math to apply color matrices.
by Alexandre Julliard 18 Sep '14

18 Sep '14

Module: wine Branch: master Commit: 57f1d4489f5b9490fc86adbe9229fa6643a760db URL: http://source.winehq.org/git/wine.git/?a=commit;h=57f1d4489f5b9490fc86adbe9… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed Sep 17 16:17:11 2014 -0500 gdiplus: Use integer math to apply color matrices. --- dlls/gdiplus/graphics.c | 80 +++++++++++++++++++++++++++++++++---------------- 1 file changed, 55 insertions(+), 25 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 8fef111..169d92c 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -593,30 +593,47 @@ static ARGB blend_line_gradient(GpLineGradient* brush, REAL position) } } -static ARGB transform_color(ARGB color, const ColorMatrix *matrix) +static BOOL round_color_matrix(const ColorMatrix *matrix, int values[5][5]) { - REAL val[5], res[4]; + /* Convert floating point color matrix to int[5][5], return TRUE if it's an identity */ + BOOL identity = TRUE; + int i, j; + + for (i=0; i<4; i++) + for (j=0; j<5; j++) + { + if (matrix->m[j][i] != (i == j ? 1.0 : 0.0)) + identity = FALSE; + values[j][i] = gdip_round(matrix->m[j][i] * 256.0); + } + + return identity; +} + +static ARGB transform_color(ARGB color, int matrix[5][5]) +{ + int val[5], res[4]; int i, j; unsigned char a, r, g, b; - val[0] = ((color >> 16) & 0xff) / 255.0; /* red */ - val[1] = ((color >> 8) & 0xff) / 255.0; /* green */ - val[2] = (color & 0xff) / 255.0; /* blue */ - val[3] = ((color >> 24) & 0xff) / 255.0; /* alpha */ - val[4] = 1.0; /* translation */ + val[0] = ((color >> 16) & 0xff); /* red */ + val[1] = ((color >> 8) & 0xff); /* green */ + val[2] = (color & 0xff); /* blue */ + val[3] = ((color >> 24) & 0xff); /* alpha */ + val[4] = 255; /* translation */ for (i=0; i<4; i++) { - res[i] = 0.0; + res[i] = 0; for (j=0; j<5; j++) - res[i] += matrix->m[j][i] * val[j]; + res[i] += matrix[j][i] * val[j]; } - a = min(max(floorf(res[3]*255.0), 0.0), 255.0); - r = min(max(floorf(res[0]*255.0), 0.0), 255.0); - g = min(max(floorf(res[1]*255.0), 0.0), 255.0); - b = min(max(floorf(res[2]*255.0), 0.0), 255.0); + a = min(max(res[3] / 256, 0), 255); + r = min(max(res[0] / 256, 0), 255); + g = min(max(res[1] / 256, 0), 255); + b = min(max(res[2] / 256, 0), 255); return (a << 24) | (r << 16) | (g << 8) | b; } @@ -703,28 +720,41 @@ static void apply_image_attributes(const GpImageAttributes *attributes, LPBYTE d attributes->colormatrices[ColorAdjustTypeDefault].enabled) { const struct color_matrix *colormatrices; + int color_matrix[5][5]; + int gray_matrix[5][5]; + BOOL identity; if (attributes->colormatrices[type].enabled) colormatrices = &attributes->colormatrices[type]; else colormatrices = &attributes->colormatrices[ColorAdjustTypeDefault]; - for (x=0; x<width; x++) - for (y=0; y<height; y++) - { - ARGB *src_color; - src_color = (ARGB*)(data + stride * y + sizeof(ARGB) * x); + identity = round_color_matrix(&colormatrices->colormatrix, color_matrix); - if (colormatrices->flags == ColorMatrixFlagsDefault || - !color_is_gray(*src_color)) - { - *src_color = transform_color(*src_color, &colormatrices->colormatrix); - } - else if (colormatrices->flags == ColorMatrixFlagsAltGray) + if (colormatrices->flags == ColorMatrixFlagsAltGray) + identity = (round_color_matrix(&colormatrices->graymatrix, gray_matrix) && identity); + + if (!identity) + { + for (x=0; x<width; x++) + { + for (y=0; y<height; y++) { - *src_color = transform_color(*src_color, &colormatrices->graymatrix); + ARGB *src_color; + src_color = (ARGB*)(data + stride * y + sizeof(ARGB) * x); + + if (colormatrices->flags == ColorMatrixFlagsDefault || + !color_is_gray(*src_color)) + { + *src_color = transform_color(*src_color, color_matrix); + } + else if (colormatrices->flags == ColorMatrixFlagsAltGray) + { + *src_color = transform_color(*src_color, gray_matrix); + } } } + } } if (attributes->gamma_enabled[type] ||

1 0

Eric Kohl : rpcrt4: Fix buffer size calculation for arrays with embedded pointers.
by Alexandre Julliard 18 Sep '14

18 Sep '14

Module: wine Branch: master Commit: 23981241c1a496399e8fa67544e16b9eb32dea62 URL: http://source.winehq.org/git/wine.git/?a=commit;h=23981241c1a496399e8fa6754… Author: Eric Kohl <eric.kohl(a)t-online.de> Date: Thu Sep 18 14:22:20 2014 +0200 rpcrt4: Fix buffer size calculation for arrays with embedded pointers. --- dlls/rpcrt4/ndr_marshall.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/rpcrt4/ndr_marshall.c b/dlls/rpcrt4/ndr_marshall.c index 3f1762a..0cb41bc 100644 --- a/dlls/rpcrt4/ndr_marshall.c +++ b/dlls/rpcrt4/ndr_marshall.c @@ -1211,7 +1211,7 @@ static unsigned char * EmbeddedPointerMarshall(PMIDL_STUB_MESSAGE pStubMsg, unsigned char *bufptr = bufbase + *(const SHORT*)&info[2]; unsigned char *saved_memory = pStubMsg->Memory; - pStubMsg->Memory = pMemory; + pStubMsg->Memory = membase; PointerMarshall(pStubMsg, bufptr, *(unsigned char**)memptr, info+4); pStubMsg->Memory = saved_memory; } @@ -1365,7 +1365,7 @@ static void EmbeddedPointerBufferSize(PMIDL_STUB_MESSAGE pStubMsg, unsigned char *memptr = membase + *(const SHORT*)&info[0]; unsigned char *saved_memory = pStubMsg->Memory; - pStubMsg->Memory = pMemory; + pStubMsg->Memory = membase; PointerBufferSize(pStubMsg, *(unsigned char**)memptr, info+4); pStubMsg->Memory = saved_memory; } @@ -1497,7 +1497,7 @@ static void EmbeddedPointerFree(PMIDL_STUB_MESSAGE pStubMsg, unsigned char *memptr = membase + *(const SHORT*)&info[0]; unsigned char *saved_memory = pStubMsg->Memory; - pStubMsg->Memory = pMemory; + pStubMsg->Memory = membase; PointerFree(pStubMsg, *(unsigned char**)memptr, info+4); pStubMsg->Memory = saved_memory; }

1 0

YongHao Hu : msvcp90: Fix comment typo.
by Alexandre Julliard 18 Sep '14

18 Sep '14

Module: wine Branch: master Commit: 3e356df597eea10dde11475cb9a8531af09989e3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3e356df597eea10dde11475cb… Author: YongHao Hu <christopherwuy(a)gmail.com> Date: Thu Sep 18 08:19:52 2014 +0800 msvcp90: Fix comment typo. --- dlls/msvcp90/ios.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msvcp90/ios.c b/dlls/msvcp90/ios.c index fbba957..4ad9586 100644 --- a/dlls/msvcp90/ios.c +++ b/dlls/msvcp90/ios.c @@ -6497,7 +6497,7 @@ basic_ostream_char* __cdecl basic_ostream_char_endl(basic_ostream_char *ostr) return ostr; } -/* $?6DU?$char_traits(a)D@std@@V?$allocator(a)D@1@@std@@YAAAV?$basic_ostream(a)DU?$char_traits(a)D@std@@@0(a)AAV10@ABV?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@0@@Z */ +/* ??$?6DU?$char_traits(a)D@std@@V?$allocator(a)D@1@@std@@YAAAV?$basic_ostream(a)DU?$char_traits(a)D@std@@@0(a)AAV10@ABV?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@0@@Z */ /* ??$?6DU?$char_traits(a)D@std@@V?$allocator(a)D@1@@std@@YAAEAV?$basic_ostream(a)DU?$char_traits(a)D@std@@@0(a)AEAV10@AEBV?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@0@@Z */ basic_ostream_char* __cdecl basic_ostream_char_print_bstr(basic_ostream_char *ostr, const basic_string_char *str) {

1 0

Qian Hong : mshtml/tests: Fixed typo.
by Alexandre Julliard 18 Sep '14

18 Sep '14

Module: wine Branch: master Commit: a9d347cb248978a919630fa08255851c746dc369 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a9d347cb248978a919630fa08… Author: Qian Hong <qhong(a)codeweavers.com> Date: Thu Sep 18 00:31:12 2014 +0800 mshtml/tests: Fixed typo. --- dlls/mshtml/tests/script.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/mshtml/tests/script.c b/dlls/mshtml/tests/script.c index 5e9ca60..031c0ac 100644 --- a/dlls/mshtml/tests/script.c +++ b/dlls/mshtml/tests/script.c @@ -2085,7 +2085,7 @@ static void test_default_arg_conv(IHTMLWindow2 *window) test_elem_disabled(elem, VARIANT_TRUE); V_VT(&v) = VT_I4; - V_BSTR(&v) = 0; + V_I4(&v) = 0; hres = dispex_propput(dispex, DISPID_IHTMLELEMENT3_DISABLED, 0, &v, NULL); ok(hres == S_OK, "InvokeEx failed: %08x\n", hres);

1 0

Qian Hong : mshtml: Handle DISPATCH_PROPERTYPUT | DISPATCH_PROPERTYPUTREF in invoke_builtin_prop.
by Alexandre Julliard 18 Sep '14

18 Sep '14

Module: wine Branch: master Commit: cdd28b0aca0647324abfb4493844d27e7471bd2c URL: http://source.winehq.org/git/wine.git/?a=commit;h=cdd28b0aca0647324abfb4493… Author: Qian Hong <qhong(a)codeweavers.com> Date: Thu Sep 18 00:33:47 2014 +0800 mshtml: Handle DISPATCH_PROPERTYPUT | DISPATCH_PROPERTYPUTREF in invoke_builtin_prop. --- dlls/mshtml/dispex.c | 3 ++- dlls/mshtml/tests/script.c | 7 +++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/dlls/mshtml/dispex.c b/dlls/mshtml/dispex.c index a81bf7c..4a872a8 100644 --- a/dlls/mshtml/dispex.c +++ b/dlls/mshtml/dispex.c @@ -1230,6 +1230,7 @@ static HRESULT invoke_builtin_prop(DispatchEx *This, DISPID id, LCID lcid, WORD switch(flags) { case DISPATCH_PROPERTYPUT: + case DISPATCH_PROPERTYPUT | DISPATCH_PROPERTYPUTREF: if(res) V_VT(res) = VT_EMPTY; hres = builtin_propput(This, func, dp, caller); @@ -1249,7 +1250,7 @@ static HRESULT invoke_builtin_prop(DispatchEx *This, DISPID id, LCID lcid, WORD if(flags != (DISPATCH_PROPERTYGET|DISPATCH_METHOD) || dp->cArgs) { if(V_VT(&v) != VT_DISPATCH) { - FIXME("Not a function %s\n", debugstr_variant(&v)); + FIXME("Not a function %s flags %08x\n", debugstr_variant(&v), flags); VariantClear(&v); return E_FAIL; } diff --git a/dlls/mshtml/tests/script.c b/dlls/mshtml/tests/script.c index 031c0ac..c9b9eb5 100644 --- a/dlls/mshtml/tests/script.c +++ b/dlls/mshtml/tests/script.c @@ -2091,6 +2091,13 @@ static void test_default_arg_conv(IHTMLWindow2 *window) test_elem_disabled(elem, VARIANT_FALSE); + V_VT(&v) = VT_I4; + V_I4(&v) = 1; + hres = dispex_propput(dispex, DISPID_IHTMLELEMENT3_DISABLED, DISPATCH_PROPERTYPUTREF, &v, NULL); + ok(hres == S_OK, "InvokeEx failed: %08x\n", hres); + + test_elem_disabled(elem, VARIANT_TRUE); + IHTMLElement_Release(elem); IDispatchEx_Release(dispex); }

1 0

Qian Hong : mshtml: Added IHTMLDOMAttribute::put_nodeValue implementation.
by Alexandre Julliard 18 Sep '14

18 Sep '14

Module: wine Branch: master Commit: e2b7354ac146b62f0c2bd515e28a85d27a5dd6b6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e2b7354ac146b62f0c2bd515e… Author: Qian Hong <qhong(a)codeweavers.com> Date: Thu Sep 18 13:11:38 2014 +0800 mshtml: Added IHTMLDOMAttribute::put_nodeValue implementation. --- dlls/mshtml/htmlattr.c | 22 ++++++++++++++++++---- dlls/mshtml/tests/dom.c | 38 +++++++++++++++++++++++++++++++++++++- 2 files changed, 55 insertions(+), 5 deletions(-) diff --git a/dlls/mshtml/htmlattr.c b/dlls/mshtml/htmlattr.c index 420a275..ae9bbfe 100644 --- a/dlls/mshtml/htmlattr.c +++ b/dlls/mshtml/htmlattr.c @@ -138,11 +138,25 @@ static HRESULT WINAPI HTMLDOMAttribute_get_nodeName(IHTMLDOMAttribute *iface, BS return IDispatchEx_GetMemberName(&This->elem->node.dispex.IDispatchEx_iface, This->dispid, p); } -static HRESULT WINAPI HTMLDOMAttribute_put_nodeName(IHTMLDOMAttribute *iface, VARIANT v) +static HRESULT WINAPI HTMLDOMAttribute_put_nodeValue(IHTMLDOMAttribute *iface, VARIANT v) { HTMLDOMAttribute *This = impl_from_IHTMLDOMAttribute(iface); - FIXME("(%p)->(%s)\n", This, debugstr_variant(&v)); - return E_NOTIMPL; + DISPID dispidNamed = DISPID_PROPERTYPUT; + DISPPARAMS dp = {&v, &dispidNamed, 1, 1}; + EXCEPINFO ei; + VARIANT ret; + + TRACE("(%p)->(%s)\n", This, debugstr_variant(&v)); + + if(!This->elem) { + FIXME("NULL This->elem\n"); + return E_UNEXPECTED; + } + + memset(&ei, 0, sizeof(ei)); + + return IDispatchEx_InvokeEx(&This->elem->node.dispex.IDispatchEx_iface, This->dispid, LOCALE_SYSTEM_DEFAULT, + DISPATCH_PROPERTYPUT, &dp, &ret, &ei, NULL); } static HRESULT WINAPI HTMLDOMAttribute_get_nodeValue(IHTMLDOMAttribute *iface, VARIANT *p) @@ -216,7 +230,7 @@ static const IHTMLDOMAttributeVtbl HTMLDOMAttributeVtbl = { HTMLDOMAttribute_GetIDsOfNames, HTMLDOMAttribute_Invoke, HTMLDOMAttribute_get_nodeName, - HTMLDOMAttribute_put_nodeName, + HTMLDOMAttribute_put_nodeValue, HTMLDOMAttribute_get_nodeValue, HTMLDOMAttribute_get_specified }; diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 9f352f6..4dc89e0 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -4236,10 +4236,19 @@ static void _get_attr_node_value(unsigned line, IHTMLDOMAttribute *attr, VARIANT HRESULT hres; hres = IHTMLDOMAttribute_get_nodeValue(attr, v); - ok_(__FILE__,line) (hres == S_OK, "get_nodeValue failed: %08x, expected VT_BSTR\n", hres); + ok_(__FILE__,line) (hres == S_OK, "get_nodeValue failed: %08x\n", hres); ok_(__FILE__,line) (V_VT(v) == vt, "vt=%d, expected %d\n", V_VT(v), vt); } +#define put_attr_node_value(a,b) _put_attr_node_value(__LINE__,a,b) +static void _put_attr_node_value(unsigned line, IHTMLDOMAttribute *attr, VARIANT v) +{ + HRESULT hres; + + hres = IHTMLDOMAttribute_put_nodeValue(attr, v); + ok_(__FILE__,line) (hres == S_OK, "put_nodeValue failed: %08x\n", hres); +} + #define get_window_doc(e) _get_window_doc(__LINE__,e) static IHTMLDocument2 *_get_window_doc(unsigned line, IHTMLWindow2 *window) { @@ -7548,12 +7557,31 @@ static void test_attr(IHTMLElement *elem) ok(!strcmp_wa(V_BSTR(&v), "divid"), "V_BSTR(v) = %s\n", wine_dbgstr_w(V_BSTR(&v))); VariantClear(&v); + V_VT(&v) = VT_BSTR; + V_BSTR(&v) = a2bstr("divid2"); + put_attr_node_value(attr, v); + + get_attr_node_value(attr, &v, VT_BSTR); + ok(!strcmp_wa(V_BSTR(&v), "divid2"), "V_BSTR(v) = %s\n", wine_dbgstr_w(V_BSTR(&v))); + VariantClear(&v); + IHTMLDOMAttribute_Release(attr); attr = get_elem_attr_node((IUnknown*)elem, "emptyattr", TRUE); get_attr_node_value(attr, &v, VT_BSTR); ok(!V_BSTR(&v), "V_BSTR(v) = %s\n", wine_dbgstr_w(V_BSTR(&v))); VariantClear(&v); + + V_VT(&v) = VT_BSTR; + V_BSTR(&v) = a2bstr("newvalue"); + put_attr_node_value(attr, v); + VariantClear(&v); + + attr = get_elem_attr_node((IUnknown*)elem, "emptyattr", TRUE); + get_attr_node_value(attr, &v, VT_BSTR); + ok(!strcmp_wa(V_BSTR(&v), "newvalue"), "V_BSTR(v) = %s\n", wine_dbgstr_w(V_BSTR(&v))); + VariantClear(&v); + test_attr_specified(attr, VARIANT_TRUE); IHTMLDOMAttribute_Release(attr); @@ -7564,6 +7592,14 @@ static void test_attr(IHTMLElement *elem) get_attr_node_value(attr, &v, VT_I4); ok(V_I4(&v) == 100, "V_I4(v) = %d\n", V_I4(&v)); test_attr_specified(attr, VARIANT_TRUE); + + V_VT(&v) = VT_I4; + V_I4(&v) = 150; + put_attr_node_value(attr, v); + + get_attr_node_value(attr, &v, VT_I4); + ok(V_I4(&v) == 150, "V_I4(v) = %d\n", V_I4(&v)); + IHTMLDOMAttribute_Release(attr); attr = get_elem_attr_node((IUnknown*)elem, "tabIndex", TRUE);

1 0

Henri Verbeet : d3d10: Also store the depth/ stencil state in the stateblock.
by Alexandre Julliard 18 Sep '14

18 Sep '14

Module: wine Branch: master Commit: b5a91d1246bd6cc1ed85c5e22208595d9f4d6b97 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b5a91d1246bd6cc1ed85c5e22… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Sep 18 10:56:25 2014 +0200 d3d10: Also store the depth/stencil state in the stateblock. --- dlls/d3d10/stateblock.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/dlls/d3d10/stateblock.c b/dlls/d3d10/stateblock.c index 73d4b1b..72466a1 100644 --- a/dlls/d3d10/stateblock.c +++ b/dlls/d3d10/stateblock.c @@ -55,6 +55,7 @@ struct d3d10_stateblock ID3D10RenderTargetView *rtvs[D3D10_SIMULTANEOUS_RENDER_TARGET_COUNT]; ID3D10DepthStencilView *dsv; ID3D10DepthStencilState *dss; + UINT stencil_ref; ID3D10BlendState *bs; float blend_factor[4]; UINT sample_mask; @@ -198,6 +199,11 @@ static void stateblock_cleanup(struct d3d10_stateblock *stateblock) ID3D10DepthStencilView_Release(stateblock->dsv); stateblock->dsv = NULL; } + if (stateblock->dss) + { + ID3D10DepthStencilState_Release(stateblock->dss); + stateblock->dss = NULL; + } if (stateblock->bs) { ID3D10BlendState_Release(stateblock->bs); @@ -355,6 +361,8 @@ static HRESULT STDMETHODCALLTYPE d3d10_stateblock_Capture(ID3D10StateBlock *ifac if (stateblock->mask.OMRenderTargets) ID3D10Device_OMGetRenderTargets(stateblock->device, D3D10_SIMULTANEOUS_RENDER_TARGET_COUNT, stateblock->rtvs, &stateblock->dsv); + if (stateblock->mask.OMDepthStencilState) + ID3D10Device_OMGetDepthStencilState(stateblock->device, &stateblock->dss, &stateblock->stencil_ref); if (stateblock->mask.OMBlendState) ID3D10Device_OMGetBlendState(stateblock->device, &stateblock->bs, stateblock->blend_factor, &stateblock->sample_mask); @@ -454,6 +462,8 @@ static HRESULT STDMETHODCALLTYPE d3d10_stateblock_Apply(ID3D10StateBlock *iface) if (stateblock->mask.OMRenderTargets) ID3D10Device_OMSetRenderTargets(stateblock->device, D3D10_SIMULTANEOUS_RENDER_TARGET_COUNT, stateblock->rtvs, stateblock->dsv); + if (stateblock->mask.OMDepthStencilState) + ID3D10Device_OMSetDepthStencilState(stateblock->device, stateblock->dss, stateblock->stencil_ref); if (stateblock->mask.OMBlendState) ID3D10Device_OMSetBlendState(stateblock->device, stateblock->bs, stateblock->blend_factor, stateblock->sample_mask);

1 0

Henri Verbeet : wined3d: Do not increment the reference count of the returned buffer in wined3d_device_get_stream_source ().
by Alexandre Julliard 18 Sep '14

18 Sep '14

Module: wine Branch: master Commit: 74ab8e8ce919f1e88f7e26870c89aa08dadbac7a URL: http://source.winehq.org/git/wine.git/?a=commit;h=74ab8e8ce919f1e88f7e26870… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Sep 18 10:56:26 2014 +0200 wined3d: Do not increment the reference count of the returned buffer in wined3d_device_get_stream_source(). None of the other getters increment the reference count either. --- dlls/d3d8/device.c | 1 - dlls/d3d9/device.c | 1 - dlls/ddraw/vertexbuffer.c | 2 -- dlls/wined3d/device.c | 2 -- 4 files changed, 6 deletions(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 429b30c..2e74a41 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -2798,7 +2798,6 @@ static HRESULT WINAPI d3d8_device_GetStreamSource(IDirect3DDevice8 *iface, buffer_impl = wined3d_buffer_get_parent(wined3d_buffer); *buffer = &buffer_impl->IDirect3DVertexBuffer8_iface; IDirect3DVertexBuffer8_AddRef(*buffer); - wined3d_buffer_decref(wined3d_buffer); } else { diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 7b9b635..a40a6a1 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -2769,7 +2769,6 @@ static HRESULT WINAPI d3d9_device_GetStreamSource(IDirect3DDevice9Ex *iface, buffer_impl = wined3d_buffer_get_parent(wined3d_buffer); *buffer = &buffer_impl->IDirect3DVertexBuffer9_iface; IDirect3DVertexBuffer9_AddRef(*buffer); - wined3d_buffer_decref(wined3d_buffer); } else { diff --git a/dlls/ddraw/vertexbuffer.c b/dlls/ddraw/vertexbuffer.c index 5d77790..0f06fe5 100644 --- a/dlls/ddraw/vertexbuffer.c +++ b/dlls/ddraw/vertexbuffer.c @@ -159,8 +159,6 @@ static ULONG WINAPI d3d_vertex_buffer7_Release(IDirect3DVertexBuffer7 *iface) 0, &curVB, &offset, &stride); if (curVB == buffer->wineD3DVertexBuffer) wined3d_device_set_stream_source(buffer->ddraw->wined3d_device, 0, NULL, 0, 0); - if (curVB) - wined3d_buffer_decref(curVB); /* For the GetStreamSource */ wined3d_vertex_declaration_decref(buffer->wineD3DVertexDeclaration); wined3d_buffer_decref(buffer->wineD3DVertexBuffer); diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index b9a0954..cbdf509 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1276,8 +1276,6 @@ HRESULT CDECL wined3d_device_get_stream_source(const struct wined3d_device *devi stream = &device->state.streams[stream_idx]; *buffer = stream->buffer; - if (*buffer) - wined3d_buffer_incref(*buffer); if (offset) *offset = stream->offset; *stride = stream->stride;

1 0

Henri Verbeet : wined3d: Set the initial primitive type to WINED3D_PT_UNDEFINED.
by Alexandre Julliard 18 Sep '14

18 Sep '14

Module: wine Branch: master Commit: 2f67b139189096e02ab73608b4418269089f771b URL: http://source.winehq.org/git/wine.git/?a=commit;h=2f67b139189096e02ab73608b… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Sep 18 10:56:27 2014 +0200 wined3d: Set the initial primitive type to WINED3D_PT_UNDEFINED. --- dlls/wined3d/device.c | 4 +++- dlls/wined3d/stateblock.c | 2 ++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index cbdf509..44fa206 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -90,7 +90,8 @@ GLenum gl_primitive_type_from_d3d(enum wined3d_primitive_type primitive_type) default: FIXME("Unhandled primitive type %s\n", debug_d3dprimitivetype(primitive_type)); - return GL_NONE; + case WINED3D_PT_UNDEFINED: + return ~0u; } } @@ -130,6 +131,7 @@ static enum wined3d_primitive_type d3d_primitive_type_from_gl(GLenum primitive_t default: FIXME("Unhandled primitive type %s\n", debug_d3dprimitivetype(primitive_type)); + case ~0u: return WINED3D_PT_UNDEFINED; } } diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index e98ee2a..7e8c782 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -1121,6 +1121,8 @@ static void state_init_default(struct wined3d_state *state, const struct wined3d TRACE("state %p, gl_info %p.\n", state, gl_info); + state->gl_primitive_type = ~0u; + /* Set some of the defaults for lights, transforms etc */ state->transforms[WINED3D_TS_PROJECTION] = identity; state->transforms[WINED3D_TS_VIEW] = identity;

1 0