November 2012 - Wine-Commits

Dmitry Timoshkov : windowscodecs: Add a NULL check to GetFrameCount of the JPEG decoder.
by Alexandre Julliard Nov. 27, 2012

Nov. 27, 2012

Module: wine Branch: master Commit: c44024f1e0be0065a43e87b81c187e0c43b04ab7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c44024f1e0be0065a43e87b81… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Nov 23 11:49:09 2012 +0800 windowscodecs: Add a NULL check to GetFrameCount of the JPEG decoder. --- dlls/windowscodecs/jpegformat.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/windowscodecs/jpegformat.c b/dlls/windowscodecs/jpegformat.c index eab50f0..e9c722e 100644 --- a/dlls/windowscodecs/jpegformat.c +++ b/dlls/windowscodecs/jpegformat.c @@ -430,6 +430,8 @@ static HRESULT WINAPI JpegDecoder_GetThumbnail(IWICBitmapDecoder *iface, static HRESULT WINAPI JpegDecoder_GetFrameCount(IWICBitmapDecoder *iface, UINT *pCount) { + if (!pCount) return E_INVALIDARG; + *pCount = 1; return S_OK; }

1 0

Alexandre Julliard : server: Don't expose the desktop on window resizes.
by Alexandre Julliard Nov. 27, 2012

Nov. 27, 2012

Module: wine Branch: master Commit: 6c94d4466ac575c0b703c9c2000208d40251de4e URL: http://source.winehq.org/git/wine.git/?a=commit;h=6c94d4466ac575c0b703c9c20… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Nov 27 16:51:46 2012 +0100 server: Don't expose the desktop on window resizes. --- server/window.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/server/window.c b/server/window.c index fc40d55..a460a7c 100644 --- a/server/window.c +++ b/server/window.c @@ -1581,7 +1581,7 @@ static struct region *expose_window( struct window *win, const rectangle_t *old_ } } - if (win->parent) + if (win->parent && !is_desktop_window( win->parent )) { /* make it relative to the old window pos for subtracting */ offset_region( new_vis_rgn, win->window_rect.left - old_window_rect->left,

1 0

Piotr Caban : msvcp: Sync implementations.
by Alexandre Julliard Nov. 27, 2012

Nov. 27, 2012

Module: wine Branch: master Commit: a62ea07a1561be687a4de01aca472a51cb5cb3ee URL: http://source.winehq.org/git/wine.git/?a=commit;h=a62ea07a1561be687a4de01ac… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Nov 26 22:31:09 2012 +0000 msvcp: Sync implementations. --- dlls/msvcp60/ios.c | 22 ++++++++++++++++++++++ dlls/msvcp60/msvcp60.spec | 8 ++++---- dlls/msvcp70/msvcp70.spec | 12 ++++++------ dlls/msvcp71/ios.c | 22 ++++++++++++++++++++++ dlls/msvcp71/msvcp71.spec | 12 ++++++------ dlls/msvcp80/msvcp80.spec | 12 ++++++------ dlls/msvcp90/ios.c | 22 ++++++++++++++++++++++ dlls/msvcp90/msvcp90.spec | 12 ++++++------ 8 files changed, 94 insertions(+), 28 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a62ea07a1561be687a4de…

1 0

Piotr Caban : msvcp100: Added _Container_base0::operator= implementation.
by Alexandre Julliard Nov. 27, 2012

Nov. 27, 2012

Module: wine Branch: master Commit: acbfab38dbe10c4c9600878235fe876615bf6533 URL: http://source.winehq.org/git/wine.git/?a=commit;h=acbfab38dbe10c4c960087823… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Nov 26 22:32:28 2012 +0000 msvcp100: Added _Container_base0::operator= implementation. --- dlls/msvcp100/misc.c | 30 ++++++++++++++++++++++++++++++ dlls/msvcp100/msvcp100.c | 22 ---------------------- dlls/msvcp100/msvcp100.spec | 4 ++-- 3 files changed, 32 insertions(+), 24 deletions(-) diff --git a/dlls/msvcp100/misc.c b/dlls/msvcp100/misc.c index 5854c5e..13183bb 100644 --- a/dlls/msvcp100/misc.c +++ b/dlls/msvcp100/misc.c @@ -229,3 +229,33 @@ MSVCP_new_handler_func __cdecl set_new_handler_reset(int unused) { return set_new_handler(NULL); } + +/* _Container_base0 is used by apps compiled without iterator checking + * (i.e. with _ITERATOR_DEBUG_LEVEL=0 ). + * It provides empty versions of methods used by visual c++'s stl's + * iterator checking. + * msvcr100 has to provide them in case apps are compiled with /Od + * or the optimizer fails to inline those (empty) calls. + */ + +/* ?_Orphan_all(a)_Container_base0@std@@QAEXXZ */ +/* ?_Orphan_all(a)_Container_base0@std@@QEAAXXZ */ +DEFINE_THISCALL_WRAPPER(Container_base0_Orphan_all, 4) +void __thiscall Container_base0_Orphan_all(void *this) +{ +} + +/* ?_Swap_all(a)_Container_base0@std@@QAEXAAU12@@Z */ +/* ?_Swap_all(a)_Container_base0@std@@QEAAXAEAU12@@Z */ +DEFINE_THISCALL_WRAPPER(Container_base0_Swap_all, 8) +void __thiscall Container_base0_Swap_all(void *this, void *that) +{ +} + +/* ??4_Container_base0(a)std@@QAEAAU01(a)ABU01@@Z */ +/* ??4_Container_base0(a)std@@QEAAAEAU01(a)AEBU01@@Z */ +DEFINE_THISCALL_WRAPPER(Container_base0_op_assign, 8) +void* __thiscall Container_base0_op_assign(void *this, const void *that) +{ + return this; +} diff --git a/dlls/msvcp100/msvcp100.c b/dlls/msvcp100/msvcp100.c index 4238a24..c0f1ecd 100644 --- a/dlls/msvcp100/msvcp100.c +++ b/dlls/msvcp100/msvcp100.c @@ -80,28 +80,6 @@ static void init_cxx_funcs(void) } } -/* _Container_base0 is used by apps compiled without iterator checking - * (i.e. with _ITERATOR_DEBUG_LEVEL=0 ). - * It provides empty versions of methods used by visual c++'s stl's - * iterator checking. - * msvcr100 has to provide them in case apps are compiled with /Od - * or the optimizer fails to inline those (empty) calls. - */ - -/* ?_Orphan_all(a)_Container_base0@std@@QAEXXZ */ -/* ?_Orphan_all(a)_Container_base0@std@@QEAAXXZ */ -DEFINE_THISCALL_WRAPPER(Container_base0_Orphan_all, 4) -void __thiscall Container_base0_Orphan_all(void *this) -{ -} - -/* ?_Swap_all(a)_Container_base0@std@@QAEXAAU12@@Z */ -/* ?_Swap_all(a)_Container_base0@std@@QEAAXAEAU12@@Z */ -DEFINE_THISCALL_WRAPPER(Container_base0_Swap_all, 8) -void __thiscall Container_base0_Swap_all(void *this, void *that) -{ -} - BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) { TRACE("(0x%p, %d, %p)\n", hinstDLL, fdwReason, lpvReserved); diff --git a/dlls/msvcp100/msvcp100.spec b/dlls/msvcp100/msvcp100.spec index 0603fd4..4ed384e 100644 --- a/dlls/msvcp100/msvcp100.spec +++ b/dlls/msvcp100/msvcp100.spec @@ -400,8 +400,8 @@ @ cdecl -arch=win64 ??4?$numeric_limits(a)_W@std@@QEAAAEAV01(a)AEBV01@@Z(ptr ptr) std_Num_base_op_assign @ thiscall -arch=win32 ??4Init(a)ios_base@std@@QAEAAV012(a)ABV012@@Z(ptr ptr) ios_base_Init_op_assign @ cdecl -arch=win64 ??4Init(a)ios_base@std@@QEAAAEAV012(a)AEBV012@@Z(ptr ptr) ios_base_Init_op_assign -@ stub -arch=win32 ??4_Container_base0(a)std@@QAEAAU01(a)ABU01@@Z -@ stub -arch=win64 ??4_Container_base0(a)std@@QEAAAEAU01(a)AEBU01@@Z +@ thiscall -arch=win32 ??4_Container_base0(a)std@@QAEAAU01(a)ABU01@@Z(ptr ptr) Container_base0_op_assign +@ cdecl -arch=win64 ??4_Container_base0(a)std@@QEAAAEAU01(a)AEBU01@@Z(ptr ptr) Container_base0_op_assign @ stub -arch=win32 ??4_Container_base12(a)std@@QAEAAU01(a)ABU01@@Z @ stub -arch=win64 ??4_Container_base12(a)std@@QEAAAEAU01(a)AEBU01@@Z @ stub -arch=win32 ??4_Init_locks(a)std@@QAEAAV01(a)ABV01@@Z

1 0

Maarten Lankhorst : dsound: Set dwChannelMask when limiting channels.
by Alexandre Julliard Nov. 27, 2012

Nov. 27, 2012

Module: wine Branch: master Commit: 79084be3c176e169d4f45391a7a566867c9c8f7d URL: http://source.winehq.org/git/wine.git/?a=commit;h=79084be3c176e169d4f45391a… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Mon Nov 26 17:02:06 2012 +0100 dsound: Set dwChannelMask when limiting channels. --- dlls/dsound/primary.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/dsound/primary.c b/dlls/dsound/primary.c index bf76dec..bc72d78 100644 --- a/dlls/dsound/primary.c +++ b/dlls/dsound/primary.c @@ -80,6 +80,7 @@ static HRESULT DSOUND_WaveFormat(DirectSoundDevice *device, IAudioClient *client mixwfe->Format.nChannels = 2; mixwfe->Format.nBlockAlign = mixwfe->Format.nChannels * mixwfe->Format.wBitsPerSample / 8; mixwfe->Format.nAvgBytesPerSec = mixwfe->Format.nSamplesPerSec * mixwfe->Format.nBlockAlign; + mixwfe->dwChannelMask = SPEAKER_FRONT_LEFT | SPEAKER_FRONT_RIGHT; } if (!IsEqualGUID(&mixwfe->SubFormat, &KSDATAFORMAT_SUBTYPE_IEEE_FLOAT)) {

1 0

Nikolay Sivov : msxml3: Support ISequentialStream as a document load source .
by Alexandre Julliard Nov. 27, 2012

Nov. 27, 2012

Module: wine Branch: master Commit: db9d8ebb086c5ef3ef12fb33e7cb47478205e89e URL: http://source.winehq.org/git/wine.git/?a=commit;h=db9d8ebb086c5ef3ef12fb33e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Nov 26 23:29:06 2012 -0500 msxml3: Support ISequentialStream as a document load source. --- dlls/msxml3/domdoc.c | 58 +++++++++++++++++++------------------------------ 1 files changed, 23 insertions(+), 35 deletions(-) diff --git a/dlls/msxml3/domdoc.c b/dlls/msxml3/domdoc.c index 16fc64c..c3144ce 100644 --- a/dlls/msxml3/domdoc.c +++ b/dlls/msxml3/domdoc.c @@ -2037,8 +2037,6 @@ static HRESULT WINAPI domdoc_load( domdoc *This = impl_from_IXMLDOMDocument3( iface ); LPWSTR filename = NULL; HRESULT hr = S_FALSE; - IXMLDOMDocument3 *pNewDoc = NULL; - IStream *pStream = NULL; xmlDocPtr xmldoc; TRACE("(%p)->(%s)\n", This, debugstr_variant(&source)); @@ -2104,13 +2102,18 @@ static HRESULT WINAPI domdoc_load( } break; case VT_UNKNOWN: + { + ISequentialStream *stream = NULL; + IXMLDOMDocument3 *newdoc = NULL; + if (!V_UNKNOWN(&source)) return E_INVALIDARG; - hr = IUnknown_QueryInterface(V_UNKNOWN(&source), &IID_IXMLDOMDocument3, (void**)&pNewDoc); + + hr = IUnknown_QueryInterface(V_UNKNOWN(&source), &IID_IXMLDOMDocument3, (void**)&newdoc); if(hr == S_OK) { - if(pNewDoc) + if(newdoc) { - domdoc *newDoc = impl_from_IXMLDOMDocument3( pNewDoc ); + domdoc *newDoc = impl_from_IXMLDOMDocument3( newdoc ); xmldoc = xmlCopyDoc(get_doc(newDoc), 1); xmldoc->_private = create_priv(); @@ -2122,40 +2125,25 @@ static HRESULT WINAPI domdoc_load( return hr; } } - hr = IUnknown_QueryInterface(V_UNKNOWN(&source), &IID_IStream, (void**)&pStream); - if(hr == S_OK) - { - IPersistStream *pDocStream; - hr = IXMLDOMDocument3_QueryInterface(iface, &IID_IPersistStream, (void**)&pDocStream); - if(hr == S_OK) - { - hr = IPersistStream_Load(pDocStream, pStream); - IStream_Release(pStream); - if(hr == S_OK) - { - *isSuccessful = VARIANT_TRUE; - TRACE("Using IStream to load Document\n"); - return S_OK; - } - else - { - ERR("xmldoc_IPersistStream_Load failed (%d)\n", hr); - } - } - else - { - ERR("QueryInterface IID_IPersistStream failed (%d)\n", hr); - } - } - else + hr = IUnknown_QueryInterface(V_UNKNOWN(&source), &IID_IStream, (void**)&stream); + if (FAILED(hr)) + hr = IUnknown_QueryInterface(V_UNKNOWN(&source), &IID_ISequentialStream, (void**)&stream); + + if (hr == S_OK) { - /* ISequentialStream */ - FIXME("Unknown type not supported (0x%08x) (%p)(%p)\n", hr, pNewDoc, V_UNKNOWN(&source)->lpVtbl); + hr = domdoc_load_from_stream(This, stream); + if (hr == S_OK) + *isSuccessful = VARIANT_TRUE; + ISequentialStream_Release(stream); + return hr; } + + FIXME("unsupported IUnknown type (0x%08x) (%p)\n", hr, V_UNKNOWN(&source)->lpVtbl); break; - default: - FIXME("VT type not supported (%d)\n", V_VT(&source)); + } + default: + FIXME("VT type not supported (%d)\n", V_VT(&source)); } if ( filename )

1 0

Huw Davies : winex11: Add a few 'fall through' comments.
by Alexandre Julliard Nov. 27, 2012

Nov. 27, 2012

Module: wine Branch: master Commit: 2232fef56c0258f859bf6622f6104c8b2e2d7610 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2232fef56c0258f859bf6622f… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Nov 27 10:11:03 2012 +0000 winex11: Add a few 'fall through' comments. --- dlls/winex11.drv/palette.c | 2 ++ dlls/winex11.drv/xrender.c | 1 + 2 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/winex11.drv/palette.c b/dlls/winex11.drv/palette.c index 91476d4..b9ad599 100644 --- a/dlls/winex11.drv/palette.c +++ b/dlls/winex11.drv/palette.c @@ -146,6 +146,7 @@ int X11DRV_PALETTE_Init(void) { case DirectColor: X11DRV_PALETTE_PaletteFlags |= X11DRV_PALETTE_VIRTUAL; + /* fall through */ case GrayScale: case PseudoColor: if (private_color_map) @@ -175,6 +176,7 @@ int X11DRV_PALETTE_Init(void) case TrueColor: X11DRV_PALETTE_PaletteFlags |= X11DRV_PALETTE_VIRTUAL; + /* fall through */ case StaticColor: X11DRV_PALETTE_PaletteFlags |= X11DRV_PALETTE_FIXED; X11DRV_PALETTE_ComputeColorShifts(&X11DRV_PALETTE_default_shifts, default_visual.red_mask, default_visual.green_mask, default_visual.blue_mask); diff --git a/dlls/winex11.drv/xrender.c b/dlls/winex11.drv/xrender.c index bafc622..d1d1ccc 100644 --- a/dlls/winex11.drv/xrender.c +++ b/dlls/winex11.drv/xrender.c @@ -1112,6 +1112,7 @@ static void UploadGlyph(struct xrender_physdev *physDev, int glyph) default: ERR("aa = %d - not implemented\n", format); + /* fall through */ case AA_None: wxr_format = WXR_FORMAT_MONO; break;

1 0

Nikolay Sivov : msxml3: Move document loading from stream to a separate function.
by Alexandre Julliard Nov. 27, 2012

Nov. 27, 2012

Module: wine Branch: master Commit: b296b08a5c383a1f80484e49e1821f1f96d9119a URL: http://source.winehq.org/git/wine.git/?a=commit;h=b296b08a5c383a1f80484e49e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Nov 26 23:07:24 2012 -0500 msxml3: Move document loading from stream to a separate function. --- dlls/msxml3/domdoc.c | 49 ++++++++++++++++++++++++++++++------------------- 1 files changed, 30 insertions(+), 19 deletions(-) diff --git a/dlls/msxml3/domdoc.c b/dlls/msxml3/domdoc.c index d1e0ebb..16fc64c 100644 --- a/dlls/msxml3/domdoc.c +++ b/dlls/msxml3/domdoc.c @@ -718,46 +718,45 @@ static HRESULT WINAPI PersistStreamInit_IsDirty( return S_FALSE; } -static HRESULT WINAPI PersistStreamInit_Load( - IPersistStreamInit *iface, LPSTREAM pStm) +static HRESULT domdoc_load_from_stream(domdoc *doc, ISequentialStream *stream) { - domdoc *This = impl_from_IPersistStreamInit(iface); - HRESULT hr; - HGLOBAL hglobal; DWORD read, written, len; + xmlDocPtr xmldoc = NULL; + HGLOBAL hglobal; BYTE buf[4096]; + HRESULT hr; char *ptr; - xmlDocPtr xmldoc = NULL; - - TRACE("(%p)->(%p)\n", This, pStm); - if (!pStm) - return E_INVALIDARG; + if (doc->stream) + { + IStream_Release(doc->stream); + doc->stream = NULL; + } - hr = CreateStreamOnHGlobal(NULL, TRUE, &This->stream); + hr = CreateStreamOnHGlobal(NULL, TRUE, &doc->stream); if (FAILED(hr)) return hr; do { - IStream_Read(pStm, buf, sizeof(buf), &read); - hr = IStream_Write(This->stream, buf, read, &written); + ISequentialStream_Read(stream, buf, sizeof(buf), &read); + hr = IStream_Write(doc->stream, buf, read, &written); } while(SUCCEEDED(hr) && written != 0 && read != 0); if (FAILED(hr)) { - ERR("Failed to copy stream\n"); + ERR("failed to copy stream 0x%08x\n", hr); return hr; } - hr = GetHGlobalFromStream(This->stream, &hglobal); + hr = GetHGlobalFromStream(doc->stream, &hglobal); if (FAILED(hr)) return hr; len = GlobalSize(hglobal); ptr = GlobalLock(hglobal); - if (len != 0) - xmldoc = doparse(This, ptr, len, XML_CHAR_ENCODING_NONE); + if (len) + xmldoc = doparse(doc, ptr, len, XML_CHAR_ENCODING_NONE); GlobalUnlock(hglobal); if (!xmldoc) @@ -768,7 +767,19 @@ static HRESULT WINAPI PersistStreamInit_Load( xmldoc->_private = create_priv(); - return attach_xmldoc(This, xmldoc); + return attach_xmldoc(doc, xmldoc); +} + +static HRESULT WINAPI PersistStreamInit_Load(IPersistStreamInit *iface, IStream *stream) +{ + domdoc *This = impl_from_IPersistStreamInit(iface); + + TRACE("(%p)->(%p)\n", This, stream); + + if (!stream) + return E_INVALIDARG; + + return domdoc_load_from_stream(This, (ISequentialStream*)stream); } static HRESULT WINAPI PersistStreamInit_Save( @@ -2140,7 +2151,7 @@ static HRESULT WINAPI domdoc_load( else { /* ISequentialStream */ - FIXME("Unknown type not supported (%d) (%p)(%p)\n", hr, pNewDoc, V_UNKNOWN(&source)->lpVtbl); + FIXME("Unknown type not supported (0x%08x) (%p)(%p)\n", hr, pNewDoc, V_UNKNOWN(&source)->lpVtbl); } break; default:

1 0

Huw Davies : gdi32: Simplify the point type checking logic.
by Alexandre Julliard Nov. 27, 2012

Nov. 27, 2012

Module: wine Branch: master Commit: e6f1930116c9f0fa49d931120ea02e4828e1991a URL: http://source.winehq.org/git/wine.git/?a=commit;h=e6f1930116c9f0fa49d931120… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Nov 27 09:15:53 2012 +0000 gdi32: Simplify the point type checking logic. --- dlls/gdi32/painting.c | 11 +++++------ 1 files changed, 5 insertions(+), 6 deletions(-) diff --git a/dlls/gdi32/painting.c b/dlls/gdi32/painting.c index 74ca835..354bea9 100644 --- a/dlls/gdi32/painting.c +++ b/dlls/gdi32/painting.c @@ -152,12 +152,11 @@ BOOL nulldrv_PolyDraw( PHYSDEV dev, const POINT *points, const BYTE *types, DWOR case PT_LINETO: break; case PT_BEZIERTO: - if((i + 2 < count) && (types[i + 1] == PT_BEZIERTO) && - ((types[i + 2] & ~PT_CLOSEFIGURE) == PT_BEZIERTO)) - { - i += 2; - break; - } + if (i + 2 >= count) return FALSE; + if (types[i + 1] != PT_BEZIERTO) return FALSE; + if ((types[i + 2] & ~PT_CLOSEFIGURE) != PT_BEZIERTO) return FALSE; + i += 2; + break; default: return FALSE; }

1 0

Nikolay Sivov : xmllite: Implement encoding declaration parsing.
by Alexandre Julliard Nov. 27, 2012

Nov. 27, 2012

Module: wine Branch: master Commit: 8e2bc1eb1b875f0dfdc4c09735b1f53538baeceb URL: http://source.winehq.org/git/wine.git/?a=commit;h=8e2bc1eb1b875f0dfdc4c0973… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Nov 27 08:46:42 2012 -0500 xmllite: Implement encoding declaration parsing. --- dlls/xmllite/reader.c | 99 +++++++++++++++++++++++++++++++++++++++++++----- 1 files changed, 88 insertions(+), 11 deletions(-) diff --git a/dlls/xmllite/reader.c b/dlls/xmllite/reader.c index 0d21e79..87d7936 100644 --- a/dlls/xmllite/reader.c +++ b/dlls/xmllite/reader.c @@ -46,6 +46,10 @@ typedef enum static const WCHAR utf16W[] = {'U','T','F','-','1','6',0}; static const WCHAR utf8W[] = {'U','T','F','-','8',0}; +static const WCHAR dblquoteW[] = {'\"',0}; +static const WCHAR quoteW[] = {'\'',0}; +static const WCHAR eqW[] = {'=',0}; + struct xml_encoding_data { const WCHAR *name; @@ -213,7 +217,7 @@ static HRESULT get_code_page(xml_encoding encoding, UINT *cp) return S_OK; } -static xml_encoding parse_encoding_name(const WCHAR *name) +static xml_encoding parse_encoding_name(const WCHAR *name, int len) { int min, max, n, c; @@ -226,7 +230,10 @@ static xml_encoding parse_encoding_name(const WCHAR *name) { n = (min+max)/2; - c = strcmpiW(xml_encoding_map[n].name, name); + if (len != -1) + c = strncmpiW(xml_encoding_map[n].name, name, len); + else + c = strcmpiW(xml_encoding_map[n].name, name); if (!c) return xml_encoding_map[n].enc; @@ -491,20 +498,20 @@ static int reader_skipspaces(xmlreader *reader) /* [26] VersionNum ::= '1.' [0-9]+ */ static HRESULT reader_parse_versionnum(xmlreader *reader) { - const WCHAR *ptr, *start = reader_get_cur(reader); + const WCHAR *ptr, *ptr2, *start = reader_get_cur(reader); static const WCHAR onedotW[] = {'1','.',0}; if (reader_cmp(reader, onedotW)) return WC_E_XMLDECL; /* skip "1." */ reader_skipn(reader, 2); - ptr = reader_get_cur(reader); + ptr2 = ptr = reader_get_cur(reader); while (*ptr >= '0' && *ptr <= '9') ptr++; - if (ptr == start) return WC_E_DIGIT; - TRACE("version=%s\n", debugstr_wn(start, ptr-start)); - reader_skipn(reader, ptr-start); + if (ptr2 == ptr) return WC_E_DIGIT; + TRACE("version=%s", debugstr_wn(start, ptr-start)); + reader_skipn(reader, ptr-ptr2); return S_OK; } @@ -512,9 +519,6 @@ static HRESULT reader_parse_versionnum(xmlreader *reader) static HRESULT reader_parse_versioninfo(xmlreader *reader) { static const WCHAR versionW[] = {'v','e','r','s','i','o','n',0}; - static const WCHAR dblquoteW[] = {'\"',0}; - static const WCHAR quoteW[] = {'\'',0}; - static const WCHAR eqW[] = {'=',0}; HRESULT hr; if (!reader_skipspaces(reader)) return WC_E_WHITESPACE; @@ -544,6 +548,75 @@ static HRESULT reader_parse_versioninfo(xmlreader *reader) return S_OK; } +/* ([A-Za-z0-9._] | '-') */ +static inline int is_wchar_encname(WCHAR ch) +{ + return ((ch >= 'A' && ch <= 'Z') || + (ch >= 'a' && ch <= 'z') || + (ch >= '0' && ch <= '9') || + (ch == '.') || (ch == '_') || + (ch == '-')); +} + +/* [81] EncName ::= [A-Za-z] ([A-Za-z0-9._] | '-')* */ +static HRESULT reader_parse_encname(xmlreader *reader) +{ + const WCHAR *start = reader_get_cur(reader), *ptr; + xml_encoding enc; + int len; + + if ((*start < 'A' || *start > 'Z') && (*start < 'a' || *start > 'z')) + return WC_E_ENCNAME; + + ptr = start; + while (is_wchar_encname(*++ptr)) + ; + + len = ptr - start; + enc = parse_encoding_name(start, len); + TRACE("encoding name %s\n", debugstr_wn(start, len)); + + if (enc == XmlEncoding_Unknown) + return WC_E_ENCNAME; + + /* skip encoding name */ + reader_skipn(reader, len); + return S_OK; +} + +/* [80] EncodingDecl ::= S 'encoding' Eq ('"' EncName '"' | "'" EncName "'" ) */ +static HRESULT reader_parse_encdecl(xmlreader *reader) +{ + static const WCHAR encodingW[] = {'e','n','c','o','d','i','n','g',0}; + HRESULT hr; + + if (!reader_skipspaces(reader)) return WC_E_WHITESPACE; + + if (reader_cmp(reader, encodingW)) return S_OK; + /* skip 'encoding' */ + reader_skipn(reader, 8); + + if (reader_cmp(reader, eqW)) return WC_E_EQUAL; + /* skip '=' */ + reader_skipn(reader, 1); + + if (reader_cmp(reader, quoteW) && reader_cmp(reader, dblquoteW)) + return WC_E_QUOTE; + /* skip "'"|'"' */ + reader_skipn(reader, 1); + + hr = reader_parse_encname(reader); + if (FAILED(hr)) return hr; + + if (reader_cmp(reader, quoteW) && reader_cmp(reader, dblquoteW)) + return WC_E_QUOTE; + + /* skip "'"|'"' */ + reader_skipn(reader, 1); + + return S_OK; +} + /* [23] XMLDecl ::= '<?xml' VersionInfo EncodingDecl? SDDecl? S? '?>' */ static HRESULT reader_parse_xmldecl(xmlreader *reader) { @@ -558,6 +631,10 @@ static HRESULT reader_parse_xmldecl(xmlreader *reader) if (FAILED(hr)) return hr; + hr = reader_parse_encdecl(reader); + if (FAILED(hr)) + return hr; + return E_NOTIMPL; } @@ -1028,7 +1105,7 @@ HRESULT WINAPI CreateXmlReaderInputWithEncodingName(IUnknown *stream, readerinput->imalloc = imalloc; readerinput->stream = NULL; if (imalloc) IMalloc_AddRef(imalloc); - readerinput->encoding = parse_encoding_name(encoding); + readerinput->encoding = parse_encoding_name(encoding, -1); readerinput->hint = hint; readerinput->baseuri = readerinput_strdupW(readerinput, base_uri);

1 0