Ros-diffs March 2013

ros-diffs@reactos.org

14 participants
249 discussions

[akhaldi] 58611: [USP10] * Sync with Wine 1.5.26.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Tue Mar 26 19:16:32 2013 New Revision: 58611 URL: http://svn.reactos.org/svn/reactos?rev=58611&view=rev Log: [USP10] * Sync with Wine 1.5.26. Modified: trunk/reactos/dll/win32/usp10/bidi.c trunk/reactos/dll/win32/usp10/shape.c trunk/reactos/dll/win32/usp10/usp10.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/usp10/bidi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/usp10/bidi.c?rev… ============================================================================== --- trunk/reactos/dll/win32/usp10/bidi.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/usp10/bidi.c [iso-8859-1] Tue Mar 26 19:16:32 2013 @@ -749,7 +749,8 @@ ) { WORD *chartype; - unsigned baselevel = 0,j; + unsigned baselevel = 0; + INT j; TRACE("%s, %d\n", debugstr_wn(lpString, uCount), uCount); chartype = HeapAlloc(GetProcessHeap(), 0, uCount * sizeof(WORD)); Modified: trunk/reactos/dll/win32/usp10/shape.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/usp10/shape.c?re… ============================================================================== --- trunk/reactos/dll/win32/usp10/shape.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/usp10/shape.c [iso-8859-1] Tue Mar 26 19:16:32 2013 @@ -931,7 +931,7 @@ context_type[i] = lex(pwcChars[i]); GetGlyphIndicesW(hdc, &invalid, 1, &invalid_glyph, 0); - for (i = 1, g=1; i < cChars; i++, g++) + for (i = 1, g=1; i < cChars - 1; i++, g++) { if (context_type[i] != 0 && context_type[i+write_dir]==context_type[i]) { Modified: trunk/reactos/dll/win32/usp10/usp10.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/usp10/usp10.c?re… ============================================================================== --- trunk/reactos/dll/win32/usp10/usp10.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/usp10/usp10.c [iso-8859-1] Tue Mar 26 19:16:32 2013 @@ -1017,13 +1017,14 @@ if (psc && *psc) { unsigned int i; + INT n; for (i = 0; i < GLYPH_MAX / GLYPH_BLOCK_SIZE; i++) { heap_free(((ScriptCache *)*psc)->widths[i]); } for (i = 0; i < 0x10; i++) { - int j; + unsigned int j; if (((ScriptCache *)*psc)->page[i]) for (j = 0; j < GLYPH_MAX / GLYPH_BLOCK_SIZE; j++) heap_free(((ScriptCache *)*psc)->page[i]->glyphs[j]); @@ -1033,20 +1034,20 @@ heap_free(((ScriptCache *)*psc)->GDEF_Table); heap_free(((ScriptCache *)*psc)->CMAP_Table); heap_free(((ScriptCache *)*psc)->GPOS_Table); - for (i = 0; i < ((ScriptCache *)*psc)->script_count; i++) + for (n = 0; n < ((ScriptCache *)*psc)->script_count; n++) { int j; - for (j = 0; j < ((ScriptCache *)*psc)->scripts[i].language_count; j++) + for (j = 0; j < ((ScriptCache *)*psc)->scripts[n].language_count; j++) { int k; - for (k = 0; k < ((ScriptCache *)*psc)->scripts[i].languages[j].feature_count; k++) - heap_free(((ScriptCache *)*psc)->scripts[i].languages[j].features[k].lookups); - heap_free(((ScriptCache *)*psc)->scripts[i].languages[j].features); + for (k = 0; k < ((ScriptCache *)*psc)->scripts[n].languages[j].feature_count; k++) + heap_free(((ScriptCache *)*psc)->scripts[n].languages[j].features[k].lookups); + heap_free(((ScriptCache *)*psc)->scripts[n].languages[j].features); } - for (j = 0; j < ((ScriptCache *)*psc)->scripts[i].default_language.feature_count; j++) - heap_free(((ScriptCache *)*psc)->scripts[i].default_language.features[j].lookups); - heap_free(((ScriptCache *)*psc)->scripts[i].default_language.features); - heap_free(((ScriptCache *)*psc)->scripts[i].languages); + for (j = 0; j < ((ScriptCache *)*psc)->scripts[n].default_language.feature_count; j++) + heap_free(((ScriptCache *)*psc)->scripts[n].default_language.features[j].lookups); + heap_free(((ScriptCache *)*psc)->scripts[n].default_language.features); + heap_free(((ScriptCache *)*psc)->scripts[n].languages); } heap_free(((ScriptCache *)*psc)->scripts); heap_free(((ScriptCache *)*psc)->otm); @@ -2534,8 +2535,9 @@ if (check >= cChars && !iMaxPos) { - for (check = clust; check < cChars; check++) - special_size += get_glyph_cluster_advance(piAdvance, psva, pwLogClust, cGlyphs, cChars, check, 1); + int glyph; + for (glyph = clust; glyph < cGlyphs; glyph++) + special_size += get_glyph_cluster_advance(piAdvance, psva, pwLogClust, cGlyphs, cChars, glyph, 1); iSpecial = item; special_size /= (cChars - item); iPosX += special_size; @@ -2666,8 +2668,9 @@ if (check >= cChars && direction > 0) { - for (check = clust; check < cChars; check++) - special_size += get_glyph_cluster_advance(piAdvance, psva, pwLogClust, cGlyphs, cChars, check, direction); + int glyph; + for (glyph = clust; glyph < cGlyphs; glyph++) + special_size += get_glyph_cluster_advance(piAdvance, psva, pwLogClust, cGlyphs, cChars, glyph, direction); iSpecial = item; special_size /= (cChars - item); iPosX += special_size; @@ -2841,7 +2844,8 @@ SCRIPT_GLYPHPROP *pOutGlyphProps, int *pcGlyphs) { HRESULT hr; - unsigned int i,g; + int i; + unsigned int g; BOOL rtl; int cluster; 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] Tue Mar 26 19:16:32 2013 @@ -180,7 +180,7 @@ reactos/dll/win32/updspapi # Synced to Wine-1.5.4 reactos/dll/win32/url # Synced to Wine-1.5.19 reactos/dll/win32/urlmon # Synced to Wine-1.5.26 -reactos/dll/win32/usp10 # Synced to Wine-1.5.24 +reactos/dll/win32/usp10 # Synced to Wine-1.5.26 reactos/dll/win32/uxtheme # Forked reactos/dll/win32/version # Autosync reactos/dll/win32/wer # Autosync

11 years, 9 months

[akhaldi] 58610: [XMLLITE_WINETEST] * Sync with Wine 1.5.26.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Tue Mar 26 19:02:58 2013 New Revision: 58610 URL: http://svn.reactos.org/svn/reactos?rev=58610&view=rev Log: [XMLLITE_WINETEST] * Sync with Wine 1.5.26. Modified: trunk/rostests/winetests/xmllite/reader.c trunk/rostests/winetests/xmllite/testlist.c trunk/rostests/winetests/xmllite/writer.c Modified: trunk/rostests/winetests/xmllite/reader.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/xmllite/reader.… ============================================================================== --- trunk/rostests/winetests/xmllite/reader.c [iso-8859-1] (original) +++ trunk/rostests/winetests/xmllite/reader.c [iso-8859-1] Tue Mar 26 19:02:58 2013 @@ -1,7 +1,7 @@ /* - * XMLLite IXmlReader tests + * IXmlReader tests * - * Copyright 2010 (C) Nikolay Sivov + * Copyright 2010, 2012-2013 Nikolay Sivov * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -18,18 +18,23 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + #define COBJMACROS #define CONST_VTABLE -#include <stdarg.h> +//#include <stdarg.h> #include <stdio.h> -#include "windef.h" -#include "winbase.h" -#include "initguid.h" -#include "ole2.h" -#include "xmllite.h" -#include "wine/test.h" +#include <windef.h> +#include <winbase.h> +#include <winnls.h> +#include <initguid.h> +#include <ole2.h> +#include <xmllite.h> +#include <wine/test.h> DEFINE_GUID(IID_IXmlReaderInput, 0x0b3ccc9b, 0x9214, 0x428b, 0xa2, 0xae, 0xef, 0x3a, 0xa8, 0x71, 0xaf, 0xda); @@ -50,6 +55,19 @@ riid->Data4[5], riid->Data4[6], riid->Data4[7]); return buf; +} + +static WCHAR *a2w(const char *str) +{ + int len = MultiByteToWideChar(CP_ACP, 0, str, -1, NULL, 0); + WCHAR *ret = HeapAlloc(GetProcessHeap(), 0, len*sizeof(WCHAR)); + MultiByteToWideChar(CP_ACP, 0, str, -1, ret, len); + return ret; +} + +static void free_str(WCHAR *str) +{ + HeapFree(GetProcessHeap(), 0, str); } static const char xmldecl_full[] = "\xef\xbb\xbf<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"yes\"?>\n"; @@ -326,6 +344,60 @@ return S_OK; } +static HRESULT WINAPI teststream_QueryInterface(ISequentialStream *iface, REFIID riid, void **obj) +{ + if (IsEqualIID(riid, &IID_IUnknown) || IsEqualIID(riid, &IID_ISequentialStream)) + { + *obj = iface; + return S_OK; + } + + *obj = NULL; + return E_NOINTERFACE; +} + +static ULONG WINAPI teststream_AddRef(ISequentialStream *iface) +{ + return 2; +} + +static ULONG WINAPI teststream_Release(ISequentialStream *iface) +{ + return 1; +} + +static int stream_readcall; + +static HRESULT WINAPI teststream_Read(ISequentialStream *iface, void *pv, ULONG cb, ULONG *pread) +{ + static const char xml[] = ""; + + if (stream_readcall++) + { + *pread = 0; + return E_PENDING; + } + + *pread = sizeof(xml) / 2; + memcpy(pv, xml, *pread); + return S_OK; +} + +static HRESULT WINAPI teststream_Write(ISequentialStream *iface, const void *pv, ULONG cb, ULONG *written) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static const ISequentialStreamVtbl teststreamvtbl = +{ + teststream_QueryInterface, + teststream_AddRef, + teststream_Release, + teststream_Read, + teststream_Write +}; + static BOOL init_pointers(void) { /* don't free module here, it's to be unloaded on exit */ @@ -497,6 +569,7 @@ IStream_Release(stream); /* test input interface selection sequence */ + input = NULL; hr = testinput_createinstance((void**)&input); ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); @@ -634,10 +707,8 @@ test_read_state(reader, XmlReadState_Interactive, -1, 0); hr = IXmlReader_GetValue(reader, &val, NULL); -todo_wine - ok(hr == S_OK, "got %08x\n", hr); - if (hr == S_OK) - ok(*val == 0, "got %s\n", wine_dbgstr_w(val)); + ok(hr == S_OK, "got %08x\n", hr); + ok(*val == 0, "got %s\n", wine_dbgstr_w(val)); /* check attributes */ hr = IXmlReader_MoveToNextAttribute(reader); @@ -675,10 +746,9 @@ ok(count == 3, "Expected 3, got %d\n", count); hr = IXmlReader_GetDepth(reader, &count); -todo_wine { - ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); + ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); +todo_wine ok(count == 1, "Expected 1, got %d\n", count); -} hr = IXmlReader_MoveToElement(reader); ok(hr == S_OK, "got %08x\n", hr); @@ -688,7 +758,646 @@ ok(hr == S_OK, "got %08x\n", hr); ok(type == XmlNodeType_XmlDeclaration, "got %d\n", type); + type = XmlNodeType_XmlDeclaration; + hr = IXmlReader_Read(reader, &type); + /* newer versions return syntax error here cause document is incomplete, + it makes more sense than invalid char error */ +todo_wine { + ok(hr == WC_E_SYNTAX || broken(hr == WC_E_XMLCHARACTER), "got 0x%08x\n", hr); + ok(type == XmlNodeType_None, "got %d\n", type); +} IStream_Release(stream); + IXmlReader_Release(reader); +} + +struct test_entry { + const char *xml; + const char *name; + const char *value; + HRESULT hr; + HRESULT hr_broken; /* this is set to older version results */ +}; + +static struct test_entry comment_tests[] = { + { "", "", " comment ", S_OK }, + { "", "", " - comment", S_OK }, + { "", NULL, NULL, WC_E_COMMENT, WC_E_GREATERTHAN }, + { "", NULL, NULL, WC_E_COMMENT, WC_E_GREATERTHAN }, + { NULL } +}; + +static void test_read_comment(void) +{ + struct test_entry *test = comment_tests; + IXmlReader *reader; + HRESULT hr; + + hr = pCreateXmlReader(&IID_IXmlReader, (void**)&reader, NULL); + ok(hr == S_OK, "S_OK, got %08x\n", hr); + + while (test->xml) + { + XmlNodeType type; + IStream *stream; + + stream = create_stream_on_data(test->xml, strlen(test->xml)+1); + hr = IXmlReader_SetInput(reader, (IUnknown*)stream); + ok(hr == S_OK, "got %08x\n", hr); + + type = XmlNodeType_None; + hr = IXmlReader_Read(reader, &type); + if (test->hr_broken) + ok(hr == test->hr || broken(hr == test->hr_broken), "got %08x for %s\n", hr, test->xml); + else + ok(hr == test->hr, "got %08x for %s\n", hr, test->xml); + if (hr == S_OK) + { + const WCHAR *str; + WCHAR *str_exp; + UINT len; + + ok(type == XmlNodeType_Comment, "got %d for %s\n", type, test->xml); + + len = 1; + str = NULL; + hr = IXmlReader_GetLocalName(reader, &str, &len); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(len == strlen(test->name), "got %u\n", len); + str_exp = a2w(test->name); + ok(!lstrcmpW(str, str_exp), "got %s\n", wine_dbgstr_w(str)); + free_str(str_exp); + + len = 1; + str = NULL; + hr = IXmlReader_GetQualifiedName(reader, &str, &len); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(len == strlen(test->name), "got %u\n", len); + str_exp = a2w(test->name); + ok(!lstrcmpW(str, str_exp), "got %s\n", wine_dbgstr_w(str)); + free_str(str_exp); + + /* value */ + len = 1; + str = NULL; + hr = IXmlReader_GetValue(reader, &str, &len); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(len == strlen(test->value), "got %u\n", len); + str_exp = a2w(test->value); + ok(!lstrcmpW(str, str_exp), "got %s\n", wine_dbgstr_w(str)); + free_str(str_exp); + } + + IStream_Release(stream); + test++; + } + + IXmlReader_Release(reader); +} + +static struct test_entry pi_tests[] = { + { "<?pi?>", "pi", "", S_OK }, + { "<?pi ?>", "pi", "", S_OK }, + { "<?pi ?>", "pi", "", S_OK }, + { "<?pi pi data?>", "pi", "pi data", S_OK }, + { "<?pi pi data ?>", "pi", "pi data ", S_OK }, + { "<?pi:pi?>", NULL, NULL, NC_E_NAMECOLON, WC_E_NAMECHARACTER }, + { "<?:pi ?>", NULL, NULL, WC_E_PI, WC_E_NAMECHARACTER }, + { "<?-pi ?>", NULL, NULL, WC_E_PI, WC_E_NAMECHARACTER }, + { "<?xml-stylesheet ?>", "xml-stylesheet", "", S_OK }, + { NULL } +}; + +static void test_read_pi(void) +{ + struct test_entry *test = pi_tests; + IXmlReader *reader; + HRESULT hr; + + hr = pCreateXmlReader(&IID_IXmlReader, (void**)&reader, NULL); + ok(hr == S_OK, "S_OK, got %08x\n", hr); + + while (test->xml) + { + XmlNodeType type; + IStream *stream; + + stream = create_stream_on_data(test->xml, strlen(test->xml)+1); + hr = IXmlReader_SetInput(reader, (IUnknown*)stream); + ok(hr == S_OK, "got %08x\n", hr); + + type = XmlNodeType_None; + hr = IXmlReader_Read(reader, &type); + if (test->hr_broken) + ok(hr == test->hr || broken(hr == test->hr_broken), "got %08x for %s\n", hr, test->xml); + else + ok(hr == test->hr, "got %08x for %s\n", hr, test->xml); + if (hr == S_OK) + { + const WCHAR *str; + WCHAR *str_exp; + UINT len; + + ok(type == XmlNodeType_ProcessingInstruction, "got %d for %s\n", type, test->xml); + + len = 0; + str = NULL; + hr = IXmlReader_GetLocalName(reader, &str, &len); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(len == strlen(test->name), "got %u\n", len); + str_exp = a2w(test->name); + ok(!lstrcmpW(str, str_exp), "got %s\n", wine_dbgstr_w(str)); + free_str(str_exp); + + len = 0; + str = NULL; + hr = IXmlReader_GetQualifiedName(reader, &str, &len); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(len == strlen(test->name), "got %u\n", len); + str_exp = a2w(test->name); + ok(!lstrcmpW(str, str_exp), "got %s\n", wine_dbgstr_w(str)); + free_str(str_exp); + + /* value */ + len = !strlen(test->value); + str = NULL; + hr = IXmlReader_GetValue(reader, &str, &len); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(len == strlen(test->value), "got %u\n", len); + str_exp = a2w(test->value); + ok(!lstrcmpW(str, str_exp), "got %s\n", wine_dbgstr_w(str)); + free_str(str_exp); + } + + IStream_Release(stream); + test++; + } + + IXmlReader_Release(reader); +} + +struct nodes_test { + const char *xml; + XmlNodeType types[20]; +}; + +static const char misc_test_xml[] = + "" + "" + "<?pi1 pi1body ?>" + "" + " \t \r \n" + "" + "<a>" + "<b/>" + "" + "<?pi pibody ?>" + "</a>" +; + +static struct nodes_test misc_test = { + misc_test_xml, + { + XmlNodeType_Comment, + XmlNodeType_Comment, + XmlNodeType_ProcessingInstruction, + XmlNodeType_Comment, + XmlNodeType_Whitespace, + XmlNodeType_Comment, + XmlNodeType_Element, + XmlNodeType_Element, + XmlNodeType_Comment, + XmlNodeType_ProcessingInstruction, + XmlNodeType_EndElement, + XmlNodeType_None + } +}; + +static void test_read_full(void) +{ + struct nodes_test *test = &misc_test; + IXmlReader *reader; + XmlNodeType type; + IStream *stream; + HRESULT hr; + int i; + + hr = pCreateXmlReader(&IID_IXmlReader, (void**)&reader, NULL); + ok(hr == S_OK, "S_OK, got %08x\n", hr); + + stream = create_stream_on_data(test->xml, strlen(test->xml)+1); + hr = IXmlReader_SetInput(reader, (IUnknown*)stream); + ok(hr == S_OK, "got %08x\n", hr); + + i = 0; + type = XmlNodeType_None; + hr = IXmlReader_Read(reader, &type); + while (hr == S_OK) + { + ok(test->types[i] != XmlNodeType_None, "%d: unexpected end of test data\n", i); + if (test->types[i] == XmlNodeType_None) break; + ok(type == test->types[i], "%d: got wrong type %d, expected %d\n", i, type, test->types[i]); + hr = IXmlReader_Read(reader, &type); + i++; + } + ok(test->types[i] == XmlNodeType_None, "incomplete sequence, got %d\n", test->types[i]); + + IStream_Release(stream); + IXmlReader_Release(reader); +} + +static const char test_dtd[] = + "<!DOCTYPE testdtd SYSTEM \"externalid uri\" >" + ""; + +static void test_read_dtd(void) +{ + static const WCHAR sysvalW[] = {'e','x','t','e','r','n','a','l','i','d',' ','u','r','i',0}; + static const WCHAR dtdnameW[] = {'t','e','s','t','d','t','d',0}; + static const WCHAR sysW[] = {'S','Y','S','T','E','M',0}; + IXmlReader *reader; + const WCHAR *str; + XmlNodeType type; + IStream *stream; + UINT len, count; + HRESULT hr; + + hr = pCreateXmlReader(&IID_IXmlReader, (void**)&reader, NULL); + ok(hr == S_OK, "S_OK, got %08x\n", hr); + + hr = IXmlReader_SetProperty(reader, XmlReaderProperty_DtdProcessing, DtdProcessing_Parse); + ok(hr == S_OK, "got 0x%8x\n", hr); + + stream = create_stream_on_data(test_dtd, sizeof(test_dtd)); + hr = IXmlReader_SetInput(reader, (IUnknown*)stream); + ok(hr == S_OK, "got %08x\n", hr); + + type = XmlNodeType_None; + hr = IXmlReader_Read(reader, &type); + ok(hr == S_OK, "got 0x%8x\n", hr); + ok(type == XmlNodeType_DocumentType, "got type %d\n", type); + + count = 0; + hr = IXmlReader_GetAttributeCount(reader, &count); + ok(hr == S_OK, "got %08x\n", hr); + ok(count == 1, "got %d\n", count); + + hr = IXmlReader_MoveToFirstAttribute(reader); + ok(hr == S_OK, "got %08x\n", hr); + + type = XmlNodeType_None; + hr = IXmlReader_GetNodeType(reader, &type); + ok(hr == S_OK, "got %08x\n", hr); + ok(type == XmlNodeType_Attribute, "got %d\n", type); + + len = 0; + str = NULL; + hr = IXmlReader_GetLocalName(reader, &str, &len); + ok(hr == S_OK, "got 0x%08x\n", hr); +todo_wine { + ok(len == lstrlenW(sysW), "got %u\n", len); + ok(!lstrcmpW(str, sysW), "got %s\n", wine_dbgstr_w(str)); +} + len = 0; + str = NULL; + hr = IXmlReader_GetValue(reader, &str, &len); + ok(hr == S_OK, "got 0x%08x\n", hr); +todo_wine { + ok(len == lstrlenW(sysvalW), "got %u\n", len); + ok(!lstrcmpW(str, sysvalW), "got %s\n", wine_dbgstr_w(str)); +} + hr = IXmlReader_MoveToElement(reader); + ok(hr == S_OK, "got 0x%08x\n", hr); + + len = 0; + str = NULL; + hr = IXmlReader_GetLocalName(reader, &str, &len); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(len == lstrlenW(dtdnameW), "got %u\n", len); + ok(!lstrcmpW(str, dtdnameW), "got %s\n", wine_dbgstr_w(str)); + + len = 0; + str = NULL; + hr = IXmlReader_GetQualifiedName(reader, &str, &len); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(len == lstrlenW(dtdnameW), "got %u\n", len); + ok(!lstrcmpW(str, dtdnameW), "got %s\n", wine_dbgstr_w(str)); + + type = XmlNodeType_None; + hr = IXmlReader_Read(reader, &type); + ok(hr == S_OK, "got 0x%8x\n", hr); + ok(type == XmlNodeType_Comment, "got type %d\n", type); + + IStream_Release(stream); + IXmlReader_Release(reader); +} + +static struct test_entry element_tests[] = { + { "<a/>", "a", "", S_OK }, + { "<a />", "a", "", S_OK }, + { "<a:b/>", "a:b", "", NC_E_UNDECLAREDPREFIX }, + { "<:a/>", NULL, NULL, NC_E_QNAMECHARACTER }, + { "< a/>", NULL, NULL, NC_E_QNAMECHARACTER }, + { "<a>", "a", "", S_OK }, + { "<a >", "a", "", S_OK }, + { "<a \r \t\n>", "a", "", S_OK }, + { "</a>", NULL, NULL, NC_E_QNAMECHARACTER }, + { NULL } +}; + +static void test_read_element(void) +{ + struct test_entry *test = element_tests; + static const char stag[] = "<a><b></b></a>"; + static const char mismatch[] = "<a></b>"; + IXmlReader *reader; + XmlNodeType type; + IStream *stream; + UINT depth; + HRESULT hr; + + hr = pCreateXmlReader(&IID_IXmlReader, (void**)&reader, NULL); + ok(hr == S_OK, "S_OK, got %08x\n", hr); + + while (test->xml) + { + stream = create_stream_on_data(test->xml, strlen(test->xml)+1); + hr = IXmlReader_SetInput(reader, (IUnknown*)stream); + ok(hr == S_OK, "got %08x\n", hr); + + type = XmlNodeType_None; + hr = IXmlReader_Read(reader, &type); + if (test->hr_broken) + ok(hr == test->hr || broken(hr == test->hr_broken), "got %08x for %s\n", hr, test->xml); + else + ok(hr == test->hr, "got %08x for %s\n", hr, test->xml); + if (hr == S_OK) + { + const WCHAR *str; + WCHAR *str_exp; + UINT len; + + ok(type == XmlNodeType_Element, "got %d for %s\n", type, test->xml); + + len = 0; + str = NULL; + hr = IXmlReader_GetQualifiedName(reader, &str, &len); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(len == strlen(test->name), "got %u\n", len); + str_exp = a2w(test->name); + ok(!lstrcmpW(str, str_exp), "got %s\n", wine_dbgstr_w(str)); + free_str(str_exp); + + /* value */ + len = 1; + str = NULL; + hr = IXmlReader_GetValue(reader, &str, &len); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(len == 0, "got %u\n", len); + ok(*str == 0, "got %s\n", wine_dbgstr_w(str)); + } + + IStream_Release(stream); + test++; + } + + /* test reader depth increment */ + stream = create_stream_on_data(stag, sizeof(stag)); + hr = IXmlReader_SetInput(reader, (IUnknown*)stream); + ok(hr == S_OK, "got %08x\n", hr); + + depth = 1; + hr = IXmlReader_GetDepth(reader, &depth); + ok(hr == S_OK, "got %08x\n", hr); + ok(depth == 0, "got %d\n", depth); + + hr = IXmlReader_Read(reader, &type); + ok(hr == S_OK, "got %08x\n", hr); + + depth = 1; + hr = IXmlReader_GetDepth(reader, &depth); + ok(hr == S_OK, "got %08x\n", hr); + ok(depth == 0, "got %d\n", depth); + + hr = IXmlReader_Read(reader, &type); + ok(hr == S_OK, "got %08x\n", hr); + + depth = 0; + hr = IXmlReader_GetDepth(reader, &depth); + ok(hr == S_OK, "got %08x\n", hr); + ok(depth == 1, "got %d\n", depth); + + /* read end tag for inner element */ + type = XmlNodeType_None; + hr = IXmlReader_Read(reader, &type); + ok(hr == S_OK, "got %08x\n", hr); + ok(type == XmlNodeType_EndElement, "got %d\n", type); + + depth = 0; + hr = IXmlReader_GetDepth(reader, &depth); + ok(hr == S_OK, "got %08x\n", hr); +todo_wine + ok(depth == 2, "got %d\n", depth); + + /* read end tag for container element */ + type = XmlNodeType_None; + hr = IXmlReader_Read(reader, &type); + ok(hr == S_OK, "got %08x\n", hr); + ok(type == XmlNodeType_EndElement, "got %d\n", type); + + depth = 0; + hr = IXmlReader_GetDepth(reader, &depth); + ok(hr == S_OK, "got %08x\n", hr); + ok(depth == 1, "got %d\n", depth); + + IStream_Release(stream); + + /* start/end tag mismatch */ + stream = create_stream_on_data(mismatch, sizeof(mismatch)); + hr = IXmlReader_SetInput(reader, (IUnknown*)stream); + ok(hr == S_OK, "got %08x\n", hr); + + type = XmlNodeType_None; + hr = IXmlReader_Read(reader, &type); + ok(hr == S_OK, "got %08x\n", hr); + ok(type == XmlNodeType_Element, "got %d\n", type); + + type = XmlNodeType_Element; + hr = IXmlReader_Read(reader, &type); + ok(hr == WC_E_ELEMENTMATCH, "got %08x\n", hr); +todo_wine + ok(type == XmlNodeType_None, "got %d\n", type); + + IStream_Release(stream); + + IXmlReader_Release(reader); +} + +static ISequentialStream teststream = { &teststreamvtbl }; + +static void test_read_pending(void) +{ + IXmlReader *reader; + const WCHAR *value; + XmlNodeType type; + HRESULT hr; + int c; + + hr = pCreateXmlReader(&IID_IXmlReader, (void**)&reader, NULL); + ok(hr == S_OK, "S_OK, got 0x%08x\n", hr); + + hr = IXmlReader_SetInput(reader, (IUnknown*)&teststream); + ok(hr == S_OK, "got 0x%08x\n", hr); + + /* first read call returns incomplete node, second attempt fails with E_PENDING */ + stream_readcall = 0; + type = XmlNodeType_Element; + hr = IXmlReader_Read(reader, &type); + ok(hr == S_OK || broken(hr == E_PENDING), "got 0x%08x\n", hr); + /* newer versions are happy when it's enough data to detect node type, + older versions keep reading until it fails to read more */ + ok(stream_readcall == 1 || broken(stream_readcall > 1), "got %d\n", stream_readcall); + ok(type == XmlNodeType_Comment || broken(type == XmlNodeType_None), "got %d\n", type); + + /* newer versions' GetValue() makes an attempt to read more */ + c = stream_readcall; + value = (void*)0xdeadbeef; + hr = IXmlReader_GetValue(reader, &value, NULL); + ok(hr == E_PENDING, "got 0x%08x\n", hr); + ok(value == NULL || broken(value == (void*)0xdeadbeef) /* Win8 sets it to NULL */, "got %p\n", value); + ok(c < stream_readcall || broken(c == stream_readcall), "got %d, expected %d\n", stream_readcall, c+1); + + IXmlReader_Release(reader); +} + +static void test_readvaluechunk(void) +{ + static const char testA[] = ""; + IXmlReader *reader; + XmlNodeType type; + IStream *stream; + const WCHAR *value; + WCHAR b; + HRESULT hr; + UINT c; + + hr = pCreateXmlReader(&IID_IXmlReader, (void**)&reader, NULL); + ok(hr == S_OK, "S_OK, got %08x\n", hr); + + stream = create_stream_on_data(testA, sizeof(testA)); + hr = IXmlReader_SetInput(reader, (IUnknown*)stream); + ok(hr == S_OK, "got %08x\n", hr); + + hr = IXmlReader_Read(reader, &type); + ok(hr == S_OK, "got %08x\n", hr); + + c = 0; + b = 0; + hr = IXmlReader_ReadValueChunk(reader, &b, 1, &c); + ok(hr == S_OK, "got %08x\n", hr); + ok(c == 1, "got %u\n", c); + ok(b == ' ', "got %x\n", b); + + /* portion read as chunk is skipped from resulting node value */ + value = NULL; + hr = IXmlReader_GetValue(reader, &value, NULL); + ok(hr == S_OK, "got %08x\n", hr); + ok(value[0] == 'c', "got %s\n", wine_dbgstr_w(value)); + + /* once value is returned/allocated it's not possible to read by chunk */ + c = 0; + b = 0; + hr = IXmlReader_ReadValueChunk(reader, &b, 1, &c); + ok(hr == S_FALSE, "got %08x\n", hr); + ok(c == 0, "got %u\n", c); + ok(b == 0, "got %x\n", b); + + value = NULL; + hr = IXmlReader_GetValue(reader, &value, NULL); + ok(hr == S_OK, "got %08x\n", hr); + ok(value[0] == 'c', "got %s\n", wine_dbgstr_w(value)); + + IXmlReader_Release(reader); +} + +static struct test_entry cdata_tests[] = { + { "<a><![CDATA[ ]]data ]]></a>", "", " ]]data ", S_OK }, + { "<a><![CDATA[<![CDATA[ data ]]]]></a>", "", "<![CDATA[ data ]]", S_OK }, + { NULL } +}; + +static void test_read_cdata(void) +{ + struct test_entry *test = cdata_tests; + IXmlReader *reader; + HRESULT hr; + + hr = pCreateXmlReader(&IID_IXmlReader, (void**)&reader, NULL); + ok(hr == S_OK, "S_OK, got %08x\n", hr); + + while (test->xml) + { + XmlNodeType type; + IStream *stream; + + stream = create_stream_on_data(test->xml, strlen(test->xml)+1); + hr = IXmlReader_SetInput(reader, (IUnknown*)stream); + ok(hr == S_OK, "got %08x\n", hr); + + type = XmlNodeType_None; + hr = IXmlReader_Read(reader, &type); + + /* read one more to get to CDATA */ + if (type == XmlNodeType_Element) + { + type = XmlNodeType_None; + hr = IXmlReader_Read(reader, &type); + } + + if (test->hr_broken) + ok(hr == test->hr || broken(hr == test->hr_broken), "got %08x for %s\n", hr, test->xml); + else + ok(hr == test->hr, "got %08x for %s\n", hr, test->xml); + if (hr == S_OK) + { + const WCHAR *str; + WCHAR *str_exp; + UINT len; + + ok(type == XmlNodeType_CDATA, "got %d for %s\n", type, test->xml); + + len = 1; + str = NULL; + hr = IXmlReader_GetLocalName(reader, &str, &len); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(len == strlen(test->name), "got %u\n", len); + str_exp = a2w(test->name); + ok(!lstrcmpW(str, str_exp), "got %s\n", wine_dbgstr_w(str)); + free_str(str_exp); + + len = 1; + str = NULL; + hr = IXmlReader_GetQualifiedName(reader, &str, &len); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(len == strlen(test->name), "got %u\n", len); + str_exp = a2w(test->name); + ok(!lstrcmpW(str, str_exp), "got %s\n", wine_dbgstr_w(str)); + free_str(str_exp); + + /* value */ + len = 1; + str = NULL; + hr = IXmlReader_GetValue(reader, &str, &len); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(len == strlen(test->value), "got %u\n", len); + str_exp = a2w(test->value); + ok(!lstrcmpW(str, str_exp), "got %s\n", wine_dbgstr_w(str)); + free_str(str_exp); + } + + IStream_Release(stream); + test++; + } + IXmlReader_Release(reader); } @@ -708,6 +1417,14 @@ test_reader_create(); test_readerinput(); test_reader_state(); + test_read_cdata(); + test_read_comment(); + test_read_pi(); + test_read_dtd(); + test_read_element(); + test_read_full(); + test_read_pending(); + test_readvaluechunk(); test_read_xmldeclaration(); CoUninitialize(); Modified: trunk/rostests/winetests/xmllite/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/xmllite/testlis… ============================================================================== --- trunk/rostests/winetests/xmllite/testlist.c [iso-8859-1] (original) +++ trunk/rostests/winetests/xmllite/testlist.c [iso-8859-1] Tue Mar 26 19:02:58 2013 @@ -1,10 +1,7 @@ /* Automatically generated file; DO NOT EDIT!! */ -#define WIN32_LEAN_AND_MEAN -#include <windows.h> - #define STANDALONE -#include "wine/test.h" +#include <wine/test.h> extern void func_reader(void); extern void func_writer(void); Modified: trunk/rostests/winetests/xmllite/writer.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/xmllite/writer.… ============================================================================== --- trunk/rostests/winetests/xmllite/writer.c [iso-8859-1] (original) +++ trunk/rostests/winetests/xmllite/writer.c [iso-8859-1] Tue Mar 26 19:02:58 2013 @@ -17,16 +17,22 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ + +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + #define COBJMACROS #include <stdarg.h> -#include <stdio.h> +//#include <stdio.h> -#include "windef.h" -#include "winbase.h" -#include "ole2.h" -#include "xmllite.h" -#include "wine/test.h" +#include <windef.h> +#include <winbase.h> +#include <objbase.h> +//#include "ole2.h" +#include <xmllite.h> +#include <wine/test.h> static HRESULT (WINAPI *pCreateXmlWriter)(REFIID riid, void **ppvObject, IMalloc *pMalloc);

11 years, 9 months

[akhaldi] 58609: [XMLLITE] * Sync with Wine 1.5.26.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Tue Mar 26 19:02:38 2013 New Revision: 58609 URL: http://svn.reactos.org/svn/reactos?rev=58609&view=rev Log: [XMLLITE] * Sync with Wine 1.5.26. Modified: trunk/reactos/dll/win32/xmllite/reader.c trunk/reactos/dll/win32/xmllite/xmllite_main.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/xmllite/reader.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/xmllite/reader.c… ============================================================================== --- trunk/reactos/dll/win32/xmllite/reader.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/xmllite/reader.c [iso-8859-1] Tue Mar 26 19:02:38 2013 @@ -1,7 +1,7 @@ /* * IXmlReader implementation * - * Copyright 2010, 2012 Nikolay Sivov + * Copyright 2010, 2012-2013 Nikolay Sivov * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -48,11 +48,56 @@ XmlEncoding_Unknown } xml_encoding; +typedef enum +{ + XmlReadInState_Initial, + XmlReadInState_XmlDecl, + XmlReadInState_Misc_DTD, + XmlReadInState_DTD, + XmlReadInState_DTD_Misc, + XmlReadInState_Element, + XmlReadInState_Content, + XmlReadInState_MiscEnd +} XmlReaderInternalState; + +/* This state denotes where parsing was interrupted by input problem. + Reader resumes parsing using this information. */ +typedef enum +{ + XmlReadResumeState_Initial, + XmlReadResumeState_PITarget, + XmlReadResumeState_PIBody, + XmlReadResumeState_CDATA, + XmlReadResumeState_Comment, + XmlReadResumeState_STag +} XmlReaderResumeState; + +/* saved pointer index to resume from particular input position */ +typedef enum +{ + XmlReadResume_Name, /* PITarget, name for NCName, prefix for QName */ + XmlReadResume_Local, /* local for QName */ + XmlReadResume_Body, /* PI body, comment text, CDATA text */ + XmlReadResume_Last +} XmlReaderResume; + +typedef enum +{ + StringValue_LocalName, + StringValue_QualifiedName, + StringValue_Value, + StringValue_Last +} XmlReaderStringValue; + static const WCHAR utf16W[] = {'U','T','F','-','1','6',0}; static const WCHAR utf8W[] = {'U','T','F','-','8',0}; static const WCHAR dblquoteW[] = {'\"',0}; static const WCHAR quoteW[] = {'\'',0}; +static const WCHAR ltW[] = {'<',0}; +static const WCHAR gtW[] = {'>',0}; +static const WCHAR commentW[] = {'<','!','-','-',0}; +static const WCHAR piW[] = {'<','?',0}; struct xml_encoding_data { @@ -76,7 +121,7 @@ typedef struct input_buffer input_buffer; -typedef struct _xmlreaderinput +typedef struct { IXmlReaderInput IXmlReaderInput_iface; LONG ref; @@ -91,13 +136,28 @@ optimizations possible with IStream aren't implemented */ ISequentialStream *stream; input_buffer *buffer; + unsigned int pending : 1; } xmlreaderinput; +static const struct IUnknownVtbl xmlreaderinputvtbl; + +/* Structure to hold parsed string of specific length. + + Reader stores node value as 'start' pointer, on request + a null-terminated version of it is allocated. + + To init a strval variable use reader_init_strval(), + to set strval as a reader value use reader_set_strval(). + */ typedef struct { - const WCHAR *str; - UINT len; + WCHAR *start; /* input position where value starts */ + UINT len; /* length in WCHARs, altered after ReadValueChunk */ + WCHAR *str; /* allocated null-terminated string */ } strval; + +static WCHAR emptyW[] = {0}; +static const strval strval_empty = {emptyW, 0, emptyW}; struct attribute { @@ -106,19 +166,31 @@ strval value; }; -typedef struct _xmlreader +struct element +{ + struct list entry; + strval qname; +}; + +typedef struct { IXmlReader IXmlReader_iface; LONG ref; xmlreaderinput *input; IMalloc *imalloc; XmlReadState state; + XmlReaderInternalState instate; + XmlReaderResumeState resumestate; XmlNodeType nodetype; DtdProcessing dtdmode; UINT line, pos; /* reader position in XML stream */ struct list attrs; /* attributes list for current node */ struct attribute *attr; /* current attribute */ UINT attr_count; + struct list elements; + strval strvalues[StringValue_Last]; + UINT depth; + WCHAR *resume[XmlReadResume_Last]; /* pointers used to resume reader */ } xmlreader; struct input_buffer @@ -174,6 +246,21 @@ m_free(reader->imalloc, mem); } +static HRESULT reader_strvaldup(xmlreader *reader, const strval *src, strval *dest) +{ + *dest = *src; + + if (src->str != strval_empty.str) + { + dest->str = reader_alloc(reader, (dest->len+1)*sizeof(WCHAR)); + if (!dest->str) return E_OUTOFMEMORY; + memcpy(dest->str, src->str, dest->len*sizeof(WCHAR)); + dest->str[dest->len] = 0; + } + + return S_OK; +} + /* reader input memory allocation functions */ static inline void *readerinput_alloc(xmlreaderinput *input, size_t len) { @@ -231,6 +318,134 @@ reader->attr_count++; return S_OK; +} + +/* This one frees stored string value if needed */ +static void reader_free_strvalued(xmlreader *reader, strval *v) +{ + if (v->str != strval_empty.str) + { + reader_free(reader, v->str); + *v = strval_empty; + } +} + +static inline void reader_init_strvalue(WCHAR *str, UINT len, strval *v) +{ + v->start = v->str = str; + v->len = len; +} + +static void reader_free_strvalue(xmlreader *reader, XmlReaderStringValue type) +{ + reader_free_strvalued(reader, &reader->strvalues[type]); +} + +static void reader_free_strvalues(xmlreader *reader) +{ + int type; + for (type = 0; type < StringValue_Last; type++) + reader_free_strvalue(reader, type); +} + +/* This helper should only be used to test if strings are the same, + it doesn't try to sort. */ +static inline int strval_eq(const strval *str1, const strval *str2) +{ + if (str1->len != str2->len) return 0; + return !memcmp(str1->str, str2->str, str1->len*sizeof(WCHAR)); +} + +static void reader_clear_elements(xmlreader *reader) +{ + struct element *elem, *elem2; + LIST_FOR_EACH_ENTRY_SAFE(elem, elem2, &reader->elements, struct element, entry) + { + reader_free_strvalued(reader, &elem->qname); + reader_free(reader, elem); + } + list_init(&reader->elements); +} + +static HRESULT reader_inc_depth(xmlreader *reader) +{ + /* FIXME: handle XmlReaderProperty_MaxElementDepth property */ + reader->depth++; + return S_OK; +} + +static HRESULT reader_push_element(xmlreader *reader, strval *qname) +{ + struct element *elem; + HRESULT hr; + + elem = reader_alloc(reader, sizeof(*elem)); + if (!elem) return E_OUTOFMEMORY; + + hr = reader_strvaldup(reader, qname, &elem->qname); + if (FAILED(hr)) return hr; + + if (!list_empty(&reader->elements)) + { + hr = reader_inc_depth(reader); + if (FAILED(hr)) return hr; + } + + list_add_head(&reader->elements, &elem->entry); + return hr; +} + +static void reader_pop_element(xmlreader *reader) +{ + struct element *elem = LIST_ENTRY(list_head(&reader->elements), struct element, entry); + + if (elem) + { + list_remove(&elem->entry); + reader_free_strvalued(reader, &elem->qname); + reader_free(reader, elem); + } +} + +/* Always make a copy, cause strings are supposed to be null terminated. Null pointer for 'value' + means node value is to be determined. */ +static void reader_set_strvalue(xmlreader *reader, XmlReaderStringValue type, const strval *value) +{ + strval *v = &reader->strvalues[type]; + + reader_free_strvalue(reader, type); + if (!value) + { + v->str = NULL; + v->start = NULL; + v->len = 0; + return; + } + + if (value->str == strval_empty.str) + *v = *value; + else + { + if (type == StringValue_Value) + { + /* defer allocation for value string */ + v->str = NULL; + v->start = value->start; + v->len = value->len; + } + else + { + v->str = reader_alloc(reader, (value->len + 1)*sizeof(WCHAR)); + memcpy(v->str, value->start, value->len*sizeof(WCHAR)); + v->str[value->len] = 0; + v->len = value->len; + } + } +} + +static inline int is_reader_pending(xmlreader *reader) +{ + return reader->input->pending; } static HRESULT init_encoded_buffer(xmlreaderinput *input, encoded_buffer *buffer) @@ -356,10 +571,12 @@ static HRESULT readerinput_growraw(xmlreaderinput *readerinput) { encoded_buffer *buffer = &readerinput->buffer->encoded; - ULONG len = buffer->allocated - buffer->written, read; + /* to make sure aligned length won't exceed allocated length */ + ULONG len = buffer->allocated - buffer->written - 4; + ULONG read; HRESULT hr; - /* always try to get aligned to 4 bytes, so the only case we can get partialy read characters is + /* always try to get aligned to 4 bytes, so the only case we can get partially read characters is variable width encodings like UTF-8 */ len = (len + 3) & ~3; /* try to use allocated space or grow */ @@ -370,9 +587,11 @@ len = buffer->allocated - buffer->written; } + read = 0; hr = ISequentialStream_Read(readerinput->stream, buffer->data + buffer->written, len, &read); + TRACE("requested %d, read %d, ret 0x%08x\n", len, read, hr); + readerinput->pending = hr == E_PENDING; if (FAILED(hr)) return hr; - TRACE("requested %d, read %d, ret 0x%08x\n", len, read, hr); buffer->written += read; return hr; @@ -392,23 +611,48 @@ } } +static inline int readerinput_is_utf8(xmlreaderinput *readerinput) +{ + static char startA[] = {'<','?'}; + static char commentA[] = {'<','!'}; + encoded_buffer *buffer = &readerinput->buffer->encoded; + unsigned char *ptr = (unsigned char*)buffer->data; + + return !memcmp(buffer->data, startA, sizeof(startA)) || + !memcmp(buffer->data, commentA, sizeof(commentA)) || + /* test start byte */ + (ptr[0] == '<' && + ( + (ptr[1] && (ptr[1] <= 0x7f)) || + (buffer->data[1] >> 5) == 0x6 || /* 2 bytes */ + (buffer->data[1] >> 4) == 0xe || /* 3 bytes */ + (buffer->data[1] >> 3) == 0x1e) /* 4 bytes */ + ); +} + static HRESULT readerinput_detectencoding(xmlreaderinput *readerinput, xml_encoding *enc) { encoded_buffer *buffer = &readerinput->buffer->encoded; - static char startA[] = {'<','?','x','m'}; static WCHAR startW[] = {'<','?'}; + static WCHAR commentW[] = {'<','!'}; static char utf8bom[] = {0xef,0xbb,0xbf}; static char utf16lebom[] = {0xff,0xfe}; *enc = XmlEncoding_Unknown; - if (buffer->written <= 3) return MX_E_INPUTEND; + if (buffer->written <= 3) + { + HRESULT hr = readerinput_growraw(readerinput); + if (FAILED(hr)) return hr; + if (buffer->written <= 3) return MX_E_INPUTEND; + } /* try start symbols if we have enough data to do that, input buffer should contain first chunk already */ - if (!memcmp(buffer->data, startA, sizeof(startA))) + if (readerinput_is_utf8(readerinput)) *enc = XmlEncoding_UTF8; - else if (!memcmp(buffer->data, startW, sizeof(startW))) + else if (!memcmp(buffer->data, startW, sizeof(startW)) || + !memcmp(buffer->data, commentW, sizeof(commentW))) *enc = XmlEncoding_UTF16; /* try with BOM now */ else if (!memcmp(buffer->data, utf8bom, sizeof(utf8bom))) @@ -440,18 +684,39 @@ return len; } -/* returns byte length of complete char sequence for specified code page, */ -static int readerinput_get_convlen(xmlreaderinput *readerinput, UINT cp) +/* Returns byte length of complete char sequence for buffer code page, + it's relative to current buffer position which is currently used for BOM handling + only. */ +static int readerinput_get_convlen(xmlreaderinput *readerinput) { encoded_buffer *buffer = &readerinput->buffer->encoded; - int len = buffer->written; - - if (cp == CP_UTF8) + int len; + + if (readerinput->buffer->code_page == CP_UTF8) len = readerinput_get_utf8_convlen(readerinput); else len = buffer->written; + TRACE("%d\n", len - (int)(buffer->cur - buffer->data)); return len - (buffer->cur - buffer->data); +} + +/* It's possible that raw buffer has some leftovers from last conversion - some char + sequence that doesn't represent a full code point. Length argument should be calculated with + readerinput_get_convlen(), if it's -1 it will be calculated here. */ +static void readerinput_shrinkraw(xmlreaderinput *readerinput, int len) +{ + encoded_buffer *buffer = &readerinput->buffer->encoded; + + if (len == -1) + len = readerinput_get_convlen(readerinput); + + memmove(buffer->data, buffer->cur + (buffer->written - len), len); + /* everything below cur is lost too */ + buffer->written -= len + (buffer->cur - buffer->data); + /* after this point we don't need cur pointer really, + it's used only to mark where actual data begins when first chunk is read */ + buffer->cur = buffer->data; } /* note that raw buffer content is kept */ @@ -461,12 +726,14 @@ encoded_buffer *dest = &readerinput->buffer->utf16; int len, dest_len; HRESULT hr; + WCHAR *ptr; UINT cp; hr = get_code_page(enc, &cp); if (FAILED(hr)) return; - len = readerinput_get_convlen(readerinput, cp); + readerinput->buffer->code_page = cp; + len = readerinput_get_convlen(readerinput); TRACE("switching to cp %d\n", cp); @@ -475,35 +742,81 @@ { readerinput_grow(readerinput, len); memcpy(dest->data, src->cur, len); - readerinput->buffer->code_page = cp; + dest->written += len*sizeof(WCHAR); return; } dest_len = MultiByteToWideChar(cp, 0, src->cur, len, NULL, 0); readerinput_grow(readerinput, dest_len); - MultiByteToWideChar(cp, 0, src->cur, len, (WCHAR*)dest->data, dest_len); - dest->data[dest_len] = 0; - readerinput->buffer->code_page = cp; -} - -static inline const WCHAR *reader_get_cur(xmlreader *reader) -{ - return (WCHAR*)reader->input->buffer->utf16.cur; + ptr = (WCHAR*)dest->data; + MultiByteToWideChar(cp, 0, src->cur, len, ptr, dest_len); + ptr[dest_len] = 0; + dest->written += dest_len*sizeof(WCHAR); +} + +/* shrinks parsed data a buffer begins with */ +static void reader_shrink(xmlreader *reader) +{ + encoded_buffer *buffer = &reader->input->buffer->utf16; + + /* avoid to move too often using threshold shrink length */ + if (buffer->cur - buffer->data > buffer->written / 2) + { + buffer->written -= buffer->cur - buffer->data; + memmove(buffer->data, buffer->cur, buffer->written); + buffer->cur = buffer->data; + *(WCHAR*)&buffer->cur[buffer->written] = 0; + } +} + +/* This is a normal way for reader to get new data converted from raw buffer to utf16 buffer. + It won't attempt to shrink but will grow destination buffer if needed */ +static HRESULT reader_more(xmlreader *reader) +{ + xmlreaderinput *readerinput = reader->input; + encoded_buffer *src = &readerinput->buffer->encoded; + encoded_buffer *dest = &readerinput->buffer->utf16; + UINT cp = readerinput->buffer->code_page; + int len, dest_len; + HRESULT hr; + WCHAR *ptr; + + /* get some raw data from stream first */ + hr = readerinput_growraw(readerinput); + len = readerinput_get_convlen(readerinput); + + /* just copy for UTF-16 case */ + if (cp == ~0) + { + readerinput_grow(readerinput, len); + memcpy(dest->data, src->cur, len); + dest->written += len*sizeof(WCHAR); + return hr; + } + + dest_len = MultiByteToWideChar(cp, 0, src->cur, len, NULL, 0); + readerinput_grow(readerinput, dest_len); + ptr = (WCHAR*)dest->data; + MultiByteToWideChar(cp, 0, src->cur, len, ptr, dest_len); + ptr[dest_len] = 0; + dest->written += dest_len*sizeof(WCHAR); + /* get rid of processed data */ + readerinput_shrinkraw(readerinput, len); + + return hr; +} + +static inline WCHAR *reader_get_cur(xmlreader *reader) +{ + WCHAR *ptr = (WCHAR*)reader->input->buffer->utf16.cur; + if (!*ptr) reader_more(reader); + return ptr; } static int reader_cmp(xmlreader *reader, const WCHAR *str) { const WCHAR *ptr = reader_get_cur(reader); - int i = 0; - return strncmpW(str, ptr, strlenW(str)); - - while (str[i]) { - if (ptr[i] != str[i]) return 0; - i++; - } - - return 1; } /* moves cursor n WCHARs forward */ @@ -519,13 +832,18 @@ } } +static inline int is_wchar_space(WCHAR ch) +{ + return ch == ' ' || ch == '\t' || ch == '\r' || ch == '\n'; +} + /* [3] S ::= (#x20 | #x9 | #xD | #xA)+ */ static int reader_skipspaces(xmlreader *reader) { encoded_buffer *buffer = &reader->input->buffer->utf16; const WCHAR *ptr = reader_get_cur(reader), *start = ptr; - while (*ptr == ' ' || *ptr == '\t' || *ptr == '\r' || *ptr == '\n') + while (is_wchar_space(*ptr)) { buffer->cur += sizeof(WCHAR); if (*ptr == '\r') @@ -546,7 +864,7 @@ /* [26] VersionNum ::= '1.' [0-9]+ */ static HRESULT reader_parse_versionnum(xmlreader *reader, strval *val) { - const WCHAR *ptr, *ptr2, *start = reader_get_cur(reader); + WCHAR *ptr, *ptr2, *start = reader_get_cur(reader); static const WCHAR onedotW[] = {'1','.',0}; if (reader_cmp(reader, onedotW)) return WC_E_XMLDECL; @@ -559,8 +877,7 @@ if (ptr2 == ptr) return WC_E_DIGIT; TRACE("version=%s\n", debugstr_wn(start, ptr-start)); - val->str = start; - val->len = ptr-start; + reader_init_strvalue(start, ptr-start, val); reader_skipn(reader, ptr-ptr2); return S_OK; } @@ -587,8 +904,7 @@ if (!reader_skipspaces(reader)) return WC_E_WHITESPACE; if (reader_cmp(reader, versionW)) return WC_E_XMLDECL; - name.str = reader_get_cur(reader); - name.len = 7; + reader_init_strvalue(reader_get_cur(reader), 7, &name); /* skip 'version' */ reader_skipn(reader, 7); @@ -625,7 +941,7 @@ /* [81] EncName ::= [A-Za-z] ([A-Za-z0-9._] | '-')* */ static HRESULT reader_parse_encname(xmlreader *reader, strval *val) { - const WCHAR *start = reader_get_cur(reader), *ptr; + WCHAR *start = reader_get_cur(reader), *ptr; xml_encoding enc; int len; @@ -691,15 +1007,14 @@ static const WCHAR standaloneW[] = {'s','t','a','n','d','a','l','o','n','e',0}; static const WCHAR yesW[] = {'y','e','s',0}; static const WCHAR noW[] = {'n','o',0}; - const WCHAR *start, *ptr; + WCHAR *start, *ptr; strval name, val; HRESULT hr; if (!reader_skipspaces(reader)) return WC_E_WHITESPACE; if (reader_cmp(reader, standaloneW)) return S_FALSE; - name.str = reader_get_cur(reader); - name.len = 10; + reader_init_strvalue(reader_get_cur(reader), 10, &name); /* skip 'standalone' */ reader_skipn(reader, 10); @@ -733,11 +1048,11 @@ /* [23] XMLDecl ::= '<?xml' VersionInfo EncodingDecl? SDDecl? S? '?>' */ static HRESULT reader_parse_xmldecl(xmlreader *reader) { - static const WCHAR xmldeclW[] = {'<','?','x','m','l',0}; + static const WCHAR xmldeclW[] = {'<','?','x','m','l',' ',0}; static const WCHAR declcloseW[] = {'?','>',0}; HRESULT hr; - /* check if we have "<?xml" */ + /* check if we have "<?xml " */ if (reader_cmp(reader, xmldeclW)) return S_FALSE; reader_skipn(reader, 5); @@ -757,14 +1072,926 @@ if (reader_cmp(reader, declcloseW)) return WC_E_XMLDECL; reader_skipn(reader, 2); - return S_OK; + reader->nodetype = XmlNodeType_XmlDeclaration; + reader_set_strvalue(reader, StringValue_LocalName, &strval_empty); + reader_set_strvalue(reader, StringValue_QualifiedName, &strval_empty); + reader_set_strvalue(reader, StringValue_Value, &strval_empty); + + return S_OK; +} + +/* [15] Comment ::= '' */ +static HRESULT reader_parse_comment(xmlreader *reader) +{ + WCHAR *start, *ptr; + + if (reader->resume[XmlReadResume_Body]) + { + start = reader->resume[XmlReadResume_Body]; + ptr = reader_get_cur(reader); + } + else + { + /* skip '' */ + reader_skipn(reader, 3); + reader_init_strvalue(start, ptr-start, &value); + reader_set_strvalue(reader, StringValue_LocalName, &strval_empty); + reader_set_strvalue(reader, StringValue_QualifiedName, &strval_empty); + reader_set_strvalue(reader, StringValue_Value, &value); + reader->resume[XmlReadResume_Body] = NULL; + reader->resumestate = XmlReadResumeState_Initial; + return S_OK; + } + else + return WC_E_COMMENT; + } + else + ptr++; + } + else + { + reader_skipn(reader, 1); + ptr++; + } + } + + return S_OK; +} + +/* [2] Char ::= #x9 | #xA | #xD | [#x20-#xD7FF] | [#xE000-#xFFFD] | [#x10000-#x10FFFF] */ +static inline int is_char(WCHAR ch) +{ + return (ch == '\t') || (ch == '\r') || (ch == '\n') || + (ch >= 0x20 && ch <= 0xd7ff) || + (ch >= 0xd800 && ch <= 0xdbff) || /* high surrogate */ + (ch >= 0xdc00 && ch <= 0xdfff) || /* low surrogate */ + (ch >= 0xe000 && ch <= 0xfffd); +} + +/* [13] PubidChar ::= #x20 | #xD | #xA | [a-zA-Z0-9] | [-'()+,./:=?;!*#@$_%] */ +static inline int is_pubchar(WCHAR ch) +{ + return (ch == ' ') || + (ch >= 'a' && ch <= 'z') || + (ch >= 'A' && ch <= 'Z') || + (ch >= '0' && ch <= '9') || + (ch >= '-' && ch <= ';') || /* '()*+,-./:; */ + (ch == '=') || (ch == '?') || + (ch == '@') || (ch == '!') || + (ch >= '#' && ch <= '%') || /* #$% */ + (ch == '_') || (ch == '\r') || (ch == '\n'); +} + +static inline int is_namestartchar(WCHAR ch) +{ + return (ch == ':') || (ch >= 'A' && ch <= 'Z') || + (ch == '_') || (ch >= 'a' && ch <= 'z') || + (ch >= 0xc0 && ch <= 0xd6) || + (ch >= 0xd8 && ch <= 0xf6) || + (ch >= 0xf8 && ch <= 0x2ff) || + (ch >= 0x370 && ch <= 0x37d) || + (ch >= 0x37f && ch <= 0x1fff) || + (ch >= 0x200c && ch <= 0x200d) || + (ch >= 0x2070 && ch <= 0x218f) || + (ch >= 0x2c00 && ch <= 0x2fef) || + (ch >= 0x3001 && ch <= 0xd7ff) || + (ch >= 0xd800 && ch <= 0xdbff) || /* high surrogate */ + (ch >= 0xdc00 && ch <= 0xdfff) || /* low surrogate */ + (ch >= 0xf900 && ch <= 0xfdcf) || + (ch >= 0xfdf0 && ch <= 0xfffd); +} + +/* [4 NS] NCName ::= Name - (Char* ':' Char*) */ +static inline int is_ncnamechar(WCHAR ch) +{ + return (ch >= 'A' && ch <= 'Z') || + (ch == '_') || (ch >= 'a' && ch <= 'z') || + (ch == '-') || (ch == '.') || + (ch >= '0' && ch <= '9') || + (ch == 0xb7) || + (ch >= 0xc0 && ch <= 0xd6) || + (ch >= 0xd8 && ch <= 0xf6) || + (ch >= 0xf8 && ch <= 0x2ff) || + (ch >= 0x300 && ch <= 0x36f) || + (ch >= 0x370 && ch <= 0x37d) || + (ch >= 0x37f && ch <= 0x1fff) || + (ch >= 0x200c && ch <= 0x200d) || + (ch >= 0x203f && ch <= 0x2040) || + (ch >= 0x2070 && ch <= 0x218f) || + (ch >= 0x2c00 && ch <= 0x2fef) || + (ch >= 0x3001 && ch <= 0xd7ff) || + (ch >= 0xd800 && ch <= 0xdbff) || /* high surrogate */ + (ch >= 0xdc00 && ch <= 0xdfff) || /* low surrogate */ + (ch >= 0xf900 && ch <= 0xfdcf) || + (ch >= 0xfdf0 && ch <= 0xfffd); +} + +static inline int is_namechar(WCHAR ch) +{ + return (ch == ':') || is_ncnamechar(ch); +} + +/* [4] NameStartChar ::= ":" | [A-Z] | "_" | [a-z] | [#xC0-#xD6] | [#xD8-#xF6] | [#xF8-#x2FF] | [#x370-#x37D] | + [#x37F-#x1FFF] | [#x200C-#x200D] | [#x2070-#x218F] | [#x2C00-#x2FEF] | [#x3001-#xD7FF] | + [#xF900-#xFDCF] | [#xFDF0-#xFFFD] | [#x10000-#xEFFFF] + [4a] NameChar ::= NameStartChar | "-" | "." | [0-9] | #xB7 | [#x0300-#x036F] | [#x203F-#x2040] + [5] Name ::= NameStartChar (NameChar)* */ +static HRESULT reader_parse_name(xmlreader *reader, strval *name) +{ + WCHAR *ptr, *start; + + if (reader->resume[XmlReadResume_Name]) + { + start = reader->resume[XmlReadResume_Name]; + ptr = reader_get_cur(reader); + } + else + { + ptr = start = reader_get_cur(reader); + if (!is_namestartchar(*ptr)) return WC_E_NAMECHARACTER; + } + + while (is_namechar(*ptr)) + { + reader_skipn(reader, 1); + ptr = reader_get_cur(reader); + } + + if (is_reader_pending(reader)) + { + reader->resume[XmlReadResume_Name] = start; + return E_PENDING; + } + else + reader->resume[XmlReadResume_Name] = NULL; + + TRACE("name %s:%d\n", debugstr_wn(start, ptr-start), (int)(ptr-start)); + reader_init_strvalue(start, ptr-start, name); + + return S_OK; +} + +/* [17] PITarget ::= Name - (('X' | 'x') ('M' | 'm') ('L' | 'l')) */ +static HRESULT reader_parse_pitarget(xmlreader *reader, strval *target) +{ + static const WCHAR xmlW[] = {'x','m','l'}; + strval name; + HRESULT hr; + UINT i; + + hr = reader_parse_name(reader, &name); + if (FAILED(hr)) return is_reader_pending(reader) ? E_PENDING : WC_E_PI; + + /* now that we got name check for illegal content */ + if (name.len == 3 && !strncmpiW(name.str, xmlW, 3)) + return WC_E_LEADINGXML; + + /* PITarget can't be a qualified name */ + for (i = 0; i < name.len; i++) + if (name.str[i] == ':') + return i ? NC_E_NAMECOLON : WC_E_PI; + + TRACE("pitarget %s:%d\n", debugstr_wn(name.str, name.len), name.len); + *target = name; + return S_OK; +} + +/* [16] PI ::= '<?' PITarget (S (Char* - (Char* '?>' Char*)))? '?>' */ +static HRESULT reader_parse_pi(xmlreader *reader) +{ + WCHAR *ptr, *start; + strval target; + HRESULT hr; + + switch (reader->resumestate) + { + case XmlReadResumeState_Initial: + /* skip '<?' */ + reader_skipn(reader, 2); + reader_shrink(reader); + reader->resumestate = XmlReadResumeState_PITarget; + case XmlReadResumeState_PITarget: + hr = reader_parse_pitarget(reader, &target); + if (FAILED(hr)) return hr; + reader->resumestate = XmlReadResumeState_PIBody; + default: + ; + } + + ptr = reader_get_cur(reader); + /* exit earlier if there's no content */ + if (ptr[0] == '?' && ptr[1] == '>') + { + /* skip '?>' */ + reader_skipn(reader, 2); + reader->nodetype = XmlNodeType_ProcessingInstruction; + reader->resumestate = XmlReadResumeState_Initial; + reader_set_strvalue(reader, StringValue_LocalName, &target); + reader_set_strvalue(reader, StringValue_QualifiedName, &target); + reader_set_strvalue(reader, StringValue_Value, &strval_empty); + return S_OK; + } + + if (!reader->resume[XmlReadResume_Body]) + { + /* now at least a single space char should be there */ + if (!is_wchar_space(*ptr)) return WC_E_WHITESPACE; + reader_skipspaces(reader); + ptr = start = reader_get_cur(reader); + reader->resume[XmlReadResume_Body] = start; + } + else + { + start = reader->resume[XmlReadResume_Body]; + ptr = reader_get_cur(reader); + } + + while (*ptr) + { + if (ptr[0] == '?') + { + if (ptr[1] == '>') + { + strval value; + + TRACE("%s\n", debugstr_wn(start, ptr-start)); + /* skip '?>' */ + reader_skipn(reader, 2); + reader->nodetype = XmlNodeType_ProcessingInstruction; + reader->resumestate = XmlReadResumeState_Initial; + reader->resume[XmlReadResume_Body] = NULL; + reader_init_strvalue(start, ptr-start, &value); + reader_set_strvalue(reader, StringValue_LocalName, &target); + reader_set_strvalue(reader, StringValue_QualifiedName, &target); + reader_set_strvalue(reader, StringValue_Value, &value); + return S_OK; + } + else + { + ptr++; + reader_more(reader); + } + } + else + { + reader_skipn(reader, 1); + ptr = reader_get_cur(reader); + } + } + + return S_OK; +} + +/* This one is used to parse significant whitespace nodes, like in Misc production */ +static HRESULT reader_parse_whitespace(xmlreader *reader) +{ + WCHAR *start, *ptr; + + reader_shrink(reader); + start = reader_get_cur(reader); + + reader_skipspaces(reader); + ptr = reader_get_cur(reader); + TRACE("%s\n", debugstr_wn(start, ptr-start)); + + reader->nodetype = XmlNodeType_Whitespace; + reader_set_strvalue(reader, StringValue_LocalName, &strval_empty); + reader_set_strvalue(reader, StringValue_QualifiedName, &strval_empty); + reader_set_strvalue(reader, StringValue_Value, &strval_empty); + return S_OK; +} + +/* [27] Misc ::= Comment | PI | S */ +static HRESULT reader_parse_misc(xmlreader *reader) +{ + HRESULT hr = S_FALSE; + + if (reader->resumestate != XmlReadResumeState_Initial) + { + hr = reader_more(reader); + if (FAILED(hr)) return hr; + + /* finish current node */ + switch (reader->resumestate) + { + case XmlReadResumeState_PITarget: + case XmlReadResumeState_PIBody: + return reader_parse_pi(reader); + case XmlReadResumeState_Comment: + return reader_parse_comment(reader); + default: + ERR("unknown resume state %d\n", reader->resumestate); + } + } + + while (1) + { + const WCHAR *cur = reader_get_cur(reader); + + if (is_wchar_space(*cur)) + hr = reader_parse_whitespace(reader); + else if (!reader_cmp(reader, commentW)) + hr = reader_parse_comment(reader); + else if (!reader_cmp(reader, piW)) + hr = reader_parse_pi(reader); + else + break; + + if (hr != S_FALSE) return hr; + } + + return hr; +} + +/* [11] SystemLiteral ::= ('"' [^"]* '"') | ("'" [^']* "'") */ +static HRESULT reader_parse_sys_literal(xmlreader *reader, strval *literal) +{ + WCHAR *start = reader_get_cur(reader), *cur, quote; + + if (*start != '"' && *start != '\'') return WC_E_QUOTE; + + quote = *start; + reader_skipn(reader, 1); + + cur = start = reader_get_cur(reader); + while (is_char(*cur) && *cur != quote) + { + reader_skipn(reader, 1); + cur = reader_get_cur(reader); + } + if (*cur == quote) reader_skipn(reader, 1); + + literal->str = start; + literal->len = cur-start; + TRACE("%s\n", debugstr_wn(start, cur-start)); + return S_OK; +} + +/* [12] PubidLiteral ::= '"' PubidChar* '"' | "'" (PubidChar - "'")* "'" + [13] PubidChar ::= #x20 | #xD | #xA | [a-zA-Z0-9] | [-'()+,./:=?;!*#@$_%] */ +static HRESULT reader_parse_pub_literal(xmlreader *reader, strval *literal) +{ + WCHAR *start = reader_get_cur(reader), *cur, quote; + + if (*start != '"' && *start != '\'') return WC_E_QUOTE; + + quote = *start; + reader_skipn(reader, 1); + + cur = start; + while (is_pubchar(*cur) && *cur != quote) + { + reader_skipn(reader, 1); + cur = reader_get_cur(reader); + } + + reader_init_strvalue(start, cur-start, literal); + TRACE("%s\n", debugstr_wn(start, cur-start)); + return S_OK; +} + +/* [75] ExternalID ::= 'SYSTEM' S SystemLiteral | 'PUBLIC' S PubidLiteral S SystemLiteral */ +static HRESULT reader_parse_externalid(xmlreader *reader) +{ + static WCHAR systemW[] = {'S','Y','S','T','E','M',0}; + static WCHAR publicW[] = {'P','U','B','L','I','C',0}; + strval name; + HRESULT hr; + int cnt; + + if (reader_cmp(reader, systemW)) + { + if (reader_cmp(reader, publicW)) + return S_FALSE; + else + { + strval pub; + + /* public id */ + reader_skipn(reader, 6); + cnt = reader_skipspaces(reader); + if (!cnt) return WC_E_WHITESPACE; + + hr = reader_parse_pub_literal(reader, &pub); + if (FAILED(hr)) return hr; + + reader_init_strvalue(publicW, strlenW(publicW), &name); + return reader_add_attr(reader, &name, &pub); + } + } + else + { + strval sys; + + /* system id */ + reader_skipn(reader, 6); + cnt = reader_skipspaces(reader); + if (!cnt) return WC_E_WHITESPACE; + + hr = reader_parse_sys_literal(reader, &sys); + if (FAILED(hr)) return hr; + + reader_init_strvalue(systemW, strlenW(systemW), &name); + return reader_add_attr(reader, &name, &sys); + } + + return hr; +} + +/* [28] doctypedecl ::= '<!DOCTYPE' S Name (S ExternalID)? S? ('[' intSubset ']' S?)? '>' */ +static HRESULT reader_parse_dtd(xmlreader *reader) +{ + static const WCHAR doctypeW[] = {'<','!','D','O','C','T','Y','P','E',0}; + strval name; + WCHAR *cur; + HRESULT hr; + + /* check if we have "<!DOCTYPE" */ + if (reader_cmp(reader, doctypeW)) return S_FALSE; + reader_shrink(reader); + + /* DTD processing is not allowed by default */ + if (reader->dtdmode == DtdProcessing_Prohibit) return WC_E_DTDPROHIBITED; + + reader_skipn(reader, 9); + if (!reader_skipspaces(reader)) return WC_E_WHITESPACE; + + /* name */ + hr = reader_parse_name(reader, &name); + if (FAILED(hr)) return WC_E_DECLDOCTYPE; + + reader_skipspaces(reader); + + hr = reader_parse_externalid(reader); + if (FAILED(hr)) return hr; + + reader_skipspaces(reader); + + cur = reader_get_cur(reader); + if (*cur != '>') + { + FIXME("internal subset parsing not implemented\n"); + return E_NOTIMPL; + } + + /* skip '>' */ + reader_skipn(reader, 1); + + reader->nodetype = XmlNodeType_DocumentType; + reader_set_strvalue(reader, StringValue_LocalName, &name); + reader_set_strvalue(reader, StringValue_QualifiedName, &name); + + return S_OK; +} + +/* [11 NS] LocalPart ::= NCName */ +static HRESULT reader_parse_local(xmlreader *reader, strval *local) +{ + WCHAR *ptr, *start; + + if (reader->resume[XmlReadResume_Local]) + { + start = reader->resume[XmlReadResume_Local]; + ptr = reader_get_cur(reader); + } + else + { + ptr = start = reader_get_cur(reader); + } + + while (is_ncnamechar(*ptr)) + { + reader_skipn(reader, 1); + ptr = reader_get_cur(reader); + } + + if (is_reader_pending(reader)) + { + reader->resume[XmlReadResume_Local] = start; + return E_PENDING; + } + else + reader->resume[XmlReadResume_Local] = NULL; + + reader_init_strvalue(start, ptr-start, local); + + return S_OK; +} + +/* [7 NS] QName ::= PrefixedName | UnprefixedName + [8 NS] PrefixedName ::= Prefix ':' LocalPart + [9 NS] UnprefixedName ::= LocalPart + [10 NS] Prefix ::= NCName */ +static HRESULT reader_parse_qname(xmlreader *reader, strval *prefix, strval *local, strval *qname) +{ + WCHAR *ptr, *start; + HRESULT hr; + + if (reader->resume[XmlReadResume_Name]) + { + start = reader->resume[XmlReadResume_Name]; + ptr = reader_get_cur(reader); + } + else + { + ptr = start = reader_get_cur(reader); + reader->resume[XmlReadResume_Name] = start; + if (!is_ncnamechar(*ptr)) return NC_E_QNAMECHARACTER; + } + + if (reader->resume[XmlReadResume_Local]) + { + hr = reader_parse_local(reader, local); + if (FAILED(hr)) return hr; + + reader_init_strvalue(reader->resume[XmlReadResume_Name], + local->start - reader->resume[XmlReadResume_Name] - 1, + prefix); + } + else + { + /* skip prefix part */ + while (is_ncnamechar(*ptr)) + { + reader_skipn(reader, 1); + ptr = reader_get_cur(reader); + } + + if (is_reader_pending(reader)) return E_PENDING; + + /* got a qualified name */ + if (*ptr == ':') + { + reader_init_strvalue(start, ptr-start, prefix); + + /* skip ':' */ + reader_skipn(reader, 1); + hr = reader_parse_local(reader, local); + if (FAILED(hr)) return hr; + } + else + { + reader_init_strvalue(reader->resume[XmlReadResume_Name], ptr-reader->resume[XmlReadResume_Name], local); + reader_init_strvalue(NULL, 0, prefix); + } + } + + reader_init_strvalue(start, ptr-start, local); + + if (prefix->len) + TRACE("qname %s:%s\n", debugstr_wn(prefix->start, prefix->len), debugstr_wn(local->start, local->len)); + else + TRACE("ncname %s\n", debugstr_wn(local->start, local->len)); + + reader_init_strvalue(prefix->start ? prefix->start : local->start, + /* count ':' too */ + (prefix->len ? prefix->len + 1 : 0) + local->len, + qname); + + reader->resume[XmlReadResume_Name] = NULL; + reader->resume[XmlReadResume_Local] = NULL; + + return S_OK; +} + +/* [12 NS] STag ::= '<' QName (S Attribute)* S? '>' + [14 NS] EmptyElemTag ::= '<' QName (S Attribute)* S? '/>' */ +static HRESULT reader_parse_stag(xmlreader *reader, strval *prefix, strval *local, strval *qname, int *empty) +{ + static const WCHAR endW[] = {'/','>',0}; + HRESULT hr; + + hr = reader_parse_qname(reader, prefix, local, qname); + if (FAILED(hr)) return hr; + + reader_skipspaces(reader); + + /* empty element */ + if ((*empty = !reader_cmp(reader, endW))) + { + /* skip '/>' */ + reader_skipn(reader, 2); + return S_OK; + } + + /* got a start tag */ + if (!reader_cmp(reader, gtW)) + { + /* skip '>' */ + reader_skipn(reader, 1); + return reader_push_element(reader, qname); + } + + FIXME("only empty elements/start tags without attribute list supported\n"); + return E_NOTIMPL; +} + +/* [39] element ::= EmptyElemTag | STag content ETag */ +static HRESULT reader_parse_element(xmlreader *reader) +{ + HRESULT hr; + + switch (reader->resumestate) + { + case XmlReadResumeState_Initial: + /* check if we are really on element */ + if (reader_cmp(reader, ltW)) return S_FALSE; + + /* skip '<' */ + reader_skipn(reader, 1); + + reader_shrink(reader); + reader->resumestate = XmlReadResumeState_STag; + case XmlReadResumeState_STag: + { + strval qname, prefix, local; + int empty = 0; + + /* this handles empty elements too */ + hr = reader_parse_stag(reader, &prefix, &local, &qname, &empty); + if (FAILED(hr)) return hr; + + /* FIXME: need to check for defined namespace to reject invalid prefix, + currently reject all prefixes */ + if (prefix.len) return NC_E_UNDECLAREDPREFIX; + + /* if we got empty element and stack is empty go straight to Misc */ + if (empty && list_empty(&reader->elements)) + reader->instate = XmlReadInState_MiscEnd; + else + reader->instate = XmlReadInState_Content; + + reader->nodetype = XmlNodeType_Element; + reader->resumestate = XmlReadResumeState_Initial; + reader_set_strvalue(reader, StringValue_LocalName, &local); + reader_set_strvalue(reader, StringValue_QualifiedName, &qname); + break; + } + default: + hr = E_FAIL; + } + + return hr; +} + +/* [13 NS] ETag ::= '</' QName S? '>' */ +static HRESULT reader_parse_endtag(xmlreader *reader) +{ + strval prefix, local, qname; + struct element *elem; + HRESULT hr; + + /* skip '</' */ + reader_skipn(reader, 2); + + hr = reader_parse_qname(reader, &prefix, &local, &qname); + if (FAILED(hr)) return hr; + + reader_skipspaces(reader); + + if (reader_cmp(reader, gtW)) return WC_E_GREATERTHAN; + + /* skip '>' */ + reader_skipn(reader, 1); + + /* Element stack should never be empty at this point, cause we shouldn't get to + content parsing if it's empty. */ + elem = LIST_ENTRY(list_head(&reader->elements), struct element, entry); + if (!strval_eq(&elem->qname, &qname)) return WC_E_ELEMENTMATCH; + + reader_pop_element(reader); + + reader->nodetype = XmlNodeType_EndElement; + reader_set_strvalue(reader, StringValue_LocalName, &local); + reader_set_strvalue(reader, StringValue_QualifiedName, &qname); + + return S_OK; +} + +/* [18] CDSect ::= CDStart CData CDEnd + [19] CDStart ::= '<![CDATA[' + [20] CData ::= (Char* - (Char* ']]>' Char*)) + [21] CDEnd ::= ']]>' */ +static HRESULT reader_parse_cdata(xmlreader *reader) +{ + WCHAR *start, *ptr; + + if (reader->resume[XmlReadResume_Body]) + { + start = reader->resume[XmlReadResume_Body]; + ptr = reader_get_cur(reader); + } + else + { + /* skip markup '<![CDATA[' */ + reader_skipn(reader, 9); + reader_shrink(reader); + ptr = start = reader_get_cur(reader); + reader->nodetype = XmlNodeType_CDATA; + reader->resume[XmlReadResume_Body] = start; + reader->resumestate = XmlReadResumeState_CDATA; + reader_set_strvalue(reader, StringValue_LocalName, NULL); + reader_set_strvalue(reader, StringValue_QualifiedName, NULL); + reader_set_strvalue(reader, StringValue_Value, NULL); + } + + while (*ptr) + { + if (*ptr == ']' && *(ptr+1) == ']' && *(ptr+2) == '>') + { + strval value; + + TRACE("%s\n", debugstr_wn(start, ptr-start)); + /* skip ']]>' */ + reader_skipn(reader, 3); + reader_init_strvalue(start, ptr-start, &value); + reader_set_strvalue(reader, StringValue_LocalName, &strval_empty); + reader_set_strvalue(reader, StringValue_QualifiedName, &strval_empty); + reader_set_strvalue(reader, StringValue_Value, &value); + reader->resume[XmlReadResume_Body] = NULL; + reader->resumestate = XmlReadResumeState_Initial; + return S_OK; + } + else + { + reader_skipn(reader, 1); + ptr++; + } + } + + return S_OK; +} + +/* [66] CharRef ::= '&#' [0-9]+ ';' | '&#x' [0-9a-fA-F]+ ';' + [67] Reference ::= EntityRef | CharRef + [68] EntityRef ::= '&' Name ';' */ +static HRESULT reader_parse_reference(xmlreader *reader) +{ + FIXME("References not supported\n"); + return E_NOTIMPL; +} + +/* [14] CharData ::= [^<&]* - ([^<&]* ']]>' [^<&]*) */ +static HRESULT reader_parse_chardata(xmlreader *reader) +{ + FIXME("CharData not supported\n"); + return E_NOTIMPL; +} + +/* [43] content ::= CharData? ((element | Reference | CDSect | PI | Comment) CharData?)* */ +static HRESULT reader_parse_content(xmlreader *reader) +{ + static const WCHAR cdstartW[] = {'<','!','[','C','D','A','T','A','[',0}; + static const WCHAR etagW[] = {'<','/',0}; + static const WCHAR ampW[] = {'&',0}; + + if (reader->resumestate != XmlReadResumeState_Initial) + { + switch (reader->resumestate) + { + case XmlReadResumeState_CDATA: + return reader_parse_cdata(reader); + case XmlReadResumeState_Comment: + return reader_parse_comment(reader); + case XmlReadResumeState_PIBody: + case XmlReadResumeState_PITarget: + return reader_parse_pi(reader); + default: + ERR("unknown resume state %d\n", reader->resumestate); + } + } + + reader_shrink(reader); + + /* handle end tag here, it indicates end of content as well */ + if (!reader_cmp(reader, etagW)) + return reader_parse_endtag(reader); + + if (!reader_cmp(reader, commentW)) + return reader_parse_comment(reader); + + if (!reader_cmp(reader, piW)) + return reader_parse_pi(reader); + + if (!reader_cmp(reader, cdstartW)) + return reader_parse_cdata(reader); + + if (!reader_cmp(reader, ampW)) + return reader_parse_reference(reader); + + if (!reader_cmp(reader, ltW)) + return reader_parse_element(reader); + + /* what's left must be CharData */ + return reader_parse_chardata(reader); +} + +static HRESULT reader_parse_nextnode(xmlreader *reader) +{ + HRESULT hr; + + while (1) + { + switch (reader->instate) + { + /* if it's a first call for a new input we need to detect stream encoding */ + case XmlReadInState_Initial: + { + xml_encoding enc; + + hr = readerinput_growraw(reader->input); + if (FAILED(hr)) return hr; + + /* try to detect encoding by BOM or data and set input code page */ + hr = readerinput_detectencoding(reader->input, &enc); + TRACE("detected encoding %s, 0x%08x\n", debugstr_w(xml_encoding_map[enc].name), hr); + if (FAILED(hr)) return hr; + + /* always switch first time cause we have to put something in */ + readerinput_switchencoding(reader->input, enc); + + /* parse xml declaration */ + hr = reader_parse_xmldecl(reader); + if (FAILED(hr)) return hr; + + readerinput_shrinkraw(reader->input, -1); + reader->instate = XmlReadInState_Misc_DTD; + if (hr == S_OK) return hr; + } + break; + case XmlReadInState_Misc_DTD: + hr = reader_parse_misc(reader); + if (FAILED(hr)) return hr; + + if (hr == S_FALSE) + reader->instate = XmlReadInState_DTD; + else + return hr; + break; + case XmlReadInState_DTD: + hr = reader_parse_dtd(reader); + if (FAILED(hr)) return hr; + + if (hr == S_OK) + { + reader->instate = XmlReadInState_DTD_Misc; + return hr; + } + else + reader->instate = XmlReadInState_Element; + break; + case XmlReadInState_DTD_Misc: + hr = reader_parse_misc(reader); + if (FAILED(hr)) return hr; + + if (hr == S_FALSE) + reader->instate = XmlReadInState_Element; + else + return hr; + break; + case XmlReadInState_Element: + return reader_parse_element(reader); + case XmlReadInState_Content: + return reader_parse_content(reader); + default: + FIXME("internal state %d not handled\n", reader->instate); + return E_NOTIMPL; + } + } + + return E_NOTIMPL; } static HRESULT WINAPI xmlreader_QueryInterface(IXmlReader *iface, REFIID riid, void** ppvObject) { xmlreader *This = impl_from_IXmlReader(iface); - TRACE("%p %s %p\n", This, debugstr_guid(riid), ppvObject); + TRACE("(%p)->(%s %p)\n", This, debugstr_guid(riid), ppvObject); if (IsEqualGUID(riid, &IID_IUnknown) || IsEqualGUID(riid, &IID_IXmlReader)) @@ -774,6 +2001,7 @@ else { FIXME("interface %s not implemented\n", debugstr_guid(riid)); + *ppvObject = NULL; return E_NOINTERFACE; } @@ -802,6 +2030,8 @@ IMalloc *imalloc = This->imalloc; if (This->input) IUnknown_Release(&This->input->IXmlReaderInput_iface); reader_clear_attrs(This); + reader_clear_elements(This); + reader_free_strvalues(This); reader_free(This, This); if (imalloc) IMalloc_Release(imalloc); } @@ -812,9 +2042,10 @@ static HRESULT WINAPI xmlreader_SetInput(IXmlReader* iface, IUnknown *input) { xmlreader *This = impl_from_IXmlReader(iface); + IXmlReaderInput *readerinput; HRESULT hr; - TRACE("(%p %p)\n", This, input); + TRACE("(%p)->(%p)\n", This, input); if (This->input) { @@ -824,6 +2055,10 @@ } This->line = This->pos = 0; + reader_clear_elements(This); + This->depth = 0; + This->resumestate = XmlReadResumeState_Initial; + memset(This->resume, 0, sizeof(This->resume)); /* just reset current input */ if (!input) @@ -833,11 +2068,23 @@ } /* now try IXmlReaderInput, ISequentialStream, IStream */ - hr = IUnknown_QueryInterface(input, &IID_IXmlReaderInput, (void**)&This->input); - if (hr != S_OK) - { - IXmlReaderInput *readerinput; - + hr = IUnknown_QueryInterface(input, &IID_IXmlReaderInput, (void**)&readerinput); + if (hr == S_OK) + { + if (readerinput->lpVtbl == &xmlreaderinputvtbl) + This->input = impl_from_IXmlReaderInput(readerinput); + else + { + ERR("got external IXmlReaderInput implementation: %p, vtbl=%p\n", + readerinput, readerinput->lpVtbl); + IUnknown_Release(readerinput); + return E_FAIL; + + } + } + + if (hr != S_OK || !readerinput) + { /* create IXmlReaderInput basing on supplied interface */ hr = CreateXmlReaderInputWithEncodingName(input, NULL, NULL, FALSE, NULL, &readerinput); @@ -848,7 +2095,10 @@ /* set stream for supplied IXmlReaderInput */ hr = readerinput_query_for_stream(This->input); if (hr == S_OK) + { This->state = XmlReadState_Initial; + This->instate = XmlReadInState_Initial; + } return hr; } @@ -897,44 +2147,22 @@ return S_OK; } -static HRESULT WINAPI xmlreader_Read(IXmlReader* iface, XmlNodeType *node_type) +static HRESULT WINAPI xmlreader_Read(IXmlReader* iface, XmlNodeType *nodetype) { xmlreader *This = impl_from_IXmlReader(iface); - - FIXME("(%p)->(%p): stub\n", This, node_type); + XmlNodeType oldtype = This->nodetype; + HRESULT hr; + + TRACE("(%p)->(%p)\n", This, nodetype); if (This->state == XmlReadState_Closed) return S_FALSE; - /* if it's a first call for a new input we need to detect stream encoding */ - if (This->state == XmlReadState_Initial) - { - xml_encoding enc; - HRESULT hr; - - hr = readerinput_growraw(This->input); - if (FAILED(hr)) return hr; - - /* try to detect encoding by BOM or data and set input code page */ - hr = readerinput_detectencoding(This->input, &enc); - TRACE("detected encoding %s, 0x%08x\n", debugstr_w(xml_encoding_map[enc].name), hr); - if (FAILED(hr)) return hr; - - /* always switch first time cause we have to put something in */ - readerinput_switchencoding(This->input, enc); - - /* parse xml declaration */ - hr = reader_parse_xmldecl(This); - if (FAILED(hr)) return hr; - - if (hr == S_OK) - { - This->state = XmlReadState_Interactive; - This->nodetype = *node_type = XmlNodeType_XmlDeclaration; - return S_OK; - } - } - - return E_NOTIMPL; + hr = reader_parse_nextnode(This); + if (oldtype == XmlNodeType_None && This->nodetype != oldtype) + This->state = XmlReadState_Interactive; + if (hr == S_OK) *nodetype = This->nodetype; + + return hr; } static HRESULT WINAPI xmlreader_GetNodeType(IXmlReader* iface, XmlNodeType *node_type) @@ -998,11 +2226,14 @@ return S_OK; } -static HRESULT WINAPI xmlreader_GetQualifiedName(IXmlReader* iface, LPCWSTR *qualifiedName, - UINT *qualifiedName_length) -{ - FIXME("(%p %p %p): stub\n", iface, qualifiedName, qualifiedName_length); - return E_NOTIMPL; +static HRESULT WINAPI xmlreader_GetQualifiedName(IXmlReader* iface, LPCWSTR *name, UINT *len) +{ + xmlreader *This = impl_from_IXmlReader(iface); + + TRACE("(%p)->(%p %p)\n", This, name, len); + *name = This->strvalues[StringValue_QualifiedName].str; + *len = This->strvalues[StringValue_QualifiedName].len; + return S_OK; } static HRESULT WINAPI xmlreader_GetNamespaceUri(IXmlReader* iface, @@ -1013,12 +2244,14 @@ return E_NOTIMPL; } -static HRESULT WINAPI xmlreader_GetLocalName(IXmlReader* iface, - LPCWSTR *local_name, - UINT *local_name_length) -{ - FIXME("(%p %p %p): stub\n", iface, local_name, local_name_length); - return E_NOTIMPL; +static HRESULT WINAPI xmlreader_GetLocalName(IXmlReader* iface, LPCWSTR *name, UINT *len) +{ + xmlreader *This = impl_from_IXmlReader(iface); + + TRACE("(%p)->(%p %p)\n", This, name, len); + *name = This->strvalues[StringValue_LocalName].str; + *len = This->strvalues[StringValue_LocalName].len; + return S_OK; } static HRESULT WINAPI xmlreader_GetPrefix(IXmlReader* iface, @@ -1029,21 +2262,61 @@ return E_NOTIMPL; } -static HRESULT WINAPI xmlreader_GetValue(IXmlReader* iface, - LPCWSTR *value, - UINT *value_length) -{ - FIXME("(%p %p %p): stub\n", iface, value, value_length); - return E_NOTIMPL; -} - -static HRESULT WINAPI xmlreader_ReadValueChunk(IXmlReader* iface, - WCHAR *buffer, - UINT chunk_size, - UINT *read) -{ - FIXME("(%p %p %u %p): stub\n", iface, buffer, chunk_size, read); - return E_NOTIMPL; +static HRESULT WINAPI xmlreader_GetValue(IXmlReader* iface, const WCHAR **value, UINT *len) +{ + xmlreader *reader = impl_from_IXmlReader(iface); + strval *val = &reader->strvalues[StringValue_Value]; + + TRACE("(%p)->(%p %p)\n", reader, value, len); + + *value = NULL; + + if ((reader->nodetype == XmlNodeType_Comment && !val->str) || is_reader_pending(reader)) + { + XmlNodeType type; + HRESULT hr; + + hr = IXmlReader_Read(iface, &type); + if (FAILED(hr)) return hr; + + /* return if still pending, partially read values are not reported */ + if (is_reader_pending(reader)) return E_PENDING; + } + + if (!val->str) + { + val->str = reader_alloc(reader, (val->len+1)*sizeof(WCHAR)); + if (!val->str) return E_OUTOFMEMORY; + memcpy(val->str, val->start, val->len*sizeof(WCHAR)); + val->str[val->len] = 0; + } + + *value = val->str; + if (len) *len = val->len; + return S_OK; +} + +static HRESULT WINAPI xmlreader_ReadValueChunk(IXmlReader* iface, WCHAR *buffer, UINT chunk_size, UINT *read) +{ + xmlreader *reader = impl_from_IXmlReader(iface); + strval *val = &reader->strvalues[StringValue_Value]; + UINT len; + + TRACE("(%p)->(%p %u %p)\n", reader, buffer, chunk_size, read); + + /* Value is already allocated, chunked reads are not possible. */ + if (val->str) return S_FALSE; + + if (val->len) + { + len = min(chunk_size, val->len); + memcpy(buffer, val->start, len); + val->start += len; + val->len -= len; + if (read) *read = len; + } + + return S_OK; } static HRESULT WINAPI xmlreader_GetBaseUri(IXmlReader* iface, @@ -1106,8 +2379,10 @@ static HRESULT WINAPI xmlreader_GetDepth(IXmlReader* iface, UINT *depth) { - FIXME("(%p %p): stub\n", iface, depth); - return E_NOTIMPL; + xmlreader *This = impl_from_IXmlReader(iface); + TRACE("(%p)->(%p)\n", This, depth); + *depth = This->depth; + return S_OK; } static BOOL WINAPI xmlreader_IsEOF(IXmlReader* iface) @@ -1151,7 +2426,7 @@ { xmlreaderinput *This = impl_from_IXmlReaderInput(iface); - TRACE("%p %s %p\n", This, debugstr_guid(riid), ppvObject); + TRACE("(%p)->(%s %p)\n", This, debugstr_guid(riid), ppvObject); if (IsEqualGUID(riid, &IID_IXmlReaderInput) || IsEqualGUID(riid, &IID_IUnknown)) @@ -1161,6 +2436,7 @@ else { WARN("interface %s not implemented\n", debugstr_guid(riid)); + *ppvObject = NULL; return E_NOINTERFACE; } @@ -1198,7 +2474,7 @@ return ref; } -static const struct IUnknownVtbl xmlreaderinput_vtbl = +static const struct IUnknownVtbl xmlreaderinputvtbl = { xmlreaderinput_QueryInterface, xmlreaderinput_AddRef, @@ -1208,6 +2484,7 @@ HRESULT WINAPI CreateXmlReader(REFIID riid, void **obj, IMalloc *imalloc) { xmlreader *reader; + int i; TRACE("(%s, %p, %p)\n", wine_dbgstr_guid(riid), obj, imalloc); @@ -1227,6 +2504,8 @@ reader->ref = 1; reader->input = NULL; reader->state = XmlReadState_Closed; + reader->instate = XmlReadInState_Initial; + reader->resumestate = XmlReadResumeState_Initial; reader->dtdmode = DtdProcessing_Prohibit; reader->line = reader->pos = 0; reader->imalloc = imalloc; @@ -1235,6 +2514,12 @@ list_init(&reader->attrs); reader->attr_count = 0; reader->attr = NULL; + list_init(&reader->elements); + reader->depth = 0; + memset(reader->resume, 0, sizeof(reader->resume)); + + for (i = 0; i < StringValue_Last; i++) + reader->strvalues[i] = strval_empty; *obj = &reader->IXmlReader_iface; @@ -1264,7 +2549,7 @@ readerinput = heap_alloc(sizeof(*readerinput)); if(!readerinput) return E_OUTOFMEMORY; - readerinput->IXmlReaderInput_iface.lpVtbl = &xmlreaderinput_vtbl; + readerinput->IXmlReaderInput_iface.lpVtbl = &xmlreaderinputvtbl; readerinput->ref = 1; readerinput->imalloc = imalloc; readerinput->stream = NULL; @@ -1272,11 +2557,14 @@ readerinput->encoding = parse_encoding_name(encoding, -1); readerinput->hint = hint; readerinput->baseuri = readerinput_strdupW(readerinput, base_uri); + readerinput->pending = 0; hr = alloc_input_buffer(readerinput); if (hr != S_OK) { + readerinput_free(readerinput, readerinput->baseuri); readerinput_free(readerinput, readerinput); + if (imalloc) IMalloc_Release(imalloc); return hr; } IUnknown_QueryInterface(stream, &IID_IUnknown, (void**)&readerinput->input); Modified: trunk/reactos/dll/win32/xmllite/xmllite_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/xmllite/xmllite_… ============================================================================== --- trunk/reactos/dll/win32/xmllite/xmllite_main.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/xmllite/xmllite_main.c [iso-8859-1] Tue Mar 26 19:02:38 2013 @@ -30,7 +30,7 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) { - TRACE("(0x%p, %d, %p)\n", hinstDLL, fdwReason, lpvReserved); + TRACE("(%p, %u, %p)\n", hinstDLL, fdwReason, lpvReserved); switch (fdwReason) { 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] Tue Mar 26 19:02:38 2013 @@ -201,7 +201,7 @@ reactos/dll/win32/xinput1_2 # Synced to Wine-1.5.19 reactos/dll/win32/xinput1_3 # Synced to Wine-1.5.19 reactos/dll/win32/xinput9_1_0 # Synced to Wine-1.5.19 -reactos/dll/win32/xmllite # Synced to Wine-1.5.19 +reactos/dll/win32/xmllite # Synced to Wine-1.5.26 reactos/dll/cpl/inetcpl # Synced to Wine-1.3.21

11 years, 9 months

[akhaldi] 58608: [UNIATA] * Sync to 0.44d. [ATACTL] * Sync to 0.44d.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sun Mar 24 19:41:59 2013 New Revision: 58608 URL: http://svn.reactos.org/svn/reactos?rev=58608&view=rev Log: [UNIATA] * Sync to 0.44d. [ATACTL] * Sync to 0.44d. Modified: trunk/reactos/base/applications/atactl/atactl.cpp trunk/reactos/drivers/storage/ide/uniata/atapi.h trunk/reactos/drivers/storage/ide/uniata/bm_devs.h trunk/reactos/drivers/storage/ide/uniata/id_ata.cpp trunk/reactos/drivers/storage/ide/uniata/id_init.cpp trunk/reactos/drivers/storage/ide/uniata/id_probe.cpp trunk/reactos/drivers/storage/ide/uniata/id_sata.cpp trunk/reactos/drivers/storage/ide/uniata/uniata_ver.h Modified: trunk/reactos/base/applications/atactl/atactl.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/atactl/a… ============================================================================== --- trunk/reactos/base/applications/atactl/atactl.cpp [iso-8859-1] (original) +++ trunk/reactos/base/applications/atactl/atactl.cpp [iso-8859-1] Sun Mar 24 19:41:59 2013 @@ -337,7 +337,7 @@ { ULONG status; PSCSI_PASS_THROUGH_WITH_BUFFERS sptwb; - ULONG data_len = BufferLength; + //ULONG data_len = BufferLength; ULONG len; len = BufferLength + offsetof(SCSI_PASS_THROUGH_WITH_BUFFERS, ucDataBuf); @@ -1065,7 +1065,7 @@ { char dev_name[64]; HANDLE h; - BOOLEAN uniata_driven; + //BOOLEAN uniata_driven; if(bus_id == -1) { for(bus_id=0; TRUE; bus_id++) { @@ -1074,7 +1074,7 @@ } return TRUE; } - uniata_driven = ata_adapter_info(bus_id, g_adapter_info); + /*uniata_driven =*/ ata_adapter_info(bus_id, g_adapter_info); sprintf(dev_name, "\\\\.\\Scsi%d:", bus_id); h = ata_open_dev(dev_name); if(!h) @@ -1230,8 +1230,13 @@ &to, sizeof(to), NULL, 0, &returned); + if(!status) { + printf("Delete failed\n"); + } else { + printf("Device is detached\n"); + } ata_close_dev(h); - return TRUE; + return status ? TRUE : FALSE; } // end ata_hide() BOOLEAN @@ -1289,7 +1294,7 @@ FALSE); } ata_close_dev(h); - return TRUE; + return status ? TRUE : FALSE; } // end ata_scan() CHAR* @@ -1656,7 +1661,7 @@ NULL, 0, FALSE, &senseData, &returned); ata_close_dev(h); - return TRUE; + return status ? TRUE : FALSE; } // end ata_power_mode() int Modified: trunk/reactos/drivers/storage/ide/uniata/atapi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/uniata… ============================================================================== --- trunk/reactos/drivers/storage/ide/uniata/atapi.h [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/ide/uniata/atapi.h [iso-8859-1] Sun Mar 24 19:41:59 2013 @@ -333,6 +333,8 @@ #define ATA_SA150 0x47 /*0x80*/ #define ATA_SA300 0x48 /*0x81*/ #define ATA_SA600 0x49 /*0x82*/ + +#define ATA_MODE_NOT_SPEC ((ULONG)(-1)) /*0x82*/ // // IDE command definitions Modified: trunk/reactos/drivers/storage/ide/uniata/bm_devs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/uniata… ============================================================================== --- trunk/reactos/drivers/storage/ide/uniata/bm_devs.h [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/ide/uniata/bm_devs.h [iso-8859-1] Sun Mar 24 19:41:59 2013 @@ -66,7 +66,7 @@ ULONG nDeviceId; ULONG nRevId; ULONG MaxTransferMode; - PCHAR FullDevName; + PVEN_STR FullDevName; ULONG RaidFlags; CHAR VendorIdStr[4]; CHAR DeviceIdStr[4]; @@ -665,7 +665,7 @@ #ifdef USER_MODE #define PCI_DEV_HW_SPEC_BM(idhi, idlo, rev, mode, name, flags) \ - { (PVEN_STR) #idlo, 4, 0x##idlo, (PVEN_STR) #idhi, 4, 0x##idhi, rev, mode, name, flags} + { (PVEN_STR) #idlo, 4, 0x##idlo, (PVEN_STR) #idhi, 4, 0x##idhi, rev, mode, (PVEN_STR)name, flags} #else #define PCI_DEV_HW_SPEC_BM(idhi, idlo, rev, mode, name, flags) \ { (PVEN_STR) #idlo, 4, 0x##idlo, (PVEN_STR) #idhi, 4, 0x##idhi, rev, mode, NULL, flags} Modified: trunk/reactos/drivers/storage/ide/uniata/id_ata.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/uniata… ============================================================================== --- trunk/reactos/drivers/storage/ide/uniata/id_ata.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/ide/uniata/id_ata.cpp [iso-8859-1] Sun Mar 24 19:41:59 2013 @@ -1354,7 +1354,7 @@ ULONG waitCount = 50000; ULONG j; UCHAR statusByte; - UCHAR statusByte2; + //UCHAR statusByte2; UCHAR signatureLow, signatureHigh; BOOLEAN atapiDev = FALSE; @@ -1393,7 +1393,7 @@ AtapiStallExecution(10); statusByte = WaitOnBusyLong(chan); // Check that the status register makes sense. - GetBaseStatus(chan, statusByte2); + GetBaseStatus(chan, statusByte); } if (Command == IDE_COMMAND_IDENTIFY) { @@ -1435,11 +1435,11 @@ } } while ((statusByte & IDE_STATUS_BUSY) && waitCount--); - GetBaseStatus(chan, statusByte2); + GetBaseStatus(chan, statusByte); SelectDrive(chan, DeviceNumber); } else { - GetBaseStatus(chan, statusByte2); + GetBaseStatus(chan, statusByte); } // Another check for signature, to deal with one model Atapi that doesn't assert signature after // a soft reset. @@ -3121,7 +3121,7 @@ } else if (!(LunExt->DeviceFlags & DFLAGS_CHANGER_INITED)){ ULONG j; - BOOLEAN isSanyo = FALSE; + //BOOLEAN isSanyo = FALSE; CCHAR vendorId[26]; KdPrint2((PRINT_PREFIX "AtapiHwInitialize: ATAPI/Changer branch\n")); @@ -3142,7 +3142,7 @@ // acting like 1) a multi-lun device and 2) building the 'special' TUR's. LunExt->DeviceFlags |= (DFLAGS_CHANGER_INITED | DFLAGS_SANYO_ATAPI_CHANGER); LunExt->DiscsPresent = 3; - isSanyo = TRUE; + //isSanyo = TRUE; } } } @@ -4533,7 +4533,9 @@ BOOLEAN atapiDev = FALSE; +#ifdef DBG UCHAR Channel; +#endif //DBG UCHAR lChannel; UCHAR DeviceNumber; BOOLEAN DmaTransfer = FALSE; @@ -4564,9 +4566,12 @@ PHW_LU_EXTENSION LunExt; lChannel = c; + +#ifdef DBG Channel = (UCHAR)(deviceExtension->Channel + lChannel); KdPrint2((PRINT_PREFIX " cntrlr %#x:%d, irql %#x, c %d\n", deviceExtension->DevIndex, Channel, KeGetCurrentIrql(), c)); +#endif //DBG if((chan->ChannelCtrlFlags & CTRFLAGS_DMA_ACTIVE) || (AtaReq && (AtaReq->Flags & REQ_FLAG_DMA_OPERATION)) || @@ -5525,11 +5530,20 @@ } else if (interruptReason == (ATAPI_IR_IO_toHost | ATAPI_IR_COD_Cmd) && !(statusByte & IDE_STATUS_DRQ)) { KdPrint2((PRINT_PREFIX "AtapiInterrupt: interruptReason = CompleteRequest\n")); - // Command complete. + // Command complete. We exactly know this because os IReason. + if(DmaTransfer) { KdPrint2((PRINT_PREFIX "AtapiInterrupt: CompleteRequest, was DmaTransfer\n")); - AtaReq->WordsTransfered = AtaReq->WordsLeft; + AtaReq->WordsTransfered += AtaReq->WordsLeft; AtaReq->WordsLeft = 0; + } else { + KdPrint2((PRINT_PREFIX "AtapiInterrupt: CompleteRequest, was PIO\n")); + + wordCount = AtaReq->WordsLeft; + // Advance data buffer pointer and bytes left. + AtaReq->DataBuffer += wordCount; + AtaReq->WordsLeft -= wordCount; + AtaReq->WordsTransfered += wordCount; } //if (AtaReq->WordsLeft) { // status = SRB_STATUS_DATA_OVERRUN; @@ -9905,7 +9919,7 @@ ULONG statusToReturn, newStatus; PUNICODE_STRING RegistryPath = (PUNICODE_STRING)Argument2; BOOLEAN ReEnter = FALSE; - WCHAR a; +// WCHAR a; #ifndef USE_REACTOS_DDK NTSTATUS status; #endif @@ -9918,7 +9932,7 @@ Connect_DbgPrint(); KdPrint2((PRINT_PREFIX "%s", (PCCHAR)ver_string)); - a = (WCHAR)strlen(ver_string); + //a = (WCHAR)strlen(ver_string); g_opt_Verbose = (BOOLEAN)AtapiRegCheckDevValue(NULL, CHAN_NOT_SPECIFIED, DEVNUM_NOT_SPECIFIED, L"PrintLogo", 0); if(g_opt_Verbose) { @@ -10752,7 +10766,7 @@ } if(deviceExtension->AdapterInterfaceType == PCIBus) { // we must never get here for non-PCI - status = UniataDisconnectIntr2(HwDeviceExtension); + /*status =*/ UniataDisconnectIntr2(HwDeviceExtension); BMList[deviceExtension->DevIndex].Isr2Enable = FALSE; } break; @@ -10765,15 +10779,17 @@ AtapiChipInit(HwDeviceExtension, DEVNUM_NOT_SPECIFIED, CHAN_NOT_SPECIFIED); status = UniataConnectIntr2(HwDeviceExtension); - for (c = 0; c < numberChannels; c++) { - AtapiChipInit(HwDeviceExtension, DEVNUM_NOT_SPECIFIED, c); - FindDevices(HwDeviceExtension, 0, c); - AtapiEnableInterrupts(deviceExtension, c); - AtapiHwInitialize__(deviceExtension, c); - } - if(deviceExtension->Isr2DevObj) { - // we must never get here for non-PCI - BMList[deviceExtension->DevIndex].Isr2Enable = TRUE; + if(NT_SUCCESS(status)) { + for (c = 0; c < numberChannels; c++) { + AtapiChipInit(HwDeviceExtension, DEVNUM_NOT_SPECIFIED, c); + FindDevices(HwDeviceExtension, 0, c); + AtapiEnableInterrupts(deviceExtension, c); + AtapiHwInitialize__(deviceExtension, c); + } + if(deviceExtension->Isr2DevObj) { + // we must never get here for non-PCI + BMList[deviceExtension->DevIndex].Isr2Enable = TRUE; + } } break; @@ -10808,13 +10824,13 @@ ... ) { - int len; + //int len; UCHAR dbg_print_tmp_buff[DEBUG_MSG_BUFFER_SIZE]; // UNICODE_STRING msgBuff; va_list ap; va_start(ap, DebugMessage); - len = _vsnprintf((PCHAR)&dbg_print_tmp_buff[0], DEBUG_MSG_BUFFER_SIZE-1, DebugMessage, ap); + /*len =*/ _vsnprintf((PCHAR)&dbg_print_tmp_buff[0], DEBUG_MSG_BUFFER_SIZE-1, DebugMessage, ap); dbg_print_tmp_buff[DEBUG_MSG_BUFFER_SIZE-1] = 0; Modified: trunk/reactos/drivers/storage/ide/uniata/id_init.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/uniata… ============================================================================== --- trunk/reactos/drivers/storage/ide/uniata/id_init.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/ide/uniata/id_init.cpp [iso-8859-1] Sun Mar 24 19:41:59 2013 @@ -359,10 +359,10 @@ }; static BUSMASTER_CONTROLLER_INFORMATION const ViaSouthAdapters[] = { - PCI_DEV_HW_SPEC_BM( 3112, 1106, 0x00, -1, "VIA 8361", VIASOUTH ), - PCI_DEV_HW_SPEC_BM( 0305, 1106, 0x00, -1, "VIA 8363", VIASOUTH ), - PCI_DEV_HW_SPEC_BM( 0391, 1106, 0x00, -1, "VIA 8371", VIASOUTH ), - PCI_DEV_HW_SPEC_BM( 3102, 1106, 0x00, -1, "VIA 8662", VIASOUTH ), + PCI_DEV_HW_SPEC_BM( 3112, 1106, 0x00, ATA_MODE_NOT_SPEC, "VIA 8361", VIASOUTH ), + PCI_DEV_HW_SPEC_BM( 0305, 1106, 0x00, ATA_MODE_NOT_SPEC, "VIA 8363", VIASOUTH ), + PCI_DEV_HW_SPEC_BM( 0391, 1106, 0x00, ATA_MODE_NOT_SPEC, "VIA 8371", VIASOUTH ), + PCI_DEV_HW_SPEC_BM( 3102, 1106, 0x00, ATA_MODE_NOT_SPEC, "VIA 8662", VIASOUTH ), PCI_DEV_HW_SPEC_BM( ffff, ffff, 0xff, BMLIST_TERMINATOR, NULL , BMLIST_TERMINATOR ) }; @@ -785,9 +785,9 @@ ChangePciConfig1(0x57, (a | 0x80)); } else { static BUSMASTER_CONTROLLER_INFORMATION const SiSSouthAdapters[] = { - PCI_DEV_HW_SPEC_BM( 0008, 1039, 0x10, -1, "SiS 961", 0 ), -// PCI_DEV_HW_SPEC_BM( 0008, 1039, 0x00, -1, "SiS 961", 0 ), - PCI_DEV_HW_SPEC_BM( ffff, ffff, 0xff, -1, NULL , -1 ) + PCI_DEV_HW_SPEC_BM( 0008, 1039, 0x10, ATA_MODE_NOT_SPEC, "SiS 961", 0 ), +// PCI_DEV_HW_SPEC_BM( 0008, 1039, 0x00, ATA_MODE_NOT_SPEC, "SiS 961", 0 ), + PCI_DEV_HW_SPEC_BM( ffff, ffff, 0xff, ATA_MODE_NOT_SPEC, NULL , -1 ) }; // Save settings GetPciConfig1(0x4a, tmp8); @@ -798,8 +798,8 @@ -1, HwDeviceExtension, SystemIoBusNumber, PCISLOTNUM_NOT_SPECIFIED, NULL); if(i != BMLIST_TERMINATOR) { deviceExtension->HwFlags = (deviceExtension->HwFlags & ~CHIPTYPE_MASK) | SIS133OLD; - //deviceExtension->MaxTransferMode = ATA_UDMA6; - deviceExtension->MaxTransferMode = SiSSouthAdapters[i].MaxTransferMode; + deviceExtension->MaxTransferMode = ATA_UDMA6; + //deviceExtension->MaxTransferMode = SiSSouthAdapters[i].MaxTransferMode; if(SiSSouthAdapters[i].RaidFlags & UNIATA_SATA) { deviceExtension->HwFlags |= UNIATA_SATA; if(SiSSouthAdapters[i].nDeviceId == 0x1182) { @@ -1651,7 +1651,7 @@ PHW_CHANNEL chan; UCHAR tmp8; USHORT tmp16; - ULONG tmp32; + //ULONG tmp32; ULONG c; // logical channel (for Compatible Mode controllers) BOOLEAN CheckCable = FALSE; BOOLEAN GlobalInit = FALSE; @@ -2142,15 +2142,15 @@ chan = &deviceExtension->chan[c]; /* dont block interrupts */ //ChangePciConfig4(0x48, (a & ~0x03c00000)); - tmp32 = AtapiReadPortEx4(NULL, (ULONGIO_PTR)(&deviceExtension->BaseIoAddressSATA_0),0x48); + /*tmp32 =*/ AtapiReadPortEx4(NULL, (ULONGIO_PTR)(&deviceExtension->BaseIoAddressSATA_0),0x48); AtapiWritePortEx4(NULL, (ULONGIO_PTR)(&deviceExtension->BaseIoAddressSATA_0),0x48, (1 << 22) << c); // flush - tmp32 = AtapiReadPortEx4(NULL, (ULONGIO_PTR)(&deviceExtension->BaseIoAddressSATA_0),0x48); + /*tmp32 =*/ AtapiReadPortEx4(NULL, (ULONGIO_PTR)(&deviceExtension->BaseIoAddressSATA_0),0x48); /* Initialize FIFO PCI bus arbitration */ GetPciConfig1(offsetof(PCI_COMMON_CONFIG, CacheLineSize), tmp8); if(tmp8) { - KdPrint2((PRINT_PREFIX "SII: CacheLine=%d\n", tmp32)); + KdPrint2((PRINT_PREFIX "SII: CacheLine=%d\n", tmp8)); tmp8 = (tmp8/8)+1; AtapiWritePort2(chan, IDX_BM_DeviceSpecific1, ((USHORT)tmp8) << 8 | tmp8); } else { Modified: trunk/reactos/drivers/storage/ide/uniata/id_probe.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/uniata… ============================================================================== --- trunk/reactos/drivers/storage/ide/uniata/id_probe.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/ide/uniata/id_probe.cpp [iso-8859-1] Sun Mar 24 19:41:59 2013 @@ -127,6 +127,10 @@ // reread config space busDataRead = HalGetBusData(PCIConfiguration, busNumber, slotNumber, pciData, PCI_COMMON_HDR_LENGTH); + if(busDataRead < PCI_COMMON_HDR_LENGTH) { + KdPrint2((PRINT_PREFIX "HalGetBusData() failed %#x\n", busDataRead)); + break; + } KdPrint2((PRINT_PREFIX "New pciData.Command = %#x\n", pciData->Command)); } KdPrint2((PRINT_PREFIX "InterruptLine = %#x\n", pciData->u.type0.InterruptLine)); @@ -287,7 +291,7 @@ ) { // PHW_DEVICE_EXTENSION deviceExtension = (PHW_DEVICE_EXTENSION)HwDeviceExtension; - PVOID HwDeviceExtension; +// PVOID HwDeviceExtension; PHW_DEVICE_EXTENSION deviceExtension = NULL; PCI_SLOT_NUMBER slotData; PCI_COMMON_CONFIG pciData; @@ -328,7 +332,7 @@ deviceStrPtr = deviceString; slotData.u.AsULONG = 0; - HwDeviceExtension = + /*HwDeviceExtension =*/ deviceExtension = (PHW_DEVICE_EXTENSION)ExAllocatePool(NonPagedPool, sizeof(HW_DEVICE_EXTENSION)); if(!deviceExtension) { return(SP_RETURN_NOT_FOUND); @@ -920,12 +924,13 @@ ULONG slotNumber; ULONG busDataRead; ULONG SystemIoBusNumber; - +/* UCHAR vendorString[5]; UCHAR deviceString[5]; + PUCHAR vendorStrPtr; PUCHAR deviceStrPtr; - +*/ UCHAR BaseClass; UCHAR SubClass; ULONG VendorID; @@ -1025,10 +1030,10 @@ return SP_RETURN_ERROR; } RtlZeroMemory(deviceExtension, sizeof(HW_DEVICE_EXTENSION)); - +/* vendorStrPtr = vendorString; deviceStrPtr = deviceString; - +*/ slotNumber = BMList[i].slotNumber; SystemIoBusNumber = BMList[i].busNumber; @@ -2108,7 +2113,7 @@ ULONG irq=0; ULONG portBase; ULONG retryCount; - BOOLEAN atapiOnly; +// BOOLEAN atapiOnly; UCHAR statusByte; BOOLEAN preConfig = FALSE; // @@ -2457,12 +2462,12 @@ if (AtapiParseArgumentString(ArgumentString, "dump") == 1) { KdPrint2((PRINT_PREFIX "AtapiFindController: Crash dump\n")); - atapiOnly = FALSE; + //atapiOnly = FALSE; deviceExtension->DriverMustPoll = TRUE; } else { KdPrint2((PRINT_PREFIX "AtapiFindController: Atapi Only\n")); - atapiOnly = TRUE; + //atapiOnly = TRUE; deviceExtension->DriverMustPoll = FALSE; } #endif //UNIATA_CORE @@ -2470,17 +2475,17 @@ KdPrint2((PRINT_PREFIX "AtapiFindController: Atapi Only (2)\n")); - atapiOnly = TRUE; + //atapiOnly = TRUE; deviceExtension->DriverMustPoll = FALSE; } } else { - atapiOnly = FALSE; + //atapiOnly = FALSE; } } else { - atapiOnly = FALSE; + //atapiOnly = FALSE; deviceExtension->DriverMustPoll = FALSE; }// preConfig check Modified: trunk/reactos/drivers/storage/ide/uniata/id_sata.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/uniata… ============================================================================== --- trunk/reactos/drivers/storage/ide/uniata/id_sata.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/ide/uniata/id_sata.cpp [iso-8859-1] Sun Mar 24 19:41:59 2013 @@ -645,7 +645,9 @@ PHW_CHANNEL chan; ULONG offs; ULONG BaseMemAddress; +#ifdef DBG ULONG PI; +#endif //DBG ULONG CAP; ULONG GHC; BOOLEAN MemIo = FALSE; @@ -722,9 +724,11 @@ if(CAP & AHCI_CAP_SAM) { KdPrint2((PRINT_PREFIX " AHCI legasy SATA\n")); } +#ifdef DBG /* get the number of HW channels */ PI = UniataAhciReadHostPort4(deviceExtension, IDX_AHCI_PI); KdPrint2((PRINT_PREFIX " AHCI PI %#x\n", PI)); +#endif //DBG /* clear interrupts */ UniataAhciWriteHostPort4(deviceExtension, IDX_AHCI_IS, @@ -837,9 +841,11 @@ ULONG CAP; ULONG CAP2; ULONG GHC, GHC0; +#ifdef DBG ULONG BOHC; + ULONG v_Mn, v_Mj; +#endif //DBG ULONG NumberChannels; - ULONG v_Mn, v_Mj; ULONG BaseMemAddress; BOOLEAN MemIo = FALSE; BOOLEAN found = FALSE; @@ -905,10 +911,12 @@ KdPrint2((PRINT_PREFIX " 64bit")); //deviceExtension->Host64 = TRUE; // this is just DETECT, do not update anything } +#ifdef DBG if(CAP2 & AHCI_CAP2_BOH) { BOHC = UniataAhciReadHostPort4(deviceExtension, IDX_AHCI_BOHC); KdPrint2((PRINT_PREFIX " BOHC %#x", BOHC)); } +#endif //DBG if(CAP & AHCI_CAP_NCQ) { KdPrint2((PRINT_PREFIX " NCQ")); } @@ -950,6 +958,7 @@ goto exit_detect; } +#ifdef DBG v_Mj = ((version >> 20) & 0xf0) + ((version >> 16) & 0x0f); v_Mn = ((version >> 4) & 0xf0) + (version & 0x0f); @@ -957,6 +966,7 @@ v_Mj, v_Mn, NumberChannels, PI)); KdPrint((" AHCI SATA Gen %d\n", (((CAP & AHCI_CAP_ISS_MASK) >> 20)) )); +#endif //DBG if(CAP & AHCI_CAP_SPM) { KdPrint2((PRINT_PREFIX " PM supported\n")); @@ -2166,11 +2176,11 @@ ULONG tag=0; //ULONG i; PIDE_AHCI_CMD_LIST AHCI_CL = &(chan->AhciCtlBlock->cmd_list[tag]); - PHW_LU_EXTENSION LunExt; + //PHW_LU_EXTENSION LunExt; KdPrint2(("UniataAhciEndTransaction: lChan %d\n", chan->lChannel)); - LunExt = chan->lun[DeviceNumber]; + //LunExt = chan->lun[DeviceNumber]; TFD = UniataAhciReadChannelPort4(chan, IDX_AHCI_P_TFD); KdPrint2((" TFD %#x\n", TFD)); @@ -2474,7 +2484,9 @@ PUCHAR prd_base0; ULONGLONG prd_base64_0; }; +#ifdef DBG ULONG d; +#endif // DBG prd_base64_0 = prd_base64 = 0; prd_base = (PUCHAR)(&AtaReq->ahci_cmd0); @@ -2482,8 +2494,10 @@ prd_base64 = (prd_base64 + max(FIELD_OFFSET(ATA_REQ, ahci_cmd0), AHCI_CMD_ALIGNEMENT_MASK+1)) & ~AHCI_CMD_ALIGNEMENT_MASK; +#ifdef DBG d = (ULONG)(prd_base64 - prd_base64_0); KdPrint2((PRINT_PREFIX " AtaReq %#x: cmd aligned %I64x, d=%x\n", AtaReq, prd_base64, d)); +#endif // DBG AtaReq->ahci.ahci_cmd_ptr = (PIDE_AHCI_CMD)prd_base64; KdPrint2((PRINT_PREFIX " ahci_cmd_ptr %#x\n", AtaReq->ahci.ahci_cmd_ptr)); Modified: trunk/reactos/drivers/storage/ide/uniata/uniata_ver.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/uniata… ============================================================================== --- trunk/reactos/drivers/storage/ide/uniata/uniata_ver.h [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/ide/uniata/uniata_ver.h [iso-8859-1] Sun Mar 24 19:41:59 2013 @@ -6,5 +6,5 @@ #define UNIATA_VER_SUB_MN 1 #define UNIATA_VER_DOT_COMMA 0,44,2,1 #define UNIATA_VER_DOT_STR "0.44.2.1" -#define UNIATA_VER_YEAR 2012 -#define UNIATA_VER_YEAR_STR "2012" +#define UNIATA_VER_YEAR 2013 +#define UNIATA_VER_YEAR_STR "2013"

11 years, 9 months

[hbelusca] 58607: Synchronize with trunk r58606.

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sun Mar 24 19:05:43 2013 New Revision: 58607 URL: http://svn.reactos.org/svn/reactos?rev=58607&view=rev Log: Synchronize with trunk r58606. Added: branches/ros-csrss/base/applications/cmdutils/doskey/lang/it-IT.rc - copied unchanged from r58606, trunk/reactos/base/applications/cmdutils/doskey/lang/it-IT.rc branches/ros-csrss/base/applications/dxdiag/lang/it-IT.rc - copied unchanged from r58606, trunk/reactos/base/applications/dxdiag/lang/it-IT.rc branches/ros-csrss/base/applications/fontview/lang/it-IT.rc - copied unchanged from r58606, trunk/reactos/base/applications/fontview/lang/it-IT.rc branches/ros-csrss/base/applications/magnify/lang/tr-TR.rc - copied unchanged from r58606, trunk/reactos/base/applications/magnify/lang/tr-TR.rc branches/ros-csrss/base/applications/mplay32/lang/tr-TR.rc - copied unchanged from r58606, trunk/reactos/base/applications/mplay32/lang/tr-TR.rc branches/ros-csrss/base/applications/mspaint/lang/tr-TR.rc - copied unchanged from r58606, trunk/reactos/base/applications/mspaint/lang/tr-TR.rc branches/ros-csrss/base/applications/network/wlanconf/lang/de-DE.rc - copied unchanged from r58606, trunk/reactos/base/applications/network/wlanconf/lang/de-DE.rc branches/ros-csrss/base/applications/network/wlanconf/lang/it-IT.rc - copied unchanged from r58606, trunk/reactos/base/applications/network/wlanconf/lang/it-IT.rc branches/ros-csrss/base/applications/sndrec32/lang/tr-TR.rc - copied unchanged from r58606, trunk/reactos/base/applications/sndrec32/lang/tr-TR.rc branches/ros-csrss/base/applications/write/Tr.rc - copied unchanged from r58606, trunk/reactos/base/applications/write/Tr.rc branches/ros-csrss/dll/directx/ddraw/CMakeLists.txt - copied unchanged from r58606, trunk/reactos/dll/directx/ddraw/CMakeLists.txt branches/ros-csrss/dll/win32/propsys/ (props changed) - copied from r58606, trunk/reactos/dll/win32/propsys/ branches/ros-csrss/dll/win32/urlmon/axinstall.c - copied unchanged from r58606, trunk/reactos/dll/win32/urlmon/axinstall.c branches/ros-csrss/dll/win32/urlmon/resource.h - copied unchanged from r58606, trunk/reactos/dll/win32/urlmon/resource.h branches/ros-csrss/dll/win32/urlmon/urlmon.rc - copied unchanged from r58606, trunk/reactos/dll/win32/urlmon/urlmon.rc branches/ros-csrss/dll/win32/urlmon/urlmon_urlmon.rgs - copied unchanged from r58606, trunk/reactos/dll/win32/urlmon/urlmon_urlmon.rgs branches/ros-csrss/hal/halx86/acpi.cmake - copied unchanged from r58606, trunk/reactos/hal/halx86/acpi.cmake branches/ros-csrss/hal/halx86/apic.cmake - copied unchanged from r58606, trunk/reactos/hal/halx86/apic.cmake branches/ros-csrss/hal/halx86/generic.cmake - copied unchanged from r58606, trunk/reactos/hal/halx86/generic.cmake branches/ros-csrss/hal/halx86/legacy.cmake - copied unchanged from r58606, trunk/reactos/hal/halx86/legacy.cmake branches/ros-csrss/hal/halx86/minihal.cmake - copied unchanged from r58606, trunk/reactos/hal/halx86/minihal.cmake branches/ros-csrss/hal/halx86/pcidata.cmake - copied unchanged from r58606, trunk/reactos/hal/halx86/pcidata.cmake branches/ros-csrss/hal/halx86/pic.cmake - copied unchanged from r58606, trunk/reactos/hal/halx86/pic.cmake branches/ros-csrss/hal/halx86/up.cmake - copied unchanged from r58606, trunk/reactos/hal/halx86/up.cmake branches/ros-csrss/win32ss/user/user32/lang/zh-CN.rc - copied unchanged from r58606, trunk/reactos/win32ss/user/user32/lang/zh-CN.rc Removed: branches/ros-csrss/dll/win32/urlmon/protproxy.c branches/ros-csrss/dll/win32/urlmon/rsrc.rc branches/ros-csrss/dll/win32/urlmon/version.rc Modified: branches/ros-csrss/ (props changed) branches/ros-csrss/base/applications/cacls/lang/ja-JP.rc branches/ros-csrss/base/applications/cmdutils/doskey/doskey.rc branches/ros-csrss/base/applications/dxdiag/rsrc.rc branches/ros-csrss/base/applications/fontview/fontview.rc branches/ros-csrss/base/applications/games/solitaire/lang/ja-JP.rc branches/ros-csrss/base/applications/games/solitaire/lang/tr-TR.rc branches/ros-csrss/base/applications/games/spider/lang/ja-JP.rc branches/ros-csrss/base/applications/games/spider/lang/tr-TR.rc branches/ros-csrss/base/applications/games/winmine/lang/tr-TR.rc branches/ros-csrss/base/applications/logoff/lang/ja-JP.rc branches/ros-csrss/base/applications/magnify/rsrc.rc branches/ros-csrss/base/applications/mplay32/rsrc.rc branches/ros-csrss/base/applications/mscutils/devmgmt/lang/ja-JP.rc branches/ros-csrss/base/applications/mscutils/eventvwr/lang/ja-JP.rc branches/ros-csrss/base/applications/mscutils/servman/lang/ja-JP.rc branches/ros-csrss/base/applications/mspaint/lang/ja-JP.rc branches/ros-csrss/base/applications/mspaint/rsrc.rc branches/ros-csrss/base/applications/mstsc/lang/ja-JP.rc branches/ros-csrss/base/applications/network/wlanconf/wlanconf.rc branches/ros-csrss/base/applications/notepad/lang/ja-JP.rc branches/ros-csrss/base/applications/notepad/lang/tr-TR.rc branches/ros-csrss/base/applications/regedit/lang/it-IT.rc branches/ros-csrss/base/applications/regedit/lang/ja-JP.rc branches/ros-csrss/base/applications/regedit/rsrc.rc branches/ros-csrss/base/applications/shutdown/lang/it-IT.rc branches/ros-csrss/base/applications/sndrec32/lang/en-US.rc branches/ros-csrss/base/applications/sndrec32/rsrc.rc branches/ros-csrss/base/applications/sndvol32/lang/ja-JP.rc branches/ros-csrss/base/applications/taskmgr/lang/ja-JP.rc branches/ros-csrss/base/applications/wordpad/En.rc branches/ros-csrss/base/applications/wordpad/Tr.rc branches/ros-csrss/base/applications/wordpad/rsrc.rc branches/ros-csrss/base/applications/write/rsrc.rc branches/ros-csrss/base/shell/cmd/copy.c branches/ros-csrss/base/shell/cmd/echo.c branches/ros-csrss/base/shell/cmd/filecomp.c branches/ros-csrss/base/system/regsvr32/lang/ja-JP.rc branches/ros-csrss/base/system/services/database.c branches/ros-csrss/base/system/services/rpcserver.c branches/ros-csrss/base/system/services/services.c branches/ros-csrss/base/system/services/services.h branches/ros-csrss/boot/bootdata/CMakeLists.txt branches/ros-csrss/boot/bootdata/hivedef.inf branches/ros-csrss/boot/freeldr/freeldr/CMakeLists.txt branches/ros-csrss/boot/freeldr/freeldr/arch/amd64/entry.S branches/ros-csrss/boot/freeldr/freeldr/arch/amd64/winldr.c branches/ros-csrss/boot/freeldr/freeldr/debug.c branches/ros-csrss/boot/freeldr/freeldr/include/mm.h branches/ros-csrss/boot/freeldr/freeldr/mm/meminit.c branches/ros-csrss/cmake/CMakeMacros.cmake branches/ros-csrss/cmake/config.cmake branches/ros-csrss/cmake/gcc.cmake branches/ros-csrss/dll/cpl/access/lang/ja-JP.rc branches/ros-csrss/dll/cpl/sysdm/lang/ja-JP.rc branches/ros-csrss/dll/cpl/telephon/lang/ja-JP.rc branches/ros-csrss/dll/cpl/timedate/lang/it-IT.rc branches/ros-csrss/dll/cpl/timedate/rsrc.rc branches/ros-csrss/dll/directx/ksproxy/output_pin.cpp branches/ros-csrss/dll/ntdll/def/ntdll.spec branches/ros-csrss/dll/ntdll/ldr/ldrinit.c branches/ros-csrss/dll/opengl/opengl32/CMakeLists.txt branches/ros-csrss/dll/opengl/opengl32/font.c branches/ros-csrss/dll/opengl/opengl32/opengl32.spec branches/ros-csrss/dll/opengl/opengl32/wgl.c branches/ros-csrss/dll/win32/CMakeLists.txt branches/ros-csrss/dll/win32/kernel32/client/fiber.c branches/ros-csrss/dll/win32/kernel32/client/thread.c branches/ros-csrss/dll/win32/lsasrv/authpackage.c branches/ros-csrss/dll/win32/lsasrv/lsasrv.c branches/ros-csrss/dll/win32/lsasrv/lsasrv.spec branches/ros-csrss/dll/win32/lsasrv/policy.c branches/ros-csrss/dll/win32/msv1_0/CMakeLists.txt branches/ros-csrss/dll/win32/msv1_0/msv1_0.c branches/ros-csrss/dll/win32/msv1_0/msv1_0.h branches/ros-csrss/dll/win32/msv1_0/msv1_0.spec branches/ros-csrss/dll/win32/msxml3/attribute.c branches/ros-csrss/dll/win32/msxml3/cdata.c branches/ros-csrss/dll/win32/msxml3/dispex.c branches/ros-csrss/dll/win32/msxml3/domdoc.c branches/ros-csrss/dll/win32/msxml3/element.c branches/ros-csrss/dll/win32/msxml3/factory.c branches/ros-csrss/dll/win32/msxml3/httprequest.c branches/ros-csrss/dll/win32/msxml3/main.c branches/ros-csrss/dll/win32/msxml3/msxml_private.h branches/ros-csrss/dll/win32/msxml3/mxwriter.c branches/ros-csrss/dll/win32/msxml3/node.c branches/ros-csrss/dll/win32/msxml3/nodelist.c branches/ros-csrss/dll/win32/msxml3/saxreader.c branches/ros-csrss/dll/win32/msxml3/schema.c branches/ros-csrss/dll/win32/msxml3/text.c branches/ros-csrss/dll/win32/msxml3/xmlparser.c branches/ros-csrss/dll/win32/msxml3/xslpattern.l branches/ros-csrss/dll/win32/msxml3/xslpattern.yy.c branches/ros-csrss/dll/win32/netcfgx/lang/ja-JP.rc branches/ros-csrss/dll/win32/netid/lang/ja-JP.rc branches/ros-csrss/dll/win32/newdev/lang/ja-JP.rc branches/ros-csrss/dll/win32/newdev/wizard.c branches/ros-csrss/dll/win32/ole32/compobj.c branches/ros-csrss/dll/win32/ole32/compositemoniker.c branches/ros-csrss/dll/win32/ole32/defaulthandler.c branches/ros-csrss/dll/win32/ole32/moniker.c branches/ros-csrss/dll/win32/ole32/ole2.c branches/ros-csrss/dll/win32/ole32/pointermoniker.c branches/ros-csrss/dll/win32/ole32/rpc.c branches/ros-csrss/dll/win32/ole32/storage32.c branches/ros-csrss/dll/win32/ole32/usrmarshal.c branches/ros-csrss/dll/win32/oleaut32/connpt.h branches/ros-csrss/dll/win32/oleaut32/oleaut.c branches/ros-csrss/dll/win32/oleaut32/olepicture.c branches/ros-csrss/dll/win32/oleaut32/olepropframe.c branches/ros-csrss/dll/win32/oleaut32/recinfo.c branches/ros-csrss/dll/win32/oleaut32/tmarshal.c branches/ros-csrss/dll/win32/oleaut32/typelib.c branches/ros-csrss/dll/win32/oleaut32/typelib.h branches/ros-csrss/dll/win32/oleaut32/typelib2.c branches/ros-csrss/dll/win32/oleaut32/varformat.c branches/ros-csrss/dll/win32/oleaut32/variant.c branches/ros-csrss/dll/win32/oleaut32/variant.h branches/ros-csrss/dll/win32/oleaut32/vartype.c branches/ros-csrss/dll/win32/samsrv/samrpc.c branches/ros-csrss/dll/win32/shell32/CMakeLists.txt branches/ros-csrss/dll/win32/shlwapi/istream.c branches/ros-csrss/dll/win32/shlwapi/ordinal.c branches/ros-csrss/dll/win32/shlwapi/path.c branches/ros-csrss/dll/win32/shlwapi/reg.c branches/ros-csrss/dll/win32/shlwapi/shlwapi.rc branches/ros-csrss/dll/win32/shlwapi/shlwapi.spec branches/ros-csrss/dll/win32/shlwapi/string.c branches/ros-csrss/dll/win32/shlwapi/thread.c branches/ros-csrss/dll/win32/shlwapi/url.c branches/ros-csrss/dll/win32/syssetup/lang/ja-JP.rc branches/ros-csrss/dll/win32/urlmon/CMakeLists.txt branches/ros-csrss/dll/win32/urlmon/bindctx.c branches/ros-csrss/dll/win32/urlmon/binding.c branches/ros-csrss/dll/win32/urlmon/bindprot.c branches/ros-csrss/dll/win32/urlmon/download.c branches/ros-csrss/dll/win32/urlmon/file.c branches/ros-csrss/dll/win32/urlmon/ftp.c branches/ros-csrss/dll/win32/urlmon/http.c branches/ros-csrss/dll/win32/urlmon/internet.c branches/ros-csrss/dll/win32/urlmon/mk.c branches/ros-csrss/dll/win32/urlmon/protocol.c branches/ros-csrss/dll/win32/urlmon/sec_mgr.c branches/ros-csrss/dll/win32/urlmon/session.c branches/ros-csrss/dll/win32/urlmon/umon.c branches/ros-csrss/dll/win32/urlmon/umstream.c branches/ros-csrss/dll/win32/urlmon/uri.c branches/ros-csrss/dll/win32/urlmon/urlmon.spec branches/ros-csrss/dll/win32/urlmon/urlmon_main.c branches/ros-csrss/dll/win32/urlmon/urlmon_main.h branches/ros-csrss/dll/win32/urlmon/urlmon_urlmon.idl branches/ros-csrss/dll/win32/urlmon/usrmarshal.c branches/ros-csrss/dll/win32/userenv/lang/it-IT.rc branches/ros-csrss/dll/win32/windowscodecs/jpegformat.c branches/ros-csrss/drivers/usb/usbehci/ (props changed) branches/ros-csrss/drivers/usb/usbehci/hardware.cpp branches/ros-csrss/drivers/usb/usbehci/usb_queue.cpp branches/ros-csrss/drivers/usb/usbohci/ (props changed) branches/ros-csrss/drivers/usb/usbohci/hardware.cpp branches/ros-csrss/drivers/usb/usbohci/usb_request.cpp branches/ros-csrss/drivers/usb/usbstor/descriptor.c branches/ros-csrss/drivers/usb/usbstor/error.c branches/ros-csrss/drivers/usb/usbstor/fdo.c branches/ros-csrss/drivers/usb/usbstor/pdo.c branches/ros-csrss/drivers/usb/usbuhci/hardware.cpp branches/ros-csrss/hal/halx86/CMakeLists.txt branches/ros-csrss/include/asm/genincdata.c branches/ros-csrss/include/crt/mbstring.h branches/ros-csrss/include/crt/msc/intrin.h branches/ros-csrss/include/crt/sys/stat.h branches/ros-csrss/include/crt/sys/timeb.h branches/ros-csrss/include/ddk/ntsam.h branches/ros-csrss/include/ddk/ntstrsafe.h branches/ros-csrss/include/ddk/usbbusif.h branches/ros-csrss/include/ddk/wdm.h branches/ros-csrss/include/ndk/mmtypes.h branches/ros-csrss/include/ndk/obfuncs.h branches/ros-csrss/include/ndk/rtlfuncs.h branches/ros-csrss/include/psdk/propvarutil.h branches/ros-csrss/include/psdk/sal.h branches/ros-csrss/include/psdk/sal_old.h branches/ros-csrss/include/psdk/urlmon.idl branches/ros-csrss/include/xdk/kefuncs.h branches/ros-csrss/include/xdk/ketypes.h branches/ros-csrss/lib/drivers/libusb/hcd_controller.cpp (contents, props changed) branches/ros-csrss/lib/drivers/libusb/hub_controller.cpp (contents, props changed) branches/ros-csrss/lib/drivers/libusb/usb_device.cpp (contents, props changed) branches/ros-csrss/lib/rtl/actctx.c branches/ros-csrss/lib/sdk/uuid/otherguids.c branches/ros-csrss/media/doc/README.WINE branches/ros-csrss/tools/geninc/geninc.c branches/ros-csrss/tools/mkhive/reginf.c branches/ros-csrss/tools/mkhive/registry.c branches/ros-csrss/tools/mkshelllink/mkshelllink.c branches/ros-csrss/tools/obj2bin/obj2bin.c branches/ros-csrss/tools/rsym/rsym.c branches/ros-csrss/win32ss/gdi/eng/floatobj.h branches/ros-csrss/win32ss/gdi/eng/mapping.c branches/ros-csrss/win32ss/gdi/gdi32/main/dllmain.c branches/ros-csrss/win32ss/gdi/ntgdi/freetype.c branches/ros-csrss/win32ss/gdi/ntgdi/palette.c branches/ros-csrss/win32ss/include/ntuser.h branches/ros-csrss/win32ss/user/ntuser/focus.c branches/ros-csrss/win32ss/user/ntuser/focus.h branches/ros-csrss/win32ss/user/ntuser/message.c branches/ros-csrss/win32ss/user/ntuser/simplecall.c branches/ros-csrss/win32ss/user/user32/lang/en-US.rc branches/ros-csrss/win32ss/user/user32/user32.rc branches/ros-csrss/win32ss/user/user32/windows/nonclient.c [This mail would be too long, it was shortened to contain the URLs only.] Modified: branches/ros-csrss/base/applications/cacls/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/base/applications/cac… Modified: branches/ros-csrss/base/applications/cmdutils/doskey/doskey.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/base/applications/cmd… Modified: branches/ros-csrss/base/applications/dxdiag/rsrc.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/base/applications/dxd… Modified: branches/ros-csrss/base/applications/fontview/fontview.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/base/applications/fon… Modified: branches/ros-csrss/base/applications/games/solitaire/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/base/applications/gam… Modified: branches/ros-csrss/base/applications/games/solitaire/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/base/applications/gam… Modified: branches/ros-csrss/base/applications/games/spider/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/base/applications/gam… Modified: branches/ros-csrss/base/applications/games/spider/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/base/applications/gam… Modified: branches/ros-csrss/base/applications/games/winmine/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/base/applications/gam… Modified: branches/ros-csrss/base/applications/logoff/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/base/applications/log… Modified: branches/ros-csrss/base/applications/magnify/rsrc.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/base/applications/mag… Modified: branches/ros-csrss/base/applications/mplay32/rsrc.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/base/applications/mpl… Modified: branches/ros-csrss/base/applications/mscutils/devmgmt/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/base/applications/msc… Modified: branches/ros-csrss/base/applications/mscutils/eventvwr/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/base/applications/msc… Modified: branches/ros-csrss/base/applications/mscutils/servman/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/base/applications/msc… Modified: branches/ros-csrss/base/applications/mspaint/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/base/applications/msp… Modified: branches/ros-csrss/base/applications/mspaint/rsrc.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/base/applications/msp… Modified: branches/ros-csrss/base/applications/mstsc/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/base/applications/mst… Modified: branches/ros-csrss/base/applications/network/wlanconf/wlanconf.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/base/applications/net… Modified: branches/ros-csrss/base/applications/notepad/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/base/applications/not… Modified: branches/ros-csrss/base/applications/notepad/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/base/applications/not… Modified: branches/ros-csrss/base/applications/regedit/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/base/applications/reg… Modified: branches/ros-csrss/base/applications/regedit/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/base/applications/reg… Modified: branches/ros-csrss/base/applications/regedit/rsrc.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/base/applications/reg… Modified: branches/ros-csrss/base/applications/shutdown/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/base/applications/shu… Modified: branches/ros-csrss/base/applications/sndrec32/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/base/applications/snd… Modified: branches/ros-csrss/base/applications/sndrec32/rsrc.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/base/applications/snd… Modified: branches/ros-csrss/base/applications/sndvol32/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/base/applications/snd… Modified: branches/ros-csrss/base/applications/taskmgr/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/base/applications/tas… Modified: branches/ros-csrss/base/applications/wordpad/En.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/base/applications/wor… Modified: branches/ros-csrss/base/applications/wordpad/Tr.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/base/applications/wor… Modified: branches/ros-csrss/base/applications/wordpad/rsrc.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/base/applications/wor… Modified: branches/ros-csrss/base/applications/write/rsrc.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/base/applications/wri… Modified: branches/ros-csrss/base/shell/cmd/copy.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/base/shell/cmd/copy.c… Modified: branches/ros-csrss/base/shell/cmd/echo.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/base/shell/cmd/echo.c… Modified: branches/ros-csrss/base/shell/cmd/filecomp.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/base/shell/cmd/fileco… Modified: branches/ros-csrss/base/system/regsvr32/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/base/system/regsvr32/… Modified: branches/ros-csrss/base/system/services/database.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/base/system/services/… Modified: branches/ros-csrss/base/system/services/rpcserver.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/base/system/services/… Modified: branches/ros-csrss/base/system/services/services.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/base/system/services/… Modified: branches/ros-csrss/base/system/services/services.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/base/system/services/… Modified: branches/ros-csrss/boot/bootdata/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/boot/bootdata/CMakeLi… Modified: branches/ros-csrss/boot/bootdata/hivedef.inf URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/boot/bootdata/hivedef… Modified: branches/ros-csrss/boot/freeldr/freeldr/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/boot/freeldr/freeldr/… Modified: branches/ros-csrss/boot/freeldr/freeldr/arch/amd64/entry.S URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/boot/freeldr/freeldr/… Modified: branches/ros-csrss/boot/freeldr/freeldr/arch/amd64/winldr.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/boot/freeldr/freeldr/… Modified: branches/ros-csrss/boot/freeldr/freeldr/debug.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/boot/freeldr/freeldr/… Modified: branches/ros-csrss/boot/freeldr/freeldr/include/mm.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/boot/freeldr/freeldr/… Modified: branches/ros-csrss/boot/freeldr/freeldr/mm/meminit.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/boot/freeldr/freeldr/… Modified: branches/ros-csrss/cmake/CMakeMacros.cmake URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/cmake/CMakeMacros.cma… Modified: branches/ros-csrss/cmake/config.cmake URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/cmake/config.cmake?re… Modified: branches/ros-csrss/cmake/gcc.cmake URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/cmake/gcc.cmake?rev=5… Modified: branches/ros-csrss/dll/cpl/access/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/cpl/access/lang/j… Modified: branches/ros-csrss/dll/cpl/sysdm/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/cpl/sysdm/lang/ja… Modified: branches/ros-csrss/dll/cpl/telephon/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/cpl/telephon/lang… Modified: branches/ros-csrss/dll/cpl/timedate/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/cpl/timedate/lang… Modified: branches/ros-csrss/dll/cpl/timedate/rsrc.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/cpl/timedate/rsrc… Modified: branches/ros-csrss/dll/directx/ksproxy/output_pin.cpp URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/directx/ksproxy/o… Modified: branches/ros-csrss/dll/ntdll/def/ntdll.spec URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/ntdll/def/ntdll.s… Modified: branches/ros-csrss/dll/ntdll/ldr/ldrinit.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/ntdll/ldr/ldrinit… Modified: branches/ros-csrss/dll/opengl/opengl32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/opengl/opengl32/C… Modified: branches/ros-csrss/dll/opengl/opengl32/font.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/opengl/opengl32/f… Modified: branches/ros-csrss/dll/opengl/opengl32/opengl32.spec URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/opengl/opengl32/o… Modified: branches/ros-csrss/dll/opengl/opengl32/wgl.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/opengl/opengl32/w… Modified: branches/ros-csrss/dll/win32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/CMakeLists.… Modified: branches/ros-csrss/dll/win32/kernel32/client/fiber.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/kernel32/cl… Modified: branches/ros-csrss/dll/win32/kernel32/client/thread.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/kernel32/cl… Modified: branches/ros-csrss/dll/win32/lsasrv/authpackage.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/lsasrv/auth… Modified: branches/ros-csrss/dll/win32/lsasrv/lsasrv.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/lsasrv/lsas… Modified: branches/ros-csrss/dll/win32/lsasrv/lsasrv.spec URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/lsasrv/lsas… Modified: branches/ros-csrss/dll/win32/lsasrv/policy.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/lsasrv/poli… Modified: branches/ros-csrss/dll/win32/msv1_0/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/msv1_0/CMak… Modified: branches/ros-csrss/dll/win32/msv1_0/msv1_0.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/msv1_0/msv1… Modified: branches/ros-csrss/dll/win32/msv1_0/msv1_0.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/msv1_0/msv1… Modified: branches/ros-csrss/dll/win32/msv1_0/msv1_0.spec URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/msv1_0/msv1… Modified: branches/ros-csrss/dll/win32/msxml3/attribute.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/msxml3/attr… Modified: branches/ros-csrss/dll/win32/msxml3/cdata.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/msxml3/cdat… Modified: branches/ros-csrss/dll/win32/msxml3/dispex.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/msxml3/disp… Modified: branches/ros-csrss/dll/win32/msxml3/domdoc.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/msxml3/domd… Modified: branches/ros-csrss/dll/win32/msxml3/element.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/msxml3/elem… Modified: branches/ros-csrss/dll/win32/msxml3/factory.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/msxml3/fact… Modified: branches/ros-csrss/dll/win32/msxml3/httprequest.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/msxml3/http… Modified: branches/ros-csrss/dll/win32/msxml3/main.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/msxml3/main… Modified: branches/ros-csrss/dll/win32/msxml3/msxml_private.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/msxml3/msxm… Modified: branches/ros-csrss/dll/win32/msxml3/mxwriter.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/msxml3/mxwr… Modified: branches/ros-csrss/dll/win32/msxml3/node.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/msxml3/node… Modified: branches/ros-csrss/dll/win32/msxml3/nodelist.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/msxml3/node… Modified: branches/ros-csrss/dll/win32/msxml3/saxreader.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/msxml3/saxr… Modified: branches/ros-csrss/dll/win32/msxml3/schema.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/msxml3/sche… Modified: branches/ros-csrss/dll/win32/msxml3/text.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/msxml3/text… Modified: branches/ros-csrss/dll/win32/msxml3/xmlparser.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/msxml3/xmlp… Modified: branches/ros-csrss/dll/win32/msxml3/xslpattern.l URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/msxml3/xslp… Modified: branches/ros-csrss/dll/win32/msxml3/xslpattern.yy.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/msxml3/xslp… Modified: branches/ros-csrss/dll/win32/netcfgx/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/netcfgx/lan… Modified: branches/ros-csrss/dll/win32/netid/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/netid/lang/… Modified: branches/ros-csrss/dll/win32/newdev/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/newdev/lang… Modified: branches/ros-csrss/dll/win32/newdev/wizard.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/newdev/wiza… Modified: branches/ros-csrss/dll/win32/ole32/compobj.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/ole32/compo… Modified: branches/ros-csrss/dll/win32/ole32/compositemoniker.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/ole32/compo… Modified: branches/ros-csrss/dll/win32/ole32/defaulthandler.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/ole32/defau… Modified: branches/ros-csrss/dll/win32/ole32/moniker.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/ole32/monik… Modified: branches/ros-csrss/dll/win32/ole32/ole2.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/ole32/ole2.… Modified: branches/ros-csrss/dll/win32/ole32/pointermoniker.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/ole32/point… Modified: branches/ros-csrss/dll/win32/ole32/rpc.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/ole32/rpc.c… Modified: branches/ros-csrss/dll/win32/ole32/storage32.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/ole32/stora… Modified: branches/ros-csrss/dll/win32/ole32/usrmarshal.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/ole32/usrma… Modified: branches/ros-csrss/dll/win32/oleaut32/connpt.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/oleaut32/co… Modified: branches/ros-csrss/dll/win32/oleaut32/oleaut.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/oleaut32/ol… Modified: branches/ros-csrss/dll/win32/oleaut32/olepicture.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/oleaut32/ol… Modified: branches/ros-csrss/dll/win32/oleaut32/olepropframe.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/oleaut32/ol… Modified: branches/ros-csrss/dll/win32/oleaut32/recinfo.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/oleaut32/re… Modified: branches/ros-csrss/dll/win32/oleaut32/tmarshal.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/oleaut32/tm… Modified: branches/ros-csrss/dll/win32/oleaut32/typelib.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/oleaut32/ty… Modified: branches/ros-csrss/dll/win32/oleaut32/typelib.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/oleaut32/ty… Modified: branches/ros-csrss/dll/win32/oleaut32/typelib2.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/oleaut32/ty… Modified: branches/ros-csrss/dll/win32/oleaut32/varformat.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/oleaut32/va… Modified: branches/ros-csrss/dll/win32/oleaut32/variant.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/oleaut32/va… Modified: branches/ros-csrss/dll/win32/oleaut32/variant.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/oleaut32/va… Modified: branches/ros-csrss/dll/win32/oleaut32/vartype.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/oleaut32/va… Modified: branches/ros-csrss/dll/win32/samsrv/samrpc.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/samsrv/samr… Modified: branches/ros-csrss/dll/win32/shell32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/shell32/CMa… Modified: branches/ros-csrss/dll/win32/shlwapi/istream.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/shlwapi/ist… Modified: branches/ros-csrss/dll/win32/shlwapi/ordinal.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/shlwapi/ord… Modified: branches/ros-csrss/dll/win32/shlwapi/path.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/shlwapi/pat… Modified: branches/ros-csrss/dll/win32/shlwapi/reg.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/shlwapi/reg… Modified: branches/ros-csrss/dll/win32/shlwapi/shlwapi.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/shlwapi/shl… Modified: branches/ros-csrss/dll/win32/shlwapi/shlwapi.spec URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/shlwapi/shl… Modified: branches/ros-csrss/dll/win32/shlwapi/string.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/shlwapi/str… Modified: branches/ros-csrss/dll/win32/shlwapi/thread.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/shlwapi/thr… Modified: branches/ros-csrss/dll/win32/shlwapi/url.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/shlwapi/url… Modified: branches/ros-csrss/dll/win32/syssetup/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/syssetup/la… Modified: branches/ros-csrss/dll/win32/urlmon/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/urlmon/CMak… Modified: branches/ros-csrss/dll/win32/urlmon/bindctx.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/urlmon/bind… Modified: branches/ros-csrss/dll/win32/urlmon/binding.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/urlmon/bind… Modified: branches/ros-csrss/dll/win32/urlmon/bindprot.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/urlmon/bind… Modified: branches/ros-csrss/dll/win32/urlmon/download.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/urlmon/down… Modified: branches/ros-csrss/dll/win32/urlmon/file.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/urlmon/file… Modified: branches/ros-csrss/dll/win32/urlmon/ftp.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/urlmon/ftp.… Modified: branches/ros-csrss/dll/win32/urlmon/http.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/urlmon/http… Modified: branches/ros-csrss/dll/win32/urlmon/internet.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/urlmon/inte… Modified: branches/ros-csrss/dll/win32/urlmon/mk.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/urlmon/mk.c… Modified: branches/ros-csrss/dll/win32/urlmon/protocol.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/urlmon/prot… Removed: branches/ros-csrss/dll/win32/urlmon/protproxy.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/urlmon/prot… Removed: branches/ros-csrss/dll/win32/urlmon/rsrc.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/urlmon/rsrc… Modified: branches/ros-csrss/dll/win32/urlmon/sec_mgr.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/urlmon/sec_… Modified: branches/ros-csrss/dll/win32/urlmon/session.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/urlmon/sess… Modified: branches/ros-csrss/dll/win32/urlmon/umon.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/urlmon/umon… Modified: branches/ros-csrss/dll/win32/urlmon/umstream.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/urlmon/umst… Modified: branches/ros-csrss/dll/win32/urlmon/uri.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/urlmon/uri.… Modified: branches/ros-csrss/dll/win32/urlmon/urlmon.spec URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/urlmon/urlm… Modified: branches/ros-csrss/dll/win32/urlmon/urlmon_main.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/urlmon/urlm… Modified: branches/ros-csrss/dll/win32/urlmon/urlmon_main.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/urlmon/urlm… Modified: branches/ros-csrss/dll/win32/urlmon/urlmon_urlmon.idl URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/urlmon/urlm… Modified: branches/ros-csrss/dll/win32/urlmon/usrmarshal.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/urlmon/usrm… Removed: branches/ros-csrss/dll/win32/urlmon/version.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/urlmon/vers… Modified: branches/ros-csrss/dll/win32/userenv/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/userenv/lan… Modified: branches/ros-csrss/dll/win32/windowscodecs/jpegformat.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/windowscode… Modified: branches/ros-csrss/drivers/usb/usbehci/hardware.cpp URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/drivers/usb/usbehci/h… Modified: branches/ros-csrss/drivers/usb/usbehci/usb_queue.cpp URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/drivers/usb/usbehci/u… Modified: branches/ros-csrss/drivers/usb/usbohci/hardware.cpp URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/drivers/usb/usbohci/h… Modified: branches/ros-csrss/drivers/usb/usbohci/usb_request.cpp URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/drivers/usb/usbohci/u… Modified: branches/ros-csrss/drivers/usb/usbstor/descriptor.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/drivers/usb/usbstor/d… Modified: branches/ros-csrss/drivers/usb/usbstor/error.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/drivers/usb/usbstor/e… Modified: branches/ros-csrss/drivers/usb/usbstor/fdo.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/drivers/usb/usbstor/f… Modified: branches/ros-csrss/drivers/usb/usbstor/pdo.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/drivers/usb/usbstor/p… Modified: branches/ros-csrss/drivers/usb/usbuhci/hardware.cpp URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/drivers/usb/usbuhci/h… Modified: branches/ros-csrss/hal/halx86/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/hal/halx86/CMakeLists… Modified: branches/ros-csrss/include/asm/genincdata.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/include/asm/genincdat… Modified: branches/ros-csrss/include/crt/mbstring.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/include/crt/mbstring.… Modified: branches/ros-csrss/include/crt/msc/intrin.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/include/crt/msc/intri… Modified: branches/ros-csrss/include/crt/sys/stat.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/include/crt/sys/stat.… Modified: branches/ros-csrss/include/crt/sys/timeb.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/include/crt/sys/timeb… Modified: branches/ros-csrss/include/ddk/ntsam.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/include/ddk/ntsam.h?r… Modified: branches/ros-csrss/include/ddk/ntstrsafe.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/include/ddk/ntstrsafe… Modified: branches/ros-csrss/include/ddk/usbbusif.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/include/ddk/usbbusif.… Modified: branches/ros-csrss/include/ddk/wdm.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/include/ddk/wdm.h?rev… Modified: branches/ros-csrss/include/ndk/mmtypes.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/include/ndk/mmtypes.h… Modified: branches/ros-csrss/include/ndk/obfuncs.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/include/ndk/obfuncs.h… Modified: branches/ros-csrss/include/ndk/rtlfuncs.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/include/ndk/rtlfuncs.… Modified: branches/ros-csrss/include/psdk/propvarutil.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/include/psdk/propvaru… Modified: branches/ros-csrss/include/psdk/sal.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/include/psdk/sal.h?re… Modified: branches/ros-csrss/include/psdk/sal_old.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/include/psdk/sal_old.… Modified: branches/ros-csrss/include/psdk/urlmon.idl URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/include/psdk/urlmon.i… Modified: branches/ros-csrss/include/xdk/kefuncs.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/include/xdk/kefuncs.h… Modified: branches/ros-csrss/include/xdk/ketypes.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/include/xdk/ketypes.h… Modified: branches/ros-csrss/lib/drivers/libusb/hcd_controller.cpp URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/lib/drivers/libusb/hc… Modified: branches/ros-csrss/lib/drivers/libusb/hub_controller.cpp URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/lib/drivers/libusb/hu… Modified: branches/ros-csrss/lib/drivers/libusb/usb_device.cpp URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/lib/drivers/libusb/us… Modified: branches/ros-csrss/lib/rtl/actctx.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/lib/rtl/actctx.c?rev=… Modified: branches/ros-csrss/lib/sdk/uuid/otherguids.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/lib/sdk/uuid/othergui… Modified: branches/ros-csrss/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/media/doc/README.WINE… Modified: branches/ros-csrss/tools/geninc/geninc.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/tools/geninc/geninc.c… Modified: branches/ros-csrss/tools/mkhive/reginf.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/tools/mkhive/reginf.c… Modified: branches/ros-csrss/tools/mkhive/registry.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/tools/mkhive/registry… Modified: branches/ros-csrss/tools/mkshelllink/mkshelllink.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/tools/mkshelllink/mks… Modified: branches/ros-csrss/tools/obj2bin/obj2bin.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/tools/obj2bin/obj2bin… Modified: branches/ros-csrss/tools/rsym/rsym.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/tools/rsym/rsym.c?rev… Modified: branches/ros-csrss/win32ss/gdi/eng/floatobj.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/gdi/eng/float… Modified: branches/ros-csrss/win32ss/gdi/eng/mapping.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/gdi/eng/mappi… Modified: branches/ros-csrss/win32ss/gdi/gdi32/main/dllmain.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/gdi/gdi32/mai… Modified: branches/ros-csrss/win32ss/gdi/ntgdi/freetype.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/gdi/ntgdi/fre… Modified: branches/ros-csrss/win32ss/gdi/ntgdi/palette.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/gdi/ntgdi/pal… Modified: branches/ros-csrss/win32ss/include/ntuser.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/include/ntuse… Modified: branches/ros-csrss/win32ss/user/ntuser/focus.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/ntuser/f… Modified: branches/ros-csrss/win32ss/user/ntuser/focus.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/ntuser/f… Modified: branches/ros-csrss/win32ss/user/ntuser/message.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/ntuser/m… Modified: branches/ros-csrss/win32ss/user/ntuser/simplecall.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/ntuser/s… Modified: branches/ros-csrss/win32ss/user/user32/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/user32/l… Modified: branches/ros-csrss/win32ss/user/user32/user32.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/user32/u… Modified: branches/ros-csrss/win32ss/user/user32/windows/nonclient.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/user32/w…

11 years, 9 months

[tkreuzer] 58606: [FREELDR] - Set bugcheck data when the image is corrupt - Add 2 more useful debug constants: DEBUG_WARN and DEBUG_ERR - Use COM2 for debug output when _WINKD_ is defined - Fix amd...

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Sun Mar 24 17:09:03 2013 New Revision: 58606 URL: http://svn.reactos.org/svn/reactos?rev=58606&view=rev Log: [FREELDR] - Set bugcheck data when the image is corrupt - Add 2 more useful debug constants: DEBUG_WARN and DEBUG_ERR - Use COM2 for debug output when _WINKD_ is defined - Fix amd64 boot Modified: trunk/reactos/boot/freeldr/freeldr/arch/amd64/winldr.c trunk/reactos/boot/freeldr/freeldr/debug.c trunk/reactos/boot/freeldr/freeldr/include/mm.h trunk/reactos/boot/freeldr/freeldr/mm/meminit.c Modified: trunk/reactos/boot/freeldr/freeldr/arch/amd64/winldr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/amd64/winldr.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/amd64/winldr.c [iso-8859-1] Sun Mar 24 17:09:03 2013 @@ -269,6 +269,7 @@ { PKGDTENTRY64 Entry; KDESCRIPTOR GdtDesc; + TRACE("Amd64SetupGdt(GdtBase = %p, TssBase = %p)\n", GdtBase, TssBase); /* Setup KGDT64_NULL */ Entry = KiGetGdtEntry(GdtBase, KGDT64_NULL); @@ -308,20 +309,22 @@ /* Set the new Gdt */ __lgdt(&GdtDesc.Limit); - TRACE("Gdtr.Base = %p, num = %ld\n", GdtDesc.Base, NUM_GDT); - + TRACE("Leave Amd64SetupGdt()\n"); } VOID Amd64SetupIdt(PVOID IdtBase) { KDESCRIPTOR IdtDesc, OldIdt; + ULONG Size; + TRACE("Amd64SetupIdt(IdtBase = %p)\n", IdtBase); /* Get old IDT */ - __sidt(&OldIdt); + __sidt(&OldIdt.Limit); /* Copy the old IDT */ - RtlCopyMemory(IdtBase, (PVOID)OldIdt.Base, OldIdt.Limit + 1); + Size = min(OldIdt.Limit + 1, NUM_IDT * sizeof(KIDTENTRY)); + //RtlCopyMemory(IdtBase, (PVOID)OldIdt.Base, Size); /* Setup the new IDT descriptor */ IdtDesc.Base = IdtBase; @@ -329,8 +332,7 @@ /* Set the new IDT */ __lidt(&IdtDesc.Limit); - TRACE("Idtr.Base = %p\n", IdtDesc.Base); - + TRACE("Leave Amd64SetupIdt()\n"); } VOID @@ -354,7 +356,7 @@ Amd64SetupGdt(GdtIdt, KSEG0_BASE | (TssBasePage << MM_PAGE_SHIFT)); /* Copy old Idt and set idtr */ - Amd64SetupIdt((PVOID)((ULONG64)GdtIdt + 2048)); // HACK! + Amd64SetupIdt((PVOID)((ULONG64)GdtIdt + NUM_GDT * sizeof(KGDTENTRY))); /* LDT is unused */ // __lldt(0); @@ -390,7 +392,7 @@ TssBasePage = Tss >> MM_PAGE_SHIFT; /* Allocate space for new GDT + IDT */ - BlockSize = NUM_GDT*sizeof(KGDTENTRY) + NUM_IDT*sizeof(KIDTENTRY);//FIXME: Use GDT/IDT limits here? + BlockSize = NUM_GDT * sizeof(KGDTENTRY) + NUM_IDT * sizeof(KIDTENTRY); NumPages = (BlockSize + MM_PAGE_SIZE - 1) >> MM_PAGE_SHIFT; GdtIdt = (PKGDTENTRY)MmAllocateMemoryWithType(NumPages * MM_PAGE_SIZE, LoaderMemoryData); if (GdtIdt == NULL) Modified: trunk/reactos/boot/freeldr/freeldr/debug.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/debug… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/debug.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/debug.c [iso-8859-1] Sun Mar 24 17:09:03 2013 @@ -24,6 +24,8 @@ #if DBG && !defined(_M_ARM) //#define DEBUG_ALL +//#define DEBUG_WARN +//#define DEBUG_ERR //#define DEBUG_INIFILE //#define DEBUG_REACTOS //#define DEBUG_CUSTOM @@ -49,7 +51,12 @@ //ULONG DebugPort = SCREEN; //ULONG DebugPort = BOCHS; //ULONG DebugPort = SCREEN|BOCHS; +#ifdef _WINKD_ +/* COM1 is the WinDbg port */ +ULONG ComPort = COM2; +#else ULONG ComPort = COM1; +#endif //ULONG BaudRate = 19200; ULONG BaudRate = 115200; @@ -59,6 +66,10 @@ { #if defined (DEBUG_ALL) memset(DbgChannels, MAX_LEVEL, DBG_CHANNELS_COUNT); +#elif defined (DEBUG_WARN) + memset(DbgChannels, WARN_LEVEL|FIXME_LEVEL|ERR_LEVEL, DBG_CHANNELS_COUNT); +#elif defined (DEBUG_ERR) + memset(DbgChannels, ERR_LEVEL, DBG_CHANNELS_COUNT); #else memset(DbgChannels, 0, DBG_CHANNELS_COUNT); #endif Modified: trunk/reactos/boot/freeldr/freeldr/include/mm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/inclu… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/include/mm.h [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/include/mm.h [iso-8859-1] Sun Mar 24 17:09:03 2013 @@ -23,7 +23,12 @@ #ifdef __GNUC__ #define FREELDR_SECTION_COUNT 3 #else +#ifdef _M_AMD64 +/* .text and .pdata */ +#define FREELDR_SECTION_COUNT 2 +#else #define FREELDR_SECTION_COUNT 1 +#endif #endif typedef struct _FREELDR_MEMORY_DESCRIPTOR Modified: trunk/reactos/boot/freeldr/freeldr/mm/meminit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/mm/me… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/mm/meminit.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/mm/meminit.c [iso-8859-1] Sun Mar 24 17:09:03 2013 @@ -174,7 +174,7 @@ NtHeaders = RtlImageNtHeader(&__ImageBase); if (!NtHeaders) { - ERR("Coult not get NtHeaders!\n"); + ERR("Could not get NtHeaders!\n"); return FALSE; } @@ -184,8 +184,14 @@ (FileHeader->NumberOfSections != FREELDR_SECTION_COUNT) || (FileHeader->PointerToSymbolTable != 0) || (FileHeader->NumberOfSymbols != 0) || - (FileHeader->SizeOfOptionalHeader != 0xE0)) - { + (FileHeader->SizeOfOptionalHeader != sizeof(IMAGE_OPTIONAL_HEADER))) + { + ERR("FreeLdr FileHeader is invalid.\n"); + BugCheckInfo[0] = FileHeader->Machine; + BugCheckInfo[1] = FileHeader->NumberOfSections; + BugCheckInfo[2] = FileHeader->PointerToSymbolTable; + BugCheckInfo[3] = FileHeader->NumberOfSymbols; + BugCheckInfo[4] = FileHeader->SizeOfOptionalHeader; return FALSE; } @@ -197,6 +203,12 @@ (OptionalHeader->SizeOfImage > MAX_FREELDR_PE_SIZE) || (OptionalHeader->SectionAlignment != OptionalHeader->FileAlignment)) { + ERR("FreeLdr OptionalHeader is invalid.\n"); + BugCheckInfo[0] = 0x80000000 | (OptionalHeader->Subsystem << 16) | OptionalHeader->Magic; + BugCheckInfo[1] = OptionalHeader->ImageBase; + BugCheckInfo[2] = OptionalHeader->SizeOfImage; + BugCheckInfo[3] = OptionalHeader->SectionAlignment; + BugCheckInfo[4] = OptionalHeader->FileAlignment; return FALSE; }

11 years, 9 months

[hbelusca] 58605: [CONSOLE.DLL-CONSRV] - Further separate properties of the GUI terminal front-end and those independent of the UI. - Fix some console initialization steps.

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sun Mar 24 17:08:10 2013 New Revision: 58605 URL: http://svn.reactos.org/svn/reactos?rev=58605&view=rev Log: [CONSOLE.DLL-CONSRV] - Further separate properties of the GUI terminal front-end and those independent of the UI. - Fix some console initialization steps. Added: branches/ros-csrss/win32ss/user/consrv/consolecpl.h (with props) branches/ros-csrss/win32ss/user/consrv/guisettings.c (with props) branches/ros-csrss/win32ss/user/consrv/guisettings.h (with props) Modified: branches/ros-csrss/dll/cpl/console/CMakeLists.txt branches/ros-csrss/dll/cpl/console/colors.c branches/ros-csrss/dll/cpl/console/console.c branches/ros-csrss/dll/cpl/console/console.h branches/ros-csrss/dll/cpl/console/font.c branches/ros-csrss/dll/cpl/console/layout.c branches/ros-csrss/dll/cpl/console/options.c branches/ros-csrss/dll/win32/kernel32/client/console/console.c branches/ros-csrss/dll/win32/kernel32/client/console/init.c branches/ros-csrss/include/reactos/subsys/win/conmsg.h branches/ros-csrss/win32ss/user/consrv/CMakeLists.txt branches/ros-csrss/win32ss/user/consrv/alias.c branches/ros-csrss/win32ss/user/consrv/conio.h branches/ros-csrss/win32ss/user/consrv/conoutput.c branches/ros-csrss/win32ss/user/consrv/console.c branches/ros-csrss/win32ss/user/consrv/consrv.h branches/ros-csrss/win32ss/user/consrv/consrv.rc branches/ros-csrss/win32ss/user/consrv/guiconsole.c branches/ros-csrss/win32ss/user/consrv/guiconsole.h branches/ros-csrss/win32ss/user/consrv/handle.c branches/ros-csrss/win32ss/user/consrv/settings.c branches/ros-csrss/win32ss/user/consrv/settings.h [This mail would be too long, it was shortened to contain the URLs only.] Modified: branches/ros-csrss/dll/cpl/console/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/cpl/console/CMake… Modified: branches/ros-csrss/dll/cpl/console/colors.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/cpl/console/color… Modified: branches/ros-csrss/dll/cpl/console/console.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/cpl/console/conso… Modified: branches/ros-csrss/dll/cpl/console/console.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/cpl/console/conso… Modified: branches/ros-csrss/dll/cpl/console/font.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/cpl/console/font.… Modified: branches/ros-csrss/dll/cpl/console/layout.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/cpl/console/layou… Modified: branches/ros-csrss/dll/cpl/console/options.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/cpl/console/optio… Modified: branches/ros-csrss/dll/win32/kernel32/client/console/console.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/kernel32/cl… Modified: branches/ros-csrss/dll/win32/kernel32/client/console/init.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/kernel32/cl… Modified: branches/ros-csrss/include/reactos/subsys/win/conmsg.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/include/reactos/subsy… Modified: branches/ros-csrss/win32ss/user/consrv/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/consrv/C… Modified: branches/ros-csrss/win32ss/user/consrv/alias.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/consrv/a… Modified: branches/ros-csrss/win32ss/user/consrv/conio.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/consrv/c… Modified: branches/ros-csrss/win32ss/user/consrv/conoutput.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/consrv/c… Modified: branches/ros-csrss/win32ss/user/consrv/console.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/consrv/c… Added: branches/ros-csrss/win32ss/user/consrv/consolecpl.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/consrv/c… Modified: branches/ros-csrss/win32ss/user/consrv/consrv.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/consrv/c… Modified: branches/ros-csrss/win32ss/user/consrv/consrv.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/consrv/c… Modified: branches/ros-csrss/win32ss/user/consrv/guiconsole.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/consrv/g… Modified: branches/ros-csrss/win32ss/user/consrv/guiconsole.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/consrv/g… Added: branches/ros-csrss/win32ss/user/consrv/guisettings.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/consrv/g… Added: branches/ros-csrss/win32ss/user/consrv/guisettings.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/consrv/g… Modified: branches/ros-csrss/win32ss/user/consrv/handle.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/consrv/h… Modified: branches/ros-csrss/win32ss/user/consrv/settings.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/consrv/s… Modified: branches/ros-csrss/win32ss/user/consrv/settings.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/consrv/s…

11 years, 9 months

[akhaldi] 58604: * Add the PSEH3 related define for the TestBE runs.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sun Mar 24 16:48:09 2013 New Revision: 58604 URL: http://svn.reactos.org/svn/reactos?rev=58604&view=rev Log: * Add the PSEH3 related define for the TestBE runs. 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=58604&… ============================================================================== --- trunk/reactos/cmake/gcc.cmake [iso-8859-1] (original) +++ trunk/reactos/cmake/gcc.cmake [iso-8859-1] Sun Mar 24 16:48:09 2013 @@ -94,6 +94,7 @@ # PSEH if(GCC_VERSION VERSION_GREATER 4.7) set(USE_PSEH3 1) + add_definitions(-D_USE_PSEH3=1) endif() # Other

11 years, 9 months

[akhaldi] 58603: * Use PSEH3 for the TestBE runs.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sun Mar 24 16:08:28 2013 New Revision: 58603 URL: http://svn.reactos.org/svn/reactos?rev=58603&view=rev Log: * Use PSEH3 for the TestBE runs. 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=58603&… ============================================================================== --- trunk/reactos/cmake/gcc.cmake [iso-8859-1] (original) +++ trunk/reactos/cmake/gcc.cmake [iso-8859-1] Sun Mar 24 16:08:28 2013 @@ -91,6 +91,11 @@ add_compile_flags("-mpreferred-stack-boundary=4") endif() +# PSEH +if(GCC_VERSION VERSION_GREATER 4.7) + set(USE_PSEH3 1) +endif() + # Other if(ARCH STREQUAL "amd64") add_definitions(-U_X86_ -UWIN32)

11 years, 9 months

[tkreuzer] 58602: [HAL] Link to libgcc, hopefully fixes build for Pierre

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Sun Mar 24 13:27:52 2013 New Revision: 58602 URL: http://svn.reactos.org/svn/reactos?rev=58602&view=rev Log: [HAL] Link to libgcc, hopefully fixes build for Pierre Modified: trunk/reactos/hal/halx86/CMakeLists.txt Modified: trunk/reactos/hal/halx86/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/CMakeLists.txt?… ============================================================================== --- trunk/reactos/hal/halx86/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/CMakeLists.txt [iso-8859-1] Sun Mar 24 13:27:52 2013 @@ -41,6 +41,8 @@ add_cd_file(TARGET ${_halname} DESTINATION reactos/system32 NO_CAB FOR all) if(MSVC) add_target_link_flags(${_halname} "/ignore:4216 /ignore:4078") + else() + target_link_libraries(${_halname} -lgcc) endif() endfunction()

11 years, 9 months

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 March 2013