Ros-diffs

ros-diffs@reactos.org

81390 discussions

[akhaldi] 70051: [XDK] Add missing AT_ROUND_TO_PAGE.
by akhaldi＠svn.reactos.org 23 Nov '15

23 Nov '15

Author: akhaldi Date: Mon Nov 23 09:15:43 2015 New Revision: 70051 URL: http://svn.reactos.org/svn/reactos?rev=70051&view=rev Log: [XDK] Add missing AT_ROUND_TO_PAGE. Modified: trunk/reactos/include/xdk/winnt_old.h Modified: trunk/reactos/include/xdk/winnt_old.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/xdk/winnt_old.h?re… ============================================================================== --- trunk/reactos/include/xdk/winnt_old.h [iso-8859-1] (original) +++ trunk/reactos/include/xdk/winnt_old.h [iso-8859-1] Mon Nov 23 09:15:43 2015 @@ -577,6 +577,8 @@ #define MESSAGE_RESOURCE_UNICODE 1 #define RTL_CRITSECT_TYPE 0 #define RTL_RESOURCE_TYPE 1 + +#define AT_ROUND_TO_PAGE 0x40000000 #define IMAGE_SIZEOF_FILE_HEADER 20 #define IMAGE_FILE_RELOCS_STRIPPED 1

1 0

[akhaldi] 70050: [MSXML3_WINETEST] Sync with Wine Staging 1.7.55. CORE-10536
by akhaldi＠svn.reactos.org 23 Nov '15

23 Nov '15

Author: akhaldi Date: Mon Nov 23 09:12:39 2015 New Revision: 70050 URL: http://svn.reactos.org/svn/reactos?rev=70050&view=rev Log: [MSXML3_WINETEST] Sync with Wine Staging 1.7.55. CORE-10536 Modified: trunk/rostests/winetests/msxml3/domdoc.c trunk/rostests/winetests/msxml3/saxreader.c trunk/rostests/winetests/msxml3/xmlparser.idl Modified: trunk/rostests/winetests/msxml3/domdoc.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/msxml3/domdoc.c… ============================================================================== --- trunk/rostests/winetests/msxml3/domdoc.c [iso-8859-1] (original) +++ trunk/rostests/winetests/msxml3/domdoc.c [iso-8859-1] Mon Nov 23 09:12:39 2015 @@ -7505,6 +7505,19 @@ IXMLDOMSchemaCollection *cache; VARIANT_BOOL b; VARIANT var; + IXMLDOMElement *element; + IXMLDOMNodeList *node_list; + IXMLDOMAttribute *attr; + LONG i, len; + HRESULT hr; + const CHAR nodeXML[] = + "<root id='0'>" + " " + " text node 0" + " <x attr='val'></x>" + " <?foo value='PI for x'?>" + " <![CDATA[ cdata ]]>" + "</root>"; if (!is_clsid_supported(&CLSID_DOMDocument2, &IID_IXMLDOMDocument2)) return; if (!is_clsid_supported(&CLSID_XMLSchemaCache, &IID_IXMLDOMSchemaCollection)) return; @@ -7556,6 +7569,47 @@ unset_props(doc_owner); check_default_props(doc_owner); check_default_props(doc); + + /* NULL check */ + hr = IXMLDOMDocument_loadXML(doc1, _bstr_(nodeXML), &b); + EXPECT_HR(hr, S_OK); + ok(b == VARIANT_TRUE, "failed to load XML string\n"); + + hr = IXMLDOMDocument_get_documentElement(doc1, &element); + EXPECT_HR(hr, S_OK); + + hr = IXMLDOMElement_get_childNodes(element, &node_list); + EXPECT_HR(hr, S_OK); + + hr = IXMLDOMNodeList_get_length(node_list, &len); + EXPECT_HR(hr, S_OK); + + for(i = 0; i < len; i++) { + hr = IXMLDOMNodeList_get_item(node_list, i, &node); + EXPECT_HR(hr, S_OK); + + hr = IXMLDOMNode_get_ownerDocument(node, NULL); + EXPECT_HR(hr, E_INVALIDARG); + + IXMLDOMNode_Release(node); + } + IXMLDOMElement_Release(element); + + /* Test Attribute Node */ + hr = IXMLDOMNodeList_get_item(node_list, 2, &node); + EXPECT_HR(hr, S_OK); + hr = IXMLDOMNode_QueryInterface(node, &IID_IXMLDOMElement, (void**)&element); + EXPECT_HR(hr, S_OK); + IXMLDOMNode_Release(node); + + hr = IXMLDOMElement_getAttributeNode(element, _bstr_("attr"), &attr); + EXPECT_HR(hr, S_OK); + ok(attr != NULL, "attr == NULL\n"); + IXMLDOMElement_Release(element); + hr = IXMLDOMAttribute_get_ownerDocument(attr, NULL); + EXPECT_HR(hr, E_INVALIDARG); + IXMLDOMAttribute_Release(attr); + IXMLDOMNodeList_Release(node_list); IXMLDOMSchemaCollection_Release(cache); IXMLDOMDocument_Release(doc1); @@ -8961,6 +9015,7 @@ ok(doctype == NULL, "got %p\n", doctype); hr = IXMLDOMDocument_loadXML(doc, _bstr_(szEmailXML), &b); + ok(hr == S_OK, "got 0x%08x\n", hr); ok(b == VARIANT_TRUE, "failed to load XML string\n"); doctype = NULL; @@ -10866,6 +10921,56 @@ free_bstrs(); } +static void test_getAttribute(void) +{ + IXMLDOMDocument *doc; + IXMLDOMElement *elem; + VARIANT_BOOL v; + VARIANT var; + HRESULT hr; + + doc = create_document(&IID_IXMLDOMDocument); + + hr = IXMLDOMDocument_loadXML(doc, _bstr_(szExampleXML), &v); + EXPECT_HR(hr, S_OK); + + hr = IXMLDOMDocument_get_documentElement(doc, &elem); + EXPECT_HR(hr, S_OK); + + VariantInit(&var); + hr = IXMLDOMElement_getAttribute( elem, _bstr_("xmlns:foo"), &var ); + EXPECT_HR(hr, S_OK); + ok( V_VT(&var) == VT_BSTR, "vt = %x\n", V_VT(&var)); + ok( !lstrcmpW(V_BSTR(&var), _bstr_("urn:uuid:86B2F87F-ACB6-45cd-8B77-9BDB92A01A29")), "wrong attr value: %s\n", wine_dbgstr_w(V_BSTR(&var))); + VariantClear(&var); + + hr = IXMLDOMElement_getAttribute( elem, _bstr_("a"), &var ); + EXPECT_HR(hr, S_OK); + ok( V_VT(&var) == VT_BSTR, "vt = %x\n", V_VT(&var)); + ok( !lstrcmpW(V_BSTR(&var), _bstr_("attr a")), "wrong attr value: %s\n", wine_dbgstr_w(V_BSTR(&var))); + VariantClear(&var); + + hr = IXMLDOMElement_getAttribute( elem, _bstr_("foo:b"), &var ); + EXPECT_HR(hr, S_OK); + ok( V_VT(&var) == VT_BSTR, "vt = %x\n", V_VT(&var)); + ok( !lstrcmpW(V_BSTR(&var), _bstr_("attr b")), "wrong attr value: %s\n", wine_dbgstr_w(V_BSTR(&var))); + VariantClear(&var); + + hr = IXMLDOMElement_getAttribute( elem, _bstr_("b"), &var ); + EXPECT_HR(hr, S_FALSE); + ok( V_VT(&var) == VT_NULL, "vt = %x\n", V_VT(&var)); + VariantClear(&var); + + hr = IXMLDOMElement_getAttribute( elem, _bstr_("non-existent"), &var ); + EXPECT_HR(hr, S_FALSE); + ok( V_VT(&var) == VT_NULL, "vt = %x\n", V_VT(&var)); + VariantClear(&var); + + IXMLDOMElement_Release(elem); + IXMLDOMDocument_Release(doc); + free_bstrs(); +} + typedef struct { DOMNodeType type; const char *name; @@ -11917,6 +12022,71 @@ ok(s == NULL, "got %s\n", wine_dbgstr_w(s)); IXMLDOMDocument_Release(doc); +} + +static void test_merging_text(void) +{ + IXMLDOMText *nodetext; + IXMLDOMText *newtext; + IXMLDOMElement *root; + IXMLDOMDocument *doc; + IXMLDOMNode *first; + HRESULT hr; + VARIANT v; + BSTR str; + int i; + + doc = create_document(&IID_IXMLDOMDocument); + + hr = IXMLDOMDocument_createElement(doc, _bstr_("Testing"), &root); + EXPECT_HR(hr, S_OK); + + hr = IXMLDOMDocument_appendChild(doc, (IXMLDOMNode*)root, NULL); + EXPECT_HR(hr, S_OK); + + /* test xmlAddChild */ + for (i = 0; i < 10; i++) + { + str = SysAllocString(szstr1); + hr = IXMLDOMDocument_createTextNode(doc, str, &nodetext); + SysFreeString(str); + EXPECT_HR(hr, S_OK); + + newtext = NULL; + hr = IXMLDOMElement_appendChild(root, (IXMLDOMNode*)nodetext, (IXMLDOMNode**)&newtext); + EXPECT_HR(hr, S_OK); + ok(nodetext == newtext, "expected %p, got %p\n", nodetext, newtext); + + IXMLDOMText_Release(newtext); + IXMLDOMText_Release(nodetext); + } + + /* test xmlAddPrevSibling */ + hr = IXMLDOMElement_get_firstChild(root, &first); + EXPECT_HR(hr, S_OK); + V_VT(&v) = VT_UNKNOWN; + V_UNKNOWN(&v) = (IUnknown*)first; + for (i = 0; i < 10; i++) + { + str = SysAllocString(szstr2); + hr = IXMLDOMDocument_createTextNode(doc, str, &nodetext); + SysFreeString(str); + EXPECT_HR(hr, S_OK); + + newtext = NULL; + hr = IXMLDOMElement_insertBefore(root, (IXMLDOMNode*)nodetext, v, (IXMLDOMNode**)&newtext); + EXPECT_HR(hr, S_OK); + ok(nodetext == newtext, "expected %p, got %p\n", nodetext, newtext); + + IXMLDOMText_Release(newtext); + IXMLDOMText_Release(nodetext); + } + + IXMLDOMNode_Release(first); + IXMLDOMElement_Release(root); + IXMLDOMDocument_Release(doc); + + free_bstrs(); } START_TEST(domdoc) @@ -11990,6 +12160,7 @@ test_dispex(); test_parseerror(); test_getAttributeNode(); + test_getAttribute(); test_supporterrorinfo(); test_nodeValue(); test_get_namespaces(); @@ -11998,6 +12169,7 @@ test_namedmap_newenum(); test_xmlns_attribute(); test_url(); + test_merging_text(); test_xsltemplate(); test_xsltext(); Modified: trunk/rostests/winetests/msxml3/saxreader.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/msxml3/saxreade… ============================================================================== --- trunk/rostests/winetests/msxml3/saxreader.c [iso-8859-1] (original) +++ trunk/rostests/winetests/msxml3/saxreader.c [iso-8859-1] Mon Nov 23 09:12:39 2015 @@ -2395,6 +2395,7 @@ hr = ISAXXMLReader_parse(reader, var); EXPECT_HR(hr, S_OK); ok_sequence(sequences, CONTENT_HANDLER_INDEX, test_seq, "content test attributes", TRUE); + IStream_Release(stream); hr = ISAXXMLReader_putFeature(reader, _bstr_("http://xml.org/sax/features/namespaces"), VARIANT_TRUE); EXPECT_HR(hr, S_OK); @@ -2418,6 +2419,7 @@ hr = ISAXXMLReader_parse(reader, var); EXPECT_HR(hr, S_OK); ok_sequence(sequences, CONTENT_HANDLER_INDEX, test_seq, "content test attributes", FALSE); + IStream_Release(stream); hr = ISAXXMLReader_putFeature(reader, _bstr_("http://xml.org/sax/features/namespace-prefixes"), VARIANT_TRUE); EXPECT_HR(hr, S_OK); Modified: trunk/rostests/winetests/msxml3/xmlparser.idl URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/msxml3/xmlparse… ============================================================================== --- trunk/rostests/winetests/msxml3/xmlparser.idl [iso-8859-1] (original) +++ trunk/rostests/winetests/msxml3/xmlparser.idl [iso-8859-1] Mon Nov 23 09:12:39 2015 @@ -15,6 +15,8 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ + +#pragma makedep header import "unknwn.idl"; import "objidl.idl"; @@ -254,7 +256,7 @@ ] library XMLPSR { -importlib("stdole32.tlb"); +/* importlib("stdole32.tlb"); */ importlib("stdole2.tlb"); [

1 0

[akhaldi] 70049: [MSXML3] Sync with Wine Staging 1.7.55. CORE-10536
by akhaldi＠svn.reactos.org 23 Nov '15

23 Nov '15

Author: akhaldi Date: Mon Nov 23 09:11:20 2015 New Revision: 70049 URL: http://svn.reactos.org/svn/reactos?rev=70049&view=rev Log: [MSXML3] Sync with Wine Staging 1.7.55. CORE-10536 Modified: trunk/reactos/dll/win32/msxml3/domdoc.c trunk/reactos/dll/win32/msxml3/element.c trunk/reactos/dll/win32/msxml3/node.c trunk/reactos/dll/win32/msxml3/saxreader.c trunk/reactos/dll/win32/msxml3/xmlparser.idl trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/msxml3/domdoc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msxml3/domdoc.c?… ============================================================================== --- trunk/reactos/dll/win32/msxml3/domdoc.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msxml3/domdoc.c [iso-8859-1] Mon Nov 23 09:11:20 2015 @@ -1945,7 +1945,7 @@ } xml_name = xmlchar_from_wchar(name); - /* prevent empty href to be allocated */ + /* prevent empty href from being allocated */ href = namespaceURI ? xmlchar_from_wchar(namespaceURI) : NULL; switch(node_type) @@ -1958,7 +1958,7 @@ xmlnode = xmlNewDocNode(get_doc(This), NULL, local ? local : xml_name, NULL); - /* allow to create default namespace xmlns= */ + /* allow creating the default namespace xmlns= */ if (local || (href && *href)) { xmlNsPtr ns = xmlNewNs(xmlnode, href, prefix); Modified: trunk/reactos/dll/win32/msxml3/element.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msxml3/element.c… ============================================================================== --- trunk/reactos/dll/win32/msxml3/element.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msxml3/element.c [iso-8859-1] Mon Nov 23 09:11:20 2015 @@ -1182,7 +1182,9 @@ domelem *This = impl_from_IXMLDOMElement( iface ); xmlNodePtr element; xmlChar *xml_name, *xml_value = NULL; + xmlChar *local, *prefix; HRESULT hr = S_FALSE; + xmlNsPtr ns; TRACE("(%p)->(%s %p)\n", This, debugstr_w(name), value); @@ -1201,7 +1203,28 @@ if(!xmlValidateNameValue(xml_name)) hr = E_FAIL; else - xml_value = xmlGetNsProp(element, xml_name, NULL); + { + if ((local = xmlSplitQName2(xml_name, &prefix))) + { + if (xmlStrEqual(prefix, BAD_CAST "xmlns")) + { + ns = xmlSearchNs(element->doc, element, local); + if (ns) + xml_value = xmlStrdup(ns->href); + } + else + { + ns = xmlSearchNs(element->doc, element, prefix); + if (ns) + xml_value = xmlGetNsProp(element, local, ns->href); + } + + xmlFree(prefix); + xmlFree(local); + } + else + xml_value = xmlGetNsProp(element, xml_name, NULL); + } heap_free(xml_name); if(xml_value) Modified: trunk/reactos/dll/win32/msxml3/node.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msxml3/node.c?re… ============================================================================== --- trunk/reactos/dll/win32/msxml3/node.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msxml3/node.c [iso-8859-1] Mon Nov 23 09:11:20 2015 @@ -477,7 +477,7 @@ refcount = xmlnode_get_inst_cnt(node_obj); if (refcount) xmldoc_add_refs(before_node_obj->node->doc, refcount); - xmlAddPrevSibling(before_node_obj->node, node_obj->node); + node_obj->node = xmlAddPrevSibling(before_node_obj->node, node_obj->node); if (refcount) xmldoc_release_refs(doc, refcount); node_obj->parent = This->parent; } @@ -489,7 +489,7 @@ if (refcount) xmldoc_add_refs(This->node->doc, refcount); /* xmlAddChild doesn't unlink node from previous parent */ xmlUnlinkNode(node_obj->node); - xmlAddChild(This->node, node_obj->node); + node_obj->node = xmlAddChild(This->node, node_obj->node); if (refcount) xmldoc_release_refs(doc, refcount); node_obj->parent = This->iface; } @@ -635,6 +635,8 @@ HRESULT node_get_owner_doc(const xmlnode *This, IXMLDOMDocument **doc) { + if(!doc) + return E_INVALIDARG; return get_domdoc_from_xmldoc(This->node->doc, (IXMLDOMDocument3**)doc); } 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] Mon Nov 23 09:11:20 2015 @@ -668,12 +668,13 @@ static void update_position(saxlocator *This, BOOL fix_column) { const xmlChar *p = This->pParserCtxt->input->cur-1; + const xmlChar *baseP = This->pParserCtxt->input->base; This->line = xmlSAX2GetLineNumber(This->pParserCtxt); if(fix_column) { This->column = 1; - for(; *p!='\n' && *p!='\r' && p>=This->pParserCtxt->input->base; p--) + for(;p>=baseP && *p!='\n' && *p!='\r'; p--) This->column++; } else Modified: trunk/reactos/dll/win32/msxml3/xmlparser.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msxml3/xmlparser… ============================================================================== --- trunk/reactos/dll/win32/msxml3/xmlparser.idl [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msxml3/xmlparser.idl [iso-8859-1] Mon Nov 23 09:11:20 2015 @@ -256,7 +256,7 @@ ] library XMLPSR { -importlib("stdole32.tlb"); +/* importlib("stdole32.tlb"); */ importlib("stdole2.tlb"); [ 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] Mon Nov 23 09:11:20 2015 @@ -132,7 +132,7 @@ reactos/dll/win32/msvidc32 # Synced to WineStaging-1.7.55 reactos/dll/win32/msxml # Synced to WineStaging-1.7.47 reactos/dll/win32/msxml2 # Synced to WineStaging-1.7.47 -reactos/dll/win32/msxml3 # Synced to WineStaging-1.7.47 +reactos/dll/win32/msxml3 # Synced to WineStaging-1.7.55 reactos/dll/win32/msxml4 # Synced to WineStaging-1.7.47 reactos/dll/win32/msxml6 # Synced to WineStaging-1.7.47 reactos/dll/win32/nddeapi # Synced to WineStaging-1.7.47

1 0

[akhaldi] 70048: [MSCMS_WINETEST] Sync with Wine Staging 1.7.55. CORE-10536
by akhaldi＠svn.reactos.org 23 Nov '15

23 Nov '15

Author: akhaldi Date: Mon Nov 23 09:03:09 2015 New Revision: 70048 URL: http://svn.reactos.org/svn/reactos?rev=70048&view=rev Log: [MSCMS_WINETEST] Sync with Wine Staging 1.7.55. CORE-10536 Modified: trunk/rostests/winetests/mscms/profile.c Modified: trunk/rostests/winetests/mscms/profile.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/mscms/profile.c… ============================================================================== --- trunk/rostests/winetests/mscms/profile.c [iso-8859-1] (original) +++ trunk/rostests/winetests/mscms/profile.c [iso-8859-1] Mon Nov 23 09:03:09 2015 @@ -35,6 +35,8 @@ static BOOL (WINAPI *pAssociateColorProfileWithDeviceA)(PCSTR,PCSTR,PCSTR); static BOOL (WINAPI *pCloseColorProfile)(HPROFILE); +static HTRANSFORM (WINAPI *pCreateMultiProfileTransform)(PHPROFILE,DWORD,PDWORD,DWORD,DWORD,DWORD); +static BOOL (WINAPI *pDeleteColorTransform)(HTRANSFORM); static BOOL (WINAPI *pDisassociateColorProfileFromDeviceA)(PCSTR,PCSTR,PCSTR); static BOOL (WINAPI *pGetColorDirectoryA)(PCHAR,PCHAR,PDWORD); static BOOL (WINAPI *pGetColorDirectoryW)(PWCHAR,PWCHAR,PDWORD); @@ -68,6 +70,8 @@ { GETFUNCPTR( AssociateColorProfileWithDeviceA ) GETFUNCPTR( CloseColorProfile ) + GETFUNCPTR( CreateMultiProfileTransform ) + GETFUNCPTR( DeleteColorTransform ) GETFUNCPTR( DisassociateColorProfileFromDeviceA ) GETFUNCPTR( GetColorDirectoryA ) GETFUNCPTR( GetColorDirectoryW ) @@ -1334,6 +1338,38 @@ return TRUE; } +static void test_CreateMultiProfileTransform( char *standardprofile, char *testprofile ) +{ + PROFILE profile; + HPROFILE handle[2]; + HTRANSFORM transform; + DWORD intents[2] = { INTENT_PERCEPTUAL, INTENT_PERCEPTUAL }; + + if (testprofile) + { + profile.dwType = PROFILE_FILENAME; + profile.pProfileData = standardprofile; + profile.cbDataSize = strlen(standardprofile); + + handle[0] = pOpenColorProfileA( &profile, PROFILE_READ, 0, OPEN_EXISTING ); + ok( handle[0] != NULL, "got %u\n", GetLastError() ); + + profile.dwType = PROFILE_FILENAME; + profile.pProfileData = testprofile; + profile.cbDataSize = strlen(testprofile); + + handle[1] = pOpenColorProfileA( &profile, PROFILE_READ, 0, OPEN_EXISTING ); + ok( handle[1] != NULL, "got %u\n", GetLastError() ); + + transform = pCreateMultiProfileTransform( handle, 2, intents, 2, 0, 0 ); + ok( transform != NULL, "got %u\n", GetLastError() ); + + pDeleteColorTransform( transform ); + pCloseColorProfile( handle[0] ); + pCloseColorProfile( handle[1] ); + } +} + START_TEST(profile) { UINT len; @@ -1443,6 +1479,7 @@ test_UninstallColorProfileW( testprofileW ); test_AssociateColorProfileWithDeviceA( testprofile ); + test_CreateMultiProfileTransform( standardprofile, testprofile ); if (testprofile) DeleteFileA( testprofile ); FreeLibrary( huser32 );

1 0

[akhaldi] 70047: [PSDK] Update icm.h. CORE-10536
by akhaldi＠svn.reactos.org 23 Nov '15

23 Nov '15

Author: akhaldi Date: Mon Nov 23 09:02:47 2015 New Revision: 70047 URL: http://svn.reactos.org/svn/reactos?rev=70047&view=rev Log: [PSDK] Update icm.h. CORE-10536 Modified: trunk/reactos/include/psdk/icm.h Modified: trunk/reactos/include/psdk/icm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/icm.h?rev=700… ============================================================================== --- trunk/reactos/include/psdk/icm.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/icm.h [iso-8859-1] Mon Nov 23 09:02:47 2015 @@ -179,6 +179,11 @@ typedef BOOL (CALLBACK *PBMCALLBACKFN)(ULONG,ULONG,LPARAM); typedef PBMCALLBACKFN LPPBMCALLBACKFN; +#define INTENT_PERCEPTUAL 0 +#define INTENT_RELATIVE_COLORIMETRIC 1 +#define INTENT_SATURATION 2 +#define INTENT_ABSOLUTE_COLORIMETRIC 3 + typedef struct tagPROFILEHEADER { DWORD phSize; @@ -359,7 +364,6 @@ BOOL WINAPI GetColorProfileElementTag(HPROFILE,DWORD,PTAGTYPE); BOOL WINAPI GetColorProfileFromHandle(HPROFILE,PBYTE,PDWORD); BOOL WINAPI GetColorProfileHeader(HPROFILE,PPROFILEHEADER); -HCOLORSPACE WINAPI GetColorSpace(HDC); BOOL WINAPI GetCountColorProfileElements(HPROFILE,PDWORD); BOOL WINAPI GetNamedProfileInfo(HPROFILE,PNAMED_PROFILE_INFO); BOOL WINAPI GetPS2ColorRenderingDictionary(HPROFILE,DWORD,PBYTE,PDWORD,PBOOL); @@ -384,7 +388,6 @@ BOOL WINAPI SetColorProfileElementReference(HPROFILE,TAGTYPE,TAGTYPE); BOOL WINAPI SetColorProfileElementSize(HPROFILE,TAGTYPE,DWORD); BOOL WINAPI SetColorProfileHeader(HPROFILE,PPROFILEHEADER); -HCOLORSPACE WINAPI SetColorSpace(HDC,HCOLORSPACE); BOOL WINAPI SetStandardColorSpaceProfileA(PCSTR,DWORD,PSTR); BOOL WINAPI SetStandardColorSpaceProfileW(PCWSTR,DWORD,PWSTR); #define SetStandardColorSpaceProfile WINELIB_NAME_AW(SetStandardColorSpaceProfile)

1 0

[akhaldi] 70046: [MSCMS] Sync with Wine Staging 1.7.55. CORE-10536
by akhaldi＠svn.reactos.org 23 Nov '15

23 Nov '15

Author: akhaldi Date: Mon Nov 23 09:02:03 2015 New Revision: 70046 URL: http://svn.reactos.org/svn/reactos?rev=70046&view=rev Log: [MSCMS] Sync with Wine Staging 1.7.55. CORE-10536 Modified: trunk/reactos/dll/win32/mscms/profile.c trunk/reactos/dll/win32/mscms/transform.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/mscms/profile.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mscms/profile.c?… ============================================================================== --- trunk/reactos/dll/win32/mscms/profile.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mscms/profile.c [iso-8859-1] Mon Nov 23 09:02:03 2015 @@ -1154,7 +1154,7 @@ release_profile( profile ); return FALSE; } - *present = cmsIsTag( profile->cmsprofile, type ); + *present = (cmsIsTag( profile->cmsprofile, type ) != 0); release_profile( profile ); ret = TRUE; @@ -1408,7 +1408,11 @@ if (!(data = HeapAlloc( GetProcessHeap(), 0, profile->cbDataSize ))) return NULL; memcpy( data, profile->pProfileData, profile->cbDataSize ); - cmsprofile = cmsOpenProfileFromMem( data, profile->cbDataSize ); + if (!(cmsprofile = cmsOpenProfileFromMem( data, profile->cbDataSize ))) + { + HeapFree( GetProcessHeap(), 0, data ); + return FALSE; + } size = profile->cbDataSize; } else if (profile->dwType == PROFILE_FILENAME) @@ -1466,7 +1470,12 @@ HeapFree( GetProcessHeap(), 0, data ); return NULL; } - cmsprofile = cmsOpenProfileFromMem( data, size ); + if (!(cmsprofile = cmsOpenProfileFromMem( data, size ))) + { + CloseHandle( handle ); + HeapFree( GetProcessHeap(), 0, data ); + return NULL; + } } else { Modified: trunk/reactos/dll/win32/mscms/transform.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mscms/transform.… ============================================================================== --- trunk/reactos/dll/win32/mscms/transform.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mscms/transform.c [iso-8859-1] Mon Nov 23 09:02:03 2015 @@ -38,64 +38,51 @@ #ifdef HAVE_LCMS2 -static DWORD from_profile( HPROFILE profile ) -{ - PROFILEHEADER header; - - GetColorProfileHeader( profile, &header ); - TRACE( "color space: 0x%08x %s\n", header.phDataColorSpace, dbgstr_tag( header.phDataColorSpace ) ); - - switch (header.phDataColorSpace) - { - case 0x434d594b: return TYPE_CMYK_16; /* 'CMYK' */ - case 0x47524159: return TYPE_GRAY_16; /* 'GRAY' */ - case 0x4c616220: return TYPE_Lab_16; /* 'Lab ' */ - case 0x52474220: return TYPE_RGB_16; /* 'RGB ' */ - case 0x58595a20: return TYPE_XYZ_16; /* 'XYZ ' */ - default: - WARN("unhandled format\n"); - return TYPE_RGB_16; - } -} - static DWORD from_bmformat( BMFORMAT format ) { static BOOL quietfixme = FALSE; - TRACE( "bitmap format: 0x%08x\n", format ); + DWORD ret; switch (format) { - case BM_RGBTRIPLETS: return TYPE_RGB_8; - case BM_BGRTRIPLETS: return TYPE_BGR_8; - case BM_GRAY: return TYPE_GRAY_8; - case BM_xRGBQUADS: return TYPE_ARGB_8; - case BM_xBGRQUADS: return TYPE_ABGR_8; + case BM_RGBTRIPLETS: ret = TYPE_RGB_8; break; + case BM_BGRTRIPLETS: ret = TYPE_BGR_8; break; + case BM_GRAY: ret = TYPE_GRAY_8; break; + case BM_xRGBQUADS: ret = TYPE_ARGB_8; break; + case BM_xBGRQUADS: ret = TYPE_ABGR_8; break; default: if (!quietfixme) { - FIXME("unhandled bitmap format 0x%x\n", format); + FIXME( "unhandled bitmap format %08x\n", format ); quietfixme = TRUE; } - return TYPE_RGB_8; - } + ret = TYPE_RGB_8; + break; + } + TRACE( "color space: %08x -> %08x\n", format, ret ); + return ret; } static DWORD from_type( COLORTYPE type ) { - TRACE( "color type: 0x%08x\n", type ); + DWORD ret; switch (type) { - case COLOR_GRAY: return TYPE_GRAY_16; - case COLOR_RGB: return TYPE_RGB_16; - case COLOR_XYZ: return TYPE_XYZ_16; - case COLOR_Yxy: return TYPE_Yxy_16; - case COLOR_Lab: return TYPE_Lab_16; - case COLOR_CMYK: return TYPE_CMYK_16; + case COLOR_GRAY: ret = TYPE_GRAY_16; break; + case COLOR_RGB: ret = TYPE_RGB_16; break; + case COLOR_XYZ: ret = TYPE_XYZ_16; break; + case COLOR_Yxy: ret = TYPE_Yxy_16; break; + case COLOR_Lab: ret = TYPE_Lab_16; break; + case COLOR_CMYK: ret = TYPE_CMYK_16; break; default: - FIXME("unhandled color type\n"); - return TYPE_RGB_16; - } + FIXME( "unhandled color type %08x\n", type ); + ret = TYPE_RGB_16; + break; + } + + TRACE( "color type: %08x -> %08x\n", type, ret ); + return ret; } #endif /* HAVE_LCMS2 */ @@ -147,7 +134,7 @@ struct transform transform; struct profile *dst, *tgt = NULL; cmsHPROFILE cmsinput, cmsoutput, cmstarget = NULL; - DWORD in_format, out_format, proofing = 0; + DWORD proofing = 0; int intent; TRACE( "( %p, %p, %p, 0x%08x )\n", space, dest, target, flags ); @@ -165,9 +152,6 @@ TRACE( "lcsCSType: %s\n", dbgstr_tag( space->lcsCSType ) ); TRACE( "lcsFilename: %s\n", debugstr_w( space->lcsFilename ) ); - in_format = TYPE_RGB_16; - out_format = from_profile( dest ); - cmsinput = cmsCreate_sRGBProfile(); /* FIXME: create from supplied color space */ if (target) { @@ -175,8 +159,15 @@ cmstarget = tgt->cmsprofile; } cmsoutput = dst->cmsprofile; - transform.cmstransform = cmsCreateProofingTransform(cmsinput, in_format, cmsoutput, out_format, cmstarget, - intent, INTENT_ABSOLUTE_COLORIMETRIC, proofing); + transform.cmstransform = cmsCreateProofingTransform(cmsinput, 0, cmsoutput, 0, cmstarget, + intent, INTENT_ABSOLUTE_COLORIMETRIC, + proofing); + if (!transform.cmstransform) + { + if (tgt) release_profile( tgt ); + release_profile( dst ); + return FALSE; + } ret = create_transform( &transform ); @@ -208,10 +199,9 @@ { HTRANSFORM ret = NULL; #ifdef HAVE_LCMS2 - cmsHPROFILE *cmsprofiles, cmsconvert = NULL; + cmsHPROFILE *cmsprofiles; struct transform transform; struct profile *profile0, *profile1; - DWORD in_format, out_format; TRACE( "( %p, 0x%08x, %p, 0x%08x, 0x%08x, 0x%08x )\n", profiles, nprofiles, intents, nintents, flags, cmm ); @@ -232,33 +222,21 @@ release_profile( profile0 ); return NULL; } - in_format = from_profile( profiles[0] ); - out_format = from_profile( profiles[nprofiles - 1] ); - - if (in_format != out_format) - { - /* insert a conversion profile for pairings that lcms doesn't handle */ - if (out_format == TYPE_RGB_16) cmsconvert = cmsCreate_sRGBProfile(); - if (out_format == TYPE_Lab_16) cmsconvert = cmsCreateLab2Profile( NULL ); - } - - cmsprofiles = HeapAlloc( GetProcessHeap(), 0, (nprofiles + 1) * sizeof(cmsHPROFILE) ); - if (cmsprofiles) + + if ((cmsprofiles = HeapAlloc( GetProcessHeap(), 0, (nprofiles + 1) * sizeof(cmsHPROFILE) ))) { cmsprofiles[0] = profile0->cmsprofile; - if (cmsconvert) - { - cmsprofiles[1] = cmsconvert; - cmsprofiles[2] = profile1->cmsprofile; - nprofiles++; - } - else - { - cmsprofiles[1] = profile1->cmsprofile; - } - transform.cmstransform = cmsCreateMultiprofileTransform( cmsprofiles, nprofiles, in_format, out_format, *intents, 0 ); - + cmsprofiles[1] = profile1->cmsprofile; + + transform.cmstransform = cmsCreateMultiprofileTransform( cmsprofiles, nprofiles, 0, + 0, *intents, 0 ); HeapFree( GetProcessHeap(), 0, cmsprofiles ); + if (!transform.cmstransform) + { + release_profile( profile0 ); + release_profile( profile1 ); + return FALSE; + } ret = create_transform( &transform ); } @@ -329,7 +307,8 @@ outputstride, callback, data ); if (!transform) return FALSE; - cmsChangeBuffersFormat( transform->cmstransform, from_bmformat(input), from_bmformat(output) ); + if (!cmsChangeBuffersFormat( transform->cmstransform, from_bmformat(input), from_bmformat(output) )) + return FALSE; cmsDoTransform( transform->cmstransform, srcbits, destbits, width * height ); release_transform( transform ); @@ -370,7 +349,8 @@ if (!transform) return FALSE; xfrm = transform->cmstransform; - cmsChangeBuffersFormat( xfrm, from_type(input_type), from_type(output_type) ); + if (!cmsChangeBuffersFormat( xfrm, from_type(input_type), from_type(output_type) )) + return FALSE; switch (input_type) { 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] Mon Nov 23 09:02:03 2015 @@ -107,7 +107,7 @@ reactos/dll/win32/msacm32/msacm32.drv # Synced to WineStaging-1.7.55 reactos/dll/win32/msadp32.acm # Synced to WineStaging-1.7.55 reactos/dll/win32/mscat32 # Synced to WineStaging-1.7.47 -reactos/dll/win32/mscms # Synced to WineStaging-1.7.47 +reactos/dll/win32/mscms # Synced to WineStaging-1.7.55 reactos/dll/win32/mscoree # Synced to Wine-1.5.4 reactos/dll/win32/msctf # Synced to WineStaging-1.7.47 reactos/dll/win32/msftedit # Synced to WineStaging-1.7.47

1 0

[akhaldi] 70045: [MSADP32.ACM] Sync with Wine Staging 1.7.55. CORE-10536
by akhaldi＠svn.reactos.org 23 Nov '15

23 Nov '15

Author: akhaldi Date: Mon Nov 23 08:55:46 2015 New Revision: 70045 URL: http://svn.reactos.org/svn/reactos?rev=70045&view=rev Log: [MSADP32.ACM] Sync with Wine Staging 1.7.55. CORE-10536 Modified: trunk/reactos/dll/win32/msadp32.acm/msadp32.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/msadp32.acm/msadp32.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msadp32.acm/msad… ============================================================================== --- trunk/reactos/dll/win32/msadp32.acm/msadp32.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msadp32.acm/msadp32.c [iso-8859-1] Mon Nov 23 08:55:46 2015 @@ -251,9 +251,17 @@ { const unsigned char* in_src = src; - assert(*src <= 6); + /* Catch a problem from Tomb Raider III (bug 21000) where it passes + * invalid data after a valid sequence of blocks */ + if (*src > 6 || *(src + 1) > 6) + { + /* Recalculate the amount of used output buffer. We are not changing + * nsrc, let's assume the bad data was parsed */ + *ndst -= nblock * nsamp_blk * adsi->pwfxDst->nBlockAlign; + WARN("Invalid ADPCM data, stopping conversion\n"); + break; + } coeffL = MSADPCM_CoeffSet[*src++]; - assert(*src <= 6); coeffR = MSADPCM_CoeffSet[*src++]; ideltaL = R16(src); src += 2; @@ -544,6 +552,8 @@ if (ADPCM_GetFormatIndex(adfs->pwfxDst) == 0xFFFFFFFF) return ACMERR_NOTPOSSIBLE; break; case WAVE_FORMAT_ADPCM: + if (adfs->cbwfxDst < sizeof(ADPCMWAVEFORMAT) + (7 - 1) * sizeof(ADPCMCOEFSET)) + return ACMERR_NOTPOSSIBLE; init_wfx_adpcm((ADPCMWAVEFORMAT*)adfs->pwfxDst); /* check if result is ok */ if (ADPCM_GetFormatIndex(adfs->pwfxDst) == 0xFFFFFFFF) return ACMERR_NOTPOSSIBLE; 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] Mon Nov 23 08:55:46 2015 @@ -105,7 +105,7 @@ reactos/dll/win32/mprapi # Synced to WineStaging-1.7.47 reactos/dll/win32/msacm32 # Synced to WineStaging-1.7.55 reactos/dll/win32/msacm32/msacm32.drv # Synced to WineStaging-1.7.55 -reactos/dll/win32/msadp32.acm # Synced to WineStaging-1.7.47 +reactos/dll/win32/msadp32.acm # Synced to WineStaging-1.7.55 reactos/dll/win32/mscat32 # Synced to WineStaging-1.7.47 reactos/dll/win32/mscms # Synced to WineStaging-1.7.47 reactos/dll/win32/mscoree # Synced to Wine-1.5.4

1 0

[akhaldi] 70044: [XDK] Add missing THREAD_QUERY_LIMITED_INFORMATION.
by akhaldi＠svn.reactos.org 23 Nov '15

23 Nov '15

Author: akhaldi Date: Mon Nov 23 08:51:18 2015 New Revision: 70044 URL: http://svn.reactos.org/svn/reactos?rev=70044&view=rev Log: [XDK] Add missing THREAD_QUERY_LIMITED_INFORMATION. Modified: trunk/reactos/include/xdk/winnt_old.h Modified: trunk/reactos/include/xdk/winnt_old.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/xdk/winnt_old.h?re… ============================================================================== --- trunk/reactos/include/xdk/winnt_old.h [iso-8859-1] (original) +++ trunk/reactos/include/xdk/winnt_old.h [iso-8859-1] Mon Nov 23 08:51:18 2015 @@ -335,6 +335,7 @@ #define THREAD_SET_THREAD_TOKEN 128 #define THREAD_IMPERSONATE 256 #define THREAD_DIRECT_IMPERSONATION 0x200 +#define THREAD_QUERY_LIMITED_INFORMATION 0x0800 #define THREAD_ALL_ACCESS (STANDARD_RIGHTS_REQUIRED|SYNCHRONIZE|0x3FF) #define MUTANT_QUERY_STATE 0x0001 #define MUTANT_ALL_ACCESS (STANDARD_RIGHTS_REQUIRED|SYNCHRONIZE|MUTANT_QUERY_STATE)

1 0

[akhaldi] 70043: [PSDK] Update SYSGEOTYPE.
by akhaldi＠svn.reactos.org 22 Nov '15

22 Nov '15

Author: akhaldi Date: Sun Nov 22 22:28:45 2015 New Revision: 70043 URL: http://svn.reactos.org/svn/reactos?rev=70043&view=rev Log: [PSDK] Update SYSGEOTYPE. Modified: trunk/reactos/include/psdk/winnls.h Modified: trunk/reactos/include/psdk/winnls.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winnls.h?rev=… ============================================================================== --- trunk/reactos/include/psdk/winnls.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/winnls.h [iso-8859-1] Sun Nov 22 22:28:45 2015 @@ -546,7 +546,10 @@ GEO_TIMEZONES, GEO_OFFICIALLANGUAGES, GEO_ISO_UN_NUMBER, - GEO_PARENT + GEO_PARENT, + GEO_DIALINGCODE, + GEO_CURRENCYCODE, + GEO_CURRENCYSYMBOL }; typedef struct _cpinfo {

1 0

[tfaber] 70042: [FASTFAT] - Don't leak FCBs, Arch ;)
by tfaber＠svn.reactos.org 22 Nov '15

22 Nov '15

Author: tfaber Date: Sun Nov 22 21:46:58 2015 New Revision: 70042 URL: http://svn.reactos.org/svn/reactos?rev=70042&view=rev Log: [FASTFAT] - Don't leak FCBs, Arch ;) Modified: trunk/reactos/drivers/filesystems/fastfat/create.c Modified: trunk/reactos/drivers/filesystems/fastfat/create.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat/create.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat/create.c [iso-8859-1] Sun Nov 22 21:46:58 2015 @@ -592,9 +592,6 @@ if (!OpenTargetDir) { Status = VfatOpenFile(DeviceExt, &PathNameU, FileObject, RequestedDisposition, RequestedOptions, &ParentFcb); - if (Status == STATUS_ACCESS_DENIED || - Status == STATUS_OBJECT_NAME_COLLISION) - return Status; } else { @@ -703,7 +700,9 @@ */ if (Status == STATUS_OBJECT_PATH_NOT_FOUND || Status == STATUS_INVALID_PARAMETER || - Status == STATUS_DELETE_PENDING) + Status == STATUS_DELETE_PENDING || + Status == STATUS_ACCESS_DENIED || + Status == STATUS_OBJECT_NAME_COLLISION) { if (ParentFcb) {

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs