wine-commits November 2012

wine-commits@winehq.org

2 participants
708 discussions

Nikolay Sivov : msxml3: Fix a redundant newline in transformation result in html mode.
by Alexandre Julliard 12 Nov '12

12 Nov '12

Module: wine Branch: master Commit: f9ab8dab519b25f6d5aa86f403dd6fc910b12264 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f9ab8dab519b25f6d5aa86f40… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Nov 9 22:22:25 2012 -0500 msxml3: Fix a redundant newline in transformation result in html mode. --- dlls/msxml3/node.c | 49 +++++++++++++++++++++++++++++++++++++++++++- dlls/msxml3/tests/domdoc.c | 45 ++++++++++++++++++++++++++++++++++++++- 2 files changed, 91 insertions(+), 3 deletions(-) diff --git a/dlls/msxml3/node.c b/dlls/msxml3/node.c index 36602eb..4835859 100644 --- a/dlls/msxml3/node.c +++ b/dlls/msxml3/node.c @@ -833,6 +833,53 @@ HRESULT node_get_xml(xmlnode *This, BOOL ensure_eol, BSTR *ret) return *ret ? S_OK : E_OUTOFMEMORY; } +static void htmldtd_dumpcontent(xmlOutputBufferPtr buf, xmlDocPtr doc) +{ + xmlDtdPtr cur = doc->intSubset; + + xmlOutputBufferWriteString(buf, "<!DOCTYPE "); + xmlOutputBufferWriteString(buf, (const char *)cur->name); + if (cur->ExternalID) + { + xmlOutputBufferWriteString(buf, " PUBLIC "); + xmlBufferWriteQuotedString(buf->buffer, cur->ExternalID); + if (cur->SystemID) + { + xmlOutputBufferWriteString(buf, " "); + xmlBufferWriteQuotedString(buf->buffer, cur->SystemID); + } + } + else if (cur->SystemID) + { + xmlOutputBufferWriteString(buf, " SYSTEM "); + xmlBufferWriteQuotedString(buf->buffer, cur->SystemID); + } + xmlOutputBufferWriteString(buf, ">\n"); +} + +static void htmldoc_dumpcontent(xmlOutputBufferPtr buf, xmlDocPtr doc) +{ + xmlElementType type; + + /* force HTML output */ + type = doc->type; + doc->type = XML_HTML_DOCUMENT_NODE; + if (doc->intSubset) + htmldtd_dumpcontent(buf, doc); + if (doc->children) + { + xmlNodePtr cur = doc->children; + + while (cur) + { + htmlNodeDumpFormatOutput(buf, doc, cur, NULL, 1); + cur = cur->next; + } + + } + doc->type = type; +} + HRESULT node_transform_node(const xmlnode *This, IXMLDOMNode *stylesheet, BSTR *p) { #ifdef SONAME_LIBXSLT @@ -860,7 +907,7 @@ HRESULT node_transform_node(const xmlnode *This, IXMLDOMNode *stylesheet, BSTR * xmlOutputBufferPtr output = xmlAllocOutputBuffer(NULL); if (output) { - htmlDocContentDumpOutput(output, result->doc, NULL); + htmldoc_dumpcontent(output, result->doc); content = xmlBufferContent(output->buffer); *p = bstr_from_xmlChar(content); xmlOutputBufferClose(output); diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index f59a001..85d2bc4 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -9732,8 +9732,7 @@ todo_wine { hr = IXSLProcessor_get_output(processor, &v); ok(hr == S_OK, "got 0x%08x\n", hr); ok(V_VT(&v) == VT_BSTR, "got type %d\n", V_VT(&v)); - /* we currently output one '\n' instead of empty string */ - todo_wine ok(lstrcmpW(V_BSTR(&v), _bstr_("")) == 0, "got %s\n", wine_dbgstr_w(V_BSTR(&v))); + ok(lstrcmpW(V_BSTR(&v), _bstr_("")) == 0, "got %s\n", wine_dbgstr_w(V_BSTR(&v))); IXMLDOMDocument_Release(doc2); VariantClear(&v); @@ -12469,6 +12468,47 @@ static void test_namedmap_newenum(void) IXMLDOMDocument_Release(doc); } +static const char xsltext_xsl[] = +"<?xml version=\"1.0\"?>" +"<xsl:stylesheet version=\"1.0\" xmlns:xsl=\"http://www.w3.org/1999/XSL/Transform\" >" +"<xsl:output method=\"html\" encoding=\"us-ascii\"/>" +"<xsl:template match=\"/\">" +" <xsl:choose>" +" <xsl:when test=\"testkey\">" +" <xsl:text>testdata</xsl:text>" +" </xsl:when>" +" </xsl:choose>" +"</xsl:template>" +"</xsl:stylesheet>"; + +static void test_xsltext(void) +{ + IXMLDOMDocument *doc, *doc2; + VARIANT_BOOL b; + HRESULT hr; + BSTR ret; + + doc = create_document(&IID_IXMLDOMDocument); + if (!doc) return; + + doc2 = create_document(&IID_IXMLDOMDocument); + + hr = IXMLDOMDocument_loadXML(doc, _bstr_(xsltext_xsl), &b); + EXPECT_HR(hr, S_OK); + + hr = IXMLDOMDocument_loadXML(doc2, _bstr_("<testkey/>"), &b); + EXPECT_HR(hr, S_OK); + + hr = IXMLDOMDocument_transformNode(doc2, (IXMLDOMNode*)doc, &ret); + EXPECT_HR(hr, S_OK); + ok(!lstrcmpW(ret, _bstr_("testdata")), "transform result %s\n", wine_dbgstr_w(ret)); + SysFreeString(ret); + + IXMLDOMDocument_Release(doc2); + IXMLDOMDocument_Release(doc); + free_bstrs(); +} + START_TEST(domdoc) { IXMLDOMDocument *doc; @@ -12552,6 +12592,7 @@ START_TEST(domdoc) test_namedmap_newenum(); test_xsltemplate(); + test_xsltext(); hr = CoCreateInstance(&CLSID_MXNamespaceManager40, NULL, CLSCTX_INPROC_SERVER, &IID_IMXNamespaceManager, (void**)&unk);

1 0

Nikolay Sivov : msxml3: Add VT_INT to VARIANT tracing helper.
by Alexandre Julliard 12 Nov '12

12 Nov '12

Module: wine Branch: master Commit: 9860e85ac855b32a0178f6c4ef15322eceb6cace URL: http://source.winehq.org/git/wine.git/?a=commit;h=9860e85ac855b32a0178f6c4e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Nov 7 21:43:44 2012 -0500 msxml3: Add VT_INT to VARIANT tracing helper. --- dlls/msxml3/main.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/msxml3/main.c b/dlls/msxml3/main.c index 3debd06..da3969e 100644 --- a/dlls/msxml3/main.c +++ b/dlls/msxml3/main.c @@ -273,6 +273,8 @@ const char *debugstr_variant(const VARIANT *v) return wine_dbg_sprintf("{VT_I2: %d}", V_I2(v)); case VT_I4: return wine_dbg_sprintf("{VT_I4: %d}", V_I4(v)); + case VT_INT: + return wine_dbg_sprintf("{VT_INT: %d}", V_INT(v)); case VT_R8: return wine_dbg_sprintf("{VT_R8: %lf}", V_R8(v)); case VT_BSTR:

1 0

Nikolay Sivov : comcat: Cleanup from unused includes and imports.
by Alexandre Julliard 12 Nov '12

12 Nov '12

Module: wine Branch: master Commit: bb44713e6d4431492dea28b52fdaed6f27fdfc94 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bb44713e6d4431492dea28b52… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Nov 11 23:10:10 2012 -0500 comcat: Cleanup from unused includes and imports. --- dlls/comcat/Makefile.in | 2 +- dlls/comcat/comcat_main.c | 6 ------ 2 files changed, 1 insertions(+), 7 deletions(-) diff --git a/dlls/comcat/Makefile.in b/dlls/comcat/Makefile.in index 695c66b..d38f779 100644 --- a/dlls/comcat/Makefile.in +++ b/dlls/comcat/Makefile.in @@ -1,5 +1,5 @@ MODULE = comcat.dll -IMPORTS = uuid ole32 user32 advapi32 +IMPORTS = ole32 C_SRCS = \ comcat_main.c diff --git a/dlls/comcat/comcat_main.c b/dlls/comcat/comcat_main.c index 83fc0ee..345cf67 100644 --- a/dlls/comcat/comcat_main.c +++ b/dlls/comcat/comcat_main.c @@ -20,14 +20,8 @@ #include <stdarg.h> -#define COBJMACROS - #include "windef.h" #include "winbase.h" -#include "winuser.h" -#include "winreg.h" -#include "winerror.h" -#include "ole2.h" /*********************************************************************** * DllCanUnloadNow (COMCAT.@)

1 0

Henri Verbeet : wined3d: Handle relative addresses in the common code in shader_glsl_get_register_name ().
by Alexandre Julliard 12 Nov '12

12 Nov '12

Module: wine Branch: master Commit: 0a7b32e3f08d68feddd563afca3c03416cc4cb00 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0a7b32e3f08d68feddd563afc… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Nov 11 18:52:39 2012 +0100 wined3d: Handle relative addresses in the common code in shader_glsl_get_register_name(). --- dlls/wined3d/glsl_shader.c | 39 ++++++++++++++++----------------------- 1 files changed, 16 insertions(+), 23 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 1e09c9e..66cee1b 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -1378,7 +1378,12 @@ static void shader_glsl_get_register_name(const struct wined3d_shader_register * const struct wined3d_shader_version *version = &reg_maps->shader_version; const struct wined3d_gl_info *gl_info = ins->ctx->gl_info; const char *prefix = shader_glsl_get_prefix(version->type); + struct glsl_src_param rel_param0, rel_param1; + if (reg->idx[0].offset != ~0U && reg->idx[0].rel_addr) + shader_glsl_add_src_param(ins, reg->idx[0].rel_addr, WINED3DSP_WRITEMASK_0, &rel_param0); + if (reg->idx[1].offset != ~0U && reg->idx[1].rel_addr) + shader_glsl_add_src_param(ins, reg->idx[1].rel_addr, WINED3DSP_WRITEMASK_0, &rel_param1); *is_color = FALSE; switch (reg->type) @@ -1406,24 +1411,20 @@ static void shader_glsl_get_register_name(const struct wined3d_shader_register * if (reg->idx[0].rel_addr) { - struct glsl_src_param rel_param; - - shader_glsl_add_src_param(ins, reg->idx[0].rel_addr, WINED3DSP_WRITEMASK_0, &rel_param); - - /* Removing a + 0 would be an obvious optimization, but macos doesn't see the NOP - * operation there */ + /* Removing a + 0 would be an obvious optimization, but + * OS X doesn't see the NOP operation there. */ if (idx) { if (shader->u.ps.declared_in_count > in_count) { sprintf(register_name, "((%s + %u) > %u ? (%s + %u) > %u ? gl_SecondaryColor : gl_Color : %s_in[%s + %u])", - rel_param.param_str, idx, in_count - 1, rel_param.param_str, idx, in_count, - prefix, rel_param.param_str, idx); + rel_param0.param_str, idx, in_count - 1, rel_param0.param_str, idx, in_count, + prefix, rel_param0.param_str, idx); } else { - sprintf(register_name, "%s_in[%s + %u]", prefix, rel_param.param_str, idx); + sprintf(register_name, "%s_in[%s + %u]", prefix, rel_param0.param_str, idx); } } else @@ -1431,12 +1432,12 @@ static void shader_glsl_get_register_name(const struct wined3d_shader_register * if (shader->u.ps.declared_in_count > in_count) { sprintf(register_name, "((%s) > %u ? (%s) > %u ? gl_SecondaryColor : gl_Color : %s_in[%s])", - rel_param.param_str, in_count - 1, rel_param.param_str, in_count, - prefix, rel_param.param_str); + rel_param0.param_str, in_count - 1, rel_param0.param_str, in_count, + prefix, rel_param0.param_str); } else { - sprintf(register_name, "%s_in[%s]", prefix, rel_param.param_str); + sprintf(register_name, "%s_in[%s]", prefix, rel_param0.param_str); } } } @@ -1462,12 +1463,10 @@ static void shader_glsl_get_register_name(const struct wined3d_shader_register * /* Relative addressing */ if (reg->idx[0].rel_addr) { - struct glsl_src_param rel_param; - shader_glsl_add_src_param(ins, reg->idx[0].rel_addr, WINED3DSP_WRITEMASK_0, &rel_param); if (reg->idx[0].offset) - sprintf(register_name, "%s_c[%s + %u]", prefix, rel_param.param_str, reg->idx[0].offset); + sprintf(register_name, "%s_c[%s + %u]", prefix, rel_param0.param_str, reg->idx[0].offset); else - sprintf(register_name, "%s_c[%s]", prefix, rel_param.param_str); + sprintf(register_name, "%s_c[%s]", prefix, rel_param0.param_str); } else { @@ -1606,16 +1605,10 @@ static void shader_glsl_get_register_name(const struct wined3d_shader_register * case WINED3DSPR_CONSTBUFFER: if (reg->idx[1].rel_addr) - { - struct glsl_src_param rel_param; - shader_glsl_add_src_param(ins, reg->idx[1].rel_addr, WINED3DSP_WRITEMASK_0, &rel_param); sprintf(register_name, "%s_cb%u[%s + %u]", - prefix, reg->idx[0].offset, rel_param.param_str, reg->idx[1].offset); - } + prefix, reg->idx[0].offset, rel_param1.param_str, reg->idx[1].offset); else - { sprintf(register_name, "%s_cb%u[%u]", prefix, reg->idx[0].offset, reg->idx[1].offset); - } break; case WINED3DSPR_PRIMID:

1 0

Henri Verbeet : wined3d: Add support for GLSL based fixed function fragment shaders.
by Alexandre Julliard 12 Nov '12

12 Nov '12

Module: wine Branch: master Commit: 10d46bc042696bb9e5c45ac88af332c957bbff03 URL: http://source.winehq.org/git/wine.git/?a=commit;h=10d46bc042696bb9e5c45ac88… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Nov 11 18:52:38 2012 +0100 wined3d: Add support for GLSL based fixed function fragment shaders. --- dlls/wined3d/arb_program_shader.c | 14 - dlls/wined3d/directx.c | 18 +- dlls/wined3d/glsl_shader.c | 1068 +++++++++++++++++++++++++++++++++++-- dlls/wined3d/state.c | 14 + dlls/wined3d/wined3d_private.h | 3 + 5 files changed, 1049 insertions(+), 68 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=10d46bc042696bb9e5c45…

1 0

Henri Verbeet : ddraw: Avoid LPDIRECT3DMATERIAL2.
by Alexandre Julliard 12 Nov '12

12 Nov '12

Module: wine Branch: master Commit: 67886fed9291e379765e8d6f9ef2e036ed10d9f8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=67886fed9291e379765e8d6f9… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Nov 11 18:52:37 2012 +0100 ddraw: Avoid LPDIRECT3DMATERIAL2. --- include/d3d.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/include/d3d.h b/include/d3d.h index f05f690b..3746b4b 100644 --- a/include/d3d.h +++ b/include/d3d.h @@ -260,7 +260,7 @@ DECLARE_INTERFACE_(IDirect3D2,IUnknown) /*** IDirect3D2 methods ***/ STDMETHOD(EnumDevices)(THIS_ LPD3DENUMDEVICESCALLBACK lpEnumDevicesCallback, LPVOID lpUserArg) PURE; STDMETHOD(CreateLight)(THIS_ LPDIRECT3DLIGHT *lplpDirect3DLight, IUnknown *pUnkOuter) PURE; - STDMETHOD(CreateMaterial)(THIS_ LPDIRECT3DMATERIAL2 *lplpDirect3DMaterial2, IUnknown *pUnkOuter) PURE; + STDMETHOD(CreateMaterial)(THIS_ struct IDirect3DMaterial2 **material, IUnknown *outer) PURE; STDMETHOD(CreateViewport)(THIS_ LPDIRECT3DVIEWPORT2 *lplpD3DViewport2, IUnknown *pUnkOuter) PURE; STDMETHOD(FindDevice)(THIS_ LPD3DFINDDEVICESEARCH lpD3DDFS, LPD3DFINDDEVICERESULT lpD3DFDR) PURE; STDMETHOD(CreateDevice)(THIS_ REFCLSID rclsid, IDirectDrawSurface *surface,

1 0

Henri Verbeet : ddraw: Avoid LPDIRECT3DMATERIAL3.
by Alexandre Julliard 12 Nov '12

12 Nov '12

Module: wine Branch: master Commit: 3a32ecd90fd8fb4e36fd8c4a5fa3c3d750ecde5f URL: http://source.winehq.org/git/wine.git/?a=commit;h=3a32ecd90fd8fb4e36fd8c4a5… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Nov 11 18:52:36 2012 +0100 ddraw: Avoid LPDIRECT3DMATERIAL3. --- include/d3d.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/include/d3d.h b/include/d3d.h index 4cdfe2d..f05f690b 100644 --- a/include/d3d.h +++ b/include/d3d.h @@ -308,7 +308,7 @@ DECLARE_INTERFACE_(IDirect3D3,IUnknown) /*** IDirect3D3 methods ***/ STDMETHOD(EnumDevices)(THIS_ LPD3DENUMDEVICESCALLBACK lpEnumDevicesCallback, LPVOID lpUserArg) PURE; STDMETHOD(CreateLight)(THIS_ LPDIRECT3DLIGHT *lplpDirect3DLight, IUnknown *pUnkOuter) PURE; - STDMETHOD(CreateMaterial)(THIS_ LPDIRECT3DMATERIAL3 *lplpDirect3DMaterial3, IUnknown *pUnkOuter) PURE; + STDMETHOD(CreateMaterial)(THIS_ struct IDirect3DMaterial3 **material, IUnknown *outer) PURE; STDMETHOD(CreateViewport)(THIS_ LPDIRECT3DVIEWPORT3 *lplpD3DViewport3, IUnknown *pUnkOuter) PURE; STDMETHOD(FindDevice)(THIS_ LPD3DFINDDEVICESEARCH lpD3DDFS, LPD3DFINDDEVICERESULT lpD3DFDR) PURE; STDMETHOD(CreateDevice)(THIS_ REFCLSID rclsid, IDirectDrawSurface4 *surface,

1 0

Henri Verbeet : ddraw: Avoid LPDIRECT3DTEXTURE.
by Alexandre Julliard 12 Nov '12

12 Nov '12

Module: wine Branch: master Commit: 2445ff616e02c2735296e107c8cb37e3d765cf6f URL: http://source.winehq.org/git/wine.git/?a=commit;h=2445ff616e02c2735296e107c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Nov 11 18:52:35 2012 +0100 ddraw: Avoid LPDIRECT3DTEXTURE. --- include/d3d.h | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/include/d3d.h b/include/d3d.h index fe79711..4cdfe2d 100644 --- a/include/d3d.h +++ b/include/d3d.h @@ -573,7 +573,7 @@ DECLARE_INTERFACE_(IDirect3DTexture,IUnknown) STDMETHOD(Initialize)(THIS_ struct IDirect3DDevice *device, IDirectDrawSurface *surface) PURE; STDMETHOD(GetHandle)(THIS_ LPDIRECT3DDEVICE lpDirect3DDevice, LPD3DTEXTUREHANDLE lpHandle) PURE; STDMETHOD(PaletteChanged)(THIS_ DWORD dwStart, DWORD dwCount) PURE; - STDMETHOD(Load)(THIS_ LPDIRECT3DTEXTURE lpD3DTexture) PURE; + STDMETHOD(Load)(THIS_ IDirect3DTexture *texture) PURE; STDMETHOD(Unload)(THIS) PURE; }; #undef INTERFACE @@ -938,7 +938,7 @@ DECLARE_INTERFACE_(IDirect3DDevice,IUnknown) /*** IDirect3DDevice methods ***/ STDMETHOD(Initialize)(THIS_ LPDIRECT3D lpDirect3D, LPGUID lpGUID, LPD3DDEVICEDESC lpD3DDVDesc) PURE; STDMETHOD(GetCaps)(THIS_ LPD3DDEVICEDESC lpD3DHWDevDesc, LPD3DDEVICEDESC lpD3DHELDevDesc) PURE; - STDMETHOD(SwapTextureHandles)(THIS_ LPDIRECT3DTEXTURE lpD3Dtex1, LPDIRECT3DTEXTURE lpD3DTex2) PURE; + STDMETHOD(SwapTextureHandles)(THIS_ IDirect3DTexture *tex1, IDirect3DTexture *tex2) PURE; STDMETHOD(CreateExecuteBuffer)(THIS_ D3DEXECUTEBUFFERDESC *desc, IDirect3DExecuteBuffer **buffer, IUnknown *outer) PURE; STDMETHOD(GetStats)(THIS_ LPD3DSTATS lpD3DStats) PURE;

1 0

Frédéric Delanoy : ole32: Avoid erroneously freeing a variable in ReadFmtUserTypeStg.
by Alexandre Julliard 12 Nov '12

12 Nov '12

Module: wine Branch: master Commit: 3cdd1abd09b0292955730dac2e03a831cffa0b5a URL: http://source.winehq.org/git/wine.git/?a=commit;h=3cdd1abd09b0292955730dac2… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Sat Nov 10 10:33:49 2012 +0100 ole32: Avoid erroneously freeing a variable in ReadFmtUserTypeStg. --- dlls/ole32/storage32.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/ole32/storage32.c b/dlls/ole32/storage32.c index 8498eaf..3bf3216 100644 --- a/dlls/ole32/storage32.c +++ b/dlls/ole32/storage32.c @@ -8771,7 +8771,10 @@ HRESULT WINAPI ReadFmtUserTypeStg (LPSTORAGE pstg, CLIPFORMAT* pcf, LPOLESTR* lp *pcf = RegisterClipboardFormatW( szOleTypeName ); if( lplpszUserType ) + { *lplpszUserType = szCLSIDName; + szCLSIDName = NULL; + } end: CoTaskMemFree( szCLSIDName );

1 0

Piotr Caban : msvcp90: Fixed a memory leak in virtual destructor tests.
by Alexandre Julliard 12 Nov '12

12 Nov '12

Module: wine Branch: master Commit: 96c9b0fb842c0ecf6f4e6d36c7aced3e36c805f3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=96c9b0fb842c0ecf6f4e6d36c… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Sat Nov 10 00:00:23 2012 +0100 msvcp90: Fixed a memory leak in virtual destructor tests. --- dlls/msvcp90/tests/misc.c | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/dlls/msvcp90/tests/misc.c b/dlls/msvcp90/tests/misc.c index 19dcdde..5188fd5 100644 --- a/dlls/msvcp90/tests/misc.c +++ b/dlls/msvcp90/tests/misc.c @@ -96,6 +96,7 @@ static /*basic_ostringstream_char*/void* (__thiscall *p_basic_ostringstream_char /*basic_ostringstream_char*/void*, int, /*MSVCP_bool*/int); static void (__thiscall *p_basic_ostringstream_char_dtor)(/*basic_ostringstream_char*/void*); static void (__thiscall *p_basic_ostringstream_char_vbase_dtor)(/*basic_ostringstream_char*/void*); +static void (__thiscall *p_basic_ios_char_dtor)(/*basic_ios_char*/void*); static int invalid_parameter = 0; static void __cdecl test_invalid_parameter_handler(const wchar_t *expression, @@ -223,6 +224,8 @@ static BOOL init(void) "??1?$basic_ostringstream@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@UEAA@XZ"); SET(p_basic_ostringstream_char_vbase_dtor, "??_D?$basic_ostringstream@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QEAAXXZ"); + SET(p_basic_ios_char_dtor, + "??1?$basic_ios@DU?$char_traits@D@std@@@std@@UEAA@XZ"); } else { SET(p_char_assign, "?assign@?$char_traits@D@std@@SAXAADABD@Z"); SET(p_wchar_assign, "?assign@?$char_traits@_W@std@@SAXAA_WAB_W@Z"); @@ -258,6 +261,8 @@ static BOOL init(void) "??1?$basic_ostringstream@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@UAE@XZ"); SET(p_basic_ostringstream_char_vbase_dtor, "??_D?$basic_ostringstream@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QAEXXZ"); + SET(p_basic_ios_char_dtor, + "??1?$basic_ios@DU?$char_traits@D@std@@@std@@UAE@XZ"); } init_thiscall_thunk(); @@ -503,8 +508,10 @@ static void test_virtual_base_dtors(void) call_func3(p_basic_ostringstream_char_ctor_mode, this, 0, 1); call_func1(p_basic_ostringstream_char_vbase_dtor, this); + /* this test uses vbtable set by earlier test */ call_func3(p_basic_ostringstream_char_ctor_mode, this, 0, 0); call_func1(p_basic_ostringstream_char_dtor, this+basic_ostringstream_char_vbtable[1]); + call_func1(p_basic_ios_char_dtor, this+((int**)this)[0][1]); } START_TEST(misc)

1 0

← Newer
1
...
46
47
48
49
50
51
52
...
71
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits November 2012