Ros-diffs August 2016

ros-diffs@reactos.org

20 participants
462 discussions

[akhaldi] 72298: [OLEAUT32] Sync with Wine Staging 1.9.16. CORE-11866

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Thu Aug 18 10:29:24 2016 New Revision: 72298 URL: http://svn.reactos.org/svn/reactos?rev=72298&view=rev Log: [OLEAUT32] Sync with Wine Staging 1.9.16. CORE-11866 Modified: trunk/reactos/dll/win32/oleaut32/variant.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/oleaut32/variant.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oleaut32/variant… ============================================================================== --- trunk/reactos/dll/win32/oleaut32/variant.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/oleaut32/variant.c [iso-8859-1] Thu Aug 18 10:29:24 2016 @@ -453,7 +453,10 @@ { case VT_DISPATCH: if (V_DISPATCH(ps) == NULL) + { V_UNKNOWN(pd) = NULL; + res = S_OK; + } else res = IDispatch_QueryInterface(V_DISPATCH(ps), &IID_IUnknown, (LPVOID*)&V_UNKNOWN(pd)); break; @@ -465,7 +468,10 @@ { case VT_UNKNOWN: if (V_UNKNOWN(ps) == NULL) + { V_DISPATCH(pd) = NULL; + res = S_OK; + } else res = IUnknown_QueryInterface(V_UNKNOWN(ps), &IID_IDispatch, (LPVOID*)&V_DISPATCH(pd)); break; 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] Thu Aug 18 10:29:24 2016 @@ -144,7 +144,7 @@ reactos/dll/win32/odbccp32 # Synced to WineStaging-1.9.11 reactos/dll/win32/ole32 # Synced to WineStaging-1.9.11 reactos/dll/win32/oleacc # Synced to WineStaging-1.9.11 -reactos/dll/win32/oleaut32 # Synced to WineStaging-1.9.11 +reactos/dll/win32/oleaut32 # Synced to WineStaging-1.9.16 reactos/dll/win32/olecli32 # Synced to WineStaging-1.9.11 reactos/dll/win32/oledlg # Synced to WineStaging-1.9.11 reactos/dll/win32/olepro32 # Synced to WineStaging-1.9.11

8 years, 4 months

[akhaldi] 72297: [MSXML3_WINETEST] Sync with Wine Staging 1.9.16. CORE-11866

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Thu Aug 18 10:27:46 2016 New Revision: 72297 URL: http://svn.reactos.org/svn/reactos?rev=72297&view=rev Log: [MSXML3_WINETEST] Sync with Wine Staging 1.9.16. CORE-11866 Modified: trunk/rostests/winetests/msxml3/xmlparser.c Modified: trunk/rostests/winetests/msxml3/xmlparser.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/msxml3/xmlparse… ============================================================================== --- trunk/rostests/winetests/msxml3/xmlparser.c [iso-8859-1] (original) +++ trunk/rostests/winetests/msxml3/xmlparser.c [iso-8859-1] Thu Aug 18 10:27:46 2016 @@ -149,6 +149,9 @@ hr = IXMLParser_SetFlags(parser, 0); ok(hr == S_OK, "Expected S_OK got 0x%08x\n", hr); + hr = IXMLParser_GetParserState(parser); + ok(hr == XMLPARSER_IDLE, "got 0x%08x\n", hr); + IXMLParser_Release(parser); }

8 years, 4 months

[akhaldi] 72296: [MSXML3] Sync with Wine Staging 1.9.16. CORE-11866

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Thu Aug 18 10:27:06 2016 New Revision: 72296 URL: http://svn.reactos.org/svn/reactos?rev=72296&view=rev Log: [MSXML3] Sync with Wine Staging 1.9.16. CORE-11866 Modified: trunk/reactos/dll/win32/msxml3/httprequest.c trunk/reactos/dll/win32/msxml3/saxreader.c trunk/reactos/dll/win32/msxml3/schema.c trunk/reactos/dll/win32/msxml3/xmlparser.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/msxml3/httprequest.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msxml3/httpreque… ============================================================================== --- trunk/reactos/dll/win32/msxml3/httprequest.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msxml3/httprequest.c [iso-8859-1] Thu Aug 18 10:27:06 2016 @@ -90,7 +90,6 @@ { httprequest req; IServerXMLHTTPRequest IServerXMLHTTPRequest_iface; - LONG ref; } serverhttp; static inline httprequest *impl_from_IXMLHTTPRequest( IXMLHTTPRequest *iface ) @@ -1536,19 +1535,19 @@ httprequest_ObjectWithSite_QueryInterface( IObjectWithSite* iface, REFIID riid, void** ppvObject ) { httprequest *This = impl_from_IObjectWithSite(iface); - return IXMLHTTPRequest_QueryInterface( (IXMLHTTPRequest *)This, riid, ppvObject ); + return IXMLHTTPRequest_QueryInterface(&This->IXMLHTTPRequest_iface, riid, ppvObject); } static ULONG WINAPI httprequest_ObjectWithSite_AddRef( IObjectWithSite* iface ) { httprequest *This = impl_from_IObjectWithSite(iface); - return IXMLHTTPRequest_AddRef((IXMLHTTPRequest *)This); + return IXMLHTTPRequest_AddRef(&This->IXMLHTTPRequest_iface); } static ULONG WINAPI httprequest_ObjectWithSite_Release( IObjectWithSite* iface ) { httprequest *This = impl_from_IObjectWithSite(iface); - return IXMLHTTPRequest_Release((IXMLHTTPRequest *)This); + return IXMLHTTPRequest_Release(&This->IXMLHTTPRequest_iface); } static HRESULT WINAPI httprequest_ObjectWithSite_GetSite( IObjectWithSite *iface, REFIID iid, void **ppvSite ) @@ -1632,19 +1631,19 @@ static HRESULT WINAPI httprequest_Safety_QueryInterface(IObjectSafety *iface, REFIID riid, void **ppv) { httprequest *This = impl_from_IObjectSafety(iface); - return IXMLHTTPRequest_QueryInterface( (IXMLHTTPRequest *)This, riid, ppv ); + return IXMLHTTPRequest_QueryInterface(&This->IXMLHTTPRequest_iface, riid, ppv); } static ULONG WINAPI httprequest_Safety_AddRef(IObjectSafety *iface) { httprequest *This = impl_from_IObjectSafety(iface); - return IXMLHTTPRequest_AddRef((IXMLHTTPRequest *)This); + return IXMLHTTPRequest_AddRef(&This->IXMLHTTPRequest_iface); } static ULONG WINAPI httprequest_Safety_Release(IObjectSafety *iface) { httprequest *This = impl_from_IObjectSafety(iface); - return IXMLHTTPRequest_Release((IXMLHTTPRequest *)This); + return IXMLHTTPRequest_Release(&This->IXMLHTTPRequest_iface); } static HRESULT WINAPI httprequest_Safety_GetInterfaceSafetyOptions(IObjectSafety *iface, REFIID riid, @@ -1713,7 +1712,7 @@ static ULONG WINAPI ServerXMLHTTPRequest_AddRef(IServerXMLHTTPRequest *iface) { serverhttp *This = impl_from_IServerXMLHTTPRequest( iface ); - ULONG ref = InterlockedIncrement( &This->ref ); + ULONG ref = InterlockedIncrement( &This->req.ref ); TRACE("(%p)->(%u)\n", This, ref ); return ref; } @@ -1721,7 +1720,7 @@ static ULONG WINAPI ServerXMLHTTPRequest_Release(IServerXMLHTTPRequest *iface) { serverhttp *This = impl_from_IServerXMLHTTPRequest( iface ); - ULONG ref = InterlockedDecrement( &This->ref ); + ULONG ref = InterlockedDecrement( &This->req.ref ); TRACE("(%p)->(%u)\n", This, ref ); @@ -2017,7 +2016,6 @@ init_httprequest(&req->req); req->IServerXMLHTTPRequest_iface.lpVtbl = &ServerXMLHTTPRequestVtbl; - req->ref = 1; *obj = &req->IServerXMLHTTPRequest_iface; Modified: trunk/reactos/dll/win32/msxml3/saxreader.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msxml3/saxreader… ============================================================================== --- trunk/reactos/dll/win32/msxml3/saxreader.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msxml3/saxreader.c [iso-8859-1] Thu Aug 18 10:27:06 2016 @@ -2500,7 +2500,7 @@ if (encoding == XML_CHAR_ENCODING_NONE) { const WCHAR *ptr = (WCHAR*)buffer; - /* xml declaration with possibly specified encoding will be still handled by parser */ + /* an xml declaration with optional encoding will still be handled by the parser */ if ((size >= 2) && *ptr == '<' && ptr[1] != '?') { enc_name = (xmlChar*)xmlGetCharEncodingName(XML_CHAR_ENCODING_UTF16LE); Modified: trunk/reactos/dll/win32/msxml3/schema.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msxml3/schema.c?… ============================================================================== --- trunk/reactos/dll/win32/msxml3/schema.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msxml3/schema.c [iso-8859-1] Thu Aug 18 10:27:06 2016 @@ -1227,7 +1227,30 @@ IUnknown_QueryInterface(V_UNKNOWN(&var), &IID_IXMLDOMNode, (void**)&domnode); if (domnode) - doc = xmlNodePtr_from_domnode(domnode, XML_DOCUMENT_NODE)->doc; + { + DOMNodeType type; + + IXMLDOMNode_get_nodeType(domnode, &type); + switch (type) + { + case NODE_ELEMENT: + { + IXMLDOMDocument *domdoc; + VARIANT_BOOL b; + BSTR xml; + + IXMLDOMNode_get_xml(domnode, &xml); + DOMDocument_create(This->version, (void**)&domdoc); + IXMLDOMDocument_loadXML(domdoc, xml, &b); + SysFreeString(xml); + doc = xmlNodePtr_from_domnode((IXMLDOMNode*)domdoc, XML_DOCUMENT_NODE)->doc; + break; + } + default: + doc = xmlNodePtr_from_domnode(domnode, XML_DOCUMENT_NODE)->doc; + break; + } + } if (!doc) { Modified: trunk/reactos/dll/win32/msxml3/xmlparser.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msxml3/xmlparser… ============================================================================== --- trunk/reactos/dll/win32/msxml3/xmlparser.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msxml3/xmlparser.c [iso-8859-1] Thu Aug 18 10:27:06 2016 @@ -31,6 +31,7 @@ LONG ref; int flags; + XML_PARSER_STATE state; } xmlparser; static inline xmlparser *impl_from_IXMLParser( IXMLParser *iface ) @@ -325,9 +326,9 @@ { xmlparser *This = impl_from_IXMLParser( iface ); - FIXME("(%p)\n", This); - - return E_NOTIMPL; + TRACE("(%p)\n", This); + + return This->state; } static HRESULT WINAPI xmlparser_Suspend(IXMLParser *iface) @@ -427,6 +428,7 @@ This->nodefactory = NULL; This->input = NULL; This->flags = 0; + This->state = XMLPARSER_IDLE; This->ref = 1; *ppObj = &This->IXMLParser_iface; 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] Thu Aug 18 10:27:06 2016 @@ -131,7 +131,7 @@ reactos/dll/win32/msvidc32 # Synced to WineStaging-1.9.11 reactos/dll/win32/msxml # Synced to WineStaging-1.9.11 reactos/dll/win32/msxml2 # Synced to WineStaging-1.9.11 -reactos/dll/win32/msxml3 # Synced to WineStaging-1.9.11 +reactos/dll/win32/msxml3 # Synced to WineStaging-1.9.16 reactos/dll/win32/msxml4 # Synced to WineStaging-1.9.11 reactos/dll/win32/msxml6 # Synced to WineStaging-1.9.11 reactos/dll/win32/nddeapi # Synced to WineStaging-1.9.11

8 years, 4 months

[akhaldi] 72295: [MSVFW32] Sync with Wine Staging 1.9.16. CORE-11866

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Thu Aug 18 10:25:37 2016 New Revision: 72295 URL: http://svn.reactos.org/svn/reactos?rev=72295&view=rev Log: [MSVFW32] Sync with Wine Staging 1.9.16. CORE-11866 Modified: trunk/reactos/dll/win32/msvfw32/msvideo_main.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/msvfw32/msvideo_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msvfw32/msvideo_… ============================================================================== --- trunk/reactos/dll/win32/msvfw32/msvideo_main.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msvfw32/msvideo_main.c [iso-8859-1] Thu Aug 18 10:25:37 2016 @@ -795,7 +795,7 @@ if (ICSendMessage(tmphic, ICM_DECOMPRESS_GET_FORMAT, (DWORD_PTR)lpbiIn, (DWORD_PTR)lpbiOut)) goto errout; - if (lpbiOut->biCompression != 0) { + if (lpbiOut->biCompression != 0) { FIXME("Ooch, how come decompressor outputs compressed data (%d)??\n", lpbiOut->biCompression); } 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] Thu Aug 18 10:25:37 2016 @@ -127,7 +127,7 @@ reactos/dll/win32/mstask # Synced to WineStaging-1.9.11 reactos/dll/win32/msvcrt20 # Out of sync reactos/dll/win32/msvcrt40 # Out of sync -reactos/dll/win32/msvfw32 # Synced to WineStaging-1.9.11 +reactos/dll/win32/msvfw32 # Synced to WineStaging-1.9.16 reactos/dll/win32/msvidc32 # Synced to WineStaging-1.9.11 reactos/dll/win32/msxml # Synced to WineStaging-1.9.11 reactos/dll/win32/msxml2 # Synced to WineStaging-1.9.11

8 years, 4 months

[akhaldi] 72294: [MSIMTF] Sync with Wine Staging 1.9.16. CORE-11866

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Thu Aug 18 10:24:35 2016 New Revision: 72294 URL: http://svn.reactos.org/svn/reactos?rev=72294&view=rev Log: [MSIMTF] Sync with Wine Staging 1.9.16. CORE-11866 Modified: trunk/reactos/dll/win32/msimtf/main.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/msimtf/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msimtf/main.c?re… ============================================================================== --- trunk/reactos/dll/win32/msimtf/main.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msimtf/main.c [iso-8859-1] Thu Aug 18 10:24:35 2016 @@ -126,7 +126,7 @@ ActiveIMMApp_Constructor, }; - return IClassFactory_QueryInterface((IClassFactory*)&cf, riid, ppv); + return IClassFactory_QueryInterface(&cf.IClassFactory_iface, riid, ppv); } FIXME("(%s %s %p)\n", debugstr_guid(rclsid), debugstr_guid(riid), ppv); 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] Thu Aug 18 10:24:35 2016 @@ -116,7 +116,7 @@ reactos/dll/win32/mshtml.tlb # Synced to WineStaging-1.7.55 reactos/dll/win32/msi # Synced to WineStaging-1.9.16 reactos/dll/win32/msimg32 # Synced to WineStaging-1.9.11 -reactos/dll/win32/msimtf # Synced to WineStaging-1.9.11 +reactos/dll/win32/msimtf # Synced to WineStaging-1.9.16 reactos/dll/win32/msisip # Synced to WineStaging-1.9.11 reactos/dll/win32/msisys.ocx # Synced to WineStaging-1.9.11 reactos/dll/win32/msnet32 # Synced to WineStaging-1.9.11

8 years, 4 months

[akhaldi] 72293: [MSI_WINETEST] Sync with Wine Staging 1.9.16. CORE-11866

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Thu Aug 18 10:22:37 2016 New Revision: 72293 URL: http://svn.reactos.org/svn/reactos?rev=72293&view=rev Log: [MSI_WINETEST] Sync with Wine Staging 1.9.16. CORE-11866 Modified: trunk/rostests/winetests/msi/patch.c Modified: trunk/rostests/winetests/msi/patch.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/msi/patch.c?rev… ============================================================================== --- trunk/rostests/winetests/msi/patch.c [iso-8859-1] (original) +++ trunk/rostests/winetests/msi/patch.c [iso-8859-1] Thu Aug 18 10:22:37 2016 @@ -470,16 +470,16 @@ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0xe0, 0x85, 0x9f, 0xf2, 0xf9, 0x4f, 0x68, 0x10, 0xab, 0x91, 0x08, 0x00, 0x2b, 0x27, 0xb3, 0xd9, - 0x30, 0x00, 0x00, 0x00, 0x9c, 0x01, 0x00, 0x00, 0x0c, 0x00, 0x00, + 0x30, 0x00, 0x00, 0x00, 0x9f, 0x01, 0x00, 0x00, 0x0c, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x68, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x88, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0xa8, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0xb8, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0xc4, 0x00, 0x00, 0x00, 0x12, 0x00, 0x00, 0x00, 0xd0, 0x00, 0x00, 0x00, 0x13, 0x00, 0x00, 0x00, 0xdc, 0x00, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00, 0xe4, 0x00, 0x00, 0x00, 0x08, - 0x00, 0x00, 0x00, 0xf4, 0x00, 0x00, 0x00, 0x09, 0x00, 0x00, 0x00, - 0x04, 0x01, 0x00, 0x00, 0x0e, 0x00, 0x00, 0x00, 0x8c, 0x01, 0x00, - 0x00, 0x10, 0x00, 0x00, 0x00, 0x94, 0x01, 0x00, 0x00, 0x1e, 0x00, + 0x00, 0x00, 0x00, 0xf7, 0x00, 0x00, 0x00, 0x09, 0x00, 0x00, 0x00, + 0x07, 0x01, 0x00, 0x00, 0x0e, 0x00, 0x00, 0x00, 0x8f, 0x01, 0x00, + 0x00, 0x10, 0x00, 0x00, 0x00, 0x97, 0x01, 0x00, 0x00, 0x1e, 0x00, 0x00, 0x00, 0x16, 0x00, 0x00, 0x00, 0x49, 0x6e, 0x73, 0x74, 0x61, 0x6c, 0x6c, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x20, 0x44, 0x61, 0x74, 0x61, 0x62, 0x61, 0x73, 0x65, 0x00, 0x00, 0x00, 0x1e, 0x00, 0x00, @@ -491,23 +491,24 @@ 0x00, 0x00, 0x1e, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1e, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x1e, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x3b, 0x31, - 0x30, 0x33, 0x33, 0x00, 0x00, 0x00, 0x1e, 0x00, 0x00, 0x00, 0x06, - 0x00, 0x00, 0x00, 0x3b, 0x31, 0x30, 0x33, 0x33, 0x00, 0x00, 0x00, - 0x1e, 0x00, 0x00, 0x00, 0x7f, 0x00, 0x00, 0x00, 0x7b, 0x39, 0x31, - 0x33, 0x42, 0x38, 0x44, 0x31, 0x38, 0x2d, 0x46, 0x42, 0x42, 0x36, - 0x2d, 0x34, 0x43, 0x41, 0x43, 0x2d, 0x41, 0x32, 0x33, 0x39, 0x2d, - 0x43, 0x37, 0x34, 0x43, 0x31, 0x31, 0x45, 0x33, 0x46, 0x41, 0x37, - 0x34, 0x7d, 0x31, 0x2e, 0x31, 0x2e, 0x31, 0x3b, 0x7b, 0x39, 0x31, - 0x33, 0x42, 0x38, 0x44, 0x31, 0x38, 0x2d, 0x46, 0x42, 0x42, 0x36, - 0x2d, 0x34, 0x43, 0x41, 0x43, 0x2d, 0x41, 0x32, 0x33, 0x39, 0x2d, - 0x43, 0x37, 0x34, 0x43, 0x31, 0x31, 0x45, 0x33, 0x46, 0x41, 0x37, - 0x34, 0x7d, 0x31, 0x2e, 0x31, 0x2e, 0x31, 0x3b, 0x7b, 0x41, 0x32, - 0x45, 0x33, 0x44, 0x36, 0x34, 0x33, 0x2d, 0x34, 0x45, 0x32, 0x43, - 0x2d, 0x34, 0x37, 0x37, 0x46, 0x2d, 0x41, 0x33, 0x30, 0x39, 0x2d, - 0x46, 0x37, 0x36, 0x46, 0x35, 0x35, 0x32, 0x44, 0x35, 0x46, 0x34, - 0x33, 0x7d, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x64, 0x00, 0x00, - 0x00, 0x03, 0x00, 0x00, 0x00, 0x17, 0x00, 0x22, 0x09 + 0x00, 0x1e, 0x00, 0x00, 0x00, 0x09, 0x00, 0x00, 0x00, 0x78, 0x38, + 0x36, 0x3b, 0x31, 0x30, 0x33, 0x33, 0x00, 0x00, 0x00, 0x1e, 0x00, + 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x3b, 0x31, 0x30, 0x33, 0x33, + 0x00, 0x00, 0x00, 0x1e, 0x00, 0x00, 0x00, 0x7f, 0x00, 0x00, 0x00, + 0x7b, 0x39, 0x31, 0x33, 0x42, 0x38, 0x44, 0x31, 0x38, 0x2d, 0x46, + 0x42, 0x42, 0x36, 0x2d, 0x34, 0x43, 0x41, 0x43, 0x2d, 0x41, 0x32, + 0x33, 0x39, 0x2d, 0x43, 0x37, 0x34, 0x43, 0x31, 0x31, 0x45, 0x33, + 0x46, 0x41, 0x37, 0x34, 0x7d, 0x31, 0x2e, 0x31, 0x2e, 0x31, 0x3b, + 0x7b, 0x39, 0x31, 0x33, 0x42, 0x38, 0x44, 0x31, 0x38, 0x2d, 0x46, + 0x42, 0x42, 0x36, 0x2d, 0x34, 0x43, 0x41, 0x43, 0x2d, 0x41, 0x32, + 0x33, 0x39, 0x2d, 0x43, 0x37, 0x34, 0x43, 0x31, 0x31, 0x45, 0x33, + 0x46, 0x41, 0x37, 0x34, 0x7d, 0x31, 0x2e, 0x31, 0x2e, 0x31, 0x3b, + 0x7b, 0x41, 0x32, 0x45, 0x33, 0x44, 0x36, 0x34, 0x33, 0x2d, 0x34, + 0x45, 0x32, 0x43, 0x2d, 0x34, 0x37, 0x37, 0x46, 0x2d, 0x41, 0x33, + 0x30, 0x39, 0x2d, 0x46, 0x37, 0x36, 0x46, 0x35, 0x35, 0x32, 0x44, + 0x35, 0x46, 0x34, 0x33, 0x7d, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, + 0x64, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x17, 0x00, 0x22, + 0x09 }; static const struct table_data table_transform1_data[] = {

8 years, 4 months

[akhaldi] 72292: [MSI] Sync with Wine Staging 1.9.16. CORE-11866

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Thu Aug 18 10:22:22 2016 New Revision: 72292 URL: http://svn.reactos.org/svn/reactos?rev=72292&view=rev Log: [MSI] Sync with Wine Staging 1.9.16. CORE-11866 Modified: trunk/reactos/dll/win32/msi/instabsent.bmp trunk/reactos/dll/win32/msi/instadvert.bmp trunk/reactos/dll/win32/msi/instlocal.bmp trunk/reactos/dll/win32/msi/patch.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/msi/instabsent.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/instabsent.b… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/win32/msi/instadvert.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/instadvert.b… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/win32/msi/instlocal.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/instlocal.bm… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/win32/msi/patch.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/patch.c?rev=… ============================================================================== --- trunk/reactos/dll/win32/msi/patch.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msi/patch.c [iso-8859-1] Thu Aug 18 10:22:22 2016 @@ -130,6 +130,9 @@ wanted_flags &= 0xffff; /* mask off error condition flags */ TRACE("validation flags 0x%04x\n", wanted_flags); + /* native is not validating platform */ + wanted_flags &= ~MSITRANSFORM_VALIDATE_PLATFORM; + if (wanted_flags & ~supported_flags) { FIXME("unsupported validation flags 0x%04x\n", wanted_flags); @@ -182,15 +185,6 @@ valid_flags |= MSITRANSFORM_VALIDATE_PRODUCT; } msi_free( product_code_installed ); - } - if (wanted_flags & MSITRANSFORM_VALIDATE_PLATFORM) - { - if ((p = strchrW( template, ';' ))) - { - *p = 0; - if (package->platform == parse_platform( template )) - valid_flags |= MSITRANSFORM_VALIDATE_PLATFORM; - } } msi_free( template ); if (wanted_flags & MSITRANSFORM_VALIDATE_MAJORVERSION) 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] Thu Aug 18 10:22:22 2016 @@ -114,7 +114,7 @@ reactos/dll/win32/msgsm32.acm # Synced to WineStaging-1.9.11 reactos/dll/win32/mshtml # Synced to WineStaging-1.7.55 reactos/dll/win32/mshtml.tlb # Synced to WineStaging-1.7.55 -reactos/dll/win32/msi # Synced to WineStaging-1.9.12 +reactos/dll/win32/msi # Synced to WineStaging-1.9.16 reactos/dll/win32/msimg32 # Synced to WineStaging-1.9.11 reactos/dll/win32/msimtf # Synced to WineStaging-1.9.11 reactos/dll/win32/msisip # Synced to WineStaging-1.9.11

8 years, 4 months

[akhaldi] 72291: [MSCTF_WINETEST] Sync with Wine Staging 1.9.16. CORE-11866

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Thu Aug 18 10:20:17 2016 New Revision: 72291 URL: http://svn.reactos.org/svn/reactos?rev=72291&view=rev Log: [MSCTF_WINETEST] Sync with Wine Staging 1.9.16. CORE-11866 Modified: trunk/rostests/winetests/msctf/inputprocessor.c Modified: trunk/rostests/winetests/msctf/inputprocessor.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/msctf/inputproc… ============================================================================== --- trunk/rostests/winetests/msctf/inputprocessor.c [iso-8859-1] (original) +++ trunk/rostests/winetests/msctf/inputprocessor.c [iso-8859-1] Thu Aug 18 10:20:17 2016 @@ -74,6 +74,7 @@ static INT test_OnPopContext = SINK_UNEXPECTED; static INT test_KEV_OnSetFocus = SINK_UNEXPECTED; static INT test_ACP_AdviseSink = SINK_UNEXPECTED; +static INT test_ACP_UnadviseSink = SINK_UNEXPECTED; static INT test_ACP_GetStatus = SINK_UNEXPECTED; static INT test_ACP_RequestLock = SINK_UNEXPECTED; static INT test_ACP_GetEndACP = SINK_UNEXPECTED; @@ -232,6 +233,9 @@ sink_fire_ok(&test_ACP_AdviseSink,"TextStoreACP_AdviseSink"); + if(ACPSink) + return S_OK; + hr = IUnknown_QueryInterface(punk, &IID_ITextStoreACPSink, (void**)&ACPSink); ok(SUCCEEDED(hr),"Unable to QueryInterface on sink\n"); @@ -245,7 +249,7 @@ static HRESULT WINAPI TextStoreACP_UnadviseSink(ITextStoreACP *iface, IUnknown *punk) { - trace("\n"); + sink_fire_ok(&test_ACP_UnadviseSink,"TextStoreACP_UnadviseSink"); return S_OK; } @@ -563,9 +567,9 @@ hr = ITfContext_GetDocumentMgr(pic,&docmgr); ok(SUCCEEDED(hr),"GetDocumentMgr failed\n"); test = (ITfContext*)0xdeadbeef; - ITfDocumentMgr_Release(docmgr); hr = ITfDocumentMgr_GetTop(docmgr,&test); ok(SUCCEEDED(hr),"GetTop failed\n"); + ITfDocumentMgr_Release(docmgr); ok(test == pic, "Wrong context is on top\n"); if (test) ITfContext_Release(test); @@ -969,6 +973,11 @@ { BOOL found = FALSE; IEnumTfLanguageProfiles *ppEnum; + HRESULT hr; + + hr = ITfInputProcessorProfiles_EnumLanguageProfiles(g_ipp, gLangid, NULL); + ok(hr == E_INVALIDARG, "EnumLanguageProfiles failed: %x\n", hr); + if (SUCCEEDED(ITfInputProcessorProfiles_EnumLanguageProfiles(g_ipp,gLangid,&ppEnum))) { TF_LANGUAGEPROFILE profile; @@ -1474,7 +1483,7 @@ DWORD editCookie; ITfDocumentMgr *dmtest; ITfContext *cxt,*cxt2,*cxt3,*cxtTest; - ITextStoreACP *ts; + ITextStoreACP *ts = NULL; TfClientId cid2 = 0; ITfThreadMgrEx *tmex; @@ -1641,6 +1650,8 @@ ok(hr == S_FALSE, "ITfContext_GetDocumentMgr wrong rc %x\n",hr); ok(dmtest == NULL,"returned documentmgr should be null\n"); + ITfContext_Release(cxt2); + hr = ITfDocumentMgr_GetTop(g_dm, &cxtTest); ok(SUCCEEDED(hr),"GetTop Failed\n"); ok(cxtTest == cxt, "Wrong context on top\n"); @@ -1650,6 +1661,25 @@ ok(SUCCEEDED(hr),"GetBase Failed\n"); ok(cxtTest == cxt, "Wrong context on base\n"); ITfContext_Release(cxtTest); + + hr = ITfDocumentMgr_CreateContext(g_dm, cid, 0, (IUnknown*)ts, &cxt2, &editCookie); + ok(hr == S_OK,"CreateContext Failed\n"); + + test_OnPushContext = SINK_EXPECTED; + test_ACP_AdviseSink = SINK_EXPECTED; + hr = ITfDocumentMgr_Push(g_dm, cxt2); + ok(hr == S_OK,"Push Failed\n"); + sink_check_ok(&test_OnPushContext,"OnPushContext"); + sink_check_ok(&test_ACP_AdviseSink,"TextStoreACP_AdviseSink"); + + test_ACP_UnadviseSink = SINK_EXPECTED; + cnt = check_context_refcount(cxt2); + test_OnPopContext = SINK_EXPECTED; + hr = ITfDocumentMgr_Pop(g_dm, 0); + ok(hr == S_OK,"Pop Failed\n"); + ok(check_context_refcount(cxt2) < cnt, "Ref count did not decrease\n"); + sink_check_ok(&test_OnPopContext,"OnPopContext"); + sink_check_ok(&test_ACP_UnadviseSink,"TextStoreACP_AdviseSink"); hr = ITfDocumentMgr_Pop(g_dm, 0); ok(FAILED(hr),"Pop Succeeded\n"); @@ -2320,6 +2350,9 @@ test_UnregisterCategory(); test_Unregister(); test_profile_mgr(); + + ITextStoreACPSink_Release(ACPSink); + ITfDocumentMgr_Release(g_dm); } else skip("Unable to create InputProcessor\n");

8 years, 4 months

[akhaldi] 72290: [MSCTF] Sync with Wine Staging 1.9.16. CORE-11866

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Thu Aug 18 10:19:15 2016 New Revision: 72290 URL: http://svn.reactos.org/svn/reactos?rev=72290&view=rev Log: [MSCTF] Sync with Wine Staging 1.9.16. CORE-11866 Modified: trunk/reactos/dll/win32/msctf/context.c trunk/reactos/dll/win32/msctf/inputprocessor.c trunk/reactos/dll/win32/msctf/msctf.c trunk/reactos/dll/win32/msctf/threadmgr.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/msctf/context.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msctf/context.c?… ============================================================================== --- trunk/reactos/dll/win32/msctf/context.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msctf/context.c [iso-8859-1] Thu Aug 18 10:19:15 2016 @@ -98,10 +98,7 @@ TRACE("destroying %p\n", This); if (This->pITextStoreACP) - { - ITextStoreACP_UnadviseSink(This->pITextStoreACP, (IUnknown*)&This->ITextStoreACPSink_iface); ITextStoreACP_Release(This->pITextStoreACP); - } if (This->pITfContextOwnerCompositionSink) ITfContextOwnerCompositionSink_Release(This->pITfContextOwnerCompositionSink); Modified: trunk/reactos/dll/win32/msctf/inputprocessor.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msctf/inputproce… ============================================================================== --- trunk/reactos/dll/win32/msctf/inputprocessor.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msctf/inputprocessor.c [iso-8859-1] Thu Aug 18 10:19:15 2016 @@ -72,7 +72,7 @@ } EnumTfInputProcessorProfiles; static HRESULT ProfilesEnumGuid_Constructor(IEnumGUID **ppOut); -static HRESULT EnumTfLanguageProfiles_Constructor(LANGID langid, IEnumTfLanguageProfiles **ppOut); +static HRESULT EnumTfLanguageProfiles_Constructor(LANGID langid, EnumTfLanguageProfiles **out); static inline EnumTfInputProcessorProfiles *impl_from_IEnumTfInputProcessorProfiles(IEnumTfInputProcessorProfiles *iface) { @@ -595,8 +595,17 @@ IEnumTfLanguageProfiles **ppEnum) { InputProcessorProfiles *This = impl_from_ITfInputProcessorProfiles(iface); + EnumTfLanguageProfiles *profenum; + HRESULT hr; + TRACE("(%p) %x %p\n",This,langid,ppEnum); - return EnumTfLanguageProfiles_Constructor(langid, ppEnum); + + if (!ppEnum) + return E_INVALIDARG; + hr = EnumTfLanguageProfiles_Constructor(langid, &profenum); + *ppEnum = &profenum->IEnumTfLanguageProfiles_iface; + + return hr; } static HRESULT WINAPI InputProcessorProfiles_EnableLanguageProfile( @@ -1267,16 +1276,16 @@ IEnumTfLanguageProfiles **ppenum) { EnumTfLanguageProfiles *This = impl_from_IEnumTfLanguageProfiles(iface); + EnumTfLanguageProfiles *new_This; HRESULT res; TRACE("(%p)\n",This); if (ppenum == NULL) return E_POINTER; - res = EnumTfLanguageProfiles_Constructor(This->langid, ppenum); + res = EnumTfLanguageProfiles_Constructor(This->langid, &new_This); if (SUCCEEDED(res)) { - EnumTfLanguageProfiles *new_This = (EnumTfLanguageProfiles *)*ppenum; new_This->tip_index = This->tip_index; lstrcpynW(new_This->szwCurrentClsid,This->szwCurrentClsid,39); @@ -1289,6 +1298,7 @@ res = RegOpenKeyExW(new_This->tipkey, fullkey, 0, KEY_READ | KEY_WRITE, &This->langkey); new_This->lang_index = This->lang_index; } + *ppenum = &new_This->IEnumTfLanguageProfiles_iface; } return res; } @@ -1304,7 +1314,7 @@ EnumTfLanguageProfiles_Skip }; -static HRESULT EnumTfLanguageProfiles_Constructor(LANGID langid, IEnumTfLanguageProfiles **ppOut) +static HRESULT EnumTfLanguageProfiles_Constructor(LANGID langid, EnumTfLanguageProfiles **out) { HRESULT hr; EnumTfLanguageProfiles *This; @@ -1331,7 +1341,7 @@ return E_FAIL; } - *ppOut = &This->IEnumTfLanguageProfiles_iface; - TRACE("returning %p\n", *ppOut); - return S_OK; -} + *out = This; + TRACE("returning %p\n", *out); + return S_OK; +} Modified: trunk/reactos/dll/win32/msctf/msctf.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msctf/msctf.c?re… ============================================================================== --- trunk/reactos/dll/win32/msctf/msctf.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msctf/msctf.c [iso-8859-1] Thu Aug 18 10:19:15 2016 @@ -370,7 +370,7 @@ list_remove(&ats->entry); HeapFree(GetProcessHeap(),0,ats->ats); HeapFree(GetProcessHeap(),0,ats); - /* we are guarenteeing there is only 1 */ + /* we are guaranteeing there is only 1 */ break; } } Modified: trunk/reactos/dll/win32/msctf/threadmgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msctf/threadmgr.… ============================================================================== --- trunk/reactos/dll/win32/msctf/threadmgr.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msctf/threadmgr.c [iso-8859-1] Thu Aug 18 10:19:15 2016 @@ -1467,8 +1467,8 @@ This->head = head; This->index = list_head(This->head); - TRACE("returning %p\n", This); - *ppOut = (IEnumTfDocumentMgrs*)This; + TRACE("returning %p\n", &This->IEnumTfDocumentMgrs_iface); + *ppOut = &This->IEnumTfDocumentMgrs_iface; return S_OK; } 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] Thu Aug 18 10:19:15 2016 @@ -108,7 +108,7 @@ reactos/dll/win32/mscat32 # Synced to WineStaging-1.9.11 reactos/dll/win32/mscms # Synced to WineStaging-1.9.11 reactos/dll/win32/mscoree # Synced to Wine-1.5.4 -reactos/dll/win32/msctf # Synced to WineStaging-1.9.11 +reactos/dll/win32/msctf # Synced to WineStaging-1.9.16 reactos/dll/win32/msftedit # Synced to WineStaging-1.9.11 reactos/dll/win32/msg711.acm # Synced to WineStaging-1.9.11 reactos/dll/win32/msgsm32.acm # Synced to WineStaging-1.9.11

8 years, 4 months

[akhaldi] 72289: [MMDEVAPI_WINETEST] Sync with Wine Staging 1.9.16. CORE-11866

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Thu Aug 18 10:17:56 2016 New Revision: 72289 URL: http://svn.reactos.org/svn/reactos?rev=72289&view=rev Log: [MMDEVAPI_WINETEST] Sync with Wine Staging 1.9.16. CORE-11866 Modified: trunk/rostests/winetests/mmdevapi/capture.c trunk/rostests/winetests/mmdevapi/render.c Modified: trunk/rostests/winetests/mmdevapi/capture.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/mmdevapi/captur… ============================================================================== --- trunk/rostests/winetests/mmdevapi/capture.c [iso-8859-1] (original) +++ trunk/rostests/winetests/mmdevapi/capture.c [iso-8859-1] Thu Aug 18 10:17:56 2016 @@ -244,10 +244,8 @@ ok(hr == S_OK, "Valid IAudioCaptureClient_GetBuffer returns %08x\n", hr); ok(frames2 == frames, "GetBuffer after ReleaseBuffer(0) %u/%u\n", frames2, frames); ok(pos2 == pos, "Position after ReleaseBuffer(0) %u/%u\n", (UINT)pos2, (UINT)pos); - if(qpc2 != qpc) + todo_wine_if(qpc2 != qpc) /* FIXME: Some drivers fail */ - todo_wine ok(qpc2 == qpc, "HPC after ReleaseBuffer(0) %u vs. %u\n", (UINT)qpc2, (UINT)qpc); - else ok(qpc2 == qpc, "HPC after ReleaseBuffer(0) %u vs. %u\n", (UINT)qpc2, (UINT)qpc); } @@ -414,7 +412,7 @@ sum += frames; } else if(hr == AUDCLNT_S_BUFFER_EMPTY){ - ok(!pad, "resetted GCP %u\n", pad); + ok(!pad, "reset GCP %u\n", pad); Sleep(180); } @@ -590,7 +588,7 @@ ok(hr == S_OK, "SetEventHandle returns %08x\n", hr); hr = IAudioClient_Reset(ac); - ok(hr == S_OK, "Reset on a resetted stream returns %08x\n", hr); + ok(hr == S_OK, "Reset on an already reset stream returns %08x\n", hr); hr = IAudioClient_Stop(ac); ok(hr == S_FALSE, "Stop on a stopped stream returns %08x\n", hr); @@ -920,7 +918,7 @@ ok(hr == S_OK, "GetService (SimpleAudioVolume) failed: %08x\n", hr); hr = IAudioClient_GetService(ac, &IID_IChannelAudioVolume, (void**)&cav); - ok(hr == S_OK, "GetService (ChannelAudioVolme) failed: %08x\n", hr); + ok(hr == S_OK, "GetService (ChannelAudioVolume) failed: %08x\n", hr); hr = IAudioClient_GetService(ac, &IID_IAudioStreamVolume, (void**)&asv); ok(hr == S_OK, "GetService (AudioStreamVolume) failed: %08x\n", hr); Modified: trunk/rostests/winetests/mmdevapi/render.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/mmdevapi/render… ============================================================================== --- trunk/rostests/winetests/mmdevapi/render.c [iso-8859-1] (original) +++ trunk/rostests/winetests/mmdevapi/render.c [iso-8859-1] Thu Aug 18 10:17:56 2016 @@ -358,7 +358,7 @@ ok(hr == S_OK, "Reset on an initialized stream returns %08x\n", hr); hr = IAudioClient_Reset(ac); - ok(hr == S_OK, "Reset on a resetted stream returns %08x\n", hr); + ok(hr == S_OK, "Reset on an already reset stream returns %08x\n", hr); hr = IAudioClient_Stop(ac); ok(hr == S_FALSE, "Stop on a stopped stream returns %08x\n", hr); @@ -1088,7 +1088,7 @@ slept = sum = 0; hr = IAudioClient_Reset(ac); - ok(hr == S_OK, "Reset on a resetted stream returns %08x\n", hr); + ok(hr == S_OK, "Reset on an already reset stream returns %08x\n", hr); hr = IAudioClock_GetPosition(acl, &pos, &pcpos); ok(hr == S_OK, "GetPosition failed: %08x\n", hr); @@ -1162,7 +1162,7 @@ ok(QueryPerformanceCounter(&hpctime0), "PerfCounter unavailable\n"); hr = IAudioClient_Reset(ac); - ok(hr == S_OK, "Reset on a resetted stream returns %08x\n", hr); + ok(hr == S_OK, "Reset on an already reset stream returns %08x\n", hr); hr = IAudioClient_Start(ac); ok(hr == S_OK, "Start failed: %08x\n", hr); @@ -1852,7 +1852,7 @@ } hr = IAudioClient_GetService(ac, &IID_IChannelAudioVolume, (void**)&cav); - ok(hr == S_OK, "GetService (ChannelAudioVolme) failed: %08x\n", hr); + ok(hr == S_OK, "GetService (ChannelAudioVolume) failed: %08x\n", hr); hr = IAudioClient_GetService(ac, &IID_IAudioStreamVolume, (void**)&asv); ok(hr == S_OK, "GetService (AudioStreamVolume) failed: %08x\n", hr);

8 years, 4 months

← Newer
1
...
21
22
23
24
25
26
27
...
47
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs August 2016