November 2012 - Wine-commits

Andrew Talbot : imagehlp: Remove unused variable.
by Alexandre Julliard 26 Nov '12

26 Nov '12

Module: wine Branch: master Commit: 4a79345d919e9ef41b79755afd32919f70675bf6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4a79345d919e9ef41b79755af… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Sat Nov 24 21:09:35 2012 +0000 imagehlp: Remove unused variable. --- dlls/imagehlp/access.c | 4 ---- 1 files changed, 0 insertions(+), 4 deletions(-) diff --git a/dlls/imagehlp/access.c b/dlls/imagehlp/access.c index cf19e6c..9e1f187 100644 --- a/dlls/imagehlp/access.c +++ b/dlls/imagehlp/access.c @@ -35,7 +35,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(imagehlp); */ static PLOADED_IMAGE IMAGEHLP_pFirstLoadedImage=NULL; -static PLOADED_IMAGE IMAGEHLP_pLastLoadedImage=NULL; static LOADED_IMAGE IMAGEHLP_EmptyLoadedImage = { NULL, /* ModuleName */ @@ -136,9 +135,6 @@ BOOL WINAPI ImageUnload(PLOADED_IMAGE pLoadedImage) if(pCurrent->Flink) pCurrent->Flink->Blink = pCurrent->Blink; - else - IMAGEHLP_pLastLoadedImage = pCurrent->Blink?CONTAINING_RECORD( - pCurrent->Blink, LOADED_IMAGE, Links):NULL; return FALSE; }

1 0

Andrew Talbot : xmllite: Void functions should not return a value.
by Alexandre Julliard 26 Nov '12

26 Nov '12

Module: wine Branch: master Commit: 40300b24ccb1a1aeeed7de9e8c5ad4afcacfe1a0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=40300b24ccb1a1aeeed7de9e8… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Sat Nov 24 21:09:32 2012 +0000 xmllite: Void functions should not return a value. --- dlls/xmllite/reader.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/xmllite/reader.c b/dlls/xmllite/reader.c index 3f22152..8ad78d8 100644 --- a/dlls/xmllite/reader.c +++ b/dlls/xmllite/reader.c @@ -146,7 +146,7 @@ static inline void *reader_alloc(xmlreader *reader, size_t len) static inline void reader_free(xmlreader *reader, void *mem) { - return m_free(reader->imalloc, mem); + m_free(reader->imalloc, mem); } /* reader input memory allocation functions */ @@ -162,7 +162,7 @@ static inline void *readerinput_realloc(xmlreaderinput *input, void *mem, size_t static inline void readerinput_free(xmlreaderinput *input, void *mem) { - return m_free(input->imalloc, mem); + m_free(input->imalloc, mem); } static inline WCHAR *readerinput_strdupW(xmlreaderinput *input, const WCHAR *str)

1 0

Nikolay Sivov : dwrite: Implement family name access methods for IDWriteTextFormat.
by Alexandre Julliard 26 Nov '12

26 Nov '12

Module: wine Branch: master Commit: 22f19708342572182735bd2738dc39ebb25cdd3c URL: http://source.winehq.org/git/wine.git/?a=commit;h=22f19708342572182735bd273… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Nov 26 10:43:49 2012 -0500 dwrite: Implement family name access methods for IDWriteTextFormat. --- dlls/dwrite/layout.c | 14 ++++++++++---- 1 files changed, 10 insertions(+), 4 deletions(-) diff --git a/dlls/dwrite/layout.c b/dlls/dwrite/layout.c index f6bc421..8e63f5c 100644 --- a/dlls/dwrite/layout.c +++ b/dlls/dwrite/layout.c @@ -34,6 +34,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(dwrite); struct dwrite_textformat_data { WCHAR *family_name; + UINT32 family_len; WCHAR *locale; UINT32 locale_len; @@ -880,15 +881,19 @@ static HRESULT WINAPI dwritetextformat_GetFontCollection(IDWriteTextFormat *ifac static UINT32 WINAPI dwritetextformat_GetFontFamilyNameLength(IDWriteTextFormat *iface) { struct dwrite_textformat *This = impl_from_IDWriteTextFormat(iface); - FIXME("(%p): stub\n", This); - return 0; + TRACE("(%p)\n", This); + return This->format.family_len; } static HRESULT WINAPI dwritetextformat_GetFontFamilyName(IDWriteTextFormat *iface, WCHAR *name, UINT32 size) { struct dwrite_textformat *This = impl_from_IDWriteTextFormat(iface); - FIXME("(%p)->(%p %u): stub\n", This, name, size); - return E_NOTIMPL; + + TRACE("(%p)->(%p %u)\n", This, name, size); + + if (size <= This->format.family_len) return E_NOT_SUFFICIENT_BUFFER; + strcpyW(name, This->format.family_name); + return S_OK; } static DWRITE_FONT_WEIGHT WINAPI dwritetextformat_GetFontWeight(IDWriteTextFormat *iface) @@ -981,6 +986,7 @@ HRESULT create_textformat(const WCHAR *family_name, IDWriteFontCollection *colle This->IDWriteTextFormat_iface.lpVtbl = &dwritetextformatvtbl; This->ref = 1; This->format.family_name = heap_strdupW(family_name); + This->format.family_len = strlenW(family_name); This->format.locale = heap_strdupW(locale); This->format.locale_len = strlenW(locale); This->format.weight = weight;

1 0

Nikolay Sivov : dwrite: Add a separate function to copy text format data.
by Alexandre Julliard 26 Nov '12

26 Nov '12

Module: wine Branch: master Commit: cfaf8be90645513a4677f79f66c752745ebe553a URL: http://source.winehq.org/git/wine.git/?a=commit;h=cfaf8be90645513a4677f79f6… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Nov 26 11:01:58 2012 -0500 dwrite: Add a separate function to copy text format data. --- dlls/dwrite/layout.c | 61 ++++++++++++++++++++++++++++++++++++------------- 1 files changed, 45 insertions(+), 16 deletions(-) diff --git a/dlls/dwrite/layout.c b/dlls/dwrite/layout.c index 8e63f5c..d9e4a99 100644 --- a/dlls/dwrite/layout.c +++ b/dlls/dwrite/layout.c @@ -62,6 +62,8 @@ struct dwrite_textformat { struct dwrite_textformat_data format; }; +static const IDWriteTextFormatVtbl dwritetextformatvtbl; + static void release_format_data(struct dwrite_textformat_data *data) { if (data->collection) IDWriteFontCollection_Release(data->collection); @@ -79,6 +81,11 @@ static inline struct dwrite_textformat *impl_from_IDWriteTextFormat(IDWriteTextF return CONTAINING_RECORD(iface, struct dwrite_textformat, IDWriteTextFormat_iface); } +static inline struct dwrite_textformat *unsafe_impl_from_IDWriteTextFormat(IDWriteTextFormat *iface) +{ + return iface->lpVtbl == &dwritetextformatvtbl ? impl_from_IDWriteTextFormat(iface) : NULL; +} + static HRESULT WINAPI dwritetextlayout_QueryInterface(IDWriteTextLayout *iface, REFIID riid, void **obj) { struct dwrite_textlayout *This = impl_from_IDWriteTextLayout(iface); @@ -672,10 +679,46 @@ static const IDWriteTextLayoutVtbl dwritetextlayoutvtbl = { dwritetextlayout_HitTestTextRange }; +static void layout_format_from_textformat(struct dwrite_textlayout *layout, IDWriteTextFormat *format) +{ + struct dwrite_textformat *f; + + memset(&layout->format, 0, sizeof(layout->format)); + + if ((f = unsafe_impl_from_IDWriteTextFormat(format))) + { + layout->format = f->format; + layout->format.locale = heap_strdupW(f->format.locale); + layout->format.family_name = heap_strdupW(f->format.family_name); + } + else + { + UINT32 locale_len, family_len; + + layout->format.weight = IDWriteTextFormat_GetFontWeight(format); + layout->format.style = IDWriteTextFormat_GetFontStyle(format); + layout->format.stretch = IDWriteTextFormat_GetFontStretch(format); + layout->format.size = IDWriteTextFormat_GetFontSize(format); + + /* locale name and length */ + locale_len = IDWriteTextFormat_GetLocaleNameLength(format); + layout->format.locale = heap_alloc((locale_len+1)*sizeof(WCHAR)); + IDWriteTextFormat_GetLocaleName(format, layout->format.locale, locale_len+1); + layout->format.locale_len = locale_len; + + /* font family name and length */ + family_len = IDWriteTextFormat_GetFontFamilyNameLength(format); + layout->format.family_name = heap_alloc((family_len+1)*sizeof(WCHAR)); + IDWriteTextFormat_GetFontFamilyName(format, layout->format.family_name, family_len+1); + layout->format.family_len = family_len; + } + + IDWriteTextFormat_GetFontCollection(format, &layout->format.collection); +} + HRESULT create_textlayout(const WCHAR *str, UINT32 len, IDWriteTextFormat *format, IDWriteTextLayout **layout) { struct dwrite_textlayout *This; - UINT32 locale_len; *layout = NULL; @@ -686,21 +729,7 @@ HRESULT create_textlayout(const WCHAR *str, UINT32 len, IDWriteTextFormat *forma This->ref = 1; This->str = heap_strdupnW(str, len); This->len = len; - memset(&This->format, 0, sizeof(This->format)); - - /* reference is not kept here, instead copy all underlying data */ - IDWriteTextFormat_GetFontCollection(format, &This->format.collection); - - /* locale name and length */ - locale_len = IDWriteTextFormat_GetLocaleNameLength(format); - This->format.locale = heap_alloc((locale_len+1)*sizeof(WCHAR)); - IDWriteTextFormat_GetLocaleName(format, This->format.locale, locale_len+1); - This->format.locale_len = locale_len; - - This->format.weight = IDWriteTextFormat_GetFontWeight(format); - This->format.style = IDWriteTextFormat_GetFontStyle(format); - This->format.stretch = IDWriteTextFormat_GetFontStretch(format); - This->format.size = IDWriteTextFormat_GetFontSize(format); + layout_format_from_textformat(This, format); *layout = &This->IDWriteTextLayout_iface;

1 0

Nikolay Sivov : xmllite: Implement initial encoding switching.
by Alexandre Julliard 26 Nov '12

26 Nov '12

Module: wine Branch: master Commit: eddd7fcf29994645e4047fe9738109defa78100d URL: http://source.winehq.org/git/wine.git/?a=commit;h=eddd7fcf29994645e4047fe97… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Nov 25 00:10:46 2012 -0500 xmllite: Implement initial encoding switching. --- dlls/xmllite/reader.c | 127 +++++++++++++++++++++++++++++++++++-------- dlls/xmllite/tests/reader.c | 2 +- 2 files changed, 106 insertions(+), 23 deletions(-) diff --git a/dlls/xmllite/reader.c b/dlls/xmllite/reader.c index 8ad78d8..b0ceac4 100644 --- a/dlls/xmllite/reader.c +++ b/dlls/xmllite/reader.c @@ -61,6 +61,7 @@ static const struct xml_encoding_data xml_encoding_map[] = { typedef struct { char *data; + char *cur; unsigned int allocated; unsigned int written; } encoded_buffer; @@ -187,6 +188,7 @@ static HRESULT init_encoded_buffer(xmlreaderinput *input, encoded_buffer *buffer if (!buffer->data) return E_OUTOFMEMORY; memset(buffer->data, 0, 4); + buffer->cur = buffer->data; buffer->allocated = initial_len; buffer->written = 0; @@ -198,18 +200,15 @@ static void free_encoded_buffer(xmlreaderinput *input, encoded_buffer *buffer) readerinput_free(input, buffer->data); } -static HRESULT get_code_page(xml_encoding encoding, xmlreaderinput *input) +static HRESULT get_code_page(xml_encoding encoding, UINT *cp) { - const struct xml_encoding_data *data; - if (encoding == XmlEncoding_Unknown) { FIXME("unsupported encoding %d\n", encoding); return E_NOTIMPL; } - data = &xml_encoding_map[encoding]; - input->buffer->code_page = data->cp; + *cp = xml_encoding_map[encoding].cp; return S_OK; } @@ -324,31 +323,112 @@ static HRESULT readerinput_growraw(xmlreaderinput *readerinput) return hr; } -static xml_encoding readerinput_detectencoding(xmlreaderinput *readerinput) +/* grows UTF-16 buffer so it has at least 'length' bytes free on return */ +static void readerinput_grow(xmlreaderinput *readerinput, int length) +{ + encoded_buffer *buffer = &readerinput->buffer->utf16; + + /* grow if needed, plus 4 bytes to be sure null terminator will fit in */ + if (buffer->allocated < buffer->written + length + 4) + { + int grown_size = max(2*buffer->allocated, buffer->allocated + length); + buffer->data = readerinput_realloc(readerinput, buffer->data, grown_size); + buffer->allocated = grown_size; + } +} + +static HRESULT readerinput_detectencoding(xmlreaderinput *readerinput, xml_encoding *enc) { encoded_buffer *buffer = &readerinput->buffer->encoded; + static char startA[] = {'<','?','x','m'}; + static WCHAR startW[] = {'<','?'}; + static char utf8bom[] = {0xef,0xbb,0xbf}; + static char utf16lebom[] = {0xff,0xfe}; + + *enc = XmlEncoding_Unknown; + + if (buffer->written <= 3) return MX_E_INPUTEND; /* try start symbols if we have enough data to do that, input buffer should contain first chunk already */ - if (buffer->written >= 4) + if (!memcmp(buffer->data, startA, sizeof(startA))) + *enc = XmlEncoding_UTF8; + else if (!memcmp(buffer->data, startW, sizeof(startW))) + *enc = XmlEncoding_UTF16; + /* try with BOM now */ + else if (!memcmp(buffer->data, utf8bom, sizeof(utf8bom))) { - static char startA[] = {'<','?','x','m'}; - static WCHAR startW[] = {'<','?'}; - - if (!memcmp(buffer->data, startA, sizeof(startA))) return XmlEncoding_UTF8; - if (!memcmp(buffer->data, startW, sizeof(startW))) return XmlEncoding_UTF16; + buffer->cur += sizeof(utf8bom); + *enc = XmlEncoding_UTF8; + } + else if (!memcmp(buffer->data, utf16lebom, sizeof(utf16lebom))) + { + buffer->cur += sizeof(utf16lebom); + *enc = XmlEncoding_UTF16; } - /* try with BOM now */ - if (buffer->written >= 3) + return S_OK; +} + +static int readerinput_get_utf8_convlen(xmlreaderinput *readerinput) +{ + encoded_buffer *buffer = &readerinput->buffer->encoded; + int len = buffer->written; + + /* complete single byte char */ + if (!(buffer->data[len-1] & 0x80)) return len; + + /* find start byte of multibyte char */ + while (--len && !(buffer->data[len] & 0xc0)) + ; + + return len; +} + +/* returns byte length of complete char sequence for specified code page, */ +static int readerinput_get_convlen(xmlreaderinput *readerinput, UINT cp) +{ + encoded_buffer *buffer = &readerinput->buffer->encoded; + int len = buffer->written; + + if (cp == CP_UTF8) + len = readerinput_get_utf8_convlen(readerinput); + else + len = buffer->written; + + return len - (buffer->cur - buffer->data); +} + +/* note that raw buffer content is kept */ +static void readerinput_switchencoding(xmlreaderinput *readerinput, xml_encoding enc) +{ + encoded_buffer *src = &readerinput->buffer->encoded; + encoded_buffer *dest = &readerinput->buffer->utf16; + int len, dest_len; + HRESULT hr; + UINT cp; + + hr = get_code_page(enc, &cp); + if (FAILED(hr)) return; + + len = readerinput_get_convlen(readerinput, cp); + + TRACE("switching to cp %d\n", cp); + + /* just copy in this case */ + if (enc == XmlEncoding_UTF16) { - static char utf8bom[] = {0xef,0xbb,0xbf}; - static char utf16lebom[] = {0xff,0xfe}; - if (!memcmp(buffer->data, utf8bom, sizeof(utf8bom))) return XmlEncoding_UTF8; - if (!memcmp(buffer->data, utf16lebom, sizeof(utf16lebom))) return XmlEncoding_UTF16; + readerinput_grow(readerinput, len); + memcpy(dest->data, src->cur, len); + readerinput->buffer->code_page = cp; + return; } - return XmlEncoding_Unknown; + dest_len = MultiByteToWideChar(cp, 0, src->cur, len, NULL, 0); + readerinput_grow(readerinput, dest_len); + MultiByteToWideChar(cp, 0, src->cur, len, (WCHAR*)dest->data, dest_len); + dest->data[dest_len] = 0; + readerinput->buffer->code_page = cp; } static HRESULT WINAPI xmlreader_QueryInterface(IXmlReader *iface, REFIID riid, void** ppvObject) @@ -505,9 +585,12 @@ static HRESULT WINAPI xmlreader_Read(IXmlReader* iface, XmlNodeType *node_type) if (FAILED(hr)) return hr; /* try to detect encoding by BOM or data and set input code page */ - enc = readerinput_detectencoding(This->input); - TRACE("detected encoding %d\n", enc); - get_code_page(enc, This->input); + hr = readerinput_detectencoding(This->input, &enc); + TRACE("detected encoding %d, 0x%08x\n", enc, hr); + if (FAILED(hr)) return hr; + + /* always switch first time cause we have to put something in */ + readerinput_switchencoding(This->input, enc); } return E_NOTIMPL; diff --git a/dlls/xmllite/tests/reader.c b/dlls/xmllite/tests/reader.c index 7d77fe9..729d134 100644 --- a/dlls/xmllite/tests/reader.c +++ b/dlls/xmllite/tests/reader.c @@ -52,7 +52,7 @@ static const char *debugstr_guid(REFIID riid) return buf; } -static const char xmldecl_full[] = "<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"yes\"?>\n"; +static const char xmldecl_full[] = "\xef\xbb\xbf<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"yes\"?>\n"; static IStream *create_stream_on_data(const char *data, int size) {

1 0

Nikolay Sivov : xmllite: Add partial support for xml declaration parsing.
by Alexandre Julliard 26 Nov '12

26 Nov '12

Module: wine Branch: master Commit: acb56b0796ec53b37789977e600c2839156d0da4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=acb56b0796ec53b37789977e6… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Nov 25 21:59:49 2012 -0500 xmllite: Add partial support for xml declaration parsing. --- dlls/xmllite/reader.c | 148 +++++++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 142 insertions(+), 6 deletions(-) diff --git a/dlls/xmllite/reader.c b/dlls/xmllite/reader.c index b0ceac4..0d21e79 100644 --- a/dlls/xmllite/reader.c +++ b/dlls/xmllite/reader.c @@ -1,7 +1,7 @@ /* * IXmlReader implementation * - * Copyright 2010 Nikolay Sivov + * Copyright 2010, 2012 Nikolay Sivov * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -48,7 +48,7 @@ static const WCHAR utf8W[] = {'U','T','F','-','8',0}; struct xml_encoding_data { - const WCHAR *encoding; + const WCHAR *name; xml_encoding enc; UINT cp; }; @@ -213,11 +213,11 @@ static HRESULT get_code_page(xml_encoding encoding, UINT *cp) return S_OK; } -static xml_encoding parse_encoding_name(const WCHAR *encoding) +static xml_encoding parse_encoding_name(const WCHAR *name) { int min, max, n, c; - if (!encoding) return XmlEncoding_Unknown; + if (!name) return XmlEncoding_Unknown; min = 0; max = sizeof(xml_encoding_map)/sizeof(struct xml_encoding_data) - 1; @@ -226,7 +226,7 @@ static xml_encoding parse_encoding_name(const WCHAR *encoding) { n = (min+max)/2; - c = strcmpiW(xml_encoding_map[n].encoding, encoding); + c = strcmpiW(xml_encoding_map[n].name, name); if (!c) return xml_encoding_map[n].enc; @@ -431,6 +431,136 @@ static void readerinput_switchencoding(xmlreaderinput *readerinput, xml_encoding readerinput->buffer->code_page = cp; } +static inline const WCHAR *reader_get_cur(xmlreader *reader) +{ + return (WCHAR*)reader->input->buffer->utf16.cur; +} + +static int reader_cmp(xmlreader *reader, const WCHAR *str) +{ + const WCHAR *ptr = reader_get_cur(reader); + int i = 0; + + return strncmpW(str, ptr, strlenW(str)); + + while (str[i]) { + if (ptr[i] != str[i]) return 0; + i++; + } + + return 1; +} + +/* moves cursor n WCHARs forward */ +static void reader_skipn(xmlreader *reader, int n) +{ + encoded_buffer *buffer = &reader->input->buffer->utf16; + const WCHAR *ptr = reader_get_cur(reader); + + while (*ptr++ && n--) + { + buffer->cur += sizeof(WCHAR); + reader->pos++; + } +} + +/* [3] S ::= (#x20 | #x9 | #xD | #xA)+ */ +static int reader_skipspaces(xmlreader *reader) +{ + encoded_buffer *buffer = &reader->input->buffer->utf16; + const WCHAR *ptr = reader_get_cur(reader), *start = ptr; + + while (*ptr == ' ' || *ptr == '\t' || *ptr == '\r' || *ptr == '\n') + { + buffer->cur += sizeof(WCHAR); + if (*ptr == '\r') + reader->pos = 0; + else if (*ptr == '\n') + { + reader->line++; + reader->pos = 0; + } + else + reader->pos++; + ptr++; + } + + return ptr - start; +} + +/* [26] VersionNum ::= '1.' [0-9]+ */ +static HRESULT reader_parse_versionnum(xmlreader *reader) +{ + const WCHAR *ptr, *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); + 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); + return S_OK; +} + +/* [24] VersionInfo ::= S 'version' Eq ("'" VersionNum "'" | '"' VersionNum '"') */ +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; + + if (reader_cmp(reader, versionW)) return WC_E_XMLDECL; + /* skip 'version' */ + reader_skipn(reader, 7); + + 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_versionnum(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) +{ + static const WCHAR xmldeclW[] = {'<','?','x','m','l',0}; + HRESULT hr; + + /* check if we have "<?xml" */ + if (reader_cmp(reader, xmldeclW)) return S_OK; + + reader_skipn(reader, 5); + hr = reader_parse_versioninfo(reader); + if (FAILED(hr)) + return hr; + + return E_NOTIMPL; +} + static HRESULT WINAPI xmlreader_QueryInterface(IXmlReader *iface, REFIID riid, void** ppvObject) { xmlreader *This = impl_from_IXmlReader(iface); @@ -586,11 +716,17 @@ static HRESULT WINAPI xmlreader_Read(IXmlReader* iface, XmlNodeType *node_type) /* try to detect encoding by BOM or data and set input code page */ hr = readerinput_detectencoding(This->input, &enc); - TRACE("detected encoding %d, 0x%08x\n", enc, hr); + TRACE("detected encoding %s, 0x%08x\n", debugstr_w(xml_encoding_map[enc].name), hr); if (FAILED(hr)) return hr; /* always switch first time cause we have to put something in */ readerinput_switchencoding(This->input, enc); + + /* parse xml declaration */ + hr = reader_parse_xmldecl(This); + if (FAILED(hr)) return hr; + + This->state = XmlReadState_Interactive; } return E_NOTIMPL;

1 0

Nikolay Sivov : ole32: Fix OleDraw() regarding passed rectangle handling.
by Alexandre Julliard 26 Nov '12

26 Nov '12

Module: wine Branch: master Commit: 6a8b4f11a876f16090591f1c4b834e56cc783b4e URL: http://source.winehq.org/git/wine.git/?a=commit;h=6a8b4f11a876f16090591f1c4… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Nov 26 12:49:59 2012 -0500 ole32: Fix OleDraw() regarding passed rectangle handling. --- dlls/ole32/ole2.c | 14 +------ dlls/ole32/tests/ole2.c | 87 +++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 89 insertions(+), 12 deletions(-) diff --git a/dlls/ole32/ole2.c b/dlls/ole32/ole2.c index 6a91ba6..7e55fb2 100644 --- a/dlls/ole32/ole2.c +++ b/dlls/ole32/ole2.c @@ -2554,7 +2554,7 @@ HRESULT WINAPI OleDraw( IUnknown *pUnk, DWORD dwAspect, HDC hdcDraw, - LPCRECT lprcBounds) + LPCRECT rect) { HRESULT hres; IViewObject *viewobject; @@ -2562,24 +2562,14 @@ HRESULT WINAPI OleDraw( hres = IUnknown_QueryInterface(pUnk, &IID_IViewObject, (void**)&viewobject); - if (SUCCEEDED(hres)) { - RECTL rectl; - - rectl.left = lprcBounds->left; - rectl.right = lprcBounds->right; - rectl.top = lprcBounds->top; - rectl.bottom = lprcBounds->bottom; - hres = IViewObject_Draw(viewobject, dwAspect, -1, 0, 0, 0, hdcDraw, &rectl, 0, 0, 0); - + hres = IViewObject_Draw(viewobject, dwAspect, -1, 0, 0, 0, hdcDraw, (RECTL*)rect, 0, 0, 0); IViewObject_Release(viewobject); return hres; } else - { return DV_E_NOIVIEWOBJECT; - } } /*********************************************************************** diff --git a/dlls/ole32/tests/ole2.c b/dlls/ole32/tests/ole2.c index 8dd3606..eb8e6d3 100644 --- a/dlls/ole32/tests/ole2.c +++ b/dlls/ole32/tests/ole2.c @@ -726,6 +726,84 @@ static IRunnableObject OleObjectRunnable = { &OleObjectRunnableVtbl }; static const CLSID CLSID_Equation3 = {0x0002CE02, 0x0000, 0x0000, {0xC0,0x00,0x00,0x00,0x00,0x00,0x00,0x46} }; +static HRESULT WINAPI viewobject_QueryInterface(IViewObject *iface, REFIID riid, void **obj) +{ + if (IsEqualGUID(riid, &IID_IUnknown) || IsEqualGUID(riid, &IID_IViewObject)) + { + *obj = iface; + return S_OK; + } + + *obj = NULL; + return E_NOINTERFACE; +} + +static ULONG WINAPI viewobject_AddRef(IViewObject *iface) +{ + return 2; +} + +static ULONG WINAPI viewobject_Release(IViewObject *iface) +{ + return 1; +} + +static HRESULT WINAPI viewobject_Draw(IViewObject *iface, DWORD aspect, LONG index, + void *paspect, DVTARGETDEVICE *ptd, HDC hdcTargetDev, HDC hdcDraw, + LPCRECTL bounds, LPCRECTL wbounds, BOOL (STDMETHODCALLTYPE *pfnContinue)(ULONG_PTR dwContinue), + ULONG_PTR dwContinue) +{ + ok(index == -1, "index=%d\n", index); + return S_OK; +} + +static HRESULT WINAPI viewobject_GetColorSet(IViewObject *iface, DWORD draw_aspect, LONG index, + void *aspect, DVTARGETDEVICE *ptd, HDC hicTargetDev, LOGPALETTE **colorset) +{ + ok(0, "unexpected call GetColorSet\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI viewobject_Freeze(IViewObject *iface, DWORD draw_aspect, LONG index, + void *aspect, DWORD *freeze) +{ + ok(0, "unexpected call Freeze\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI viewobject_Unfreeze(IViewObject *iface, DWORD freeze) +{ + ok(0, "unexpected call Unfreeze\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI viewobject_SetAdvise(IViewObject *iface, DWORD aspects, DWORD advf, IAdviseSink *sink) +{ + ok(0, "unexpected call SetAdvise\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI viewobject_GetAdvise(IViewObject *iface, DWORD *aspects, DWORD *advf, + IAdviseSink **sink) +{ + ok(0, "unexpected call GetAdvise\n"); + return E_NOTIMPL; +} + +static const struct IViewObjectVtbl viewobjectvtbl = { + viewobject_QueryInterface, + viewobject_AddRef, + viewobject_Release, + viewobject_Draw, + viewobject_GetColorSet, + viewobject_Freeze, + viewobject_Unfreeze, + viewobject_SetAdvise, + viewobject_GetAdvise +}; + +static IViewObject viewobject = { &viewobjectvtbl }; + static void test_OleCreate(IStorage *pStorage) { HRESULT hr; @@ -1853,6 +1931,14 @@ static void test_OleLockRunning(void) ok(hr == S_OK, "OleLockRunning failed 0x%08x\n", hr); } +static void test_OleDraw(void) +{ + HRESULT hr; + + hr = OleDraw((IUnknown*)&viewobject, 0, (HDC)0x1, NULL); + ok(hr == S_OK, "got 0x%08x\n", hr); +} + START_TEST(ole2) { DWORD dwRegister; @@ -1889,6 +1975,7 @@ START_TEST(ole2) test_default_handler(); test_runnable(); test_OleLockRunning(); + test_OleDraw(); CoUninitialize(); }

1 0

Dmitry Timoshkov : oleaut32: Add a test for loading/saving an empty picture .
by Alexandre Julliard 26 Nov '12

26 Nov '12

Module: wine Branch: master Commit: 6c53c4ee036c849f80104c0116f779946d19670b URL: http://source.winehq.org/git/wine.git/?a=commit;h=6c53c4ee036c849f80104c011… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Nov 26 17:49:58 2012 +0800 oleaut32: Add a test for loading/saving an empty picture. --- dlls/oleaut32/tests/olepicture.c | 53 ++++++++++++++++++++++++++++++++++++++ 1 files changed, 53 insertions(+), 0 deletions(-) diff --git a/dlls/oleaut32/tests/olepicture.c b/dlls/oleaut32/tests/olepicture.c index 696f8cd..ee97fe2 100644 --- a/dlls/oleaut32/tests/olepicture.c +++ b/dlls/oleaut32/tests/olepicture.c @@ -1059,6 +1059,58 @@ todo_wine IPicture_Release(pic); } +static void test_load_save_empty_picture(void) +{ + IPicture *pic; + PICTDESC desc; + short type; + OLE_HANDLE handle; + HGLOBAL hmem; + DWORD *mem; + IPersistStream *src_stream; + IStream *dst_stream; + HRESULT hr; + + memset(&pic, 0, sizeof(pic)); + desc.cbSizeofstruct = sizeof(desc); + desc.picType = PICTYPE_NONE; + hr = OleCreatePictureIndirect(&desc, &IID_IPicture, FALSE, (void **)&pic); + ok(hr == S_OK, "OleCreatePictureIndirect error %#x\n", hr); + + type = -1; + hr = IPicture_get_Type(pic, &type); + ok(hr == S_OK,"get_Type error %#8x\n", hr); + ok(type == PICTYPE_NONE,"expected picture type PICTYPE_NONE, got %d\n", type); + + handle = (OLE_HANDLE)0xdeadbeef; + hr = IPicture_get_Handle(pic, &handle); + ok(hr == S_OK,"get_Handle error %#8x\n", hr); + ok(!handle, "get_Handle returned wrong handle %#x\n", handle); + + hmem = GlobalAlloc(GMEM_ZEROINIT, 4096); + hr = CreateStreamOnHGlobal(hmem, FALSE, &dst_stream); + ok(hr == S_OK, "createstreamonhglobal error %#x\n", hr); + + hr = IPicture_QueryInterface(pic, &IID_IPersistStream, (void **)&src_stream); + ok(hr == S_OK, "QueryInterface error %#x\n", hr); + + hr = IPersistStream_Save(src_stream, dst_stream, TRUE); +todo_wine + ok(hr == S_OK, "Save error %#x\n", hr); + + mem = GlobalLock(hmem); +todo_wine + ok(!memcmp(mem, "lt\0\0", 4), "got wrong stream header %04x\n", mem[0]); + ok(mem[1] == 0, "expected stream size 0, got %u\n", mem[1]); + GlobalUnlock(hmem); + + IPersistStream_Release(src_stream); + IStream_Release(dst_stream); + + GlobalFree(hmem); + IPicture_Release(pic); +} + START_TEST(olepicture) { hOleaut32 = GetModuleHandleA("oleaut32.dll"); @@ -1097,6 +1149,7 @@ START_TEST(olepicture) test_himetric(); test_load_save_bmp(); test_load_save_icon(); + test_load_save_empty_picture(); }

1 0

Dmitry Timoshkov : oleaut32: Add support for saving an empty picture.
by Alexandre Julliard 26 Nov '12

26 Nov '12

Module: wine Branch: master Commit: 97e2c24cc7e065f67aae099941a47a541380a35f URL: http://source.winehq.org/git/wine.git/?a=commit;h=97e2c24cc7e065f67aae09994… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Nov 26 19:54:23 2012 +0800 oleaut32: Add support for saving an empty picture. --- dlls/oleaut32/olepicture.c | 6 ++++++ dlls/oleaut32/tests/olepicture.c | 2 -- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/oleaut32/olepicture.c b/dlls/oleaut32/olepicture.c index db3b852..3fdb1c7 100644 --- a/dlls/oleaut32/olepicture.c +++ b/dlls/oleaut32/olepicture.c @@ -1757,6 +1757,12 @@ static HRESULT WINAPI OLEPictureImpl_Save( TRACE("%p %p %d\n", This, pStm, fClearDirty); switch (This->desc.picType) { + case PICTYPE_NONE: + header[0] = 0x0000746c; + header[1] = 0; + hResult = IStream_Write(pStm, header, 2 * sizeof(DWORD), &dummy); + break; + case PICTYPE_ICON: if (This->bIsDirty || !This->data) { if (!serializeIcon(This->desc.u.icon.hicon, &pIconData, &iDataSize)) { diff --git a/dlls/oleaut32/tests/olepicture.c b/dlls/oleaut32/tests/olepicture.c index ee97fe2..db10baa 100644 --- a/dlls/oleaut32/tests/olepicture.c +++ b/dlls/oleaut32/tests/olepicture.c @@ -1095,11 +1095,9 @@ static void test_load_save_empty_picture(void) ok(hr == S_OK, "QueryInterface error %#x\n", hr); hr = IPersistStream_Save(src_stream, dst_stream, TRUE); -todo_wine ok(hr == S_OK, "Save error %#x\n", hr); mem = GlobalLock(hmem); -todo_wine ok(!memcmp(mem, "lt\0\0", 4), "got wrong stream header %04x\n", mem[0]); ok(mem[1] == 0, "expected stream size 0, got %u\n", mem[1]); GlobalUnlock(hmem);

1 0

Alexandre Julliard : setupapi: Fix total size when appending multi-string values.
by Alexandre Julliard 26 Nov '12

26 Nov '12

Module: wine Branch: master Commit: 4b7085fdd499ca39a7e0ae47bd27323876103df0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4b7085fdd499ca39a7e0ae47b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Nov 26 12:31:59 2012 +0100 setupapi: Fix total size when appending multi-string values. --- dlls/setupapi/install.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/setupapi/install.c b/dlls/setupapi/install.c index e216e8c..dda1396 100644 --- a/dlls/setupapi/install.c +++ b/dlls/setupapi/install.c @@ -242,7 +242,7 @@ static void append_multi_sz_value( HKEY hkey, const WCHAR *value, const WCHAR *s { memcpy( p, strings, len * sizeof(WCHAR) ); p[len] = 0; - total += len; + total += len * sizeof(WCHAR); } strings += len; }

1 0