ReactOS.org
Sign In
Sign Up
Sign In
Sign Up
Manage this list
×
Keyboard Shortcuts
Thread View
j
: Next unread message
k
: Previous unread message
j a
: Jump to all threads
j l
: Jump to MailingList overview
2024
December
November
October
September
August
July
June
May
April
March
February
January
2023
December
November
October
September
August
July
June
May
April
March
February
January
2022
December
November
October
September
August
July
June
May
April
March
February
January
2021
December
November
October
September
August
July
June
May
April
March
February
January
2020
December
November
October
September
August
July
June
May
April
March
February
January
2019
December
November
October
September
August
July
June
May
April
March
February
January
2018
December
November
October
September
August
July
June
May
April
March
February
January
2017
December
November
October
September
August
July
June
May
April
March
February
January
2016
December
November
October
September
August
July
June
May
April
March
February
January
2015
December
November
October
September
August
July
June
May
April
March
February
January
2014
December
November
October
September
August
July
June
May
April
March
February
January
2013
December
November
October
September
August
July
June
May
April
March
February
January
2012
December
November
October
September
August
July
June
May
April
March
February
January
2011
December
November
October
September
August
July
June
May
April
March
February
January
2010
December
November
October
September
August
July
June
May
April
March
February
January
2009
December
November
October
September
August
July
June
May
April
March
February
January
2008
December
November
October
September
August
July
June
May
April
March
February
January
2007
December
November
October
September
August
July
June
May
April
March
February
January
2006
December
November
October
September
August
July
June
May
April
March
February
January
2005
December
November
October
September
August
July
June
May
April
March
February
January
2004
December
November
October
September
August
July
June
May
April
March
February
List overview
Download
Ros-diffs
July 2016
----- 2024 -----
December 2024
November 2024
October 2024
September 2024
August 2024
July 2024
June 2024
May 2024
April 2024
March 2024
February 2024
January 2024
----- 2023 -----
December 2023
November 2023
October 2023
September 2023
August 2023
July 2023
June 2023
May 2023
April 2023
March 2023
February 2023
January 2023
----- 2022 -----
December 2022
November 2022
October 2022
September 2022
August 2022
July 2022
June 2022
May 2022
April 2022
March 2022
February 2022
January 2022
----- 2021 -----
December 2021
November 2021
October 2021
September 2021
August 2021
July 2021
June 2021
May 2021
April 2021
March 2021
February 2021
January 2021
----- 2020 -----
December 2020
November 2020
October 2020
September 2020
August 2020
July 2020
June 2020
May 2020
April 2020
March 2020
February 2020
January 2020
----- 2019 -----
December 2019
November 2019
October 2019
September 2019
August 2019
July 2019
June 2019
May 2019
April 2019
March 2019
February 2019
January 2019
----- 2018 -----
December 2018
November 2018
October 2018
September 2018
August 2018
July 2018
June 2018
May 2018
April 2018
March 2018
February 2018
January 2018
----- 2017 -----
December 2017
November 2017
October 2017
September 2017
August 2017
July 2017
June 2017
May 2017
April 2017
March 2017
February 2017
January 2017
----- 2016 -----
December 2016
November 2016
October 2016
September 2016
August 2016
July 2016
June 2016
May 2016
April 2016
March 2016
February 2016
January 2016
----- 2015 -----
December 2015
November 2015
October 2015
September 2015
August 2015
July 2015
June 2015
May 2015
April 2015
March 2015
February 2015
January 2015
----- 2014 -----
December 2014
November 2014
October 2014
September 2014
August 2014
July 2014
June 2014
May 2014
April 2014
March 2014
February 2014
January 2014
----- 2013 -----
December 2013
November 2013
October 2013
September 2013
August 2013
July 2013
June 2013
May 2013
April 2013
March 2013
February 2013
January 2013
----- 2012 -----
December 2012
November 2012
October 2012
September 2012
August 2012
July 2012
June 2012
May 2012
April 2012
March 2012
February 2012
January 2012
----- 2011 -----
December 2011
November 2011
October 2011
September 2011
August 2011
July 2011
June 2011
May 2011
April 2011
March 2011
February 2011
January 2011
----- 2010 -----
December 2010
November 2010
October 2010
September 2010
August 2010
July 2010
June 2010
May 2010
April 2010
March 2010
February 2010
January 2010
----- 2009 -----
December 2009
November 2009
October 2009
September 2009
August 2009
July 2009
June 2009
May 2009
April 2009
March 2009
February 2009
January 2009
----- 2008 -----
December 2008
November 2008
October 2008
September 2008
August 2008
July 2008
June 2008
May 2008
April 2008
March 2008
February 2008
January 2008
----- 2007 -----
December 2007
November 2007
October 2007
September 2007
August 2007
July 2007
June 2007
May 2007
April 2007
March 2007
February 2007
January 2007
----- 2006 -----
December 2006
November 2006
October 2006
September 2006
August 2006
July 2006
June 2006
May 2006
April 2006
March 2006
February 2006
January 2006
----- 2005 -----
December 2005
November 2005
October 2005
September 2005
August 2005
July 2005
June 2005
May 2005
April 2005
March 2005
February 2005
January 2005
----- 2004 -----
December 2004
November 2004
October 2004
September 2004
August 2004
July 2004
June 2004
May 2004
April 2004
March 2004
February 2004
ros-diffs@reactos.org
18 participants
358 discussions
Start a n
N
ew thread
[akhaldi] 71726: [PSDK] Update xmllite.idl. CORE-11368
by akhaldi@svn.reactos.org
Author: akhaldi Date: Sat Jul 2 12:56:15 2016 New Revision: 71726 URL:
http://svn.reactos.org/svn/reactos?rev=71726&view=rev
Log: [PSDK] Update xmllite.idl. CORE-11368 Modified: trunk/reactos/sdk/include/psdk/xmllite.idl Modified: trunk/reactos/sdk/include/psdk/xmllite.idl URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/include/psdk/xmllite.i…
============================================================================== --- trunk/reactos/sdk/include/psdk/xmllite.idl [iso-8859-1] (original) +++ trunk/reactos/sdk/include/psdk/xmllite.idl [iso-8859-1] Sat Jul 2 12:56:15 2016 @@ -300,3 +300,5 @@ cpp_quote("typedef IUnknown IXmlWriterOutput;") cpp_quote("STDAPI CreateXmlWriterOutputWithEncodingName(IUnknown *stream, IMalloc *pMalloc,") cpp_quote(" LPCWSTR encoding, IXmlWriterOutput **output);") +cpp_quote("STDAPI CreateXmlWriterOutputWithEncodingCodePage(IUnknown *stream, IMalloc *pMalloc,") +cpp_quote(" UINT codepage, IXmlWriterOutput **output);")
8 years, 5 months
1
0
0
0
[akhaldi] 71725: [XMLLITE] Sync with Wine Staging 1.9.11. CORE-11368
by akhaldi@svn.reactos.org
Author: akhaldi Date: Sat Jul 2 12:53:37 2016 New Revision: 71725 URL:
http://svn.reactos.org/svn/reactos?rev=71725&view=rev
Log: [XMLLITE] Sync with Wine Staging 1.9.11. CORE-11368 Modified: trunk/reactos/dll/win32/xmllite/reader.c trunk/reactos/dll/win32/xmllite/writer.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/xmllite/reader.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/xmllite/reader.c…
============================================================================== --- trunk/reactos/dll/win32/xmllite/reader.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/xmllite/reader.c [iso-8859-1] Sat Jul 2 12:53:37 2016 @@ -233,6 +233,7 @@ XmlReaderResumeState resumestate; XmlNodeType nodetype; DtdProcessing dtdmode; + IXmlResolver *resolver; UINT line, pos; /* reader position in XML stream */ struct list attrs; /* attributes list for current node */ struct attribute *attr; /* current attribute */ @@ -2462,6 +2463,7 @@ { IMalloc *imalloc = This->imalloc; if (This->input) IUnknown_Release(&This->input->IXmlReaderInput_iface); + if (This->resolver) IXmlResolver_Release(This->resolver); reader_clear_attrs(This); reader_clear_elements(This); reader_free_strvalues(This); @@ -2546,6 +2548,11 @@ switch (property) { + case XmlReaderProperty_XmlResolver: + *value = (LONG_PTR)This->resolver; + if (This->resolver) + IXmlResolver_AddRef(This->resolver); + break; case XmlReaderProperty_DtdProcessing: *value = This->dtdmode; break; @@ -2564,10 +2571,17 @@ { xmlreader *This = impl_from_IXmlReader(iface); - TRACE("(%p)->(%s %lu)\n", This, debugstr_reader_prop(property), value); + TRACE("(%p)->(%s 0x%lx)\n", This, debugstr_reader_prop(property), value); switch (property) { + case XmlReaderProperty_XmlResolver: + if (This->resolver) + IXmlResolver_Release(This->resolver); + This->resolver = (IXmlResolver*)value; + if (This->resolver) + IXmlResolver_AddRef(This->resolver); + break; case XmlReaderProperty_DtdProcessing: if (value < 0 || value > _DtdProcessing_Last) return E_INVALIDARG; This->dtdmode = value; @@ -2964,6 +2978,7 @@ reader->instate = XmlReadInState_Initial; reader->resumestate = XmlReadResumeState_Initial; reader->dtdmode = DtdProcessing_Prohibit; + reader->resolver = NULL; reader->line = reader->pos = 0; reader->imalloc = imalloc; if (imalloc) IMalloc_AddRef(imalloc); Modified: trunk/reactos/dll/win32/xmllite/writer.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/xmllite/writer.c…
============================================================================== --- trunk/reactos/dll/win32/xmllite/writer.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/xmllite/writer.c [iso-8859-1] Sat Jul 2 12:53:37 2016 @@ -33,6 +33,7 @@ static const WCHAR closepiW[] = {'?','>'}; static const WCHAR ltW[] = {'<'}; static const WCHAR gtW[] = {'>'}; +static const WCHAR spaceW[] = {' '}; struct output_buffer { @@ -358,6 +359,40 @@ } writer->bomwritten = TRUE; + return S_OK; +} + +static HRESULT write_xmldecl(xmlwriter *writer, XmlStandalone standalone) +{ + static const WCHAR versionW[] = {'<','?','x','m','l',' ','v','e','r','s','i','o','n','=','"','1','.','0','"'}; + static const WCHAR encodingW[] = {' ','e','n','c','o','d','i','n','g','='}; + + write_encoding_bom(writer); + writer->state = XmlWriterState_DocStarted; + if (writer->omitxmldecl) return S_OK; + + /* version */ + write_output_buffer(writer->output, versionW, ARRAY_SIZE(versionW)); + + /* encoding */ + write_output_buffer(writer->output, encodingW, ARRAY_SIZE(encodingW)); + write_output_buffer_quoted(writer->output, get_encoding_name(writer->output->encoding), -1); + + /* standalone */ + if (standalone == XmlStandalone_Omit) + write_output_buffer(writer->output, closepiW, ARRAY_SIZE(closepiW)); + else { + static const WCHAR standaloneW[] = {' ','s','t','a','n','d','a','l','o','n','e','=','\"'}; + static const WCHAR yesW[] = {'y','e','s','\"','?','>'}; + static const WCHAR noW[] = {'n','o','\"','?','>'}; + + write_output_buffer(writer->output, standaloneW, ARRAY_SIZE(standaloneW)); + if (standalone == XmlStandalone_Yes) + write_output_buffer(writer->output, yesW, ARRAY_SIZE(yesW)); + else + write_output_buffer(writer->output, noW, ARRAY_SIZE(noW)); + } + return S_OK; } @@ -542,55 +577,37 @@ FIXME("%p %s %s %s %s\n", This, wine_dbgstr_w(pwszPrefix), wine_dbgstr_w(pwszLocalName), wine_dbgstr_w(pwszNamespaceUri), wine_dbgstr_w(pwszValue)); - return E_NOTIMPL; -} - -static HRESULT WINAPI xmlwriter_WriteCData(IXmlWriter *iface, LPCWSTR pwszText) -{ - xmlwriter *This = impl_from_IXmlWriter(iface); - - FIXME("%p %s\n", This, wine_dbgstr_w(pwszText)); - - return E_NOTIMPL; -} - -static HRESULT WINAPI xmlwriter_WriteCharEntity(IXmlWriter *iface, WCHAR wch) -{ - return E_NOTIMPL; -} - -static HRESULT WINAPI xmlwriter_WriteChars(IXmlWriter *iface, const WCHAR *pwch, UINT cwch) -{ - xmlwriter *This = impl_from_IXmlWriter(iface); - - FIXME("%p %s %d\n", This, wine_dbgstr_w(pwch), cwch); - - return E_NOTIMPL; -} - -static HRESULT WINAPI xmlwriter_WriteComment(IXmlWriter *iface, LPCWSTR pwszComment) -{ - return E_NOTIMPL; -} - -static HRESULT WINAPI xmlwriter_WriteDocType(IXmlWriter *iface, LPCWSTR pwszName, LPCWSTR pwszPublicId, - LPCWSTR pwszSystemId, LPCWSTR pwszSubset) -{ - xmlwriter *This = impl_from_IXmlWriter(iface); - - FIXME("%p %s %s %s %s\n", This, wine_dbgstr_w(pwszName), wine_dbgstr_w(pwszPublicId), - wine_dbgstr_w(pwszSystemId), wine_dbgstr_w(pwszSubset)); - - return E_NOTIMPL; -} - -static HRESULT WINAPI xmlwriter_WriteElementString(IXmlWriter *iface, LPCWSTR prefix, - LPCWSTR local_name, LPCWSTR uri, LPCWSTR value) -{ - xmlwriter *This = impl_from_IXmlWriter(iface); - - TRACE("(%p)->(%s %s %s %s)\n", This, wine_dbgstr_w(prefix), wine_dbgstr_w(local_name), - wine_dbgstr_w(uri), wine_dbgstr_w(value)); + switch (This->state) + { + case XmlWriterState_Initial: + return E_UNEXPECTED; + case XmlWriterState_Ready: + case XmlWriterState_DocClosed: + This->state = XmlWriterState_DocClosed; + return WR_E_INVALIDACTION; + default: + ; + } + + return E_NOTIMPL; +} + +static void write_cdata_section(xmlwriteroutput *output, const WCHAR *data, int len) +{ + static const WCHAR cdataopenW[] = {'<','!','[','C','D','A','T','A','['}; + static const WCHAR cdatacloseW[] = {']',']','>'}; + write_output_buffer(output, cdataopenW, ARRAY_SIZE(cdataopenW)); + if (data) + write_output_buffer(output, data, len); + write_output_buffer(output, cdatacloseW, ARRAY_SIZE(cdatacloseW)); +} + +static HRESULT WINAPI xmlwriter_WriteCData(IXmlWriter *iface, LPCWSTR data) +{ + xmlwriter *This = impl_from_IXmlWriter(iface); + int len; + + TRACE("%p %s\n", This, debugstr_w(data)); switch (This->state) { @@ -599,10 +616,154 @@ case XmlWriterState_ElemStarted: writer_close_starttag(This); break; - case XmlWriterState_DocClosed: - return WR_E_INVALIDACTION; - default: - ; + case XmlWriterState_Ready: + case XmlWriterState_DocClosed: + This->state = XmlWriterState_DocClosed; + return WR_E_INVALIDACTION; + default: + ; + } + + len = data ? strlenW(data) : 0; + + if (!len) + write_cdata_section(This->output, NULL, 0); + else { + static const WCHAR cdatacloseW[] = {']',']','>',0}; + while (len) { + const WCHAR *str = strstrW(data, cdatacloseW); + if (str) { + str += 2; + write_cdata_section(This->output, data, str - data); + len -= str - data; + data = str; + } + else { + write_cdata_section(This->output, data, len); + break; + } + } + } + + return S_OK; +} + +static HRESULT WINAPI xmlwriter_WriteCharEntity(IXmlWriter *iface, WCHAR ch) +{ + xmlwriter *This = impl_from_IXmlWriter(iface); + + FIXME("%p %x\n", This, ch); + + switch (This->state) + { + case XmlWriterState_Initial: + return E_UNEXPECTED; + case XmlWriterState_DocClosed: + return WR_E_INVALIDACTION; + default: + ; + } + + return E_NOTIMPL; +} + +static HRESULT WINAPI xmlwriter_WriteChars(IXmlWriter *iface, const WCHAR *pwch, UINT cwch) +{ + xmlwriter *This = impl_from_IXmlWriter(iface); + + FIXME("%p %s %d\n", This, wine_dbgstr_w(pwch), cwch); + + switch (This->state) + { + case XmlWriterState_Initial: + return E_UNEXPECTED; + case XmlWriterState_DocClosed: + return WR_E_INVALIDACTION; + default: + ; + } + + return E_NOTIMPL; +} + +static HRESULT WINAPI xmlwriter_WriteComment(IXmlWriter *iface, LPCWSTR comment) +{ + static const WCHAR copenW[] = {'<','!','-','-'}; + static const WCHAR ccloseW[] = {'-','-','>'}; + xmlwriter *This = impl_from_IXmlWriter(iface); + + TRACE("%p %s\n", This, debugstr_w(comment)); + + switch (This->state) + { + case XmlWriterState_Initial: + return E_UNEXPECTED; + case XmlWriterState_ElemStarted: + writer_close_starttag(This); + break; + case XmlWriterState_DocClosed: + return WR_E_INVALIDACTION; + default: + ; + } + + write_output_buffer(This->output, copenW, ARRAY_SIZE(copenW)); + if (comment) { + int len = strlenW(comment), i; + + /* Make sure there's no two hyphen sequences in a string, space is used as a separator to produce compliant + comment string */ + if (len > 1) { + for (i = 0; i < len; i++) { + write_output_buffer(This->output, comment + i, 1); + if (comment[i] == '-' && (i + 1 < len) && comment[i+1] == '-') + write_output_buffer(This->output, spaceW, ARRAY_SIZE(spaceW)); + } + } + else + write_output_buffer(This->output, comment, len); + + if (len && comment[len-1] == '-') + write_output_buffer(This->output, spaceW, ARRAY_SIZE(spaceW)); + } + write_output_buffer(This->output, ccloseW, ARRAY_SIZE(ccloseW)); + + return S_OK; +} + +static HRESULT WINAPI xmlwriter_WriteDocType(IXmlWriter *iface, LPCWSTR pwszName, LPCWSTR pwszPublicId, + LPCWSTR pwszSystemId, LPCWSTR pwszSubset) +{ + xmlwriter *This = impl_from_IXmlWriter(iface); + + FIXME("%p %s %s %s %s\n", This, wine_dbgstr_w(pwszName), wine_dbgstr_w(pwszPublicId), + wine_dbgstr_w(pwszSystemId), wine_dbgstr_w(pwszSubset)); + + return E_NOTIMPL; +} + +static HRESULT WINAPI xmlwriter_WriteElementString(IXmlWriter *iface, LPCWSTR prefix, + LPCWSTR local_name, LPCWSTR uri, LPCWSTR value) +{ + xmlwriter *This = impl_from_IXmlWriter(iface); + + TRACE("(%p)->(%s %s %s %s)\n", This, wine_dbgstr_w(prefix), wine_dbgstr_w(local_name), + wine_dbgstr_w(uri), wine_dbgstr_w(value)); + + switch (This->state) + { + case XmlWriterState_Initial: + return E_UNEXPECTED; + case XmlWriterState_ElemStarted: + writer_close_starttag(This); + break; + case XmlWriterState_Ready: + case XmlWriterState_DocStarted: + case XmlWriterState_PIDocStarted: + break; + default: + This->state = XmlWriterState_DocClosed; + return WR_E_INVALIDACTION; } write_encoding_bom(This); @@ -624,26 +785,19 @@ static HRESULT WINAPI xmlwriter_WriteEndDocument(IXmlWriter *iface) { xmlwriter *This = impl_from_IXmlWriter(iface); - HRESULT hr = S_OK; TRACE("%p\n", This); switch (This->state) { case XmlWriterState_Initial: - hr = E_UNEXPECTED; - break; + return E_UNEXPECTED; case XmlWriterState_Ready: case XmlWriterState_DocClosed: - hr = WR_E_INVALIDACTION; - break; - default: - ; - } - - if (FAILED(hr)) { This->state = XmlWriterState_DocClosed; - return hr; + return WR_E_INVALIDACTION; + default: + ; } /* empty element stack */ @@ -660,6 +814,18 @@ struct element *element; TRACE("%p\n", This); + + switch (This->state) + { + case XmlWriterState_Initial: + return E_UNEXPECTED; + case XmlWriterState_Ready: + case XmlWriterState_DocClosed: + This->state = XmlWriterState_DocClosed; + return WR_E_INVALIDACTION; + default: + ; + } element = pop_element(This); if (!element) @@ -686,6 +852,16 @@ FIXME("%p %s\n", This, wine_dbgstr_w(pwszName)); + switch (This->state) + { + case XmlWriterState_Initial: + return E_UNEXPECTED; + case XmlWriterState_DocClosed: + return WR_E_INVALIDACTION; + default: + ; + } + return E_NOTIMPL; } @@ -695,6 +871,18 @@ struct element *element; TRACE("%p\n", This); + + switch (This->state) + { + case XmlWriterState_Initial: + return E_UNEXPECTED; + case XmlWriterState_Ready: + case XmlWriterState_DocClosed: + This->state = XmlWriterState_DocClosed; + return WR_E_INVALIDACTION; + default: + ; + } element = pop_element(This); if (!element) @@ -715,6 +903,18 @@ FIXME("%p %s\n", This, wine_dbgstr_w(pwszName)); + switch (This->state) + { + case XmlWriterState_Initial: + return E_UNEXPECTED; + case XmlWriterState_Ready: + case XmlWriterState_DocClosed: + This->state = XmlWriterState_DocClosed; + return WR_E_INVALIDACTION; + default: + ; + } + return E_NOTIMPL; } @@ -723,6 +923,18 @@ xmlwriter *This = impl_from_IXmlWriter(iface); FIXME("%p %s\n", This, wine_dbgstr_w(pwszNmToken)); + + switch (This->state) + { + case XmlWriterState_Initial: + return E_UNEXPECTED; + case XmlWriterState_Ready: + case XmlWriterState_DocClosed: + This->state = XmlWriterState_DocClosed; + return WR_E_INVALIDACTION; + default: + ; + } return E_NOTIMPL; } @@ -753,7 +965,6 @@ xmlwriter *This = impl_from_IXmlWriter(iface); static const WCHAR xmlW[] = {'x','m','l',0}; static const WCHAR openpiW[] = {'<','?'}; - static const WCHAR spaceW[] = {' '}; TRACE("(%p)->(%s %s)\n", This, wine_dbgstr_w(name), wine_dbgstr_w(text)); @@ -792,16 +1003,45 @@ FIXME("%p %s %s\n", This, wine_dbgstr_w(pwszLocalName), wine_dbgstr_w(pwszNamespaceUri)); - return E_NOTIMPL; -} - -static HRESULT WINAPI xmlwriter_WriteRaw(IXmlWriter *iface, LPCWSTR pwszData) -{ - xmlwriter *This = impl_from_IXmlWriter(iface); - - FIXME("%p %s\n", This, wine_dbgstr_w(pwszData)); - - return E_NOTIMPL; + switch (This->state) + { + case XmlWriterState_Initial: + return E_UNEXPECTED; + case XmlWriterState_DocClosed: + return WR_E_INVALIDACTION; + default: + ; + } + + return E_NOTIMPL; +} + +static HRESULT WINAPI xmlwriter_WriteRaw(IXmlWriter *iface, LPCWSTR data) +{ + xmlwriter *This = impl_from_IXmlWriter(iface); + + TRACE("%p %s\n", This, debugstr_w(data)); + + if (!data) + return S_OK; + + switch (This->state) + { + case XmlWriterState_Initial: + return E_UNEXPECTED; + case XmlWriterState_Ready: + write_xmldecl(This, XmlStandalone_Omit); + /* fallthrough */ + case XmlWriterState_DocStarted: + case XmlWriterState_PIDocStarted: + break; + default: + This->state = XmlWriterState_DocClosed; + return WR_E_INVALIDACTION; + } + + write_output_buffer(This->output, data, -1); + return S_OK; } static HRESULT WINAPI xmlwriter_WriteRawChars(IXmlWriter *iface, const WCHAR *pwch, UINT cwch) @@ -810,13 +1050,21 @@ FIXME("%p %s %d\n", This, wine_dbgstr_w(pwch), cwch); + switch (This->state) + { + case XmlWriterState_Initial: + return E_UNEXPECTED; + case XmlWriterState_DocClosed: + return WR_E_INVALIDACTION; + default: + ; + } + return E_NOTIMPL; } static HRESULT WINAPI xmlwriter_WriteStartDocument(IXmlWriter *iface, XmlStandalone standalone) { - static const WCHAR versionW[] = {'<','?','x','m','l',' ','v','e','r','s','i','o','n','=','"','1','.','0','"'}; - static const WCHAR encodingW[] = {' ','e','n','c','o','d','i','n','g','='}; xmlwriter *This = impl_from_IXmlWriter(iface); TRACE("(%p)->(%d)\n", This, standalone); @@ -828,41 +1076,14 @@ case XmlWriterState_PIDocStarted: This->state = XmlWriterState_DocStarted; return S_OK; - case XmlWriterState_DocStarted: - case XmlWriterState_ElemStarted: - case XmlWriterState_DocClosed: - return WR_E_INVALIDACTION; - default: - ; - } - - write_encoding_bom(This); - This->state = XmlWriterState_DocStarted; - if (This->omitxmldecl) return S_OK; - - /* version */ - write_output_buffer(This->output, versionW, ARRAY_SIZE(versionW)); - - /* encoding */ - write_output_buffer(This->output, encodingW, ARRAY_SIZE(encodingW)); - write_output_buffer_quoted(This->output, get_encoding_name(This->output->encoding), -1); - - /* standalone */ - if (standalone == XmlStandalone_Omit) - write_output_buffer(This->output, closepiW, ARRAY_SIZE(closepiW)); - else { - static const WCHAR standaloneW[] = {' ','s','t','a','n','d','a','l','o','n','e','=','\"'}; - static const WCHAR yesW[] = {'y','e','s','\"','?','>'}; - static const WCHAR noW[] = {'n','o','\"','?','>'}; - - write_output_buffer(This->output, standaloneW, ARRAY_SIZE(standaloneW)); - if (standalone == XmlStandalone_Yes) - write_output_buffer(This->output, yesW, ARRAY_SIZE(yesW)); - else - write_output_buffer(This->output, noW, ARRAY_SIZE(noW)); - } - - return S_OK; + case XmlWriterState_Ready: + break; + default: + This->state = XmlWriterState_DocClosed; + return WR_E_INVALIDACTION; + } + + return write_xmldecl(This, standalone); } static HRESULT WINAPI xmlwriter_WriteStartElement(IXmlWriter *iface, LPCWSTR prefix, LPCWSTR local_name, LPCWSTR uri) @@ -871,19 +1092,19 @@ struct element *element; TRACE("(%p)->(%s %s %s)\n", This, wine_dbgstr_w(prefix), wine_dbgstr_w(local_name), wine_dbgstr_w(uri)); - - switch (This->state) - { - case XmlWriterState_Initial: - return E_UNEXPECTED; - case XmlWriterState_DocClosed: - return WR_E_INVALIDACTION; - default: - ; - } if (!local_name) return E_INVALIDARG; + + switch (This->state) + { + case XmlWriterState_Initial: + return E_UNEXPECTED; + case XmlWriterState_DocClosed: + return WR_E_INVALIDACTION; + default: + ; + } /* close pending element */ if (This->starttagopen) @@ -910,6 +1131,18 @@ xmlwriter *This = impl_from_IXmlWriter(iface); FIXME("%p %s\n", This, wine_dbgstr_w(pwszText)); + + switch (This->state) + { + case XmlWriterState_Initial: + return E_UNEXPECTED; + case XmlWriterState_Ready: + case XmlWriterState_DocClosed: + This->state = XmlWriterState_DocClosed; + return WR_E_INVALIDACTION; + default: + ; + } return E_NOTIMPL; } Modified: trunk/reactos/media/doc/README.WINE URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=…
============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Sat Jul 2 12:53:37 2016 @@ -222,7 +222,7 @@ reactos/dll/win32/xinput1_2 # Synced to WineStaging-1.9.4 reactos/dll/win32/xinput1_3 # Synced to WineStaging-1.9.4 reactos/dll/win32/xinput9_1_0 # Synced to WineStaging-1.9.4 -reactos/dll/win32/xmllite # Synced to WineStaging-1.9.4 +reactos/dll/win32/xmllite # Synced to WineStaging-1.9.11 reactos/dll/cpl/inetcpl # Synced to WineStaging-1.9.4
8 years, 5 months
1
0
0
0
[akhaldi] 71724: [USP10_WINETEST] Sync with Wine Staging 1.9.11. CORE-11368
by akhaldi@svn.reactos.org
Author: akhaldi Date: Sat Jul 2 12:51:53 2016 New Revision: 71724 URL:
http://svn.reactos.org/svn/reactos?rev=71724&view=rev
Log: [USP10_WINETEST] Sync with Wine Staging 1.9.11. CORE-11368 Modified: trunk/rostests/winetests/usp10/usp10.c Modified: trunk/rostests/winetests/usp10/usp10.c URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/usp10/usp10.c?r…
============================================================================== --- trunk/rostests/winetests/usp10/usp10.c [iso-8859-1] (original) +++ trunk/rostests/winetests/usp10/usp10.c [iso-8859-1] Sat Jul 2 12:51:53 2016 @@ -565,6 +565,11 @@ static const itemTest t552[3] = {{{0,0,0,0,0,0},0,0,0,0,1,hebr_tag,FALSE}, {{0,0,0,0,0,0},2,0,1,0,1,0,FALSE}, {{0,0,0,0,0,0},8,0,0,0,0,-1,FALSE}}; + + /* ZWNJ */ + static const WCHAR test56[] = {0x0645, 0x06cc, 0x200c, 0x06a9, 0x0646, 0x0645}; /* Ù ÛâÚ©ÙÙ */ + static const itemTest t561[] = {{{0,0,0,0,0,0},0,1,1,1,0,arab_tag,FALSE},{{0,0,0,0,0,0},6,0,0,0,0,-1,FALSE}}; + static const itemTest t562[] = {{{0,0,0,0,0,0},0,0,0,0,1,arab_tag,FALSE},{{0,0,0,0,0,0},6,0,0,0,0,-1,FALSE}}; SCRIPT_ITEM items[15]; SCRIPT_CONTROL Control; @@ -646,6 +651,7 @@ test_items_ok(test45,24,NULL,NULL,1,t451,FALSE,0); test_items_ok(test46,16,NULL,NULL,1,t461,FALSE,0); test_items_ok(test47,26,NULL,NULL,1,t471,FALSE,0); + test_items_ok(test56,6,NULL,NULL,1,t561,FALSE,0); State.uBidiLevel = 0; test_items_ok(test1,4,&Control,&State,1,t11,FALSE,0); @@ -708,6 +714,7 @@ test_items_ok(test53,8,&Control,&State,4,t531,FALSE,0); test_items_ok(test54,7,&Control,&State,2,t541,FALSE,0); test_items_ok(test55,8,&Control,&State,2,t551,FALSE,0); + test_items_ok(test56,6,&Control,&State,1,t561,FALSE,0); State.uBidiLevel = 1; test_items_ok(test1,4,&Control,&State,1,t12,FALSE,0); @@ -762,6 +769,7 @@ test_items_ok(test45,24,&Control,&State,1,t452,FALSE,0); test_items_ok(test46,16,&Control,&State,1,t462,FALSE,0); test_items_ok(test47,26,&Control,&State,1,t472,FALSE,0); + test_items_ok(test56,6,&Control,&State,1,t561,FALSE,0); State.uBidiLevel = 1; Control.fMergeNeutralItems = TRUE; @@ -817,6 +825,7 @@ test_items_ok(test45,24,&Control,&State,1,t452,FALSE,0); test_items_ok(test46,16,&Control,&State,1,t462,FALSE,0); test_items_ok(test47,26,&Control,&State,1,t472,FALSE,0); + test_items_ok(test56,6,&Control,&State,1,t561,FALSE,0); State.uBidiLevel = 0; Control.fMergeNeutralItems = FALSE; @@ -881,6 +890,7 @@ test_items_ok(test53,8,&Control,&State,4,t532,FALSE,0); test_items_ok(test54,7,&Control,&State,2,t542,FALSE,0); test_items_ok(test55,8,&Control,&State,2,t552,FALSE,0); + test_items_ok(test56,6,&Control,&State,1,t562,FALSE,0); } static inline void _test_shape_ok(int valid, HDC hdc, LPCWSTR string,
8 years, 5 months
1
0
0
0
[tfaber] 71723: [DNSAPI] - Fix infinite loop in DnsQuery_W
by tfaber@svn.reactos.org
Author: tfaber Date: Sat Jul 2 12:10:05 2016 New Revision: 71723 URL:
http://svn.reactos.org/svn/reactos?rev=71723&view=rev
Log: [DNSAPI] - Fix infinite loop in DnsQuery_W Modified: trunk/reactos/dll/win32/dnsapi/dnsapi/query.c Modified: trunk/reactos/dll/win32/dnsapi/dnsapi/query.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dnsapi/dnsapi/qu…
============================================================================== --- trunk/reactos/dll/win32/dnsapi/dnsapi/query.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/dnsapi/dnsapi/query.c [iso-8859-1] Sat Jul 2 12:10:05 2016 @@ -287,6 +287,8 @@ { LastRecord = *QueryResultSet = ConvertedRecord; } + + QueryResultWide = QueryResultWide->pNext; } if (LastRecord)
8 years, 5 months
1
0
0
0
[akhaldi] 71722: * Missed this bit.
by akhaldi@svn.reactos.org
Author: akhaldi Date: Sat Jul 2 11:58:22 2016 New Revision: 71722 URL:
http://svn.reactos.org/svn/reactos?rev=71722&view=rev
Log: * Missed this bit. Modified: trunk/reactos/dll/win32/usp10/shaping.c Modified: trunk/reactos/dll/win32/usp10/shaping.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/usp10/shaping.c?…
============================================================================== --- trunk/reactos/dll/win32/usp10/shaping.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/usp10/shaping.c [iso-8859-1] Sat Jul 2 11:58:22 2016 @@ -365,7 +365,7 @@ 0x0000, 0x0001, 0x0001, 0x0001, 0x0000, 0x0000, 0x0000, 0x0000 }; -const unsigned short DECLSPEC_HIDDEN wine_shaping_forms[256][4] = +const unsigned short /* DECLSPEC_HIDDEN */ wine_shaping_forms[256][4] = { { 0x0600, 0x0600, 0x0600, 0x0600 }, { 0x0601, 0x0601, 0x0601, 0x0601 },
8 years, 5 months
1
0
0
0
[akhaldi] 71721: [USP10] Attempt to fix non PCH build.
by akhaldi@svn.reactos.org
Author: akhaldi Date: Sat Jul 2 11:55:26 2016 New Revision: 71721 URL:
http://svn.reactos.org/svn/reactos?rev=71721&view=rev
Log: [USP10] Attempt to fix non PCH build. Modified: trunk/reactos/dll/win32/usp10/bracket.c trunk/reactos/dll/win32/usp10/indicsyllable.c trunk/reactos/dll/win32/usp10/linebreak.c trunk/reactos/dll/win32/usp10/shaping.c Modified: trunk/reactos/dll/win32/usp10/bracket.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/usp10/bracket.c?…
============================================================================== --- trunk/reactos/dll/win32/usp10/bracket.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/usp10/bracket.c [iso-8859-1] Sat Jul 2 11:55:26 2016 @@ -2,7 +2,7 @@ /* generated from
http://www.unicode.org/Public/8.0.0/ucd/BidiBrackets.txt
*/ /* DO NOT EDIT!! */ -const unsigned short DECLSPEC_HIDDEN bidi_bracket_table[768] = +const unsigned short /* DECLSPEC_HIDDEN */ bidi_bracket_table[768] = { /* level 1 offsets */ 0x0100, 0x0110, 0x0110, 0x0110, 0x0110, 0x0110, 0x0110, 0x0110, Modified: trunk/reactos/dll/win32/usp10/indicsyllable.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/usp10/indicsylla…
============================================================================== --- trunk/reactos/dll/win32/usp10/indicsyllable.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/usp10/indicsyllable.c [iso-8859-1] Sat Jul 2 11:55:26 2016 @@ -3,7 +3,7 @@ /* and from
http://www.unicode.org/Public/8.0.0/ucd/IndicPositionalCategory.txt
*/ /* DO NOT EDIT!! */ -const unsigned short DECLSPEC_HIDDEN indic_syllabic_table[3264] = +const unsigned short /* DECLSPEC_HIDDEN */ indic_syllabic_table[3264] = { /* level 1 offsets */ 0x0100, 0x0110, 0x0110, 0x0110, 0x0110, 0x0110, 0x0110, 0x0110, Modified: trunk/reactos/dll/win32/usp10/linebreak.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/usp10/linebreak.…
============================================================================== --- trunk/reactos/dll/win32/usp10/linebreak.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/usp10/linebreak.c [iso-8859-1] Sat Jul 2 11:55:26 2016 @@ -2,7 +2,7 @@ /* generated from
http://www.unicode.org/Public/8.0.0/ucd/LineBreak.txt
*/ /* DO NOT EDIT!! */ -const unsigned short DECLSPEC_HIDDEN wine_linebreak_table[7216] = +const unsigned short /* DECLSPEC_HIDDEN */ wine_linebreak_table[7216] = { /* level 1 offsets */ 0x0100, 0x0110, 0x0120, 0x0130, 0x0140, 0x0150, 0x0160, 0x0170, Modified: trunk/reactos/dll/win32/usp10/shaping.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/usp10/shaping.c?…
============================================================================== --- trunk/reactos/dll/win32/usp10/shaping.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/usp10/shaping.c [iso-8859-1] Sat Jul 2 11:55:26 2016 @@ -2,7 +2,7 @@ /* generated from
http://www.unicode.org/Public/8.0.0/ucd/ArabicShaping.txt
*/ /* DO NOT EDIT!! */ -const unsigned short DECLSPEC_HIDDEN wine_shaping_table[2848] = +const unsigned short /* DECLSPEC_HIDDEN */ wine_shaping_table[2848] = { /* level 1 offsets */ 0x0100, 0x0110, 0x0110, 0x0120, 0x0130, 0x0140, 0x0150, 0x0160,
8 years, 5 months
1
0
0
0
[akhaldi] 71720: [USP10] Sync with Wine Staging 1.9.11. CORE-11368
by akhaldi@svn.reactos.org
Author: akhaldi Date: Sat Jul 2 11:44:01 2016 New Revision: 71720 URL:
http://svn.reactos.org/svn/reactos?rev=71720&view=rev
Log: [USP10] Sync with Wine Staging 1.9.11. CORE-11368 Modified: trunk/reactos/dll/win32/usp10/bidi.c trunk/reactos/dll/win32/usp10/bracket.c trunk/reactos/dll/win32/usp10/breaking.c trunk/reactos/dll/win32/usp10/indicsyllable.c trunk/reactos/dll/win32/usp10/linebreak.c trunk/reactos/dll/win32/usp10/mirror.c trunk/reactos/dll/win32/usp10/opentype.c trunk/reactos/dll/win32/usp10/shape.c trunk/reactos/dll/win32/usp10/shaping.c trunk/reactos/dll/win32/usp10/usp10.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/usp10/bidi.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/usp10/bidi.c?rev…
============================================================================== --- trunk/reactos/dll/win32/usp10/bidi.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/usp10/bidi.c [iso-8859-1] Sat Jul 2 11:44:01 2016 @@ -47,7 +47,7 @@ #include "usp10_internal.h" -extern const unsigned short bidi_bracket_table[]; +extern const unsigned short bidi_bracket_table[] DECLSPEC_HIDDEN; WINE_DEFAULT_DEBUG_CHANNEL(bidi); @@ -960,6 +960,11 @@ plevel[j--] = baselevel; plevel[i] = baselevel; } + else if (pcls[i] == LRE || pcls[i] == RLE || pcls[i] == LRO || pcls[i] == RLO || + pcls[i] == PDF || pcls[i] == BN) + { + plevel[i] = i ? plevel[i - 1] : baselevel; + } if (i == eos && (pcls[i] == WS || pcls[i] == FSI || pcls[i] == LRI || pcls[i] == RLI || pcls[i] == PDI || pcls[i] == LRE || pcls[i] == RLE || pcls[i] == LRO || Modified: trunk/reactos/dll/win32/usp10/bracket.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/usp10/bracket.c?…
============================================================================== --- trunk/reactos/dll/win32/usp10/bracket.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/usp10/bracket.c [iso-8859-1] Sat Jul 2 11:44:01 2016 @@ -2,7 +2,7 @@ /* generated from
http://www.unicode.org/Public/8.0.0/ucd/BidiBrackets.txt
*/ /* DO NOT EDIT!! */ -const unsigned short bidi_bracket_table[768] = +const unsigned short DECLSPEC_HIDDEN bidi_bracket_table[768] = { /* level 1 offsets */ 0x0100, 0x0110, 0x0110, 0x0110, 0x0110, 0x0110, 0x0110, 0x0110, Modified: trunk/reactos/dll/win32/usp10/breaking.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/usp10/breaking.c…
============================================================================== --- trunk/reactos/dll/win32/usp10/breaking.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/usp10/breaking.c [iso-8859-1] Sat Jul 2 11:44:01 2016 @@ -23,7 +23,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(uniscribe); -extern const unsigned short wine_linebreak_table[]; +extern const unsigned short wine_linebreak_table[] DECLSPEC_HIDDEN; enum breaking_types { b_BK=1, b_CR, b_LF, b_CM, b_SG, b_GL, b_CB, b_SP, b_ZW, b_NL, b_WJ, b_JL, b_JV, b_JT, b_H2, b_H3, b_XX, b_OP, b_CL, b_CP, b_QU, b_NS, b_EX, b_SY, b_IS, b_PR, b_PO, b_NU, b_AL, b_ID, b_IN, b_HY, b_BB, b_BA, b_SA, b_AI, b_B2, b_HL, b_CJ, b_RI}; Modified: trunk/reactos/dll/win32/usp10/indicsyllable.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/usp10/indicsylla…
============================================================================== --- trunk/reactos/dll/win32/usp10/indicsyllable.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/usp10/indicsyllable.c [iso-8859-1] Sat Jul 2 11:44:01 2016 @@ -3,7 +3,7 @@ /* and from
http://www.unicode.org/Public/8.0.0/ucd/IndicPositionalCategory.txt
*/ /* DO NOT EDIT!! */ -const unsigned short indic_syllabic_table[3264] = +const unsigned short DECLSPEC_HIDDEN indic_syllabic_table[3264] = { /* level 1 offsets */ 0x0100, 0x0110, 0x0110, 0x0110, 0x0110, 0x0110, 0x0110, 0x0110, Modified: trunk/reactos/dll/win32/usp10/linebreak.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/usp10/linebreak.…
============================================================================== --- trunk/reactos/dll/win32/usp10/linebreak.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/usp10/linebreak.c [iso-8859-1] Sat Jul 2 11:44:01 2016 @@ -2,7 +2,7 @@ /* generated from
http://www.unicode.org/Public/8.0.0/ucd/LineBreak.txt
*/ /* DO NOT EDIT!! */ -const unsigned short wine_linebreak_table[7216] = +const unsigned short DECLSPEC_HIDDEN wine_linebreak_table[7216] = { /* level 1 offsets */ 0x0100, 0x0110, 0x0120, 0x0130, 0x0140, 0x0150, 0x0160, 0x0170, Modified: trunk/reactos/dll/win32/usp10/mirror.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/usp10/mirror.c?r…
============================================================================== --- trunk/reactos/dll/win32/usp10/mirror.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/usp10/mirror.c [iso-8859-1] Sat Jul 2 11:44:01 2016 @@ -5,7 +5,7 @@ #include <windef.h> #include <winnt.h> -const WCHAR wine_mirror_map[3292] = +const WCHAR DECLSPEC_HIDDEN wine_mirror_map[3292] = { /* index */ 0x01d8, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, Modified: trunk/reactos/dll/win32/usp10/opentype.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/usp10/opentype.c…
============================================================================== --- trunk/reactos/dll/win32/usp10/opentype.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/usp10/opentype.c [iso-8859-1] Sat Jul 2 11:44:01 2016 @@ -1178,7 +1178,7 @@ *devX = (desX * emHeight) / (double)lpotm->otmEMSquare; *devY = (desY * emHeight) / (double)lpotm->otmEMSquare; if (lplogfont->lfWidth) - FIXME("Font with lfWidth set no handled properly\n"); + FIXME("Font with lfWidth set not handled properly\n"); } static INT GPOS_get_value_record(WORD ValueFormat, const WORD data[], GPOS_ValueRecord *record) @@ -1481,7 +1481,7 @@ ma = (const GPOS_MarkArray*)((const BYTE*)mbpf1 + offset); if (mark_index > GET_BE_WORD(ma->MarkCount)) { - ERR("Mark index exeeded mark count\n"); + ERR("Mark index exceeded mark count\n"); return -1; } mr = &ma->MarkRecord[mark_index]; @@ -1551,7 +1551,7 @@ ma = (const GPOS_MarkArray*)((const BYTE*)mlpf1 + offset); if (mark_index > GET_BE_WORD(ma->MarkCount)) { - ERR("Mark index exeeded mark count\n"); + ERR("Mark index exceeded mark count\n"); return; } mr = &ma->MarkRecord[mark_index]; @@ -1561,7 +1561,7 @@ la = (const GPOS_LigatureArray*)((const BYTE*)mlpf1 + offset); if (ligature_index > GET_BE_WORD(la->LigatureCount)) { - ERR("Ligature index exeeded ligature count\n"); + ERR("Ligature index exceeded ligature count\n"); return; } offset = GET_BE_WORD(la->LigatureAttach[ligature_index]); Modified: trunk/reactos/dll/win32/usp10/shape.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/usp10/shape.c?re…
============================================================================== --- trunk/reactos/dll/win32/usp10/shape.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/usp10/shape.c [iso-8859-1] Sat Jul 2 11:44:01 2016 @@ -72,9 +72,9 @@ static void ShapeCharGlyphProp_Malayalam( HDC hdc, ScriptCache *psc, SCRIPT_ANALYSIS *psa, const WCHAR* pwcChars, const INT cChars, const WORD* pwGlyphs, const INT cGlyphs, WORD *pwLogClust, SCRIPT_CHARPROP *pCharProp, SCRIPT_GLYPHPROP *pGlyphProp ); static void ShapeCharGlyphProp_Khmer( HDC hdc, ScriptCache *psc, SCRIPT_ANALYSIS *psa, const WCHAR* pwcChars, const INT cChars, const WORD* pwGlyphs, const INT cGlyphs, WORD *pwLogClust, SCRIPT_CHARPROP *pCharProp, SCRIPT_GLYPHPROP *pGlyphProp ); -extern const unsigned short indic_syllabic_table[]; -extern const unsigned short wine_shaping_table[]; -extern const unsigned short wine_shaping_forms[LAST_ARABIC_CHAR - FIRST_ARABIC_CHAR + 1][4]; +extern const unsigned short indic_syllabic_table[] DECLSPEC_HIDDEN; +extern const unsigned short wine_shaping_table[] DECLSPEC_HIDDEN; +extern const unsigned short wine_shaping_forms[LAST_ARABIC_CHAR - FIRST_ARABIC_CHAR + 1][4] DECLSPEC_HIDDEN; enum joining_types { jtU, Modified: trunk/reactos/dll/win32/usp10/shaping.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/usp10/shaping.c?…
============================================================================== --- trunk/reactos/dll/win32/usp10/shaping.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/usp10/shaping.c [iso-8859-1] Sat Jul 2 11:44:01 2016 @@ -2,7 +2,7 @@ /* generated from
http://www.unicode.org/Public/8.0.0/ucd/ArabicShaping.txt
*/ /* DO NOT EDIT!! */ -const unsigned short wine_shaping_table[2848] = +const unsigned short DECLSPEC_HIDDEN wine_shaping_table[2848] = { /* level 1 offsets */ 0x0100, 0x0110, 0x0110, 0x0120, 0x0130, 0x0140, 0x0150, 0x0160, @@ -365,7 +365,7 @@ 0x0000, 0x0001, 0x0001, 0x0001, 0x0000, 0x0000, 0x0000, 0x0000 }; -const unsigned short wine_shaping_forms[256][4] = +const unsigned short DECLSPEC_HIDDEN wine_shaping_forms[256][4] = { { 0x0600, 0x0600, 0x0600, 0x0600 }, { 0x0601, 0x0601, 0x0601, 0x0601 }, Modified: trunk/reactos/dll/win32/usp10/usp10.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/usp10/usp10.c?re…
============================================================================== --- trunk/reactos/dll/win32/usp10/usp10.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/usp10/usp10.c [iso-8859-1] Sat Jul 2 11:44:01 2016 @@ -289,7 +289,7 @@ { SCRIPT_UNDEFINED, 0, 0, 0} }; -/* the must be in order so that the index matches the Script value */ +/* this must be in order so that the index matches the Script value */ const scriptData scriptInformation[] = { {{SCRIPT_UNDEFINED, 0, 0, 0, 0, 0, 0, { 0,0,0,0,0,0,0,0,0,0,0}}, {LANG_NEUTRAL, 0, 0, 0, 0, ANSI_CHARSET, 0, 0, 0, 0, 0, 0, 0, 0, 0}, @@ -730,7 +730,7 @@ static const WCHAR chars[4] = {0x0020, 0x200B, 0xF71B, 0x0640}; /* U+0020: numeric space U+200B: zero width space - U+F71B: unknow char found by black box testing + U+F71B: unknown char found by black box testing U+0640: kashida */ WORD gi[4]; @@ -862,7 +862,7 @@ static WCHAR mirror_char( WCHAR ch ) { - extern const WCHAR wine_mirror_map[]; + extern const WCHAR wine_mirror_map[] DECLSPEC_HIDDEN; return ch + wine_mirror_map[wine_mirror_map[ch >> 8] + (ch & 0xff)]; } @@ -897,7 +897,7 @@ if (str[index] == 0x2212 || str[index] == 0x2044) return Script_Punctuation; - /* Currency Symboles by Unicode point */ + /* Currency Symbols by Unicode point */ switch (str[index]) { case 0x09f2: @@ -2281,8 +2281,8 @@ int item; HRESULT hr; - TRACE("(%p,%d,%d,0x%1x,%p,%d,%d,%d)\n", - ssa, iX, iY, uOptions, prc, iMinSel, iMaxSel, fDisabled); + TRACE("(%p,%d,%d,0x%08x,%s,%d,%d,%d)\n", + ssa, iX, iY, uOptions, wine_dbgstr_rect(prc), iMinSel, iMaxSel, fDisabled); if (!(analysis = ssa)) return E_INVALIDARG; if (!(analysis->dwFlags & SSA_GLYPHS)) return E_INVALIDARG; @@ -2754,8 +2754,8 @@ * use piAdvance to find the cluster we are looking at * Find the character that is the first character of the cluster * That is our base piCP - * If the script snaps to cluster boundries (Hebrew, Indic, Thai) then we - * are good Otherwise if the cluster is larger than 1 glyph we need to + * If the script snaps to cluster boundaries (Hebrew, Indic, Thai) then we + * are good. Otherwise if the cluster is larger than 1 glyph we need to * determine how far through the cluster to advance the cursor. */ HRESULT WINAPI ScriptXtoCP(int iX, @@ -2944,7 +2944,7 @@ * * PARAMS * chars [I] Array of characters. - * sa [I] String analysis. + * sa [I] Script analysis. * la [I] Array of logical attribute structures. * * RETURNS @@ -3248,7 +3248,7 @@ * PARAMS * hdc [I] Device context. * psc [I/O] Opaque pointer to a script cache. - * psa [I/O] String analysis. + * psa [I/O] Script analysis. * tagScript [I] The OpenType tag for the Script * tagLangSys [I] The OpenType tag for the Language * rcRangeChars[I] Array of Character counts in each range @@ -3472,8 +3472,8 @@ INT *lpDx; WORD *reordered_glyphs = (WORD *)pwGlyphs; - TRACE("(%p, %p, %d, %d, %04x, %p, %p, %p, %d, %p, %d, %p, %p, %p)\n", - hdc, psc, x, y, fuOptions, lprc, psa, pwcReserved, iReserved, pwGlyphs, cGlyphs, + TRACE("(%p, %p, %d, %d, %08x, %s, %p, %p, %d, %p, %d, %p, %p, %p)\n", + hdc, psc, x, y, fuOptions, wine_dbgstr_rect(lprc), psa, pwcReserved, iReserved, pwGlyphs, cGlyphs, piAdvance, piJustify, pGoffset); if (!hdc || !psc) return E_INVALIDARG; Modified: trunk/reactos/media/doc/README.WINE URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=…
============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Sat Jul 2 11:44:01 2016 @@ -193,7 +193,7 @@ reactos/dll/win32/updspapi # Synced to WineStaging-1.9.4 reactos/dll/win32/url # Synced to WineStaging-1.9.4 reactos/dll/win32/urlmon # Synced to WineStaging-1.9.4 -reactos/dll/win32/usp10 # Synced to WineStaging-1.9.4 +reactos/dll/win32/usp10 # Synced to WineStaging-1.9.11 reactos/dll/win32/uxtheme # Forked reactos/dll/win32/vbscript # Synced to WineStaging-1.9.4 reactos/dll/win32/version # Synced to WineStaging-1.9.4
8 years, 5 months
1
0
0
0
[hbelusca] 71719: ReactOS 0.4.0 for CLT2016 was already released! Tag the branch.
by hbelusca@svn.reactos.org
Author: hbelusca Date: Sat Jul 2 11:28:52 2016 New Revision: 71719 URL:
http://svn.reactos.org/svn/reactos?rev=71719&view=rev
Log: ReactOS 0.4.0 for CLT2016 was already released! Tag the branch. Added: tags/ReactOS-0.4.0-CLT2016/ (props changed) - copied from r71718, branches/ReactOS-0.4.0-CLT2016/ Removed: branches/ReactOS-0.4.0-CLT2016/ Propchange: tags/ReactOS-0.4.0-CLT2016/ ------------------------------------------------------------------------------ --- svn:mergeinfo (added) +++ svn:mergeinfo Sat Jul 2 11:28:52 2016 @@ -0,0 +1 @@ +/trunk:70000-70321,70323-70324,70328-70337,70339-70340,70347,70349,70354-70358,70360,70363,70369,70373,70375-70378,70381,70384-70385,70387-70389,70398,70400,70408,70424,70433-70437,70443,70445-70449,70454,70464,70468,70470,70477,70480,70482,70485-70487,70497,70499-70501,70507-70510,70512-70513,70523,70527-70530,70536-70537,70545-70548,70552-70554,70557-70558,70576-70578,70583,70597,70606,70627,70639,70641,70651,70655
8 years, 5 months
1
0
0
0
[hbelusca] 71718: ReactOS 0.4.1 was already released! Tag the branch.
by hbelusca@svn.reactos.org
Author: hbelusca Date: Sat Jul 2 11:13:35 2016 New Revision: 71718 URL:
http://svn.reactos.org/svn/reactos?rev=71718&view=rev
Log: ReactOS 0.4.1 was already released! Tag the branch. Added: tags/ReactOS-0.4.1/ (props changed) - copied from r71717, branches/ros-branch-0_4_1/ Removed: branches/ros-branch-0_4_1/ Propchange: tags/ReactOS-0.4.1/ ------------------------------------------------------------------------------ svn:mergeinfo = /trunk:71217,71231,71245,71252,71255,71296,71307,71309,71318
8 years, 5 months
1
0
0
0
[tfaber] 71717: [DNSAPI_APITEST] - Handle unexpected failures without crashing ROSTESTS-226
by tfaber@svn.reactos.org
Author: tfaber Date: Sat Jul 2 08:49:07 2016 New Revision: 71717 URL:
http://svn.reactos.org/svn/reactos?rev=71717&view=rev
Log: [DNSAPI_APITEST] - Handle unexpected failures without crashing ROSTESTS-226 Modified: trunk/rostests/apitests/dnsapi/DnsQuery.c Modified: trunk/rostests/apitests/dnsapi/DnsQuery.c URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/dnsapi/DnsQuery.…
============================================================================== --- trunk/rostests/apitests/dnsapi/DnsQuery.c [iso-8859-1] (original) +++ trunk/rostests/apitests/dnsapi/DnsQuery.c [iso-8859-1] Sat Jul 2 08:49:07 2016 @@ -15,9 +15,9 @@ void TestHostName(void) { - DNS_STATUS dns_status = NO_ERROR; + DNS_STATUS dns_status; char host_name[255]; - PDNS_RECORD dp = NULL; + PDNS_RECORD dp; WCHAR host_nameW[255]; gethostname(host_name, sizeof(host_name)); @@ -33,25 +33,25 @@ //Testing HostName dns_status = DnsQuery_A(host_name, DNS_TYPE_A, DNS_QUERY_STANDARD, 0, &dp, 0); ok(dns_status == NO_ERROR, "DnsQuery_A failed with error %lu\n", dns_status); - DnsRecordListFree(dp, DnsFreeRecordList); + if (dp != InvalidPointer) DnsRecordListFree(dp, DnsFreeRecordList); //127.0.0.1 dns_status = DnsQuery_A("127.0.0.1", DNS_TYPE_A, DNS_QUERY_STANDARD, 0, &dp, 0); ok(dns_status == NO_ERROR, "DnsQuery_A failed with error %lu\n", dns_status); - DnsRecordListFree(dp, DnsFreeRecordList); + if (dp != InvalidPointer) DnsRecordListFree(dp, DnsFreeRecordList); //Localhost strings dns_status = DnsQuery_A("LocalHost", DNS_TYPE_A, DNS_QUERY_STANDARD, 0, &dp, 0); ok(dns_status == NO_ERROR, "DnsQuery_A failed with error %lu\n", dns_status); - DnsRecordListFree(dp, DnsFreeRecordList); + if (dp != InvalidPointer) DnsRecordListFree(dp, DnsFreeRecordList); dns_status = DnsQuery_A("Localhost", DNS_TYPE_A, DNS_QUERY_STANDARD, 0, &dp, 0); ok(dns_status == NO_ERROR, "DnsQuery_A failed with error %lu\n", dns_status); - DnsRecordListFree(dp, DnsFreeRecordList); + if (dp != InvalidPointer) DnsRecordListFree(dp, DnsFreeRecordList); dns_status = DnsQuery_A("localhost", DNS_TYPE_A, DNS_QUERY_STANDARD, 0, &dp, 0); ok(dns_status == NO_ERROR, "DnsQuery_A failed with error %lu\n", dns_status); - DnsRecordListFree(dp, DnsFreeRecordList); + if (dp != InvalidPointer) DnsRecordListFree(dp, DnsFreeRecordList); //DnsQuery_W: //NULL @@ -74,25 +74,25 @@ //Testing HostName dns_status = DnsQuery_W(host_nameW, DNS_TYPE_A, DNS_QUERY_STANDARD, 0, &dp, 0); ok(dns_status == NO_ERROR, "DnsQuery_W failed with error %lu\n", dns_status); - DnsRecordListFree(dp, DnsFreeRecordList); + if (dp != InvalidPointer) DnsRecordListFree(dp, DnsFreeRecordList); //127.0.0.1 dns_status = DnsQuery_W(L"127.0.0.1", DNS_TYPE_A, DNS_QUERY_STANDARD, 0, &dp, 0); ok(dns_status == NO_ERROR, "DnsQuery_W failed with error %lu\n", dns_status); - DnsRecordListFree(dp, DnsFreeRecordList); + if (dp != InvalidPointer) DnsRecordListFree(dp, DnsFreeRecordList); //Localhost strings dns_status = DnsQuery_W(L"LocalHost", DNS_TYPE_A, DNS_QUERY_STANDARD, 0, &dp, 0); ok(dns_status == NO_ERROR, "DnsQuery_W failed with error %lu\n", dns_status); - DnsRecordListFree(dp, DnsFreeRecordList); + if (dp != InvalidPointer) DnsRecordListFree(dp, DnsFreeRecordList); dns_status = DnsQuery_W(L"Localhost", DNS_TYPE_A, DNS_QUERY_STANDARD, 0, &dp, 0); ok(dns_status == NO_ERROR, "DnsQuery_W failed with error %lu\n", dns_status); - DnsRecordListFree(dp, DnsFreeRecordList); + if (dp != InvalidPointer) DnsRecordListFree(dp, DnsFreeRecordList); dns_status = DnsQuery_W(L"localhost", DNS_TYPE_A, DNS_QUERY_STANDARD, 0, &dp, 0); ok(dns_status == NO_ERROR, "DnsQuery_W failed with error %lu\n", dns_status); - DnsRecordListFree(dp, DnsFreeRecordList); + if (dp != InvalidPointer) DnsRecordListFree(dp, DnsFreeRecordList); } START_TEST(DnsQuery)
8 years, 5 months
1
0
0
0
← Newer
1
...
32
33
34
35
36
Older →
Jump to page:
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
Results per page:
10
25
50
100
200