April 2012 - Wine-Commits - list.winehq.org

André Hentschel : winedbg: Print all available information about branch targets in ARM disassembler.
by Alexandre Julliard April 23, 2012

April 23, 2012

Module: wine Branch: master Commit: 6795bab565aec542a83e02090466a2843104167c URL: http://source.winehq.org/git/wine.git/?a=commit;h=6795bab565aec542a83e02090… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun Apr 22 19:03:36 2012 +0200 winedbg: Print all available information about branch targets in ARM disassembler. --- programs/winedbg/be_arm.c | 43 ++++++++++++++++++++++++++++--------------- 1 files changed, 28 insertions(+), 15 deletions(-) diff --git a/programs/winedbg/be_arm.c b/programs/winedbg/be_arm.c index 92d4094..7da28b6 100644 --- a/programs/winedbg/be_arm.c +++ b/programs/winedbg/be_arm.c @@ -99,7 +99,17 @@ static UINT db_get_inst(void* addr, int size) return result; } -static UINT arm_disasm_branch(UINT inst) +static void db_printsym(unsigned int addr) +{ + ADDRESS64 a; + + a.Mode = AddrModeFlat; + a.Offset = addr; + + print_address(&a, TRUE); +} + +static UINT arm_disasm_branch(UINT inst, ADDRESS64 *addr) { short link = (inst >> 24) & 0x01; int offset = (inst << 2) & 0x03ffffff; @@ -107,17 +117,18 @@ static UINT arm_disasm_branch(UINT inst) if (offset & 0x02000000) offset |= 0xfc000000; offset += 8; - dbg_printf("\n\tb%s%s\t#%d", link ? "l" : "", get_cond(inst), offset); + dbg_printf("\n\tb%s%s\t", link ? "l" : "", get_cond(inst)); + db_printsym(addr->Offset + offset); return 0; } -static UINT arm_disasm_branchreg(UINT inst) +static UINT arm_disasm_branchreg(UINT inst, ADDRESS64 *addr) { dbg_printf("\n\tb%s\t%s", get_cond(inst), tbl_regs[get_nibble(inst, 0)]); return 0; } -static UINT arm_disasm_dataprocessing(UINT inst) +static UINT arm_disasm_dataprocessing(UINT inst, ADDRESS64 *addr) { short condcodes = (inst >> 20) & 0x01; short opcode = (inst >> 21) & 0x0f; @@ -163,7 +174,7 @@ static UINT arm_disasm_dataprocessing(UINT inst) return 0; } -static UINT arm_disasm_singletrans(UINT inst) +static UINT arm_disasm_singletrans(UINT inst, ADDRESS64 *addr) { short load = (inst >> 20) & 0x01; short writeback = (inst >> 21) & 0x01; @@ -205,7 +216,7 @@ static UINT arm_disasm_singletrans(UINT inst) return 0; } -static UINT arm_disasm_halfwordtrans(UINT inst) +static UINT arm_disasm_halfwordtrans(UINT inst, ADDRESS64 *addr) { short halfword = (inst >> 5) & 0x01; short sign = (inst >> 6) & 0x01; @@ -238,7 +249,7 @@ static UINT arm_disasm_halfwordtrans(UINT inst) return 0; } -static UINT arm_disasm_blocktrans(UINT inst) +static UINT arm_disasm_blocktrans(UINT inst, ADDRESS64 *addr) { short load = (inst >> 20) & 0x01; short writeback = (inst >> 21) & 0x01; @@ -265,14 +276,14 @@ static UINT arm_disasm_blocktrans(UINT inst) return 0; } -static UINT arm_disasm_swi(UINT inst) +static UINT arm_disasm_swi(UINT inst, ADDRESS64 *addr) { UINT comment = inst & 0x00ffffff; dbg_printf("\n\tswi%s\t#%d", get_cond(inst), comment); return 0; } -static UINT arm_disasm_coproctrans(UINT inst) +static UINT arm_disasm_coproctrans(UINT inst, ADDRESS64 *addr) { WORD CRm = inst & 0x0f; WORD CP = (inst >> 5) & 0x07; @@ -286,7 +297,7 @@ static UINT arm_disasm_coproctrans(UINT inst) return 0; } -static UINT arm_disasm_coprocdataop(UINT inst) +static UINT arm_disasm_coprocdataop(UINT inst, ADDRESS64 *addr) { WORD CRm = inst & 0x0f; WORD CP = (inst >> 5) & 0x07; @@ -300,7 +311,7 @@ static UINT arm_disasm_coprocdataop(UINT inst) return 0; } -static UINT arm_disasm_coprocdatatrans(UINT inst) +static UINT arm_disasm_coprocdatatrans(UINT inst, ADDRESS64 *addr) { WORD CPnum = (inst >> 8) & 0x0f; WORD CRd = (inst >> 12) & 0x0f; @@ -393,14 +404,16 @@ static WORD thumb_disasm_longbl(WORD inst, ADDRESS64 *addr) if (!((inst2 & 0xf800) == 0xf800)) return inst; offset += (inst2 & 0x07ff) << 1; - dbg_printf("\n\tbl\t%08x", offset); + dbg_printf("\n\tbl\t"); + db_printsym(addr->Offset + offset); return 0; } static WORD thumb_disasm_condbranch(WORD inst, ADDRESS64 *addr) { WORD offset = inst & 0x00ff; - dbg_printf("\n\tb%s\t%04x", tbl_cond[(inst >> 8) & 0x0f], offset); + dbg_printf("\n\tb%s\t", tbl_cond[(inst >> 8) & 0x0f]); + db_printsym(addr->Offset + offset); return 0; } @@ -491,7 +504,7 @@ struct inst_arm { UINT mask; UINT pattern; - UINT (*func)(UINT); + UINT (*func)(UINT, ADDRESS64*); }; static const struct inst_arm tbl_arm[] = { @@ -581,7 +594,7 @@ void be_arm_disasm_one_insn(ADDRESS64 *addr, int display) } else { - if (!a_ptr->func(inst)) + if (!a_ptr->func(inst, addr)) addr->Offset += size; return; }

1 0

André Hentschel : dbghelp: Assorted fixes for shadow variables.
by Alexandre Julliard April 23, 2012

April 23, 2012

Module: wine Branch: master Commit: 89cb501927833ed57132a4bb5b4eb77cc1b89e15 URL: http://source.winehq.org/git/wine.git/?a=commit;h=89cb501927833ed57132a4bb5… Author: André Hentschel <nerv(a)dawncrow.de> Date: Thu Apr 19 23:22:33 2012 +0200 dbghelp: Assorted fixes for shadow variables. --- dlls/dbghelp/dwarf.c | 4 ++-- dlls/dbghelp/msc.c | 11 +++++++---- dlls/dbghelp/path.c | 1 - dlls/dbghelp/stabs.c | 1 - 4 files changed, 9 insertions(+), 8 deletions(-) diff --git a/dlls/dbghelp/dwarf.c b/dlls/dbghelp/dwarf.c index a7a7001..2ce26fa 100644 --- a/dlls/dbghelp/dwarf.c +++ b/dlls/dbghelp/dwarf.c @@ -2188,7 +2188,7 @@ static BOOL dwarf2_parse_line_numbers(const dwarf2_section_t* sections, vector_init(&files, sizeof(unsigned), 16); while (*traverse.data) { - unsigned int dir_index, mod_time, length; + unsigned int dir_index, mod_time; const char* name; const char* dir; unsigned* psrc; @@ -2199,7 +2199,7 @@ static BOOL dwarf2_parse_line_numbers(const dwarf2_section_t* sections, mod_time = dwarf2_leb128_as_unsigned(&traverse); length = dwarf2_leb128_as_unsigned(&traverse); dir = *(const char**)vector_at(&dirs, dir_index); - TRACE("Got file %s/%s (%u,%u)\n", dir, name, mod_time, length); + TRACE("Got file %s/%s (%u,%lu)\n", dir, name, mod_time, length); psrc = vector_add(&files, &ctx->pool); *psrc = source_new(ctx->module, dir, name); } diff --git a/dlls/dbghelp/msc.c b/dlls/dbghelp/msc.c index 53bf6bf..e32c463 100644 --- a/dlls/dbghelp/msc.c +++ b/dlls/dbghelp/msc.c @@ -1551,7 +1551,6 @@ static int codeview_snarf(const struct msc_debug_info* msc_dbg, const BYTE* root int i, length; struct symt_block* block = NULL; struct symt* symt; - const char* name; struct symt_compiland* compiland = NULL; struct location loc; @@ -1947,9 +1946,13 @@ static int codeview_snarf(const struct msc_debug_info* msc_dbg, const BYTE* root case S_PROCREF_V1: case S_DATAREF_V1: case S_LPROCREF_V1: - name = (const char*)sym + length; - length += (*name + 1 + 3) & ~3; - break; + { + const char* name; + + name = (const char*)sym + length; + length += (*name + 1 + 3) & ~3; + break; + } case S_MSTOOL_V3: /* just to silence a few warnings */ case S_MSTOOLINFO_V3: diff --git a/dlls/dbghelp/path.c b/dlls/dbghelp/path.c index f16eb00..5bd260e 100644 --- a/dlls/dbghelp/path.c +++ b/dlls/dbghelp/path.c @@ -479,7 +479,6 @@ static BOOL CALLBACK module_find_cb(PCWSTR buffer, PVOID user) { HANDLE hFile, hMap; void* mapping; - DWORD timestamp; timestamp = ~mf->dw1; size = ~mf->dw2; diff --git a/dlls/dbghelp/stabs.c b/dlls/dbghelp/stabs.c index b4188d1..3546cff 100644 --- a/dlls/dbghelp/stabs.c +++ b/dlls/dbghelp/stabs.c @@ -604,7 +604,6 @@ static inline int stabs_pts_read_method_info(struct ParseTypedefData* ptd) if (mthd == '*') { long int ofs; - struct symt* dt; PTS_ABORTIF(ptd, stabs_pts_read_number(ptd, &ofs) == -1); PTS_ABORTIF(ptd, *ptd->ptr++ != ';');

1 0

Christian Costa : dmusic: Fix IDirectMusic8Impl_CreateMusicBuffer buffer signature.
by Alexandre Julliard April 23, 2012

April 23, 2012

Module: wine Branch: master Commit: acea60ca85321e18521cb597a1ab6c3f1a6ad741 URL: http://source.winehq.org/git/wine.git/?a=commit;h=acea60ca85321e18521cb597a… Author: Christian Costa <titan.costa(a)gmail.com> Date: Sat Apr 21 14:19:35 2012 +0200 dmusic: Fix IDirectMusic8Impl_CreateMusicBuffer buffer signature. --- dlls/dmusic/dmusic.c | 3 ++- include/dmusicc.h | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/dmusic/dmusic.c b/dlls/dmusic/dmusic.c index 253ef1a..f6b7e04 100644 --- a/dlls/dmusic/dmusic.c +++ b/dlls/dmusic/dmusic.c @@ -153,7 +153,8 @@ static HRESULT WINAPI IDirectMusic8Impl_EnumPort(LPDIRECTMUSIC8 iface, DWORD ind return S_FALSE; } -static HRESULT WINAPI IDirectMusic8Impl_CreateMusicBuffer (LPDIRECTMUSIC8 iface, LPDMUS_BUFFERDESC pBufferDesc, LPDIRECTMUSICBUFFER** ppBuffer, LPUNKNOWN pUnkOuter) { +static HRESULT WINAPI IDirectMusic8Impl_CreateMusicBuffer(LPDIRECTMUSIC8 iface, LPDMUS_BUFFERDESC pBufferDesc, LPDIRECTMUSICBUFFER* ppBuffer, LPUNKNOWN pUnkOuter) +{ IDirectMusic8Impl *This = (IDirectMusic8Impl *)iface; TRACE("(%p, %p, %p, %p)\n", This, pBufferDesc, ppBuffer, pUnkOuter); diff --git a/include/dmusicc.h b/include/dmusicc.h index 9c07737..cdae16c 100644 --- a/include/dmusicc.h +++ b/include/dmusicc.h @@ -378,7 +378,7 @@ DECLARE_INTERFACE_(IDirectMusic,IUnknown) STDMETHOD_(ULONG,Release)(THIS) PURE; /*** IDirectMusic methods ***/ STDMETHOD(EnumPort)(THIS_ DWORD dwIndex, LPDMUS_PORTCAPS pPortCaps) PURE; - STDMETHOD(CreateMusicBuffer)(THIS_ LPDMUS_BUFFERDESC pBufferDesc, LPDIRECTMUSICBUFFER **ppBuffer, LPUNKNOWN pUnkOuter) PURE; + STDMETHOD(CreateMusicBuffer)(THIS_ LPDMUS_BUFFERDESC pBufferDesc, LPDIRECTMUSICBUFFER *ppBuffer, LPUNKNOWN pUnkOuter) PURE; STDMETHOD(CreatePort)(THIS_ REFCLSID rclsidPort, LPDMUS_PORTPARAMS pPortParams, LPDIRECTMUSICPORT *ppPort, LPUNKNOWN pUnkOuter) PURE; STDMETHOD(EnumMasterClock)(THIS_ DWORD dwIndex, LPDMUS_CLOCKINFO lpClockInfo) PURE; STDMETHOD(GetMasterClock)(THIS_ LPGUID pguidClock, struct IReferenceClock **ppReferenceClock) PURE; @@ -419,7 +419,7 @@ DECLARE_INTERFACE_(IDirectMusic8,IDirectMusic) STDMETHOD_(ULONG,Release)(THIS) PURE; /*** IDirectMusic methods ***/ STDMETHOD(EnumPort)(THIS_ DWORD dwIndex, LPDMUS_PORTCAPS pPortCaps) PURE; - STDMETHOD(CreateMusicBuffer)(THIS_ LPDMUS_BUFFERDESC pBufferDesc, LPDIRECTMUSICBUFFER **ppBuffer, LPUNKNOWN pUnkOuter) PURE; + STDMETHOD(CreateMusicBuffer)(THIS_ LPDMUS_BUFFERDESC pBufferDesc, LPDIRECTMUSICBUFFER *ppBuffer, LPUNKNOWN pUnkOuter) PURE; STDMETHOD(CreatePort)(THIS_ REFCLSID rclsidPort, LPDMUS_PORTPARAMS pPortParams, LPDIRECTMUSICPORT *ppPort, LPUNKNOWN pUnkOuter) PURE; STDMETHOD(EnumMasterClock)(THIS_ DWORD dwIndex, LPDMUS_CLOCKINFO lpClockInfo) PURE; STDMETHOD(GetMasterClock)(THIS_ LPGUID pguidClock, struct IReferenceClock **ppReferenceClock) PURE;

1 0

Lauri Kenttä : po: Update Finnish translation.
by Alexandre Julliard April 23, 2012

April 23, 2012

Module: wine Branch: master Commit: 5e1784dde7d9b6e68ec2d551557b165e8601493d URL: http://source.winehq.org/git/wine.git/?a=commit;h=5e1784dde7d9b6e68ec2d5515… Author: Lauri Kenttä <lauri.kentta(a)gmail.com> Date: Fri Apr 20 22:00:52 2012 +0300 po: Update Finnish translation. --- po/fi.po | 8 ++------ 1 files changed, 2 insertions(+), 6 deletions(-) diff --git a/po/fi.po b/po/fi.po index e97f67d..3b8e15e 100644 --- a/po/fi.po +++ b/po/fi.po @@ -3526,16 +3526,12 @@ msgid "URI to be decoded is incorrect" msgstr "Dekoodattava URI on virheellinen" #: jscript.rc:57 -#, fuzzy -#| msgid "Enumeration value out of range.\n" msgid "Number of fraction digits is out of range" -msgstr "Arvo on luettelon ulkopuolella.\n" +msgstr "Desimaalien määrä ei kelpaa" #: jscript.rc:58 -#, fuzzy -#| msgid "Subscript out of range" msgid "Precision is out of range" -msgstr "Indeksi alueen ulkopuolella" +msgstr "Tarkkuus ei kelpaa" #: jscript.rc:59 msgid "Array length must be a finite positive integer"

1 0

Henri Verbeet : d3d9: Get rid of IDirect3DTexture9Impl.
by Alexandre Julliard April 23, 2012

April 23, 2012

Module: wine Branch: master Commit: 5569db9a98be7a84b6e8a54416e493696c9b1079 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5569db9a98be7a84b6e8a5441… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Apr 22 22:47:43 2012 +0200 d3d9: Get rid of IDirect3DTexture9Impl. --- dlls/d3d9/d3d9_private.h | 26 ++---- dlls/d3d9/device.c | 2 +- dlls/d3d9/texture.c | 223 ++++++++++++++++++++++----------------------- 3 files changed, 119 insertions(+), 132 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=5569db9a98be7a84b6e8a…

1 0

Henri Verbeet : d3d8: Properly retrieve an interface pointer in IDirect3DDevice8Impl_GetTexture( ).
by Alexandre Julliard April 23, 2012

April 23, 2012

Module: wine Branch: master Commit: dd8ed6f8a91abeedb2b13337d9a82f5a592a189d URL: http://source.winehq.org/git/wine.git/?a=commit;h=dd8ed6f8a91abeedb2b13337d… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Apr 22 22:47:42 2012 +0200 d3d8: Properly retrieve an interface pointer in IDirect3DDevice8Impl_GetTexture(). --- dlls/d3d8/device.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index d50acd5..7d7b454 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -1706,6 +1706,7 @@ static HRESULT WINAPI IDirect3DDevice8Impl_GetTexture(IDirect3DDevice8 *iface, { IDirect3DDevice8Impl *This = impl_from_IDirect3DDevice8(iface); struct wined3d_texture *wined3d_texture; + struct d3d8_texture *texture_impl; HRESULT hr; TRACE("iface %p, stage %u, texture %p.\n", iface, Stage, ppTexture); @@ -1726,7 +1727,8 @@ static HRESULT WINAPI IDirect3DDevice8Impl_GetTexture(IDirect3DDevice8 *iface, if (wined3d_texture) { - *ppTexture = wined3d_texture_get_parent(wined3d_texture); + texture_impl = wined3d_texture_get_parent(wined3d_texture); + *ppTexture = &texture_impl->IDirect3DBaseTexture8_iface; IDirect3DBaseTexture8_AddRef(*ppTexture); wined3d_texture_decref(wined3d_texture); }

1 0

Dmitry Timoshkov : gdiplus: Use symbolic names of font styles.
by Alexandre Julliard April 23, 2012

April 23, 2012

Module: wine Branch: master Commit: 44ec1a2e527f9b82178ad58a01858418a1db7e36 URL: http://source.winehq.org/git/wine.git/?a=commit;h=44ec1a2e527f9b82178ad58a0… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Apr 20 16:43:24 2012 +0900 gdiplus: Use symbolic names of font styles. --- dlls/gdiplus/font.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/gdiplus/font.c b/dlls/gdiplus/font.c index 1ac7604..df3d407 100644 --- a/dlls/gdiplus/font.c +++ b/dlls/gdiplus/font.c @@ -148,7 +148,7 @@ GpStatus WINGDIPAPI GdipCreateFont(GDIPCONST GpFontFamily *fontFamily, lfw->lfHeight = (*font)->pixel_size * -1; - lfw->lfWeight = style & FontStyleBold ? 700 : 400; + lfw->lfWeight = style & FontStyleBold ? FW_BOLD : FW_REGULAR; lfw->lfItalic = style & FontStyleItalic; lfw->lfUnderline = style & FontStyleUnderline; lfw->lfStrikeOut = style & FontStyleStrikeout; @@ -340,10 +340,10 @@ GpStatus WINGDIPAPI GdipGetFontStyle(GpFont *font, INT *style) if (!(font && style)) return InvalidParameter; - if (font->lfw.lfWeight > 400) + if (font->lfw.lfWeight > FW_REGULAR) *style = FontStyleBold; else - *style = 0; + *style = FontStyleRegular; if (font->lfw.lfItalic) *style |= FontStyleItalic; if (font->lfw.lfUnderline)

1 0

André Hentschel : ws2_32: Remove unneeded shadow variable.
by Alexandre Julliard April 23, 2012

April 23, 2012

Module: wine Branch: master Commit: c5089d18b75bdf93af7c7af322a3165857f0b83d URL: http://source.winehq.org/git/wine.git/?a=commit;h=c5089d18b75bdf93af7c7af32… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun Apr 22 19:05:05 2012 +0200 ws2_32: Remove unneeded shadow variable. --- dlls/ws2_32/socket.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index fd384a5..21e084b 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -2759,7 +2759,7 @@ INT WINAPI WS_getsockopt(SOCKET s, INT level, static const int MAX_IRDA_DEVICES = 10; char buf[sizeof(struct irda_device_list) + (MAX_IRDA_DEVICES - 1) * sizeof(struct irda_device_info)]; - int fd, res; + int res; socklen_t len = sizeof(buf); if ( (fd = get_sock_fd( s, 0, NULL )) == -1)

1 0

Nikolay Sivov : msxml3: Switch parser encoding manually when it won' t be able to detect it (UTF-16 case).
by Alexandre Julliard April 23, 2012

April 23, 2012

Module: wine Branch: master Commit: 221f9efe27fe786d4c2ee9c8d76ea9d8a75fc279 URL: http://source.winehq.org/git/wine.git/?a=commit;h=221f9efe27fe786d4c2ee9c8d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Apr 21 12:32:15 2012 +0400 msxml3: Switch parser encoding manually when it won't be able to detect it (UTF-16 case). --- dlls/msxml3/saxreader.c | 30 ++++++++++++++++++++++++++---- dlls/msxml3/tests/saxreader.c | 22 ++++++++++++++++------ 2 files changed, 42 insertions(+), 10 deletions(-) diff --git a/dlls/msxml3/saxreader.c b/dlls/msxml3/saxreader.c index a5b7a32..913eeaf 100644 --- a/dlls/msxml3/saxreader.c +++ b/dlls/msxml3/saxreader.c @@ -2144,7 +2144,7 @@ static HRESULT internal_parseBuffer(saxreader *This, const char *buffer, int siz HRESULT hr; hr = SAXLocator_create(This, &locator, vbInterface); - if(FAILED(hr)) + if (FAILED(hr)) return hr; if (size >= 4) @@ -2163,22 +2163,44 @@ static HRESULT internal_parseBuffer(saxreader *This, const char *buffer, int siz } } + /* if libxml2 detection failed try to guess */ + if (encoding == XML_CHAR_ENCODING_NONE) + { + const WCHAR *ptr = (WCHAR*)buffer; + /* xml declaration with possibly specfied encoding will be still handled by parser */ + if ((size >= 2) && *ptr == '<' && ptr[1] != '?') + { + enc_name = (xmlChar*)xmlGetCharEncodingName(XML_CHAR_ENCODING_UTF16LE); + encoding = XML_CHAR_ENCODING_UTF16LE; + } + } + else if (encoding == XML_CHAR_ENCODING_UTF8) + enc_name = (xmlChar*)xmlGetCharEncodingName(encoding); + else + enc_name = NULL; + locator->pParserCtxt = xmlCreateMemoryParserCtxt(buffer, size); - if(!locator->pParserCtxt) + if (!locator->pParserCtxt) { ISAXLocator_Release(&locator->ISAXLocator_iface); return E_FAIL; } - if (encoding == XML_CHAR_ENCODING_UTF8) + if (enc_name) + { locator->pParserCtxt->encoding = xmlStrdup(enc_name); + if (encoding == XML_CHAR_ENCODING_UTF16LE) { + TRACE("switching to %s\n", enc_name); + xmlSwitchEncoding(locator->pParserCtxt, encoding); + } + } xmlFree(locator->pParserCtxt->sax); locator->pParserCtxt->sax = &locator->saxreader->sax; locator->pParserCtxt->userData = locator; This->isParsing = TRUE; - if(xmlParseDocument(locator->pParserCtxt)==-1 && locator->ret==S_OK) + if(xmlParseDocument(locator->pParserCtxt) == -1 && locator->ret == S_OK) hr = E_FAIL; else hr = locator->ret; diff --git a/dlls/msxml3/tests/saxreader.c b/dlls/msxml3/tests/saxreader.c index 00a3553..5db2d11 100644 --- a/dlls/msxml3/tests/saxreader.c +++ b/dlls/msxml3/tests/saxreader.c @@ -2317,18 +2317,20 @@ static const struct enc_test_entry_t encoding_test_data[] = { { 0 } }; -static void test_encoding(void) +static void test_saxreader_encoding(void) { const struct enc_test_entry_t *entry = encoding_test_data; static const WCHAR testXmlW[] = {'t','e','s','t','.','x','m','l',0}; static const CHAR testXmlA[] = "test.xml"; - ISAXXMLReader *reader; - DWORD written; - HANDLE file; - HRESULT hr; while (entry->guid) { + ISAXXMLReader *reader; + VARIANT input; + DWORD written; + HANDLE file; + HRESULT hr; + hr = CoCreateInstance(entry->guid, NULL, CLSCTX_INPROC_SERVER, &IID_ISAXXMLReader, (void**)&reader); if (hr != S_OK) { @@ -2349,8 +2351,16 @@ static void test_encoding(void) ok(hr == entry->hr, "Expected 0x%08x, got 0x%08x. CLSID %s\n", entry->hr, hr, entry->clsid); DeleteFileA(testXmlA); + + /* try BSTR input with no BOM or '<?xml' instruction */ + V_VT(&input) = VT_BSTR; + V_BSTR(&input) = _bstr_("<element></element>"); + hr = ISAXXMLReader_parse(reader, input); + EXPECT_HR(hr, S_OK); + ISAXXMLReader_Release(reader); + free_bstrs(); entry++; } } @@ -4474,7 +4484,7 @@ START_TEST(saxreader) test_saxreader(); test_saxreader_properties(); test_saxreader_features(); - test_encoding(); + test_saxreader_encoding(); test_dispex(); /* MXXMLWriter tests */

1 0

Aric Stewart : strmbase: Have PassThruImpl use BaseDispatch.
by Alexandre Julliard April 20, 2012

April 20, 2012

Module: wine Branch: master Commit: d080774e75d8310a8deaaad3a4722b1c3e0e666b URL: http://source.winehq.org/git/wine.git/?a=commit;h=d080774e75d8310a8deaaad3a… Author: Aric Stewart <aric(a)codeweavers.com> Date: Fri Apr 20 07:26:53 2012 -0500 strmbase: Have PassThruImpl use BaseDispatch. --- dlls/strmbase/pospass.c | 28 ++++++++++++++++------------ 1 files changed, 16 insertions(+), 12 deletions(-) diff --git a/dlls/strmbase/pospass.c b/dlls/strmbase/pospass.c index 6a5efb9..71c1dc6 100644 --- a/dlls/strmbase/pospass.c +++ b/dlls/strmbase/pospass.c @@ -40,6 +40,7 @@ typedef struct PassThruImpl { ISeekingPassThru ISeekingPassThru_iface; IMediaSeeking IMediaSeeking_iface; IMediaPosition IMediaPosition_iface; + BaseDispatch baseDispatch; LONG ref; IUnknown * outer_unk; @@ -121,6 +122,7 @@ static ULONG WINAPI SeekInner_Release(IUnknown * iface) { if (ref == 0) { + BaseDispatch_Destroy(&This->baseDispatch); This->time_cs.DebugInfo->Spare[0] = 0; DeleteCriticalSection(&This->time_cs); CoTaskMemFree(This); @@ -264,6 +266,7 @@ HRESULT WINAPI PosPassThru_Construct(IUnknown *pUnkOuter, LPVOID *ppPassThru) fimpl->timevalid = 0; InitializeCriticalSection(&fimpl->time_cs); fimpl->time_cs.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": PassThruImpl.time_cs"); + BaseDispatch_Init(&fimpl->baseDispatch, &IID_IMediaPosition); return S_OK; } @@ -681,36 +684,37 @@ static HRESULT WINAPI MediaPositionPassThru_GetTypeInfoCount(IMediaPosition *ifa { PassThruImpl *This = impl_from_IMediaPosition(iface); - FIXME("(%p/%p)->(%p): stub !!!\n", This, iface, pctinfo); - *pctinfo = 0; - - return S_OK; + return BaseDispatchImpl_GetTypeInfoCount(&This->baseDispatch, pctinfo); } static HRESULT WINAPI MediaPositionPassThru_GetTypeInfo(IMediaPosition *iface, UINT iTInfo, LCID lcid, ITypeInfo**ppTInfo) { PassThruImpl *This = impl_from_IMediaPosition(iface); - FIXME("(%p/%p)->(%d, %d, %p): stub !!!\n", This, iface, iTInfo, lcid, ppTInfo); - - return S_OK; + return BaseDispatchImpl_GetTypeInfo(&This->baseDispatch, &IID_NULL, iTInfo, lcid, ppTInfo); } static HRESULT WINAPI MediaPositionPassThru_GetIDsOfNames(IMediaPosition *iface, REFIID riid, LPOLESTR*rgszNames, UINT cNames, LCID lcid, DISPID*rgDispId) { PassThruImpl *This = impl_from_IMediaPosition(iface); - FIXME("(%p/%p)->(%s (%p), %p, %d, %d, %p): stub !!!\n", This, iface, debugstr_guid(riid), riid, rgszNames, cNames, lcid, rgDispId); - - return S_OK; + return BaseDispatchImpl_GetIDsOfNames(&This->baseDispatch, riid, rgszNames, cNames, lcid, rgDispId); } static HRESULT WINAPI MediaPositionPassThru_Invoke(IMediaPosition *iface, DISPID dispIdMember, REFIID riid, LCID lcid, WORD wFlags, DISPPARAMS*pDispParams, VARIANT*pVarResult, EXCEPINFO*pExepInfo, UINT*puArgErr) { PassThruImpl *This = impl_from_IMediaPosition(iface); - FIXME("(%p/%p)->(%d, %s (%p), %d, %04x, %p, %p, %p, %p): stub !!!\n", This, iface, dispIdMember, debugstr_guid(riid), riid, lcid, wFlags, pDispParams, pVarResult, pExepInfo, puArgErr); + HRESULT hr = S_OK; + ITypeInfo *pTypeInfo; - return S_OK; + hr = BaseDispatchImpl_GetTypeInfo(&This->baseDispatch, riid, 1, lcid, &pTypeInfo); + if (SUCCEEDED(hr)) + { + hr = ITypeInfo_Invoke(pTypeInfo, &This->IMediaPosition_iface, dispIdMember, wFlags, pDispParams, pVarResult, pExepInfo, puArgErr); + ITypeInfo_Release(pTypeInfo); + } + + return hr; } static HRESULT WINAPI MediaPositionPassThru_get_Duration(IMediaPosition *iface, REFTIME *plength)

1 0