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

Stefan Dösinger : d3d9/tests: Add a test for signed formats.
by Alexandre Julliard 10 Mar '15

10 Mar '15

Module: wine Branch: master Commit: cdb7e825ceb112c5ec13c7a8d49603b8fb7a7b1b URL: http://source.winehq.org/git/wine.git/?a=commit;h=cdb7e825ceb112c5ec13c7a8d… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sat Mar 7 10:03:37 2015 +0100 d3d9/tests: Add a test for signed formats. --- dlls/d3d9/tests/visual.c | 507 +++++++++++++++++++++++++++++++++++------------ 1 file changed, 383 insertions(+), 124 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=cdb7e825ceb112c5ec13c…

1 0

Stefan Dösinger : wined3d: Add support for GL_EXT_texture_snorm.
by Alexandre Julliard 10 Mar '15

10 Mar '15

Module: wine Branch: master Commit: 6df52ca7e680498face4a5d80c4e0d2a64bd68fa URL: http://source.winehq.org/git/wine.git/?a=commit;h=6df52ca7e680498face4a5d80… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sat Mar 7 10:03:38 2015 +0100 wined3d: Add support for GL_EXT_texture_snorm. --- dlls/wined3d/directx.c | 1 + dlls/wined3d/utils.c | 57 +++++++++++++++++++++++++++-------------------- dlls/wined3d/wined3d_gl.h | 1 + 3 files changed, 35 insertions(+), 24 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 6d04d52..3667840 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -196,6 +196,7 @@ static const struct wined3d_extension_map gl_extension_map[] = {"GL_EXT_texture_filter_anisotropic", EXT_TEXTURE_FILTER_ANISOTROPIC}, {"GL_EXT_texture_lod_bias", EXT_TEXTURE_LOD_BIAS }, {"GL_EXT_texture_mirror_clamp", EXT_TEXTURE_MIRROR_CLAMP }, + {"GL_EXT_texture_snorm", EXT_TEXTURE_SNORM }, {"GL_EXT_texture_sRGB", EXT_TEXTURE_SRGB }, {"GL_EXT_texture_sRGB_decode", EXT_TEXTURE_SRGB_DECODE }, {"GL_EXT_vertex_array_bgra", EXT_VERTEX_ARRAY_BGRA }, diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 791ddf3..5cd52b3 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -1065,6 +1065,11 @@ static const struct wined3d_format_texture_info format_texture_info[] = WINED3DFMT_FLAG_TEXTURE | WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING | WINED3DFMT_FLAG_BUMPMAP, NV_TEXTURE_SHADER, NULL}, + {WINED3DFMT_R8G8_SNORM, GL_RG8_SNORM, GL_RG8_SNORM, 0, + GL_RG, GL_BYTE, 0, + WINED3DFMT_FLAG_TEXTURE | WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING + | WINED3DFMT_FLAG_BUMPMAP, + EXT_TEXTURE_SNORM, NULL}, {WINED3DFMT_R5G5_SNORM_L6_UNORM, GL_RGB5, GL_RGB5, 0, GL_RGB, GL_UNSIGNED_SHORT_5_6_5, 2, WINED3DFMT_FLAG_TEXTURE | WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING @@ -1095,6 +1100,11 @@ static const struct wined3d_format_texture_info format_texture_info[] = WINED3DFMT_FLAG_TEXTURE | WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING | WINED3DFMT_FLAG_BUMPMAP, NV_TEXTURE_SHADER, NULL}, + {WINED3DFMT_R8G8B8A8_SNORM, GL_RGBA8_SNORM, GL_RGBA8_SNORM, 0, + GL_RGBA, GL_BYTE, 0, + WINED3DFMT_FLAG_TEXTURE | WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING + | WINED3DFMT_FLAG_BUMPMAP, + EXT_TEXTURE_SNORM, NULL}, {WINED3DFMT_R16G16_SNORM, GL_RGB16, GL_RGB16, 0, GL_BGR, GL_UNSIGNED_SHORT, 6, WINED3DFMT_FLAG_TEXTURE | WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING @@ -1105,6 +1115,11 @@ static const struct wined3d_format_texture_info format_texture_info[] = WINED3DFMT_FLAG_TEXTURE | WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING | WINED3DFMT_FLAG_BUMPMAP, NV_TEXTURE_SHADER, NULL}, + {WINED3DFMT_R16G16_SNORM, GL_RG16_SNORM, GL_RG16_SNORM, 0, + GL_RG, GL_SHORT, 0, + WINED3DFMT_FLAG_TEXTURE | WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING + | WINED3DFMT_FLAG_BUMPMAP, + EXT_TEXTURE_SNORM, NULL}, /* Depth stencil formats */ {WINED3DFMT_D16_LOCKABLE, GL_DEPTH_COMPONENT, GL_DEPTH_COMPONENT, 0, GL_DEPTH_COMPONENT, GL_UNSIGNED_SHORT, 0, @@ -1978,57 +1993,51 @@ static void apply_format_fixups(struct wined3d_adapter *adapter, struct wined3d_ gl_info->formats[idx].color_fixup = create_color_fixup_desc( 0, CHANNEL_SOURCE_X, 0, CHANNEL_SOURCE_Y, 0, CHANNEL_SOURCE_ONE, 0, CHANNEL_SOURCE_W); - /* V8U8 is supported natively by GL_ATI_envmap_bumpmap and GL_NV_texture_shader. - * V16U16 is only supported by GL_NV_texture_shader. The formats need fixup if - * their extensions are not available. GL_ATI_envmap_bumpmap is not used because - * the only driver that implements it(fglrx) has a buggy implementation. - * - * V8U8 and V16U16 need a fixup of the undefined blue channel. OpenGL - * returns 0.0 when sampling from it, DirectX 1.0. So we always have in-shader - * conversion for this format. - */ - if (!gl_info->supported[NV_TEXTURE_SHADER]) + /* GL_ATI_envmap_bumpmap in theory supports R8G8_SNORM but is no longer supported by + * any driver. */ + if (gl_info->supported[NV_TEXTURE_SHADER] || gl_info->supported[EXT_TEXTURE_SNORM]) { + /* R8G8_SNORM and R16G16_SNORM need a fixup of the undefined blue channel. OpenGL + * returns 0.0 when sampling from it, DirectX 1.0. So we always have in-shader + * conversion for this format. */ idx = getFmtIdx(WINED3DFMT_R8G8_SNORM); gl_info->formats[idx].color_fixup = create_color_fixup_desc( - 1, CHANNEL_SOURCE_X, 1, CHANNEL_SOURCE_Y, 0, CHANNEL_SOURCE_ONE, 0, CHANNEL_SOURCE_ONE); + 0, CHANNEL_SOURCE_X, 0, CHANNEL_SOURCE_Y, 0, CHANNEL_SOURCE_ONE, 0, CHANNEL_SOURCE_ONE); idx = getFmtIdx(WINED3DFMT_R16G16_SNORM); gl_info->formats[idx].color_fixup = create_color_fixup_desc( - 1, CHANNEL_SOURCE_X, 1, CHANNEL_SOURCE_Y, 0, CHANNEL_SOURCE_ONE, 0, CHANNEL_SOURCE_ONE); + 0, CHANNEL_SOURCE_X, 0, CHANNEL_SOURCE_Y, 0, CHANNEL_SOURCE_ONE, 0, CHANNEL_SOURCE_ONE); } else { + /* Emulate using unsigned formats. This requires load-time conversion in addition to the + * fixups here. */ idx = getFmtIdx(WINED3DFMT_R8G8_SNORM); gl_info->formats[idx].color_fixup = create_color_fixup_desc( - 0, CHANNEL_SOURCE_X, 0, CHANNEL_SOURCE_Y, 0, CHANNEL_SOURCE_ONE, 0, CHANNEL_SOURCE_ONE); - + 1, CHANNEL_SOURCE_X, 1, CHANNEL_SOURCE_Y, 0, CHANNEL_SOURCE_ONE, 0, CHANNEL_SOURCE_ONE); idx = getFmtIdx(WINED3DFMT_R16G16_SNORM); gl_info->formats[idx].color_fixup = create_color_fixup_desc( - 0, CHANNEL_SOURCE_X, 0, CHANNEL_SOURCE_Y, 0, CHANNEL_SOURCE_ONE, 0, CHANNEL_SOURCE_ONE); + 1, CHANNEL_SOURCE_X, 1, CHANNEL_SOURCE_Y, 0, CHANNEL_SOURCE_ONE, 0, CHANNEL_SOURCE_ONE); + idx = getFmtIdx(WINED3DFMT_R8G8B8A8_SNORM); + gl_info->formats[idx].color_fixup = create_color_fixup_desc( + 1, CHANNEL_SOURCE_X, 1, CHANNEL_SOURCE_Y, 1, CHANNEL_SOURCE_Z, 1, CHANNEL_SOURCE_W); } if (!gl_info->supported[NV_TEXTURE_SHADER]) { - /* If GL_NV_texture_shader is not supported, those formats are converted, incompatibly - * with each other - */ + /* If GL_NV_texture_shader is not supported, R5G5_SNORM_L6_UNORM and R8G8_SNORM_L8X8_UNORM + * are converted, incompatiby with each other. */ idx = getFmtIdx(WINED3DFMT_R5G5_SNORM_L6_UNORM); gl_info->formats[idx].color_fixup = create_color_fixup_desc( 1, CHANNEL_SOURCE_X, 1, CHANNEL_SOURCE_Z, 0, CHANNEL_SOURCE_Y, 0, CHANNEL_SOURCE_ONE); idx = getFmtIdx(WINED3DFMT_R8G8_SNORM_L8X8_UNORM); gl_info->formats[idx].color_fixup = create_color_fixup_desc( 1, CHANNEL_SOURCE_X, 1, CHANNEL_SOURCE_Y, 0, CHANNEL_SOURCE_Z, 0, CHANNEL_SOURCE_W); - idx = getFmtIdx(WINED3DFMT_R8G8B8A8_SNORM); - gl_info->formats[idx].color_fixup = create_color_fixup_desc( - 1, CHANNEL_SOURCE_X, 1, CHANNEL_SOURCE_Y, 1, CHANNEL_SOURCE_Z, 1, CHANNEL_SOURCE_W); } else { /* If GL_NV_texture_shader is supported, WINED3DFMT_L6V5U5 and WINED3DFMT_X8L8V8U8 * are converted at surface loading time, but they do not need any modification in - * the shader, thus they are compatible with all WINED3DFMT_UNKNOWN group formats. - * WINED3DFMT_Q8W8V8U8 doesn't even need load-time conversion - */ + * the shader, thus they are compatible with all WINED3DFMT_UNKNOWN group formats. */ } if (gl_info->supported[ARB_TEXTURE_COMPRESSION_RGTC]) diff --git a/dlls/wined3d/wined3d_gl.h b/dlls/wined3d/wined3d_gl.h index 48d25b0..4919cf6 100644 --- a/dlls/wined3d/wined3d_gl.h +++ b/dlls/wined3d/wined3d_gl.h @@ -130,6 +130,7 @@ enum wined3d_gl_extension EXT_TEXTURE_FILTER_ANISOTROPIC, EXT_TEXTURE_LOD_BIAS, EXT_TEXTURE_MIRROR_CLAMP, + EXT_TEXTURE_SNORM, EXT_TEXTURE_SRGB, EXT_TEXTURE_SRGB_DECODE, EXT_VERTEX_ARRAY_BGRA,

1 0

Stefan Dösinger : wined3d: Support WINED3DFMT_R5G5_SNORM_L6_UNORM with EXT_texture_snorm.
by Alexandre Julliard 10 Mar '15

10 Mar '15

Module: wine Branch: master Commit: d4db09d0e91adfdda19fa5b118e39dee2f0ab4f5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d4db09d0e91adfdda19fa5b11… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sat Mar 7 10:03:39 2015 +0100 wined3d: Support WINED3DFMT_R5G5_SNORM_L6_UNORM with EXT_texture_snorm. From: Stefan Dösinger <stefandoesinger(a)gmx.at> --- dlls/wined3d/utils.c | 66 +++++++++++++++++++++++++++++++++++++++++----------- 1 file changed, 53 insertions(+), 13 deletions(-) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 5cd52b3..725318f 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -322,6 +322,45 @@ static void convert_r5g5_snorm_l6_unorm(const BYTE *src, BYTE *dst, UINT src_row } } +static void convert_r5g5_snorm_l6_unorm_ext(const BYTE *src, BYTE *dst, UINT src_row_pitch, UINT src_slice_pitch, + UINT dst_row_pitch, UINT dst_slice_pitch, UINT width, UINT height, UINT depth) +{ + unsigned int x, y, z; + unsigned char *texel_out, r_out, g_out, r_in, g_in, l_in; + const unsigned short *texel_in; + + for (z = 0; z < depth; z++) + { + for (y = 0; y < height; y++) + { + texel_in = (const unsigned short *)(src + z * src_slice_pitch + y * src_row_pitch); + texel_out = dst + z * dst_slice_pitch + y * dst_row_pitch; + for (x = 0; x < width; x++ ) + { + l_in = (*texel_in & 0xfc00) >> 10; + g_in = (*texel_in & 0x03e0) >> 5; + r_in = *texel_in & 0x001f; + + r_out = r_in << 3; + if (!(r_in & 0x10)) /* r > 0 */ + r_out |= r_in >> 1; + + g_out = g_in << 3; + if (!(g_in & 0x10)) /* g > 0 */ + g_out |= g_in >> 1; + + texel_out[0] = r_out; + texel_out[1] = g_out; + texel_out[2] = l_in << 1 | l_in >> 5; + texel_out[3] = 0; + + texel_out += 4; + texel_in++; + } + } + } +} + static void convert_r5g5_snorm_l6_unorm_nv(const BYTE *src, BYTE *dst, UINT src_row_pitch, UINT src_slice_pitch, UINT dst_row_pitch, UINT dst_slice_pitch, UINT width, UINT height, UINT depth) { @@ -331,8 +370,12 @@ static void convert_r5g5_snorm_l6_unorm_nv(const BYTE *src, BYTE *dst, UINT src_ /* This makes the gl surface bigger(24 bit instead of 16), but it works with * fixed function and shaders without further conversion once the surface is - * loaded - */ + * loaded. + * + * The difference between this function and convert_r5g5_snorm_l6_unorm_ext + * is that convert_r5g5_snorm_l6_unorm_ext creates a 32 bit XRGB texture and + * this function creates a 24 bit DSDT_MAG texture. Trying to load a DSDT_MAG + * internal with a 32 bit DSDT_MAG_INTENSITY or DSDT_MAG_VIB format fails. */ for (z = 0; z < depth; z++) { for (y = 0; y < height; y++) @@ -1080,6 +1123,11 @@ static const struct wined3d_format_texture_info format_texture_info[] = WINED3DFMT_FLAG_TEXTURE | WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING | WINED3DFMT_FLAG_BUMPMAP, NV_TEXTURE_SHADER, convert_r5g5_snorm_l6_unorm_nv}, + {WINED3DFMT_R5G5_SNORM_L6_UNORM, GL_RGB8_SNORM, GL_RGB8_SNORM, 0, + GL_RGBA, GL_BYTE, 4, + WINED3DFMT_FLAG_TEXTURE | WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING + | WINED3DFMT_FLAG_BUMPMAP, + EXT_TEXTURE_SNORM, convert_r5g5_snorm_l6_unorm_ext}, {WINED3DFMT_R8G8_SNORM_L8X8_UNORM, GL_RGB8, GL_RGB8, 0, GL_BGRA, GL_UNSIGNED_INT_8_8_8_8_REV, 4, WINED3DFMT_FLAG_TEXTURE | WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING @@ -2020,25 +2068,17 @@ static void apply_format_fixups(struct wined3d_adapter *adapter, struct wined3d_ idx = getFmtIdx(WINED3DFMT_R8G8B8A8_SNORM); gl_info->formats[idx].color_fixup = create_color_fixup_desc( 1, CHANNEL_SOURCE_X, 1, CHANNEL_SOURCE_Y, 1, CHANNEL_SOURCE_Z, 1, CHANNEL_SOURCE_W); + idx = getFmtIdx(WINED3DFMT_R5G5_SNORM_L6_UNORM); + gl_info->formats[idx].color_fixup = create_color_fixup_desc( + 1, CHANNEL_SOURCE_X, 1, CHANNEL_SOURCE_Z, 0, CHANNEL_SOURCE_Y, 0, CHANNEL_SOURCE_ONE); } if (!gl_info->supported[NV_TEXTURE_SHADER]) { - /* If GL_NV_texture_shader is not supported, R5G5_SNORM_L6_UNORM and R8G8_SNORM_L8X8_UNORM - * are converted, incompatiby with each other. */ - idx = getFmtIdx(WINED3DFMT_R5G5_SNORM_L6_UNORM); - gl_info->formats[idx].color_fixup = create_color_fixup_desc( - 1, CHANNEL_SOURCE_X, 1, CHANNEL_SOURCE_Z, 0, CHANNEL_SOURCE_Y, 0, CHANNEL_SOURCE_ONE); idx = getFmtIdx(WINED3DFMT_R8G8_SNORM_L8X8_UNORM); gl_info->formats[idx].color_fixup = create_color_fixup_desc( 1, CHANNEL_SOURCE_X, 1, CHANNEL_SOURCE_Y, 0, CHANNEL_SOURCE_Z, 0, CHANNEL_SOURCE_W); } - else - { - /* If GL_NV_texture_shader is supported, WINED3DFMT_L6V5U5 and WINED3DFMT_X8L8V8U8 - * are converted at surface loading time, but they do not need any modification in - * the shader, thus they are compatible with all WINED3DFMT_UNKNOWN group formats. */ - } if (gl_info->supported[ARB_TEXTURE_COMPRESSION_RGTC]) {

1 0

Gerald Pfeifer : twain_32: Avoid using an uninitialized variable in the failure path in path in a couple of cases.
by Alexandre Julliard 10 Mar '15

10 Mar '15

Module: wine Branch: master Commit: fc324d97bcc59ec7ee1ce5f73a563ba69fb436ea URL: http://source.winehq.org/git/wine.git/?a=commit;h=fc324d97bcc59ec7ee1ce5f73… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Sat Feb 28 14:39:34 2015 +0100 twain_32: Avoid using an uninitialized variable in the failure path in path in a couple of cases. --- dlls/twain_32/tests/dsm.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/twain_32/tests/dsm.c b/dlls/twain_32/tests/dsm.c index b8f1c9e..ab6e84f 100644 --- a/dlls/twain_32/tests/dsm.c +++ b/dlls/twain_32/tests/dsm.c @@ -71,6 +71,8 @@ static BOOL get_onevalue(TW_HANDLE hcontainer, TW_UINT32 *ret, TW_UINT16 *type) GlobalUnlock(hcontainer); return TRUE; } + else + *ret = 0; return FALSE; }

1 0

Jacek Caban : mshtml: Added IHTMLDOMAttribute2 stub implementation.
by Alexandre Julliard 10 Mar '15

10 Mar '15

Module: wine Branch: master Commit: 25845c706582052b70b9f06f62f691e0d60839c6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=25845c706582052b70b9f06f6… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Mar 9 15:35:55 2015 +0100 mshtml: Added IHTMLDOMAttribute2 stub implementation. --- dlls/mshtml/htmlattr.c | 224 +++++++++++++++++++++++++++++++++++++++++++ dlls/mshtml/mshtml_private.h | 2 + dlls/mshtml/tests/dom.c | 1 + 3 files changed, 227 insertions(+) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=25845c706582052b70b9f…

1 0

Jacek Caban : mshtml: Added IHTMLDOMAttribute2:: get_expando implementation.
by Alexandre Julliard 10 Mar '15

10 Mar '15

Module: wine Branch: master Commit: 7bce21c0874459be3ca8feeea300aa12d1fa95e7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7bce21c0874459be3ca8feeea… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Mar 9 15:36:13 2015 +0100 mshtml: Added IHTMLDOMAttribute2::get_expando implementation. --- dlls/mshtml/htmlattr.c | 7 +++++-- dlls/mshtml/tests/dom.c | 52 ++++++++++++++++++++++++++++++++++++++----------- 2 files changed, 46 insertions(+), 13 deletions(-) diff --git a/dlls/mshtml/htmlattr.c b/dlls/mshtml/htmlattr.c index b52f9f9..8359847 100644 --- a/dlls/mshtml/htmlattr.c +++ b/dlls/mshtml/htmlattr.c @@ -314,8 +314,11 @@ static HRESULT WINAPI HTMLDOMAttribute2_get_value(IHTMLDOMAttribute2 *iface, BST static HRESULT WINAPI HTMLDOMAttribute2_get_expando(IHTMLDOMAttribute2 *iface, VARIANT_BOOL *p) { HTMLDOMAttribute *This = impl_from_IHTMLDOMAttribute2(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, p); + + *p = get_dispid_type(This->dispid) == DISPEXPROP_BUILTIN ? VARIANT_FALSE : VARIANT_TRUE; + return S_OK; } static HRESULT WINAPI HTMLDOMAttribute2_get_nodeType(IHTMLDOMAttribute2 *iface, LONG *p) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 7ddfb77..f083bae 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -974,6 +974,17 @@ static IHTMLLabelElement *_get_label_iface(unsigned line, IUnknown *unk) return ret; } +#define get_attr2_iface(u) _get_attr2_iface(__LINE__,u) +static IHTMLDOMAttribute2 *_get_attr2_iface(unsigned line, IUnknown *unk) +{ + IHTMLDOMAttribute2 *ret; + HRESULT hres; + + hres = IUnknown_QueryInterface(unk, &IID_IHTMLDOMAttribute2, (void**)&ret); + ok_(__FILE__,line) (hres == S_OK, "Could not get IHTMLDOMAttribute2: %08x\n", hres); + return ret; +} + #define test_node_name(u,n) _test_node_name(__LINE__,u,n) static void _test_node_name(unsigned line, IUnknown *unk, const char *exname) { @@ -1729,6 +1740,31 @@ static void _test_comment_text(unsigned line, IUnknown *unk, const char *extext) SysFreeString(text); } +#define test_attr_specified(a,b) _test_attr_specified(__LINE__,a,b) +static void _test_attr_specified(unsigned line, IHTMLDOMAttribute *attr, VARIANT_BOOL expected) +{ + VARIANT_BOOL specified; + HRESULT hres; + + hres = IHTMLDOMAttribute_get_specified(attr, &specified); + ok_(__FILE__,line)(hres == S_OK, "get_specified failed: %08x\n", hres); + ok_(__FILE__,line)(specified == expected, "specified = %x, expected %x\n", specified, expected); +} + +#define test_attr_expando(a,b) _test_attr_expando(__LINE__,a,b) +static void _test_attr_expando(unsigned line, IHTMLDOMAttribute *attr, VARIANT_BOOL expected) +{ + IHTMLDOMAttribute2 *attr2 = _get_attr2_iface(line, (IUnknown*)attr); + VARIANT_BOOL expando; + HRESULT hres; + + hres = IHTMLDOMAttribute2_get_expando(attr2, &expando); + ok_(__FILE__,line)(hres == S_OK, "get_expando failed: %08x\n", hres); + ok_(__FILE__,line)(expando == expected, "expando = %x, expected %x\n", expando, expected); + + IHTMLDOMAttribute2_Release(attr2); +} + #define test_comment_attrs(c) _test_comment_attrs(__LINE__,c) static void _test_comment_attrs(unsigned line, IUnknown *unk) { @@ -1753,6 +1789,8 @@ static void _test_comment_attrs(unsigned line, IUnknown *unk) ok(hres == S_OK, "getAttributeNode failed: %08x\n", hres); ok(attr != NULL, "attr == NULL\n"); + test_attr_expando(attr, VARIANT_TRUE); + IHTMLDOMAttribute_Release(attr); IHTMLCommentElement_Release(comment); IHTMLElement_Release(elem); @@ -3171,12 +3209,14 @@ static void test_attr_collection(IHTMLElement *elem) ok(hres == S_OK, "%d) get_nodeValue failed: %08x\n", i, hres); ok(V_VT(&val) == VT_BSTR, "id: V_VT(&val) = %d\n", V_VT(&val)); ok(!strcmp_wa(V_BSTR(&val), "attr"), "id: V_BSTR(&val) = %s\n", wine_dbgstr_w(V_BSTR(&val))); + test_attr_expando(dom_attr, VARIANT_FALSE); } else if(!strcmp_wa(name, "attr1")) { checked++; hres = IHTMLDOMAttribute_get_nodeValue(dom_attr, &val); ok(hres == S_OK, "%d) get_nodeValue failed: %08x\n", i, hres); ok(V_VT(&val) == VT_BSTR, "attr1: V_VT(&val) = %d\n", V_VT(&val)); ok(!strcmp_wa(V_BSTR(&val), "attr1"), "attr1: V_BSTR(&val) = %s\n", wine_dbgstr_w(V_BSTR(&val))); + test_attr_expando(dom_attr, VARIANT_TRUE); } else if(!strcmp_wa(name, "attr2")) { checked++; hres = IHTMLDOMAttribute_get_nodeValue(dom_attr, &val); @@ -3219,17 +3259,6 @@ static void test_attr_collection(IHTMLElement *elem) IHTMLAttributeCollection_Release(attr_col); } -#define test_attr_specified(a,b) _test_attr_specified(__LINE__,a,b) -static void _test_attr_specified(unsigned line, IHTMLDOMAttribute *attr, VARIANT_BOOL expected) -{ - VARIANT_BOOL specified; - HRESULT hres; - - hres = IHTMLDOMAttribute_get_specified(attr, &specified); - ok_(__FILE__,line)(hres == S_OK, "get_specified failed: %08x\n", hres); - ok_(__FILE__,line)(specified == expected, "specified = %x, expected %x\n", specified, expected); -} - #define test_elem_id(e,i) _test_elem_id(__LINE__,e,i) static void _test_elem_id(unsigned line, IUnknown *unk, const char *exid) { @@ -8019,6 +8048,7 @@ static void test_attr(IHTMLElement *elem) attr = get_elem_attr_node((IUnknown*)elem, "tabIndex", TRUE); test_attr_specified(attr, VARIANT_FALSE); + test_attr_expando(attr, VARIANT_FALSE); IHTMLDOMAttribute_Release(attr); }

1 0

Jacek Caban : wmsdkidl.idl: Added IWMWriter interface declaration.
by Alexandre Julliard 10 Mar '15

10 Mar '15

Module: wine Branch: master Commit: 8c826a3c63551dc8f669bf614ac3b9655eb68ebc URL: http://source.winehq.org/git/wine.git/?a=commit;h=8c826a3c63551dc8f669bf614… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Mar 9 16:46:53 2015 +0100 wmsdkidl.idl: Added IWMWriter interface declaration. --- include/wmsdkidl.idl | 71 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 71 insertions(+) diff --git a/include/wmsdkidl.idl b/include/wmsdkidl.idl index 984e283..4e2dba7 100644 --- a/include/wmsdkidl.idl +++ b/include/wmsdkidl.idl @@ -516,6 +516,77 @@ interface IWMSyncReader : IUnknown [in] IStream *pStream); }; +[ + object, + uuid(96406bd5-2b2b-11d3-b36b-00c04f6108ff), + pointer_default(unique), + local +] +interface IWMInputMediaProps : IWMMediaProps +{ + HRESULT GetConnectionName( + [out, size_is(*pcchName)] WCHAR *pwszName, + [in, out] WORD *pcchName); + + HRESULT GetGroupName( + [out, size_is(*pcchName)] WCHAR *pwszName, + [in, out] WORD *pcchName); +} + +[ + object, + uuid(96406bd4-2b2b-11d3-b36b-00c04f6108ff), + pointer_default(unique), + local +] +interface IWMWriter : IUnknown +{ + HRESULT SetProfileByID( + [in] REFGUID guidProfile); + + HRESULT SetProfile( + [in] IWMProfile *pProfile); + + HRESULT SetOutputFilename( + [in] const WCHAR *pwszFilename); + + HRESULT GetInputCount( + [out] DWORD *pcInputs); + + HRESULT GetInputProps( + [in] DWORD dwInputNum, + [out] IWMInputMediaProps **ppInput); + + HRESULT SetInputProps( + [in] DWORD dwInputNum, + [in] IWMInputMediaProps *pInput); + + HRESULT GetInputFormatCount( + [in] DWORD dwInputNumber, + [out] DWORD *pcFormats); + + HRESULT GetInputFormat( + [in] DWORD dwInputNumber, + [in] DWORD dwFormatNumber, + [out] IWMInputMediaProps **pProps); + + HRESULT BeginWriting(); + + HRESULT EndWriting(); + + HRESULT AllocateSample( + [in] DWORD dwSampleSize, + [out] INSSBuffer **ppSample); + + HRESULT WriteSample( + [in] DWORD dwInputNum, + [in] QWORD cnsSampleTime, + [in] DWORD dwFlags, + [in] INSSBuffer *pSample); + + HRESULT Flush(); +} + cpp_quote("EXTERN_GUID(WMMEDIASUBTYPE_Base, 0x00000000,0x0000,0x0010,0x80,0x00,0x00,0xaa,0x00,0x38,0x9b,0x71);") cpp_quote("EXTERN_GUID(WMMEDIATYPE_Video, 0x73646976,0x0000,0x0010,0x80,0x00,0x00,0xaa,0x00,0x38,0x9b,0x71);") cpp_quote("EXTERN_GUID(WMMEDIASUBTYPE_RGB1, 0xe436eb78,0x524f,0x11ce,0x9f,0x53,0x00,0x20,0xaf,0x0b,0xa7,0x70);")

1 0

Nikolay Sivov : oleaut32/tests: Some tests for IsMatchingType().
by Alexandre Julliard 10 Mar '15

10 Mar '15

Module: wine Branch: master Commit: 613a65982f53897c8b927fce83ac3f5c65a57411 URL: http://source.winehq.org/git/wine.git/?a=commit;h=613a65982f53897c8b927fce8… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Mar 8 18:15:47 2015 +0300 oleaut32/tests: Some tests for IsMatchingType(). --- dlls/oleaut32/recinfo.c | 7 +----- dlls/oleaut32/tests/test_reg.idl | 8 +++++++ dlls/oleaut32/tests/test_tlb.idl | 10 ++++++++ dlls/oleaut32/tests/typelib.c | 12 +++++++--- dlls/oleaut32/tests/vartype.c | 50 ++++++++++++++++++++++++++++++++++++---- 5 files changed, 73 insertions(+), 14 deletions(-) diff --git a/dlls/oleaut32/recinfo.c b/dlls/oleaut32/recinfo.c index d6da64a..be61fd5 100644 --- a/dlls/oleaut32/recinfo.c +++ b/dlls/oleaut32/recinfo.c @@ -517,12 +517,7 @@ static BOOL WINAPI IRecordInfoImpl_IsMatchingType(IRecordInfo *iface, IRecordInf TRACE( "(%p)->(%p)\n", This, info2 ); IRecordInfo_GetGuid( info2, &guid2 ); - if (IsEqualGUID( &This->guid, &guid2 )) return TRUE; - - FIXME( "records have different guids (%s %s) but could still match\n", - debugstr_guid( &This->guid ), debugstr_guid( &guid2 ) ); - - return FALSE; + return IsEqualGUID( &This->guid, &guid2 ); } static PVOID WINAPI IRecordInfoImpl_RecordCreate(IRecordInfo *iface) diff --git a/dlls/oleaut32/tests/test_reg.idl b/dlls/oleaut32/tests/test_reg.idl index ff32a1c..efc7c89 100644 --- a/dlls/oleaut32/tests/test_reg.idl +++ b/dlls/oleaut32/tests/test_reg.idl @@ -142,4 +142,12 @@ library register_test [propputref, id(2)] LONG testprop2([in] IUnknown *i); } + + /* uuid is same as for test_struct2 in test_tlb.idl, fields are different */ + [uuid(4029f190-ca4a-4611-aeb9-673983cb96de)] + struct test_struct3 + { + UINT32 field; + HRESULT hr; + }; } diff --git a/dlls/oleaut32/tests/test_tlb.idl b/dlls/oleaut32/tests/test_tlb.idl index 59425be..fa084ec 100644 --- a/dlls/oleaut32/tests/test_tlb.idl +++ b/dlls/oleaut32/tests/test_tlb.idl @@ -48,4 +48,14 @@ library Test IDispatch *disp; BSTR bstr; }; + + /* identical to 'test_struct', only guid is different */ + [uuid(4029f190-ca4a-4611-aeb9-673983cb96de)] + struct test_struct2 + { + HRESULT hr; + VARIANT_BOOL b; + IDispatch *disp; + BSTR bstr; + }; } diff --git a/dlls/oleaut32/tests/typelib.c b/dlls/oleaut32/tests/typelib.c index 45a56ea..5bde6f2 100644 --- a/dlls/oleaut32/tests/typelib.c +++ b/dlls/oleaut32/tests/typelib.c @@ -4002,6 +4002,11 @@ static const type_info info[] = { "test_struct", "{4029f190-ca4a-4611-aeb9-673983cb96dd}", /* kind */ TKIND_RECORD, /*flags*/ 0, /*align*/ 4, /*size*/ sizeof(struct test_struct) +}, +{ + "test_struct2", + "{4029f190-ca4a-4611-aeb9-673983cb96de}", + /* kind */ TKIND_RECORD, /*flags*/ 0, /*align*/ 4, /*size*/ sizeof(struct test_struct) } }; @@ -4210,7 +4215,7 @@ static void test_register_typelib(BOOL system_registration) { TYPEKIND kind; WORD flags; - } attrs[12] = + } attrs[13] = { { TKIND_INTERFACE, 0 }, { TKIND_INTERFACE, TYPEFLAG_FDISPATCHABLE }, @@ -4223,7 +4228,8 @@ static void test_register_typelib(BOOL system_registration) { TKIND_DISPATCH, TYPEFLAG_FDISPATCHABLE }, { TKIND_DISPATCH, TYPEFLAG_FDISPATCHABLE }, { TKIND_DISPATCH, TYPEFLAG_FDISPATCHABLE }, - { TKIND_INTERFACE, TYPEFLAG_FDISPATCHABLE } + { TKIND_INTERFACE, TYPEFLAG_FDISPATCHABLE }, + { TKIND_RECORD, 0 } }; trace("Starting %s typelib registration tests\n", @@ -4258,7 +4264,7 @@ static void test_register_typelib(BOOL system_registration) ok(hr == S_OK, "got %08x\n", hr); count = ITypeLib_GetTypeInfoCount(typelib); - ok(count == 12, "got %d\n", count); + ok(count == 13, "got %d\n", count); for(i = 0; i < count; i++) { diff --git a/dlls/oleaut32/tests/vartype.c b/dlls/oleaut32/tests/vartype.c index 7894560..774aee2 100644 --- a/dlls/oleaut32/tests/vartype.c +++ b/dlls/oleaut32/tests/vartype.c @@ -6382,24 +6382,32 @@ static void test_recinfo(void) { static const WCHAR testW[] = {'t','e','s','t',0}; static WCHAR teststructW[] = {'t','e','s','t','_','s','t','r','u','c','t',0}; + static WCHAR teststruct2W[] = {'t','e','s','t','_','s','t','r','u','c','t','2',0}; + static WCHAR teststruct3W[] = {'t','e','s','t','_','s','t','r','u','c','t','3',0}; + WCHAR filenameW[MAX_PATH], filename2W[MAX_PATH]; + ITypeInfo *typeinfo, *typeinfo2, *typeinfo3; + IRecordInfo *recinfo, *recinfo2, *recinfo3; struct test_struct teststruct, testcopy; - WCHAR filenameW[MAX_PATH]; + ITypeLib *typelib, *typelib2; const char *filename; - IRecordInfo *recinfo; - ITypeInfo *typeinfo; DummyDispatch dispatch; - ITypeLib *typelib; TYPEATTR *attr; MEMBERID memid; UINT16 found; HRESULT hr; ULONG size; + BOOL ret; filename = create_test_typelib(2); MultiByteToWideChar(CP_ACP, 0, filename, -1, filenameW, MAX_PATH); hr = LoadTypeLibEx(filenameW, REGKIND_NONE, &typelib); ok(hr == S_OK, "got 0x%08x\n", hr); + filename = create_test_typelib(3); + MultiByteToWideChar(CP_ACP, 0, filename, -1, filename2W, MAX_PATH); + hr = LoadTypeLibEx(filename2W, REGKIND_NONE, &typelib2); + ok(hr == S_OK, "got 0x%08x\n", hr); + typeinfo = NULL; found = 1; hr = ITypeLib_FindName(typelib, teststructW, 0, &typeinfo, &memid, &found); @@ -6410,9 +6418,40 @@ static void test_recinfo(void) ok(IsEqualGUID(&attr->guid, &UUID_test_struct), "got %s\n", wine_dbgstr_guid(&attr->guid)); ok(attr->typekind == TKIND_RECORD, "got %d\n", attr->typekind); + typeinfo2 = NULL; + found = 1; + hr = ITypeLib_FindName(typelib, teststruct2W, 0, &typeinfo2, &memid, &found); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(typeinfo2 != NULL, "got %p\n", typeinfo2); + + typeinfo3 = NULL; + found = 1; + hr = ITypeLib_FindName(typelib2, teststruct3W, 0, &typeinfo3, &memid, &found); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(typeinfo3 != NULL, "got %p\n", typeinfo3); + hr = GetRecordInfoFromTypeInfo(typeinfo, &recinfo); ok(hr == S_OK, "got 0x%08x\n", hr); + hr = GetRecordInfoFromTypeInfo(typeinfo2, &recinfo2); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = GetRecordInfoFromTypeInfo(typeinfo3, &recinfo3); + ok(hr == S_OK, "got 0x%08x\n", hr); + + /* IsMatchingType, these two records only differ in GUIDs */ + ret = IRecordInfo_IsMatchingType(recinfo, recinfo2); + ok(!ret, "got %d\n", ret); + + /* these two have same GUIDs, but different set of fields */ + ret = IRecordInfo_IsMatchingType(recinfo2, recinfo3); + ok(ret, "got %d\n", ret); + + IRecordInfo_Release(recinfo3); + ITypeInfo_Release(typeinfo3); + IRecordInfo_Release(recinfo2); + ITypeInfo_Release(typeinfo2); + size = 0; hr = IRecordInfo_GetSize(recinfo, &size); ok(hr == S_OK, "got 0x%08x\n", hr); @@ -6471,7 +6510,8 @@ static void test_recinfo(void) ITypeInfo_Release(typeinfo); ITypeLib_Release(typelib); - DeleteFileA(filename); + DeleteFileW(filenameW); + DeleteFileW(filename2W); } START_TEST(vartype)

1 0

Nikolay Sivov : rpcrt4: Export I_UuidCreate().
by Alexandre Julliard 10 Mar '15

10 Mar '15

Module: wine Branch: master Commit: 66c05a4597e364aaeb3a6d45557346360bcac30b URL: http://source.winehq.org/git/wine.git/?a=commit;h=66c05a4597e364aaeb3a6d455… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Mar 9 01:20:48 2015 +0300 rpcrt4: Export I_UuidCreate(). --- dlls/rpcrt4/rpcrt4.spec | 2 +- dlls/rpcrt4/rpcrt4_main.c | 9 +++++++++ dlls/rpcrt4/tests/rpc.c | 14 +++++++++++++- 3 files changed, 23 insertions(+), 2 deletions(-) diff --git a/dlls/rpcrt4/rpcrt4.spec b/dlls/rpcrt4/rpcrt4.spec index c42fd8b..244bc2a 100644 --- a/dlls/rpcrt4/rpcrt4.spec +++ b/dlls/rpcrt4/rpcrt4.spec @@ -93,7 +93,7 @@ @ stub I_RpcTransServerNewConnection @ stub I_RpcTurnOnEEInfoPropagation # wxp @ stdcall I_RpcWindowProc(ptr long long long) # win9x -@ stub I_UuidCreate +@ stdcall I_UuidCreate(ptr) @ stub MIDL_wchar_strcpy @ stub MIDL_wchar_strlen @ stdcall MesBufferHandleReset(ptr long long ptr long ptr) diff --git a/dlls/rpcrt4/rpcrt4_main.c b/dlls/rpcrt4/rpcrt4_main.c index ef78b03..d5d349d 100644 --- a/dlls/rpcrt4/rpcrt4_main.c +++ b/dlls/rpcrt4/rpcrt4_main.c @@ -456,6 +456,15 @@ RPC_STATUS WINAPI UuidCreateSequential(UUID *Uuid) return status; } +/************************************************************************* + * I_UuidCreate [RPCRT4.@] + * + * See UuidCreateSequential() + */ +RPC_STATUS WINAPI I_UuidCreate(UUID *Uuid) +{ + return UuidCreateSequential(Uuid); +} /************************************************************************* * UuidHash [RPCRT4.@] diff --git a/dlls/rpcrt4/tests/rpc.c b/dlls/rpcrt4/tests/rpc.c index 07ca7eb..34f7fac 100644 --- a/dlls/rpcrt4/tests/rpc.c +++ b/dlls/rpcrt4/tests/rpc.c @@ -791,13 +791,17 @@ static void test_UuidCreateSequential(void) UUID guid1; BYTE version; RPC_STATUS (WINAPI *pUuidCreateSequential)(UUID *) = (void *)GetProcAddress(GetModuleHandleA("rpcrt4.dll"), "UuidCreateSequential"); + RPC_STATUS (WINAPI *pI_UuidCreate)(UUID *) = (void*)GetProcAddress(GetModuleHandleA("rpcrt4.dll"), "I_UuidCreate"); RPC_STATUS ret; if (!pUuidCreateSequential) { - skip("UuidCreateSequential not exported\n"); + win_skip("UuidCreateSequential not exported\n"); return; } + + ok(pI_UuidCreate != pUuidCreateSequential, "got %p, %p\n", pI_UuidCreate, pUuidCreateSequential); + ret = pUuidCreateSequential(&guid1); ok(!ret || ret == RPC_S_UUID_LOCAL_ONLY, "expected RPC_S_OK or RPC_S_UUID_LOCAL_ONLY, got %08x\n", ret); @@ -836,6 +840,14 @@ static void test_UuidCreateSequential(void) ok(!memcmp(guid1.Data4, guid2.Data4, sizeof(guid2.Data4)), "unexpected value in MAC address: %s\n", wine_dbgstr_guid(&guid2)); + + /* I_UuidCreate does exactly the same */ + pI_UuidCreate(&guid2); + version = (guid2.Data3 & 0xf000) >> 12; + ok(version == 1, "unexpected version %d\n", version); + ok(!memcmp(guid1.Data4, guid2.Data4, sizeof(guid2.Data4)), + "unexpected value in MAC address: %s\n", + wine_dbgstr_guid(&guid2)); } }

1 0

Nikolay Sivov : rpcrt4: Use a helper to skip conformance.
by Alexandre Julliard 10 Mar '15

10 Mar '15

Module: wine Branch: master Commit: e1d1057232b91d10dea9ba4224c7b01e3a3a9476 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e1d1057232b91d10dea9ba422… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Mar 9 12:42:45 2015 +0300 rpcrt4: Use a helper to skip conformance. --- dlls/rpcrt4/ndr_marshall.c | 40 ++++++++++------------------------------ 1 file changed, 10 insertions(+), 30 deletions(-) diff --git a/dlls/rpcrt4/ndr_marshall.c b/dlls/rpcrt4/ndr_marshall.c index 89c2c7b..8a84ed7 100644 --- a/dlls/rpcrt4/ndr_marshall.c +++ b/dlls/rpcrt4/ndr_marshall.c @@ -440,6 +440,11 @@ static inline BOOL IsConformanceOrVariancePresent(PFORMAT_STRING pFormat) return (*(const ULONG *)pFormat != -1); } +static inline PFORMAT_STRING SkipConformance(const PMIDL_STUB_MESSAGE pStubMsg, const PFORMAT_STRING pFormat) +{ + return pStubMsg->fHasNewCorrDesc ? pFormat + 6 : pFormat + 4; +} + static PFORMAT_STRING ReadConformance(MIDL_STUB_MESSAGE *pStubMsg, PFORMAT_STRING pFormat) { align_pointer(&pStubMsg->Buffer, 4); @@ -448,10 +453,7 @@ static PFORMAT_STRING ReadConformance(MIDL_STUB_MESSAGE *pStubMsg, PFORMAT_STRIN pStubMsg->MaxCount = NDR_LOCAL_UINT32_READ(pStubMsg->Buffer); pStubMsg->Buffer += 4; TRACE("unmarshalled conformance is %ld\n", pStubMsg->MaxCount); - if (pStubMsg->fHasNewCorrDesc) - return pFormat+6; - else - return pFormat+4; + return SkipConformance(pStubMsg, pFormat); } static inline PFORMAT_STRING ReadVariance(MIDL_STUB_MESSAGE *pStubMsg, PFORMAT_STRING pFormat, ULONG MaxValue) @@ -483,10 +485,7 @@ static inline PFORMAT_STRING ReadVariance(MIDL_STUB_MESSAGE *pStubMsg, PFORMAT_S } done: - if (pStubMsg->fHasNewCorrDesc) - return pFormat+6; - else - return pFormat+4; + return SkipConformance(pStubMsg, pFormat); } /* writes the conformance value to the buffer */ @@ -664,20 +663,8 @@ done_conf_grab: finish_conf: TRACE("resulting conformance is %ld\n", *pCount); - if (pStubMsg->fHasNewCorrDesc) - return pFormat+6; - else - return pFormat+4; -} -static inline PFORMAT_STRING SkipConformance(PMIDL_STUB_MESSAGE pStubMsg, - PFORMAT_STRING pFormat) -{ - if (pStubMsg->fHasNewCorrDesc) - pFormat += 6; - else - pFormat += 4; - return pFormat; + return SkipConformance(pStubMsg, pFormat); } static inline PFORMAT_STRING SkipVariance(PMIDL_STUB_MESSAGE pStubMsg, PFORMAT_STRING pFormat) @@ -2785,11 +2772,7 @@ static ULONG EmbeddedComplexSize(MIDL_STUB_MESSAGE *pStubMsg, } case RPC_FC_NON_ENCAPSULATED_UNION: pFormat += 2; - if (pStubMsg->fHasNewCorrDesc) - pFormat += 6; - else - pFormat += 4; - + pFormat = SkipConformance(pStubMsg, pFormat); pFormat += *(const SHORT*)pFormat; return *(const SHORT*)pFormat; case RPC_FC_IP: @@ -6186,10 +6169,7 @@ static LONG unmarshall_discriminant(PMIDL_STUB_MESSAGE pStubMsg, } (*ppFormat)++; - if (pStubMsg->fHasNewCorrDesc) - *ppFormat += 6; - else - *ppFormat += 4; + *ppFormat = SkipConformance(pStubMsg, *ppFormat); return discriminant; }

1 0