Ros-diffs October 2014

ros-diffs@reactos.org

19 participants
730 discussions

[akhaldi] 64490: [MSXML][MSXML2][MSXML4][MSXML6] * Mark as synced with Wine 1.7.27. CORE-8540

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Fri Oct 3 11:26:12 2014 New Revision: 64490 URL: http://svn.reactos.org/svn/reactos?rev=64490&view=rev Log: [MSXML][MSXML2][MSXML4][MSXML6] * Mark as synced with Wine 1.7.27. CORE-8540 Removed: trunk/reactos/dll/win32/msxml/Makefile.in trunk/reactos/dll/win32/msxml2/Makefile.in trunk/reactos/dll/win32/msxml4/Makefile.in trunk/reactos/dll/win32/msxml6/Makefile.in Modified: trunk/reactos/media/doc/README.WINE Removed: trunk/reactos/dll/win32/msxml/Makefile.in URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msxml/Makefile.i… ============================================================================== --- trunk/reactos/dll/win32/msxml/Makefile.in [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msxml/Makefile.in (removed) @@ -1,9 +0,0 @@ -MODULE = msxml.dll - -C_SRCS = main.c - -IDL_TLB_SRCS = msxml_tlb.idl - -RC_SRCS = rsrc.rc - -@MAKE_DLL_RULES@ Removed: trunk/reactos/dll/win32/msxml2/Makefile.in URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msxml2/Makefile.… ============================================================================== --- trunk/reactos/dll/win32/msxml2/Makefile.in [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msxml2/Makefile.in (removed) @@ -1,7 +0,0 @@ -MODULE = msxml2.dll - -C_SRCS = main.c - -IDL_TLB_SRCS = msxml2_tlb.idl - -@MAKE_DLL_RULES@ Removed: trunk/reactos/dll/win32/msxml4/Makefile.in URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msxml4/Makefile.… ============================================================================== --- trunk/reactos/dll/win32/msxml4/Makefile.in [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msxml4/Makefile.in (removed) @@ -1,12 +0,0 @@ -EXTRADEFS = -DCOM_NO_WINDOWS_H -MODULE = msxml4.dll -IMPORTS = ole32 advapi32 - -C_SRCS = \ - main.c - -IDL_TLB_SRCS = msxml4_tlb.idl - -RC_SRCS = rsrc.rc - -@MAKE_DLL_RULES@ Removed: trunk/reactos/dll/win32/msxml6/Makefile.in URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msxml6/Makefile.… ============================================================================== --- trunk/reactos/dll/win32/msxml6/Makefile.in [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msxml6/Makefile.in (removed) @@ -1,12 +0,0 @@ -EXTRADEFS = -DCOM_NO_WINDOWS_H -MODULE = msxml6.dll -IMPORTS = oleaut32 ole32 advapi32 - -C_SRCS = \ - main.c - -RC_SRCS = rsrc.rc - -IDL_TLB_SRCS = msxml6_tlb.idl - -@MAKE_DLL_RULES@ 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] Fri Oct 3 11:26:12 2014 @@ -138,11 +138,11 @@ reactos/dll/win32/msvcrt40 # Out of sync reactos/dll/win32/msvfw32 # Synced to Wine-1.7.27 reactos/dll/win32/msvidc32 # Synced to Wine-1.7.17 -reactos/dll/win32/msxml # Synced to Wine-1.7.17 -reactos/dll/win32/msxml2 # Synced to Wine-1.7.17 +reactos/dll/win32/msxml # Synced to Wine-1.7.27 +reactos/dll/win32/msxml2 # Synced to Wine-1.7.27 reactos/dll/win32/msxml3 # Synced to Wine-1.7.27 -reactos/dll/win32/msxml4 # Synced to Wine-1.7.17 -reactos/dll/win32/msxml6 # Synced to Wine-1.7.17 +reactos/dll/win32/msxml4 # Synced to Wine-1.7.27 +reactos/dll/win32/msxml6 # Synced to Wine-1.7.27 reactos/dll/win32/nddeapi # Synced to Wine-1.7.17 reactos/dll/win32/netapi32 # Forked at Wine-1.3.34 reactos/dll/win32/ntdsapi # Synced to Wine-1.7.17

9 years, 11 months

[akhaldi] 64489: [MSXML3_WINETEST] * Sync with Wine 1.7.27. CORE-8540

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Fri Oct 3 11:23:20 2014 New Revision: 64489 URL: http://svn.reactos.org/svn/reactos?rev=64489&view=rev Log: [MSXML3_WINETEST] * Sync with Wine 1.7.27. CORE-8540 Modified: trunk/rostests/winetests/msxml3/domdoc.c trunk/rostests/winetests/msxml3/httpreq.c trunk/rostests/winetests/msxml3/saxreader.c trunk/rostests/winetests/msxml3/schema.c trunk/rostests/winetests/msxml3/xmldoc.c 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] Fri Oct 3 11:23:20 2014 @@ -504,7 +504,7 @@ " </description>\n" " </elem>\n" "\n" -" <elem>\n" +" <elem a='a'>\n" " <a>A2 field</a>\n" " <b>B2 field</b>\n" " <c type=\"old\">C2 field</c>\n" @@ -1084,14 +1084,16 @@ static char buf[4096]; char *pos = buf; LONG len = 0; + HRESULT hr; int i; if (list == NULL) { - lstrcpyA(buf, "(null)"); + strcpy(buf, "(null)"); return buf; } - ole_check(IXMLDOMNodeList_get_length(list, &len)); + hr = IXMLDOMNodeList_get_length(list, &len); + ok(hr == S_OK, "got 0x%08x\n", hr); for (i = 0; i < len; i++) { IXMLDOMNode *node; @@ -1950,6 +1952,7 @@ ok( r == E_FAIL, "getAttribute ret %08x\n", r ); ok( V_VT(&var) == VT_NULL || V_VT(&var) == VT_EMPTY, "vt = %x\n", V_VT(&var)); VariantClear(&var); + SysFreeString(str); str = SysAllocString( szdl ); V_VT(&var) = VT_I4; @@ -3020,8 +3023,24 @@ IXMLDOMDocument_Release( doc ); } +struct queryresult_t { + const char *query; + const char *result; + int len; +}; + +static const struct queryresult_t elementsbytagname[] = { + { "", "P1.D1 E2.D1 E1.E2.D1 T1.E1.E2.D1 E2.E2.D1 T1.E2.E2.D1 E3.E2.D1 E4.E2.D1 E1.E4.E2.D1 T1.E1.E4.E2.D1", 10 }, + { "*", "E2.D1 E1.E2.D1 E2.E2.D1 E3.E2.D1 E4.E2.D1 E1.E4.E2.D1", 6 }, + { "bs", "E1.E2.D1", 1 }, + { "dl", "", 0 }, + { "str1","", 0 }, + { NULL } +}; + static void test_getElementsByTagName(void) { + const struct queryresult_t *ptr = elementsbytagname; IXMLDOMNodeList *node_list; IXMLDOMDocument *doc; IXMLDOMElement *elem; @@ -3037,22 +3056,24 @@ ok( r == S_OK, "loadXML failed\n"); ok( b == VARIANT_TRUE, "failed to load XML string\n"); - str = SysAllocString( szstar ); - /* null arguments cases */ r = IXMLDOMDocument_getElementsByTagName(doc, NULL, &node_list); ok( r == E_INVALIDARG, "ret %08x\n", r ); - r = IXMLDOMDocument_getElementsByTagName(doc, str, NULL); + r = IXMLDOMDocument_getElementsByTagName(doc, _bstr_("*"), NULL); ok( r == E_INVALIDARG, "ret %08x\n", r ); - r = IXMLDOMDocument_getElementsByTagName(doc, str, &node_list); - ok( r == S_OK, "ret %08x\n", r ); - r = IXMLDOMNodeList_get_length( node_list, &len ); - ok( r == S_OK, "ret %08x\n", r ); - ok( len == 6, "len %d\n", len ); - - IXMLDOMNodeList_Release( node_list ); - SysFreeString( str ); + while (ptr->query) + { + r = IXMLDOMDocument_getElementsByTagName(doc, _bstr_(ptr->query), &node_list); + ok(r == S_OK, "ret %08x\n", r); + r = IXMLDOMNodeList_get_length(node_list, &len); + ok(r == S_OK, "ret %08x\n", r); + ok(len == ptr->len, "%s: got len %d, expected %d\n", ptr->query, len, ptr->len); + expect_list_and_release(node_list, ptr->result); + + free_bstrs(); + ptr++; + } /* broken query BSTR */ memcpy(&buff[2], szstar, sizeof(szstar)); @@ -3064,33 +3085,6 @@ ok( r == S_OK, "ret %08x\n", r ); ok( len == 6, "len %d\n", len ); IXMLDOMNodeList_Release( node_list ); - - str = SysAllocString( szbs ); - r = IXMLDOMDocument_getElementsByTagName(doc, str, &node_list); - ok( r == S_OK, "ret %08x\n", r ); - r = IXMLDOMNodeList_get_length( node_list, &len ); - ok( r == S_OK, "ret %08x\n", r ); - ok( len == 1, "len %d\n", len ); - IXMLDOMNodeList_Release( node_list ); - SysFreeString( str ); - - str = SysAllocString( szdl ); - r = IXMLDOMDocument_getElementsByTagName(doc, str, &node_list); - ok( r == S_OK, "ret %08x\n", r ); - r = IXMLDOMNodeList_get_length( node_list, &len ); - ok( r == S_OK, "ret %08x\n", r ); - ok( len == 0, "len %d\n", len ); - IXMLDOMNodeList_Release( node_list ); - SysFreeString( str ); - - str = SysAllocString( szstr1 ); - r = IXMLDOMDocument_getElementsByTagName(doc, str, &node_list); - ok( r == S_OK, "ret %08x\n", r ); - r = IXMLDOMNodeList_get_length( node_list, &len ); - ok( r == S_OK, "ret %08x\n", r ); - ok( len == 0, "len %d\n", len ); - IXMLDOMNodeList_Release( node_list ); - SysFreeString( str ); /* test for element */ r = IXMLDOMDocument_get_documentElement(doc, &elem); @@ -4488,12 +4482,13 @@ { "child::node()", "E1.E2.D1 E2.E2.D1 E3.E2.D1 E4.E2.D1" }, { "child::text()", "" }, { "child::*/..", "E2.D1" }, - { "child::*//@*/..", "E2.E5.E1.E2.D1 E3.E2.E2.D1" }, + { "child::*//@*/..", "E2.E5.E1.E2.D1 E2.E2.D1 E3.E2.E2.D1" }, { "self::node()", "E2.D1" }, { "ancestor::node()", "D1" }, { "elem[c][last()]/a", "E1.E2.E2.D1"}, { "ancestor-or-self::node()[1]", "E2.D1" }, { "((//a)[1])[last()]", "E1.E1.E2.D1" }, + { "//elem[@*]", "E2.E2.D1" }, { NULL } }; @@ -4556,7 +4551,7 @@ str = list_to_string(list); - ok(strcmp(str, xptest->list)==0, "query=%s, invalid node list: %s, expected %s\n", + ok(!strcmp(str, xptest->list), "query=%s, invalid node list: \"%s\", expected \"%s\"\n", xptest->query, str, xptest->list); if (list) @@ -6879,6 +6874,7 @@ typedef struct { const char *query; const char *list; + BOOL todo; } xslpattern_test_t; static const xslpattern_test_t xslpattern_test[] = { @@ -6941,6 +6937,7 @@ { "root/elem[index()>0 $and$ $not$ end()]", "E2.E2.D1 E3.E2.D1" }, { "root/elem[index()>0 && $not$ end()]", "E2.E2.D1 E3.E2.D1" }, { "root/elem[d]", "E1.E2.D1 E2.E2.D1 E4.E2.D1" }, + { "root/elem[@*]", "E2.E2.D1 E3.E2.D1", TRUE }, { NULL } }; @@ -7018,8 +7015,16 @@ len = 0; hr = IXMLDOMNodeList_get_length(list, &len); ok(len != 0, "query=%s, empty list\n", ptr->query); - if (len) - expect_list_and_release(list, ptr->list); + if (len) { + if (ptr->todo) { + char *str = list_to_string(list); + todo_wine + ok(!strcmp(str, ptr->list), "Invalid node list: %s, expected %s\n", str, ptr->list); + IXMLDOMNodeList_Release(list); + } + else + expect_list_and_release(list, ptr->list); + } ptr++; } @@ -8163,6 +8168,7 @@ EXPECT_HR(hr, S_OK); ok(!lstrcmpW(str, _bstr_("ABCD")), "%s\n", wine_dbgstr_w(str)); IXMLDOMNode_Release(node); + SysFreeString(str); array = SafeArrayCreateVector(VT_UI1, 0, 7); hr = SafeArrayAccessData(array, (void*)&ptr); @@ -8202,6 +8208,7 @@ ok(!lstrcmpW(str, _bstr_("ZEdWemRBPQ==")), "%s\n", wine_dbgstr_w(str)); IXMLDOMNode_Release(node); SafeArrayDestroyData(array); + SysFreeString(str); /* bin.hex */ V_VT(&value) = VT_BSTR; @@ -8250,6 +8257,7 @@ ok(!lstrcmpW(str, _bstr_("000102030405060708090a0b0c0d0e0f")), "%s\n", wine_dbgstr_w(str)); IXMLDOMNode_Release(node); SafeArrayDestroyData(array); + SysFreeString(str); IXMLDOMElement_Release(elem); IXMLDOMDocument_Release(doc); @@ -9457,6 +9465,7 @@ IEnumVARIANT_Release(enum1); IEnumVARIANT_Release(enum2); + IEnumVARIANT_Release(enum3); enum1 = NULL; hr = IXMLDOMSelection_get__newEnum(selection, (IUnknown**)&enum1); @@ -9550,6 +9559,7 @@ EXPECT_HR(hr, S_OK); ok(!lstrcmpW(name, _bstr_("c")), "got node name %s\n", wine_dbgstr_w(name)); IXMLDOMNode_Release(node); + SysFreeString(name); V_VT(&v) = VT_I2; hr = IEnumVARIANT_Next(enum1, 1, &v, NULL); @@ -9571,6 +9581,7 @@ EXPECT_HR(hr, S_OK); ok(!lstrcmpW(name, _bstr_("d")), "got node name %s\n", wine_dbgstr_w(name)); IXMLDOMNode_Release(node); + SysFreeString(name); IXMLDOMSelection_Release(selection); IXMLDOMNodeList_Release(list); @@ -10563,6 +10574,7 @@ EXPECT_HR(hr, S_OK); ok(did == DISPID_DOM_COLLECTION_BASE, "got 0x%08x\n", did); IDispatchEx_Release(dispex); + IXMLDOMNamedNodeMap_Release(map); hr = IXMLDOMDocument_selectNodes(doc, _bstr_("root/b"), &node_list); EXPECT_HR(hr, S_OK); @@ -10584,7 +10596,7 @@ hr = IDispatchEx_GetDispID(dispex, _bstr_("1"), 0, &did); EXPECT_HR(hr, S_OK); ok(did == DISPID_DOM_COLLECTION_BASE+1, "got 0x%08x\n", did); - IDispatchEx_Release(dispex); + IXMLDOMNamedNodeMap_Release(map); did = -1; hr = IDispatchEx_GetDispID(dispex, _bstr_("item"), 0, &did); @@ -10677,7 +10689,7 @@ ok(V_VT(&ret) == VT_EMPTY, "got %d\n", V_VT(&ret)); ok(broken(V_I4(&ret) == 1) || (V_I4(&ret) == 0), "got %d\n", V_I4(&ret)); - IXMLDOMNamedNodeMap_Release(map); + IDispatchEx_Release(dispex); IXMLDOMElement_Release(elem); /* IXMLDOMImplementation */ @@ -11085,7 +11097,6 @@ hr = IXMLDOMDocument_appendChild(doc, (IXMLDOMNode*)root, NULL); EXPECT_HR(hr, S_OK); - str = SysAllocString(szAttribute); hr = IXMLDOMDocument_createAttribute(doc, _bstr_("xmlns:dt"), &pAttribute); ok( hr == S_OK, "returns %08x\n", hr ); @@ -11102,15 +11113,15 @@ hr = IXMLDOMDocument_get_documentElement(doc, &elem); EXPECT_HR(hr, S_OK); + str = NULL; hr = IXMLDOMElement_get_xml(elem, &str); ok( hr == S_OK, "got 0x%08x\n", hr); todo_wine ok( lstrcmpW(str, _bstr_("<Testing xmlns:dt=\"urn:schemas-microsoft-com:datatypes\" dt:dt=\"bin.base64\"/>")) == 0, "got %s\n", wine_dbgstr_w(str)); + SysFreeString(str); IXMLDOMElement_Release(elem); IXMLDOMAttribute_Release( pAttribute); - - SysFreeString(str); IXMLDOMDocument_Release(doc); @@ -11825,6 +11836,7 @@ ok(hr == S_FALSE, "%d: got 0x%08x\n", i, hr); ok(str == NULL, "%d: got prefix %s\n", i, wine_dbgstr_w(str)); } + SysFreeString(str); str = NULL; hr = IXMLDOMNode_get_namespaceURI(node, &str); Modified: trunk/rostests/winetests/msxml3/httpreq.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/msxml3/httpreq.… ============================================================================== --- trunk/rostests/winetests/msxml3/httpreq.c [iso-8859-1] (original) +++ trunk/rostests/winetests/msxml3/httpreq.c [iso-8859-1] Fri Oct 3 11:23:20 2014 @@ -1463,14 +1463,12 @@ hr = IXMLHttpRequest_get_responseBody(xhr, &varbody); EXPECT_HR(hr, E_PENDING); ok(V_VT(&varbody) == VT_EMPTY, "got type %d\n", V_VT(&varbody)); - ok(V_I2(&varbody) == 1, "got %d\n", V_I2(&varbody)); V_VT(&varbody) = VT_I2; V_I2(&varbody) = 1; hr = IXMLHttpRequest_get_responseStream(xhr, &varbody); EXPECT_HR(hr, E_PENDING); ok(V_VT(&varbody) == VT_EMPTY, "got type %d\n", V_VT(&varbody)); - ok(V_I2(&varbody) == 1, "got %d\n", V_I2(&varbody)); /* send before open */ hr = IXMLHttpRequest_send(xhr, dummy); 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] Fri Oct 3 11:23:20 2014 @@ -1993,7 +1993,6 @@ static HRESULT WINAPI istream_Stat(IStream *iface, STATSTG *pstatstg, DWORD grfStatFlag) { - ok(0, "unexpected call\n"); return E_NOTIMPL; } @@ -2447,6 +2446,7 @@ hr = ISAXXMLReader_parse(reader, var); EXPECT_HR(hr, S_OK); ok_sequence(sequences, CONTENT_HANDLER_INDEX, test_seq, "attribute value normalization", TRUE); + IStream_Release(stream); resolver = (void*)0xdeadbeef; hr = ISAXXMLReader_getEntityResolver(reader, &resolver); @@ -2479,6 +2479,8 @@ ok(hr == S_OK, "got 0x%08x\n", hr); sprintf(seqname, "%s: cdata test", table->name); ok_sequence(sequences, CONTENT_HANDLER_INDEX, test_seq, seqname, TRUE); + + IStream_Release(stream); /* 2. CDATA sections */ stream = create_test_stream(test2_cdata_xml, -1); @@ -3301,8 +3303,9 @@ ok(pos2.QuadPart == 0, "expected stream beginning\n"); len = 2048; - buff = HeapAlloc(GetProcessHeap(), 0, len); + buff = HeapAlloc(GetProcessHeap(), 0, len+1); memset(buff, 'A', len); + buff[len] = 0; hr = ISAXContentHandler_characters(content, _bstr_(buff), len); EXPECT_HR(hr, S_OK); @@ -3348,6 +3351,7 @@ ok(pos2.QuadPart == 0, "expected stream beginning\n"); memset(buff, 'A', len); + buff[len] = 0; hr = ISAXContentHandler_characters(content, _bstr_(buff), len - 8); EXPECT_HR(hr, S_OK); @@ -3372,6 +3376,7 @@ EXPECT_HR(hr, S_OK); memset(buff, 'A', len); + buff[len] = 0; hr = ISAXContentHandler_characters(content, _bstr_(buff), len); EXPECT_HR(hr, S_OK); @@ -4245,6 +4250,7 @@ EXPECT_HR(hr, S_OK); ok(pos2.QuadPart == 2, "got wrong position\n"); + IStream_Release(stream); ISAXContentHandler_Release(content); IMXWriter_Release(writer); @@ -5510,6 +5516,7 @@ ISAXAttributes_Release(saxattr); IMXAttributes_Release(mxattr); + free_bstrs(); } } Modified: trunk/rostests/winetests/msxml3/schema.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/msxml3/schema.c… ============================================================================== --- trunk/rostests/winetests/msxml3/schema.c [iso-8859-1] (original) +++ trunk/rostests/winetests/msxml3/schema.c [iso-8859-1] Fri Oct 3 11:23:20 2014 @@ -1283,24 +1283,20 @@ while (ptr->query) { IXMLDOMNode* node = NULL; - VARIANT type, testv; + VARIANT type; /* check data types without the schema */ - memset(&testv, -1, sizeof(VARIANT)); - V_VT(&testv) = VT_NULL; - V_BSTR(&testv) = NULL; - hr = IXMLDOMDocument2_selectSingleNode(doc, _bstr_(ptr->query), &node); EXPECT_HR(hr, S_OK); ok(node != NULL, "expected node\n"); - memset(&type, -1, sizeof(VARIANT)); V_VT(&type) = VT_EMPTY; + V_BSTR(&type) = (void*)-1; hr = IXMLDOMNode_get_dataType(node, &type); EXPECT_HR(hr, S_FALSE); ok(V_VT(&type) == VT_NULL, "got type %i\n", V_VT(&type)); /* when returning VT_NULL, the pointer is set to NULL */ - ok(!memcmp(&testv, &type, sizeof(VARIANT)), "got %p\n", V_BSTR(&type)); + ok(V_BSTR(&type) == NULL, "got %p\n", V_BSTR(&type)); VariantClear(&type); hr = IXMLDOMNode_get_nodeTypedValue(node, &type); @@ -1531,7 +1527,7 @@ if (!cache) return; hr = IXMLDOMSchemaCollection2_get(cache, NULL, NULL); - EXPECT_HR(hr, E_NOTIMPL); + ok(hr == E_NOTIMPL || hr == E_POINTER /* win8 */, "got %08x\n", hr); hr = IXMLDOMSchemaCollection2_get(cache, _bstr_("uri"), &node); EXPECT_HR(hr, E_NOTIMPL); Modified: trunk/rostests/winetests/msxml3/xmldoc.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/msxml3/xmldoc.c… ============================================================================== --- trunk/rostests/winetests/msxml3/xmldoc.c [iso-8859-1] (original) +++ trunk/rostests/winetests/msxml3/xmldoc.c [iso-8859-1] Fri Oct 3 11:23:20 2014 @@ -661,7 +661,7 @@ WCHAR path[MAX_PATH]; LONG length, type; ULONG num_vars; - VARIANT var, vIndex, vName; + VARIANT var, dummy, vIndex, vName; BSTR url, str; static const CHAR szBankXML[] = "bank.xml"; static const WCHAR szNumber[] = {'N','U','M','B','E','R',0}; @@ -771,14 +771,16 @@ ok(num_vars == 1, "Expected 1, got %d\n", num_vars); /* try advance further, no children left */ - hr = IEnumVARIANT_Next(enumVar, 1, &var, &num_vars); + V_VT(&dummy) = VT_I4; + hr = IEnumVARIANT_Next(enumVar, 1, &dummy, &num_vars); ok(hr == S_FALSE, "Expected S_FALSE, got %08x\n", hr); - ok(V_VT(&var) == 0, "Expected 0, got %d\n", V_VT(&var)); + ok(V_VT(&dummy) == VT_EMPTY, "Expected 0, got %d\n", V_VT(&dummy)); ok(num_vars == 0, "Expected 0, got %d\n", num_vars); - hr = IEnumVARIANT_Next(enumVar, 1, &var, NULL); + V_VT(&dummy) = VT_I4; + hr = IEnumVARIANT_Next(enumVar, 1, &dummy, NULL); ok(hr == S_FALSE, "Expected S_FALSE, got %08x\n", hr); - ok(V_VT(&var) == 0, "Expected 0, got %d\n", V_VT(&var)); + ok(V_VT(&dummy) == VT_EMPTY, "Expected 0, got %d\n", V_VT(&dummy)); hr = IDispatch_QueryInterface(V_DISPATCH(&var), &IID_IXMLElement, (LPVOID *)&child); ok(hr == S_OK, "Expected S_OK, got %08x\n", hr);

9 years, 11 months

[akhaldi] 64488: [MSXML3] * Sync with Wine 1.7.27. CORE-8540

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Fri Oct 3 11:23:01 2014 New Revision: 64488 URL: http://svn.reactos.org/svn/reactos?rev=64488&view=rev Log: [MSXML3] * Sync with Wine 1.7.27. CORE-8540 Modified: trunk/reactos/dll/win32/msxml3/domdoc.c trunk/reactos/dll/win32/msxml3/element.c trunk/reactos/dll/win32/msxml3/msxml_private.h trunk/reactos/dll/win32/msxml3/node.c trunk/reactos/dll/win32/msxml3/saxreader.c trunk/reactos/dll/win32/msxml3/schema.c trunk/reactos/dll/win32/msxml3/xslpattern.tab.c trunk/reactos/dll/win32/msxml3/xslpattern.tab.h trunk/reactos/dll/win32/msxml3/xslpattern.y trunk/reactos/media/doc/README.WINE [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/dll/win32/msxml3/domdoc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msxml3/domdoc.c?… Modified: trunk/reactos/dll/win32/msxml3/element.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msxml3/element.c… Modified: trunk/reactos/dll/win32/msxml3/msxml_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msxml3/msxml_pri… Modified: trunk/reactos/dll/win32/msxml3/node.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msxml3/node.c?re… Modified: trunk/reactos/dll/win32/msxml3/saxreader.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msxml3/saxreader… Modified: trunk/reactos/dll/win32/msxml3/schema.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msxml3/schema.c?… Modified: trunk/reactos/dll/win32/msxml3/xslpattern.tab.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msxml3/xslpatter… Modified: trunk/reactos/dll/win32/msxml3/xslpattern.tab.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msxml3/xslpatter… Modified: trunk/reactos/dll/win32/msxml3/xslpattern.y URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msxml3/xslpatter… Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=…

9 years, 11 months

[ekohl] 64487: [USETUP] Remove obsolete partition creation checks and their corresponding error messages.

by ekohl＠svn.reactos.org

Author: ekohl Date: Fri Oct 3 11:05:56 2014 New Revision: 64487 URL: http://svn.reactos.org/svn/reactos?rev=64487&view=rev Log: [USETUP] Remove obsolete partition creation checks and their corresponding error messages. Modified: trunk/reactos/base/setup/usetup/errorcode.h trunk/reactos/base/setup/usetup/lang/bg-BG.h trunk/reactos/base/setup/usetup/lang/cs-CZ.h trunk/reactos/base/setup/usetup/lang/de-DE.h trunk/reactos/base/setup/usetup/lang/el-GR.h trunk/reactos/base/setup/usetup/lang/en-US.h trunk/reactos/base/setup/usetup/lang/es-ES.h trunk/reactos/base/setup/usetup/lang/et-EE.h trunk/reactos/base/setup/usetup/lang/fr-FR.h trunk/reactos/base/setup/usetup/lang/he-IL.h trunk/reactos/base/setup/usetup/lang/it-IT.h trunk/reactos/base/setup/usetup/lang/ja-JP.h trunk/reactos/base/setup/usetup/lang/lt-LT.h trunk/reactos/base/setup/usetup/lang/nl-NL.h trunk/reactos/base/setup/usetup/lang/pl-PL.h trunk/reactos/base/setup/usetup/lang/pt-BR.h trunk/reactos/base/setup/usetup/lang/ro-RO.h trunk/reactos/base/setup/usetup/lang/ru-RU.h trunk/reactos/base/setup/usetup/lang/sk-SK.h trunk/reactos/base/setup/usetup/lang/sq-AL.h trunk/reactos/base/setup/usetup/lang/sv-SE.h trunk/reactos/base/setup/usetup/lang/tr-TR.h trunk/reactos/base/setup/usetup/lang/uk-UA.h trunk/reactos/base/setup/usetup/partlist.c Modified: trunk/reactos/base/setup/usetup/errorcode.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/errorcod… ============================================================================== --- trunk/reactos/base/setup/usetup/errorcode.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/errorcode.h [iso-8859-1] Fri Oct 3 11:05:56 2014 @@ -67,12 +67,8 @@ ERROR_ADDING_KBLAYOUTS, ERROR_UPDATE_GEOID, ERROR_INSUFFICIENT_DISKSPACE, - ERROR_PARTITION_TABLE_FULL, ERROR_ONLY_ONE_EXTENDED, - ERROR_NOT_BEHIND_EXTENDED, - ERROR_EXTENDED_NOT_LAST, - ERROR_LAST_ERROR_CODE }ERROR_NUMBER; Modified: trunk/reactos/base/setup/usetup/lang/bg-BG.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/bg-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/bg-BG.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/bg-BG.h [iso-8859-1] Fri Oct 3 11:05:56 2014 @@ -1521,19 +1521,6 @@ { //ERROR_ONLY_ONE_EXTENDED, "You can not create more than one extended partition per disk.\n" - "\n" - " * Press any key to continue." - }, - { - //ERROR_NOT_BEHIND_EXTENDED, - "You can not create a partition behind an extended partition.\n" - "\n" - " * Press any key to continue." - }, - { - //ERROR_EXTENDED_NOT_LAST, - "An extended partition must always be the last\n" - "partition in a partition table.\n" "\n" " * Press any key to continue." }, Modified: trunk/reactos/base/setup/usetup/lang/cs-CZ.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/cs-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/cs-CZ.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/cs-CZ.h [iso-8859-1] Fri Oct 3 11:05:56 2014 @@ -1516,19 +1516,6 @@ { //ERROR_ONLY_ONE_EXTENDED, "Nen¡ mo§n vytvoýit v¡ce ne§ jeden rozç¡ýenì odd¡l na disk.\n" - "\n" - " * Pokraujte stisknut¡m libovoln kl vesy." - }, - { - //ERROR_NOT_BEHIND_EXTENDED, - "Nen¡ mo§n vytvoýit odd¡l za rozç¡ýenìm odd¡lem.\n" - "\n" - " * Pokraujte stisknut¡m libovoln kl vesy." - }, - { - //ERROR_EXTENDED_NOT_LAST, - "Rozç¡ýenì odd¡l mus¡ bìt v§dy posledn¡ odd¡l\n" - "v tabulce odd¡l.\n" "\n" " * Pokraujte stisknut¡m libovoln kl vesy." }, Modified: trunk/reactos/base/setup/usetup/lang/de-DE.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/de-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/de-DE.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/de-DE.h [iso-8859-1] Fri Oct 3 11:05:56 2014 @@ -1513,19 +1513,6 @@ { //ERROR_ONLY_ONE_EXTENDED, "Sie knnen nur eine erweiterte Partition auf jeder Festplatte anlegen.\n" - "\n" - " * Eine beliebige Taste zum Fortsetzen drcken." - }, - { - //ERROR_NOT_BEHIND_EXTENDED, - "Sie knnen hinter einer erweiterten Partition keine weitere Partition anlegen.\n" - "\n" - " * Eine beliebige Taste zum Fortsetzen drcken." - }, - { - //ERROR_EXTENDED_NOT_LAST, - "Eine erweiterte Partition muss immer die letzte Partition in \n" - "einer Partitionstabelle sein.\n" "\n" " * Eine beliebige Taste zum Fortsetzen drcken." }, Modified: trunk/reactos/base/setup/usetup/lang/el-GR.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/el-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/el-GR.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/el-GR.h [iso-8859-1] Fri Oct 3 11:05:56 2014 @@ -1533,19 +1533,6 @@ { //ERROR_ONLY_ONE_EXTENDED, "You can not create more than one extended partition per disk.\n" - "\n" - " * Press any key to continue." - }, - { - //ERROR_NOT_BEHIND_EXTENDED, - "You can not create a partition behind an extended partition.\n" - "\n" - " * Press any key to continue." - }, - { - //ERROR_EXTENDED_NOT_LAST, - "An extended partition must always be the last\n" - "partition in a partition table.\n" "\n" " * Press any key to continue." }, Modified: trunk/reactos/base/setup/usetup/lang/en-US.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/en-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/en-US.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/en-US.h [iso-8859-1] Fri Oct 3 11:05:56 2014 @@ -1508,19 +1508,6 @@ { //ERROR_ONLY_ONE_EXTENDED, "You can not create more than one extended partition per disk.\n" - "\n" - " * Press any key to continue." - }, - { - //ERROR_NOT_BEHIND_EXTENDED, - "You can not create a partition behind an extended partition.\n" - "\n" - " * Press any key to continue." - }, - { - //ERROR_EXTENDED_NOT_LAST, - "An extended partition must always be the last\n" - "partition in a partition table.\n" "\n" " * Press any key to continue." }, Modified: trunk/reactos/base/setup/usetup/lang/es-ES.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/es-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/es-ES.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/es-ES.h [iso-8859-1] Fri Oct 3 11:05:56 2014 @@ -1516,19 +1516,6 @@ { //ERROR_ONLY_ONE_EXTENDED, "You can not create more than one extended partition per disk.\n" - "\n" - " * Press any key to continue." - }, - { - //ERROR_NOT_BEHIND_EXTENDED, - "You can not create a partition behind an extended partition.\n" - "\n" - " * Press any key to continue." - }, - { - //ERROR_EXTENDED_NOT_LAST, - "An extended partition must always be the last\n" - "partition in a partition table.\n" "\n" " * Press any key to continue." }, Modified: trunk/reactos/base/setup/usetup/lang/et-EE.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/et-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/et-EE.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/et-EE.h [iso-8859-1] Fri Oct 3 11:05:56 2014 @@ -1506,19 +1506,6 @@ { //ERROR_ONLY_ONE_EXTENDED, "You can not create more than one extended partition per disk.\n" - "\n" - " * Press any key to continue." - }, - { - //ERROR_NOT_BEHIND_EXTENDED, - "You can not create a partition behind an extended partition.\n" - "\n" - " * Press any key to continue." - }, - { - //ERROR_EXTENDED_NOT_LAST, - "An extended partition must always be the last\n" - "partition in a partition table.\n" "\n" " * Press any key to continue." }, Modified: trunk/reactos/base/setup/usetup/lang/fr-FR.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/fr-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/fr-FR.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/fr-FR.h [iso-8859-1] Fri Oct 3 11:05:56 2014 @@ -1521,19 +1521,6 @@ { //ERROR_ONLY_ONE_EXTENDED, "Impossible de crer plus d'une partition tendue par disque.\n" - "\n" - " * Appuyer sur une touche pour continuer." - }, - { - //ERROR_NOT_BEHIND_EXTENDED, - "Impossible de crer une partition prcdant une partition tendue.\n" - "\n" - " * Appuyer sur une touche pour continuer." - }, - { - //ERROR_EXTENDED_NOT_LAST, - "Une partition tendue doit toujours tre place en dernier\n" - "dans la table de partition.\n" "\n" " * Appuyer sur une touche pour continuer." }, Modified: trunk/reactos/base/setup/usetup/lang/he-IL.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/he-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/he-IL.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/he-IL.h [iso-8859-1] Fri Oct 3 11:05:56 2014 @@ -1509,19 +1509,6 @@ { //ERROR_ONLY_ONE_EXTENDED, "You can not create more than one extended partition per disk.\n" - "\n" - " * Press any key to continue." - }, - { - //ERROR_NOT_BEHIND_EXTENDED, - "You can not create a partition behind an extended partition.\n" - "\n" - " * Press any key to continue." - }, - { - //ERROR_EXTENDED_NOT_LAST, - "An extended partition must always be the last\n" - "partition in a partition table.\n" "\n" " * Press any key to continue." }, Modified: trunk/reactos/base/setup/usetup/lang/it-IT.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/it-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/it-IT.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/it-IT.h [iso-8859-1] Fri Oct 3 11:05:56 2014 @@ -1510,19 +1510,6 @@ { //ERROR_ONLY_ONE_EXTENDED, "You can not create more than one extended partition per disk.\n" - "\n" - " * Press any key to continue." - }, - { - //ERROR_NOT_BEHIND_EXTENDED, - "You can not create a partition behind an extended partition.\n" - "\n" - " * Press any key to continue." - }, - { - //ERROR_EXTENDED_NOT_LAST, - "An extended partition must always be the last\n" - "partition in a partition table.\n" "\n" " * Press any key to continue." }, Modified: trunk/reactos/base/setup/usetup/lang/ja-JP.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/ja-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/ja-JP.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/ja-JP.h [iso-8859-1] Fri Oct 3 11:05:56 2014 @@ -1510,19 +1510,6 @@ { //ERROR_ONLY_ONE_EXTENDED, "You can not create more than one extended partition per disk.\n" - "\n" - " * Press any key to continue." - }, - { - //ERROR_NOT_BEHIND_EXTENDED, - "You can not create a partition behind an extended partition.\n" - "\n" - " * Press any key to continue." - }, - { - //ERROR_EXTENDED_NOT_LAST, - "An extended partition must always be the last\n" - "partition in a partition table.\n" "\n" " * Press any key to continue." }, Modified: trunk/reactos/base/setup/usetup/lang/lt-LT.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/lt-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/lt-LT.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/lt-LT.h [iso-8859-1] Fri Oct 3 11:05:56 2014 @@ -1518,19 +1518,6 @@ { //ERROR_ONLY_ONE_EXTENDED, "You can not create more than one extended partition per disk.\n" - "\n" - " * Press any key to continue." - }, - { - //ERROR_NOT_BEHIND_EXTENDED, - "You can not create a partition behind an extended partition.\n" - "\n" - " * Press any key to continue." - }, - { - //ERROR_EXTENDED_NOT_LAST, - "An extended partition must always be the last\n" - "partition in a partition table.\n" "\n" " * Press any key to continue." }, Modified: trunk/reactos/base/setup/usetup/lang/nl-NL.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/nl-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/nl-NL.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/nl-NL.h [iso-8859-1] Fri Oct 3 11:05:56 2014 @@ -1554,19 +1554,6 @@ { //ERROR_ONLY_ONE_EXTENDED, "You can not create more than one extended partition per disk.\n" - "\n" - " * Press any key to continue." - }, - { - //ERROR_NOT_BEHIND_EXTENDED, - "You can not create a partition behind an extended partition.\n" - "\n" - " * Press any key to continue." - }, - { - //ERROR_EXTENDED_NOT_LAST, - "An extended partition must always be the last\n" - "partition in a partition table.\n" "\n" " * Press any key to continue." }, Modified: trunk/reactos/base/setup/usetup/lang/pl-PL.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/pl-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/pl-PL.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/pl-PL.h [iso-8859-1] Fri Oct 3 11:05:56 2014 @@ -1518,19 +1518,6 @@ { //ERROR_ONLY_ONE_EXTENDED, "Nie mo¾esz utworzy wi©cej ni¾ jednej partycji rozszerzonej na dysku.\n" - "\n" - " * Nacinij dowolny klawisz, aby kontynuowa." - }, - { - //ERROR_NOT_BEHIND_EXTENDED, - "Nie mo¾esz utworzy partycji za partycj¥ rozszerzon¥.\n" - "\n" - " * Nacinij dowolny klawisz, aby kontynuowa." - }, - { - //ERROR_EXTENDED_NOT_LAST, - "Partycja rozszerzona musi by zawsze ostatni¥\n" - "partycj¥ w tabeli partycji.\n" "\n" " * Nacinij dowolny klawisz, aby kontynuowa." }, Modified: trunk/reactos/base/setup/usetup/lang/pt-BR.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/pt-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/pt-BR.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/pt-BR.h [iso-8859-1] Fri Oct 3 11:05:56 2014 @@ -1546,19 +1546,6 @@ { //ERROR_ONLY_ONE_EXTENDED, "You can not create more than one extended partition per disk.\n" - "\n" - " * Press any key to continue." - }, - { - //ERROR_NOT_BEHIND_EXTENDED, - "You can not create a partition behind an extended partition.\n" - "\n" - " * Press any key to continue." - }, - { - //ERROR_EXTENDED_NOT_LAST, - "An extended partition must always be the last\n" - "partition in a partition table.\n" "\n" " * Press any key to continue." }, Modified: trunk/reactos/base/setup/usetup/lang/ro-RO.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/ro-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/ro-RO.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/ro-RO.h [iso-8859-1] Fri Oct 3 11:05:56 2014 @@ -1529,7 +1529,7 @@ { //ERROR_CABINET_SECTION, "Nu se poate gÇsi secîiunea de directoare\n" - "n fiierul cabinet.", + "n fiierul cabinet.", "ENTER = Repornire calculator" }, { @@ -1540,7 +1540,7 @@ { //ERROR_FIND_SETUPDATA, "Nu se poate gÇsi secîiunea pentru date de\n" - "instalare din fiierul TXTSETUP.SIF.", + "instalare din fiierul TXTSETUP.SIF.", "ENTER = Repornire calculator" }, { @@ -1561,7 +1561,7 @@ { //ERROR_ADDING_KBLAYOUTS, "A euat includerea n registre a configuraîiei\n" - "de tastaturÇ.", + "de tastaturÇ.", "ENTER = Repornire calculator" }, { @@ -1572,7 +1572,7 @@ { //ERROR_INSUFFICIENT_DISKSPACE, "Pe partiîia selectatÇ nu existÇ suficient\n" - "spaîiu liber." + "spaîiu liber." " * Tastaîi pentru a continua.", NULL }, @@ -1586,19 +1586,6 @@ { //ERROR_ONLY_ONE_EXTENDED, "Nu se poate crea mai mult de o partiîie extinsÇ pe un disc.\n" - "\n" - " * Tastaîi pentru a continua." - }, - { - //ERROR_NOT_BEHIND_EXTENDED, - "Nu se poate crea o partiîie dupÇ o partiîie extinsÇ.\n" - "\n" - " * Tastaîi pentru a continua." - }, - { - //ERROR_EXTENDED_NOT_LAST, - "O partiîie extinsÇ trebuie sÇ fie ntotdeauna\n" - "ultima partiîie din tabela de partiîii.\n" "\n" " * Tastaîi pentru a continua." }, Modified: trunk/reactos/base/setup/usetup/lang/ru-RU.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/ru-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/ru-RU.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/ru-RU.h [iso-8859-1] Fri Oct 3 11:05:56 2014 @@ -1510,19 +1510,6 @@ { //ERROR_ONLY_ONE_EXTENDED, "You can not create more than one extended partition per disk.\n" - "\n" - " * Press any key to continue." - }, - { - //ERROR_NOT_BEHIND_EXTENDED, - "You can not create a partition behind an extended partition.\n" - "\n" - " * Press any key to continue." - }, - { - //ERROR_EXTENDED_NOT_LAST, - "An extended partition must always be the last\n" - "partition in a partition table.\n" "\n" " * Press any key to continue." }, Modified: trunk/reactos/base/setup/usetup/lang/sk-SK.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/sk-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/sk-SK.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/sk-SK.h [iso-8859-1] Fri Oct 3 11:05:56 2014 @@ -1520,19 +1520,6 @@ { //ERROR_ONLY_ONE_EXTENDED, "You can not create more than one extended partition per disk.\n" - "\n" - " * Press any key to continue." - }, - { - //ERROR_NOT_BEHIND_EXTENDED, - "You can not create a partition behind an extended partition.\n" - "\n" - " * Press any key to continue." - }, - { - //ERROR_EXTENDED_NOT_LAST, - "An extended partition must always be the last\n" - "partition in a partition table.\n" "\n" " * Press any key to continue." }, Modified: trunk/reactos/base/setup/usetup/lang/sq-AL.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/sq-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/sq-AL.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/sq-AL.h [iso-8859-1] Fri Oct 3 11:05:56 2014 @@ -1513,19 +1513,6 @@ { //ERROR_ONLY_ONE_EXTENDED, "You can not create more than one extended partition per disk.\n" - "\n" - " * Press any key to continue." - }, - { - //ERROR_NOT_BEHIND_EXTENDED, - "You can not create a partition behind an extended partition.\n" - "\n" - " * Press any key to continue." - }, - { - //ERROR_EXTENDED_NOT_LAST, - "An extended partition must always be the last\n" - "partition in a partition table.\n" "\n" " * Press any key to continue." }, Modified: trunk/reactos/base/setup/usetup/lang/sv-SE.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/sv-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/sv-SE.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/sv-SE.h [iso-8859-1] Fri Oct 3 11:05:56 2014 @@ -1516,19 +1516,6 @@ { //ERROR_ONLY_ONE_EXTENDED, "You can not create more than one extended partition per disk.\n" - "\n" - " * Press any key to continue." - }, - { - //ERROR_NOT_BEHIND_EXTENDED, - "You can not create a partition behind an extended partition.\n" - "\n" - " * Press any key to continue." - }, - { - //ERROR_EXTENDED_NOT_LAST, - "An extended partition must always be the last\n" - "partition in a partition table.\n" "\n" " * Press any key to continue." }, Modified: trunk/reactos/base/setup/usetup/lang/tr-TR.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/tr-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/tr-TR.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/tr-TR.h [iso-8859-1] Fri Oct 3 11:05:56 2014 @@ -1496,19 +1496,6 @@ { //ERROR_ONLY_ONE_EXTENDED, "Bir diskte birden ok geniletilmi blm oluturamazsnz.\n" - "\n" - " * Srdrmek iin bir d§meye basnz." - }, - { - //ERROR_NOT_BEHIND_EXTENDED, - "Bir geniletilmi blm arkasnda bir blm oluturamazsnz.\n" - "\n" - " * Srdrmek iin bir d§meye basnz." - }, - { - //ERROR_EXTENDED_NOT_LAST, - "Bir geniletilmi blm, her zaman bir blm\n" - "tablosunda son blm olmaldr.\n" "\n" " * Srdrmek iin bir d§meye basnz." }, Modified: trunk/reactos/base/setup/usetup/lang/uk-UA.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/uk-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/uk-UA.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/uk-UA.h [iso-8859-1] Fri Oct 3 11:05:56 2014 @@ -1516,19 +1516,6 @@ { //ERROR_ONLY_ONE_EXTENDED, "You can not create more than one extended partition per disk.\n" - "\n" - " * Press any key to continue." - }, - { - //ERROR_NOT_BEHIND_EXTENDED, - "You can not create a partition behind an extended partition.\n" - "\n" - " * Press any key to continue." - }, - { - //ERROR_EXTENDED_NOT_LAST, - "An extended partition must always be the last\n" - "partition in a partition table.\n" "\n" " * Press any key to continue." }, Modified: trunk/reactos/base/setup/usetup/partlist.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/partlist… ============================================================================== --- trunk/reactos/base/setup/usetup/partlist.c [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/partlist.c [iso-8859-1] Fri Oct 3 11:05:56 2014 @@ -3004,41 +3004,6 @@ static -BOOLEAN -IsLastPrimaryPartiton( - IN PPARTENTRY PartEntry) -{ - return (PartEntry->ListEntry.Flink == &PartEntry->DiskEntry->PrimaryPartListHead); -} - - -static -BOOLEAN -IsPreviousPartitionExtended( - IN PPARTENTRY PartEntry, - IN PDISKENTRY DiskEntry) -{ - PPARTENTRY PrevPartEntry; - PLIST_ENTRY Entry; - - Entry = PartEntry->ListEntry.Blink; - - while (Entry != &DiskEntry->PrimaryPartListHead) - { - PrevPartEntry = CONTAINING_RECORD(Entry, PARTENTRY, ListEntry); - - if (IsContainerPartition(PrevPartEntry->PartitionType)) - return TRUE; - - Entry = Entry->Blink; - } - - return FALSE; - -} - - -static ULONG GetPrimaryPartitionCount( IN PDISKENTRY DiskEntry) @@ -3079,10 +3044,6 @@ if (GetPrimaryPartitionCount(DiskEntry) > 4) return ERROR_PARTITION_TABLE_FULL; - /* Fail if this partiton is located behind an extended partition */ - if (IsPreviousPartitionExtended(PartEntry, DiskEntry)) - return ERROR_NOT_BEHIND_EXTENDED; - return ERROR_SUCCESS; } @@ -3109,10 +3070,6 @@ if (DiskEntry->ExtendedPartition != NULL) return ERROR_ONLY_ONE_EXTENDED; - /* Fail if the partition is not the last list entry */ - if (!IsLastPrimaryPartiton(PartEntry)) - return ERROR_EXTENDED_NOT_LAST; - return ERROR_SUCCESS; }

9 years, 11 months

[akhaldi] 64486: * Minor formatting fixes for consistency.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Fri Oct 3 10:25:20 2014 New Revision: 64486 URL: http://svn.reactos.org/svn/reactos?rev=64486&view=rev Log: * Minor formatting fixes for consistency. Modified: trunk/rostests/apitests/ws2_32/nostartup.c Modified: trunk/rostests/apitests/ws2_32/nostartup.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/ws2_32/nostartup… ============================================================================== --- trunk/rostests/apitests/ws2_32/nostartup.c [iso-8859-1] (original) +++ trunk/rostests/apitests/ws2_32/nostartup.c [iso-8859-1] Fri Oct 3 10:25:20 2014 @@ -10,6 +10,7 @@ #define WIN32_NO_STATUS #define _INC_WINDOWS #define COM_NO_WINDOWS_H + #include <windef.h> #include <winsock2.h> #include <ndk/rtlfuncs.h> @@ -18,16 +19,16 @@ // This test depends on WSAStartup not having been called START_TEST(nostartup) { - int Error=0; + int Error = 0; ok(WSASocketA(0, 0, 0, NULL, 0, 0) == INVALID_SOCKET, "WSASocketA should have failed\n"); WSASetLastError(0xdeadbeef); - getservbyname(NULL,NULL); + getservbyname(NULL, NULL); Error = WSAGetLastError(); ok_dec(Error, WSANOTINITIALISED); WSASetLastError(0xdeadbeef); - getservbyport(0,NULL); + getservbyport(0, NULL); Error = WSAGetLastError(); ok_dec(Error, WSANOTINITIALISED);

9 years, 11 months

[akhaldi] 64485: [TRANSLATIONS] * Turkish translation update by Erdem Ersoy. CORE-7861

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Fri Oct 3 10:21:00 2014 New Revision: 64485 URL: http://svn.reactos.org/svn/reactos?rev=64485&view=rev Log: [TRANSLATIONS] * Turkish translation update by Erdem Ersoy. CORE-7861 Added: trunk/reactos/dll/win32/rasdlg/lang/tr-TR.rc (with props) Modified: trunk/reactos/base/applications/regedit/lang/tr-TR.rc trunk/reactos/dll/win32/comdlg32/lang/cdlg_Tr.rc trunk/reactos/dll/win32/crypt32/lang/crypt32_Tr.rc trunk/reactos/dll/win32/cryptui/lang/cryptui_Tr.rc trunk/reactos/dll/win32/devmgr/lang/tr-TR.rc trunk/reactos/dll/win32/hhctrl.ocx/lang/Tr.rc trunk/reactos/dll/win32/jscript/lang/jscript_Tr.rc trunk/reactos/dll/win32/rasdlg/rasdlg.rc trunk/reactos/dll/win32/samsrv/lang/tr-TR.rc trunk/reactos/dll/win32/wldap32/lang/wldap32_Tr.rc [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/base/applications/regedit/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… Modified: trunk/reactos/dll/win32/comdlg32/lang/cdlg_Tr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/lang/cd… Modified: trunk/reactos/dll/win32/crypt32/lang/crypt32_Tr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/crypt32/lang/cry… Modified: trunk/reactos/dll/win32/cryptui/lang/cryptui_Tr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cryptui/lang/cry… Modified: trunk/reactos/dll/win32/devmgr/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr/lang/tr-T… Modified: trunk/reactos/dll/win32/hhctrl.ocx/lang/Tr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/hhctrl.ocx/lang/… Modified: trunk/reactos/dll/win32/jscript/lang/jscript_Tr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/jscript/lang/jsc… Added: trunk/reactos/dll/win32/rasdlg/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rasdlg/lang/tr-T… Modified: trunk/reactos/dll/win32/rasdlg/rasdlg.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rasdlg/rasdlg.rc… Modified: trunk/reactos/dll/win32/samsrv/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/samsrv/lang/tr-T… Modified: trunk/reactos/dll/win32/wldap32/lang/wldap32_Tr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wldap32/lang/wld…

9 years, 11 months

[akhaldi] 64484: [USETUP] * Prevent the "illegal character encoding in string literal" warning from flooding the build log. This must be inspected. CORE-8516

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Fri Oct 3 10:08:33 2014 New Revision: 64484 URL: http://svn.reactos.org/svn/reactos?rev=64484&view=rev Log: [USETUP] * Prevent the "illegal character encoding in string literal" warning from flooding the build log. This must be inspected. CORE-8516 Modified: trunk/reactos/base/setup/usetup/CMakeLists.txt Modified: trunk/reactos/base/setup/usetup/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/CMakeLis… ============================================================================== --- trunk/reactos/base/setup/usetup/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/CMakeLists.txt [iso-8859-1] Fri Oct 3 10:08:33 2014 @@ -32,14 +32,13 @@ settings.c usetup.h) +if(CMAKE_C_COMPILER_ID STREQUAL "Clang") + #FIXME: Investigate Clang "illegal character encoding in string literal" warning + set_property(SOURCE mui.c APPEND_STRING PROPERTY COMPILE_FLAGS " -Wno-invalid-source-encoding") +endif() + add_executable(usetup ${SOURCE} usetup.rc) - -target_link_libraries(usetup - zlib - inflib - ext2lib - vfatlib) - +target_link_libraries(usetup zlib inflib ext2lib vfatlib) set_module_type(usetup nativecui) add_importlibs(usetup ntdll) add_pch(usetup usetup.h SOURCE)

9 years, 11 months

[akhaldi] 64483: [CMAKE] * Introduce an option to compile ReactOS with dwarf symbols instead of rossym. Use NO_ROSSYM to control it. * Dedicated to V. CORE-8594 #resolve

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Fri Oct 3 09:56:36 2014 New Revision: 64483 URL: http://svn.reactos.org/svn/reactos?rev=64483&view=rev Log: [CMAKE] * Introduce an option to compile ReactOS with dwarf symbols instead of rossym. Use NO_ROSSYM to control it. * Dedicated to V. CORE-8594 #resolve Modified: trunk/reactos/cmake/gcc.cmake Modified: trunk/reactos/cmake/gcc.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/cmake/gcc.cmake?rev=64483&… ============================================================================== --- trunk/reactos/cmake/gcc.cmake [iso-8859-1] (original) +++ trunk/reactos/cmake/gcc.cmake [iso-8859-1] Fri Oct 3 09:56:36 2014 @@ -7,6 +7,11 @@ # PDB style debug info if(NOT DEFINED SEPARATE_DBG) set(SEPARATE_DBG FALSE) +endif() + +# Dwarf based builds (no rsym) +if(NOT DEFINED NO_ROSSYM) + set(NO_ROSSYM FALSE) endif() if(NOT DEFINED USE_PSEH3) @@ -194,6 +199,14 @@ "<CMAKE_C_COMPILER> <CMAKE_SHARED_LIBRARY_C_FLAGS> <LINK_FLAGS> <CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS> -o <TARGET> <OBJECTS> <LINK_LIBRARIES>" "${OBJCOPY} --only-keep-debug <TARGET> ${REACTOS_BINARY_DIR}/symbols/${SYMBOL_FILE}" "${OBJCOPY} --strip-debug <TARGET>") +elseif(NO_ROSSYM) + # Dwarf-based build + message(STATUS "Generating a dwarf-based build (no rsym)") + set(CMAKE_C_LINK_EXECUTABLE "<CMAKE_C_COMPILER> ${CMAKE_C_FLAGS} <CMAKE_C_LINK_FLAGS> <LINK_FLAGS> <OBJECTS> -o <TARGET> <LINK_LIBRARIES>") + set(CMAKE_CXX_LINK_EXECUTABLE "<CMAKE_CXX_COMPILER> ${CMAKE_CXX_FLAGS} <CMAKE_CXX_LINK_FLAGS> <LINK_FLAGS> <OBJECTS> -o <TARGET> <LINK_LIBRARIES>") + set(CMAKE_C_CREATE_SHARED_LIBRARY "<CMAKE_C_COMPILER> ${CMAKE_C_FLAGS} <CMAKE_SHARED_LIBRARY_C_FLAGS> <LINK_FLAGS> <CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS> -o <TARGET> <OBJECTS> <LINK_LIBRARIES>") + set(CMAKE_CXX_CREATE_SHARED_LIBRARY "<CMAKE_CXX_COMPILER> ${CMAKE_CXX_FLAGS} <CMAKE_SHARED_LIBRARY_CXX_FLAGS> <LINK_FLAGS> <CMAKE_SHARED_LIBRARY_CREATE_CXX_FLAGS> -o <TARGET> <OBJECTS> <LINK_LIBRARIES>") + set(CMAKE_RC_CREATE_SHARED_LIBRARY "<CMAKE_C_COMPILER> ${CMAKE_C_FLAGS} <CMAKE_SHARED_LIBRARY_C_FLAGS> <LINK_FLAGS> <CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS> -o <TARGET> <OBJECTS> <LINK_LIBRARIES>") else() # Normal rsym build get_target_property(RSYM native-rsym IMPORTED_LOCATION_NOCONFIG)

9 years, 11 months

[ekohl] 64482: [USETUP] - DeleteCurrentPartition: A deleted partition is of type PARTITION_ENTRY_UNUSED. - ScrollDownPartitionList / ScrollUpPartitionList: Ignore container partitions if they are n...

by ekohl＠svn.reactos.org

Author: ekohl Date: Fri Oct 3 09:24:54 2014 New Revision: 64482 URL: http://svn.reactos.org/svn/reactos?rev=64482&view=rev Log: [USETUP] - DeleteCurrentPartition: A deleted partition is of type PARTITION_ENTRY_UNUSED. - ScrollDownPartitionList / ScrollUpPartitionList: Ignore container partitions if they are not used. CORE-8413 #resolve #comment Fixed in r64482. Modified: trunk/reactos/base/setup/usetup/partlist.c Modified: trunk/reactos/base/setup/usetup/partlist.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/partlist… ============================================================================== --- trunk/reactos/base/setup/usetup/partlist.c [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/partlist.c [iso-8859-1] Fri Oct 3 09:24:54 2014 @@ -2054,7 +2054,8 @@ { /* Primary or extended partition */ - if (IsContainerPartition(List->CurrentPartition->PartitionType)) + if (List->CurrentPartition->IsPartitioned == TRUE && + IsContainerPartition(List->CurrentPartition->PartitionType)) { /* First logical partition */ PartListEntry = List->CurrentDisk->LogicalPartListHead.Flink; @@ -2147,7 +2148,8 @@ { PartEntry = CONTAINING_RECORD(PartListEntry, PARTENTRY, ListEntry); - if (IsContainerPartition(PartEntry->PartitionType)) + if (PartEntry->IsPartitioned == TRUE && + IsContainerPartition(PartEntry->PartitionType)) { PartListEntry = List->CurrentDisk->LogicalPartListHead.Blink; PartEntry = CONTAINING_RECORD(PartListEntry, PARTENTRY, ListEntry); @@ -2171,7 +2173,8 @@ { PartEntry = CONTAINING_RECORD(PartListEntry, PARTENTRY, ListEntry); - if (IsContainerPartition(PartEntry->PartitionType)) + if (PartEntry->IsPartitioned == TRUE && + IsContainerPartition(PartEntry->PartitionType)) { PartListEntry = DiskEntry->LogicalPartListHead.Blink; if (PartListEntry != &DiskEntry->LogicalPartListHead) @@ -2697,6 +2700,7 @@ { /* Nothing to merge but change current entry */ PartEntry->IsPartitioned = FALSE; + PartEntry->PartitionType = PARTITION_ENTRY_UNUSED; PartEntry->FormatState = Unformatted; PartEntry->DriveLetter = 0; }

9 years, 11 months

[spetreolle] 64481: [WS2_32] inet_addr does not require WSAStartup()

by spetreolle＠svn.reactos.org

Author: spetreolle Date: Fri Oct 3 09:05:34 2014 New Revision: 64481 URL: http://svn.reactos.org/svn/reactos?rev=64481&view=rev Log: [WS2_32] inet_addr does not require WSAStartup() Modified: trunk/reactos/dll/win32/ws2_32/misc/ns.c Modified: trunk/reactos/dll/win32/ws2_32/misc/ns.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2_32/misc/ns.c… ============================================================================== --- trunk/reactos/dll/win32/ws2_32/misc/ns.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ws2_32/misc/ns.c [iso-8859-1] Fri Oct 3 09:05:34 2014 @@ -1496,7 +1496,7 @@ p = (PCHAR)cp; - if (!p || !WSAINITIALIZED) + if (!p) { WSASetLastError(WSAEFAULT); return INADDR_NONE;

9 years, 11 months

← Newer
1
...
65
66
67
68
69
70
71
72
73
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 October 2014