Ros-diffs

ros-diffs@reactos.org

81390 discussions

[akhaldi] 60439: [XMLLITE] * Sync with Wine 1.7.1. CORE-7469
by akhaldi＠svn.reactos.org 28 Sep '13

28 Sep '13

Author: akhaldi Date: Sat Sep 28 15:42:58 2013 New Revision: 60439 URL: http://svn.reactos.org/svn/reactos?rev=60439&view=rev Log: [XMLLITE] * Sync with Wine 1.7.1. CORE-7469 Modified: trunk/reactos/dll/win32/xmllite/CMakeLists.txt 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/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/xmllite/CMakeLis… ============================================================================== --- trunk/reactos/dll/win32/xmllite/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/xmllite/CMakeLists.txt [iso-8859-1] Sat Sep 28 15:42:58 2013 @@ -1,25 +1,17 @@ add_definitions(-D__WINESRC__) include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) - spec2def(xmllite.dll xmllite.spec ADD_IMPORTLIB) list(APPEND SOURCE reader.c writer.c xmllite_main.c - #${REACTOS_BINARY_DIR}/include/psdk/xmllite_i.c ${CMAKE_CURRENT_BINARY_DIR}/xmllite_stubs.c ${CMAKE_CURRENT_BINARY_DIR}/xmllite.def) -if(NOT MSVC) - # FIXME: http://www.cmake.org/Bug/view.php?id=12998 - #allow_warnings(xmllite) - set_source_files_properties(${SOURCE} PROPERTIES COMPILE_FLAGS "-Wno-error") -endif() - add_library(xmllite SHARED ${SOURCE}) set_module_type(xmllite win32dll) -target_link_libraries(xmllite wine uuid) +target_link_libraries(xmllite wine) add_importlibs(xmllite msvcrt kernel32 ntdll) add_cd_file(TARGET xmllite DESTINATION reactos/system32 FOR all) Modified: trunk/reactos/dll/win32/xmllite/reader.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/xmllite/reader.c… ============================================================================== --- trunk/reactos/dll/win32/xmllite/reader.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/xmllite/reader.c [iso-8859-1] Sat Sep 28 15:42:58 2013 @@ -24,6 +24,7 @@ #define COBJMACROS +#include <stdio.h> #include <stdarg.h> #include <windef.h> #include <winbase.h> @@ -57,7 +58,8 @@ XmlReadInState_DTD_Misc, XmlReadInState_Element, XmlReadInState_Content, - XmlReadInState_MiscEnd + XmlReadInState_MiscEnd, /* optional Misc at the end of a document */ + XmlReadInState_Eof } XmlReaderInternalState; /* This state denotes where parsing was interrupted by input problem. @@ -69,7 +71,8 @@ XmlReadResumeState_PIBody, XmlReadResumeState_CDATA, XmlReadResumeState_Comment, - XmlReadResumeState_STag + XmlReadResumeState_STag, + XmlReadResumeState_CharData } XmlReaderResumeState; /* saved pointer index to resume from particular input position */ @@ -77,13 +80,14 @@ { XmlReadResume_Name, /* PITarget, name for NCName, prefix for QName */ XmlReadResume_Local, /* local for QName */ - XmlReadResume_Body, /* PI body, comment text, CDATA text */ + XmlReadResume_Body, /* PI body, comment text, CDATA text, CharData text */ XmlReadResume_Last } XmlReaderResume; typedef enum { StringValue_LocalName, + StringValue_Prefix, StringValue_QualifiedName, StringValue_Value, StringValue_Last @@ -98,6 +102,62 @@ static const WCHAR gtW[] = {'>',0}; static const WCHAR commentW[] = {'<','!','-','-',0}; static const WCHAR piW[] = {'<','?',0}; + +static const char *debugstr_nodetype(XmlNodeType nodetype) +{ + static const char* type_names[] = + { + "None", + "Element", + "Attribute", + "Text", + "CDATA", + "", + "", + "ProcessingInstruction", + "Comment", + "", + "DocumentType", + "", + "", + "Whitespace", + "", + "EndElement", + "", + "XmlDeclaration" + }; + + if (nodetype > _XmlNodeType_Last) + { + static char buf[25]; + sprintf(buf, "unknown type=%d", nodetype); + return buf; + } + return type_names[nodetype]; +} + +static const char *debugstr_prop(XmlReaderProperty prop) +{ + static const char* prop_names[] = + { + "MultiLanguage", + "ConformanceLevel", + "RandomAccess", + "XmlResolver", + "DtdProcessing", + "ReadState", + "MaxElementDepth", + "MaxEntityExpansion" + }; + + if (prop > _XmlReaderProperty_Last) + { + static char buf[25]; + sprintf(buf, "unknown property=%d", prop); + return buf; + } + return prop_names[prop]; +} struct xml_encoding_data { @@ -151,9 +211,9 @@ */ typedef struct { + WCHAR *str; /* allocated null-terminated string */ + UINT len; /* length in WCHARs, altered after ReadValueChunk */ 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}; @@ -170,6 +230,7 @@ { struct list entry; strval qname; + strval localname; }; typedef struct @@ -190,6 +251,8 @@ struct list elements; strval strvalues[StringValue_Last]; UINT depth; + UINT max_depth; + BOOL empty_element; WCHAR *resume[XmlReadResume_Last]; /* pointers used to resume reader */ } xmlreader; @@ -365,16 +428,21 @@ reader_free(reader, elem); } list_init(&reader->elements); + reader->empty_element = FALSE; } 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) + if (++reader->depth > reader->max_depth) return SC_E_MAXELEMENTDEPTH; + return S_OK; +} + +static void reader_dec_depth(xmlreader *reader) +{ + if (reader->depth > 1) reader->depth--; +} + +static HRESULT reader_push_element(xmlreader *reader, strval *qname, strval *localname) { struct element *elem; HRESULT hr; @@ -383,15 +451,30 @@ if (!elem) return E_OUTOFMEMORY; hr = reader_strvaldup(reader, qname, &elem->qname); - if (FAILED(hr)) return hr; + if (FAILED(hr)) { + reader_free(reader, elem); + return hr; + } + + hr = reader_strvaldup(reader, localname, &elem->localname); + if (FAILED(hr)) + { + reader_free_strvalued(reader, &elem->qname); + reader_free(reader, elem); + return hr; + } if (!list_empty(&reader->elements)) { hr = reader_inc_depth(reader); - if (FAILED(hr)) return hr; + if (FAILED(hr)) { + reader_free(reader, elem); + return hr; + } } list_add_head(&reader->elements, &elem->entry); + reader->empty_element = FALSE; return hr; } @@ -403,7 +486,9 @@ { list_remove(&elem->entry); reader_free_strvalued(reader, &elem->qname); + reader_free_strvalued(reader, &elem->localname); reader_free(reader, elem); + reader_dec_depth(reader); } } @@ -1034,7 +1119,7 @@ reader_skipn(reader, reader_cmp(reader, yesW) ? 2 : 3); ptr = reader_get_cur(reader); TRACE("standalone=%s\n", debugstr_wn(start, ptr-start)); - val.str = start; + val.str = val.start = start; val.len = ptr-start; if (reader_cmp(reader, quoteW) && reader_cmp(reader, dblquoteW)) @@ -1072,6 +1157,7 @@ if (reader_cmp(reader, declcloseW)) return WC_E_XMLDECL; reader_skipn(reader, 2); + reader_inc_depth(reader); reader->nodetype = XmlNodeType_XmlDeclaration; reader_set_strvalue(reader, StringValue_LocalName, &strval_empty); reader_set_strvalue(reader, StringValue_QualifiedName, &strval_empty); @@ -1216,6 +1302,14 @@ return (ch == ':') || is_ncnamechar(ch); } +static XmlNodeType reader_get_nodetype(const xmlreader *reader) +{ + /* When we're on attribute always return attribute type, container node type is kept. + Note that container is not necessarily an element, and attribute doesn't mean it's + an attribute in XML spec terms. */ + return reader->attr ? XmlNodeType_Attribute : reader->nodetype; +} + /* [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] @@ -1298,6 +1392,9 @@ case XmlReadResumeState_PITarget: hr = reader_parse_pitarget(reader, &target); if (FAILED(hr)) return hr; + reader_set_strvalue(reader, StringValue_LocalName, &target); + reader_set_strvalue(reader, StringValue_QualifiedName, &target); + reader_set_strvalue(reader, StringValue_Value, &strval_empty); reader->resumestate = XmlReadResumeState_PIBody; default: ; @@ -1311,9 +1408,6 @@ 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; } @@ -1346,8 +1440,6 @@ 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; } @@ -1446,8 +1538,7 @@ } if (*cur == quote) reader_skipn(reader, 1); - literal->str = start; - literal->len = cur-start; + reader_init_strvalue(start, cur-start, literal); TRACE("%s\n", debugstr_wn(start, cur-start)); return S_OK; } @@ -1679,36 +1770,280 @@ return S_OK; } +/* Applies normalization rules to a single char, used for attribute values. + + Rules include 2 steps: + + 1) replacing \r\n with a single \n; + 2) replacing all whitespace chars with ' '. + + */ +static void reader_normalize_space(xmlreader *reader, WCHAR *ptr) +{ + encoded_buffer *buffer = &reader->input->buffer->utf16; + + if (!is_wchar_space(*ptr)) return; + + if (*ptr == '\r' && *(ptr+1) == '\n') + { + int len = buffer->written - ((char*)ptr - buffer->data) - 2*sizeof(WCHAR); + memmove(ptr+1, ptr+2, len); + } + *ptr = ' '; +} + +static WCHAR get_predefined_entity(const strval *name) +{ + static const WCHAR entltW[] = {'l','t'}; + static const WCHAR entgtW[] = {'g','t'}; + static const WCHAR entampW[] = {'a','m','p'}; + static const WCHAR entaposW[] = {'a','p','o','s'}; + static const WCHAR entquotW[] = {'q','u','o','t'}; + + static const strval lt = { (WCHAR*)entltW, 2 }; + static const strval gt = { (WCHAR*)entgtW, 2 }; + static const strval amp = { (WCHAR*)entampW, 3 }; + static const strval apos = { (WCHAR*)entaposW, 4 }; + static const strval quot = { (WCHAR*)entquotW, 4 }; + + switch (name->str[0]) + { + case 'l': + if (strval_eq(name, &lt)) return '<'; + break; + case 'g': + if (strval_eq(name, &gt)) return '>'; + break; + case 'a': + if (strval_eq(name, &amp)) + return '&'; + else if (strval_eq(name, &apos)) + return '\''; + break; + case 'q': + if (strval_eq(name, &quot)) return '\"'; + break; + default: + ; + } + + return 0; +} + +/* [66] CharRef ::= '&#' [0-9]+ ';' | '&#x' [0-9a-fA-F]+ ';' + [67] Reference ::= EntityRef | CharRef + [68] EntityRef ::= '&' Name ';' */ +static HRESULT reader_parse_reference(xmlreader *reader) +{ + encoded_buffer *buffer = &reader->input->buffer->utf16; + WCHAR *start = reader_get_cur(reader), *ptr; + WCHAR ch = 0; + int len; + + /* skip '&' */ + reader_skipn(reader, 1); + ptr = reader_get_cur(reader); + + if (*ptr == '#') + { + reader_skipn(reader, 1); + ptr = reader_get_cur(reader); + + /* hex char or decimal */ + if (*ptr == 'x') + { + reader_skipn(reader, 1); + ptr = reader_get_cur(reader); + + while (*ptr != ';') + { + if ((*ptr >= '0' && *ptr <= '9')) + ch = ch*16 + *ptr - '0'; + else if ((*ptr >= 'a' && *ptr <= 'f')) + ch = ch*16 + *ptr - 'a' + 10; + else if ((*ptr >= 'A' && *ptr <= 'F')) + ch = ch*16 + *ptr - 'A' + 10; + else + return ch ? WC_E_SEMICOLON : WC_E_HEXDIGIT; + reader_skipn(reader, 1); + ptr = reader_get_cur(reader); + } + } + else + { + while (*ptr != ';') + { + if ((*ptr >= '0' && *ptr <= '9')) + { + ch = ch*10 + *ptr - '0'; + reader_skipn(reader, 1); + ptr = reader_get_cur(reader); + } + else + return ch ? WC_E_SEMICOLON : WC_E_DIGIT; + } + } + + if (!is_char(ch)) return WC_E_XMLCHARACTER; + + /* normalize */ + if (is_wchar_space(ch)) ch = ' '; + + len = buffer->written - ((char*)ptr - buffer->data) - sizeof(WCHAR); + memmove(start+1, ptr+1, len); + buffer->cur = (char*)(start+1); + + *start = ch; + } + else + { + strval name; + HRESULT hr; + + hr = reader_parse_name(reader, &name); + if (FAILED(hr)) return hr; + + ptr = reader_get_cur(reader); + if (*ptr != ';') return WC_E_SEMICOLON; + + /* predefined entities resolve to a single character */ + ch = get_predefined_entity(&name); + if (ch) + { + len = buffer->written - ((char*)ptr - buffer->data) - sizeof(WCHAR); + memmove(start+1, ptr+1, len); + buffer->cur = (char*)(start+1); + + *start = ch; + } + else + { + FIXME("undeclared entity %s\n", debugstr_wn(name.str, name.len)); + return WC_E_UNDECLAREDENTITY; + } + + } + + return S_OK; +} + +/* [10 NS] AttValue ::= '"' ([^<&"] | Reference)* '"' | "'" ([^<&'] | Reference)* "'" */ +static HRESULT reader_parse_attvalue(xmlreader *reader, strval *value) +{ + WCHAR *ptr, *start; + WCHAR quote; + + ptr = reader_get_cur(reader); + + /* skip opening quote */ + quote = *ptr; + if (quote != '\"' && quote != '\'') return WC_E_QUOTE; + reader_skipn(reader, 1); + + start = ptr = reader_get_cur(reader); + while (*ptr) + { + if (*ptr == '<') return WC_E_LESSTHAN; + + if (*ptr == quote) + { + /* skip closing quote */ + reader_skipn(reader, 1); + break; + } + + if (*ptr == '&') + { + HRESULT hr = reader_parse_reference(reader); + if (FAILED(hr)) return hr; + } + else + { + reader_normalize_space(reader, ptr); + reader_skipn(reader, 1); + } + ptr = reader_get_cur(reader); + } + + reader_init_strvalue(start, ptr-start, value); + + return S_OK; +} + +/* [1 NS] NSAttName ::= PrefixedAttName | DefaultAttName + [2 NS] PrefixedAttName ::= 'xmlns:' NCName + [3 NS] DefaultAttName ::= 'xmlns' + [15 NS] Attribute ::= NSAttName Eq AttValue | QName Eq AttValue */ +static HRESULT reader_parse_attribute(xmlreader *reader) +{ + static const WCHAR xmlnsW[] = {'x','m','l','n','s',0}; + strval prefix, local, qname, xmlns, value; + HRESULT hr; + + hr = reader_parse_qname(reader, &prefix, &local, &qname); + if (FAILED(hr)) return hr; + + reader_init_strvalue((WCHAR*)xmlnsW, 5, &xmlns); + + if (strval_eq(&prefix, &xmlns)) + { + FIXME("namespace definitions not supported\n"); + return E_NOTIMPL; + } + + if (strval_eq(&qname, &xmlns)) + { + FIXME("default namespace definitions not supported\n"); + return E_NOTIMPL; + } + + hr = reader_parse_eq(reader); + if (FAILED(hr)) return hr; + + hr = reader_parse_attvalue(reader, &value); + if (FAILED(hr)) return hr; + + TRACE("%s=%s\n", debugstr_wn(local.str, local.len), debugstr_wn(value.str, value.len)); + return reader_add_attr(reader, &local, &value); +} + /* [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; + while (1) + { + static const WCHAR endW[] = {'/','>',0}; + + reader_skipspaces(reader); + + /* empty element */ + if ((*empty = !reader_cmp(reader, endW))) + { + /* skip '/>' */ + reader_skipn(reader, 2); + reader->empty_element = TRUE; + return S_OK; + } + + /* got a start tag */ + if (!reader_cmp(reader, gtW)) + { + /* skip '>' */ + reader_skipn(reader, 1); + return reader_push_element(reader, qname, local); + } + + hr = reader_parse_attribute(reader); + if (FAILED(hr)) return hr; + } + + return S_OK; } /* [39] element ::= EmptyElemTag | STag content ETag */ @@ -1749,6 +2084,7 @@ reader->nodetype = XmlNodeType_Element; reader->resumestate = XmlReadResumeState_Initial; reader_set_strvalue(reader, StringValue_LocalName, &local); + reader_set_strvalue(reader, StringValue_Prefix, &prefix); reader_set_strvalue(reader, StringValue_QualifiedName, &qname); break; } @@ -1785,6 +2121,10 @@ if (!strval_eq(&elem->qname, &qname)) return WC_E_ELEMENTMATCH; reader_pop_element(reader); + + /* It was a root element, the rest is expected as Misc */ + if (list_empty(&reader->elements)) + reader->instate = XmlReadInState_MiscEnd; reader->nodetype = XmlNodeType_EndElement; reader_set_strvalue(reader, StringValue_LocalName, &local); @@ -1839,6 +2179,12 @@ } else { + /* Value normalization is not fully implemented, rules are: + + - single '\r' -> '\n'; + - sequence '\r\n' -> '\n', in this case value length changes; + */ + if (*ptr == '\r') *ptr = '\n'; reader_skipn(reader, 1); ptr++; } @@ -1847,20 +2193,51 @@ 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; + WCHAR *start, *ptr; + + if (reader->resume[XmlReadResume_Body]) + { + start = reader->resume[XmlReadResume_Body]; + ptr = reader_get_cur(reader); + } + else + { + reader_shrink(reader); + ptr = start = reader_get_cur(reader); + /* There's no text */ + if (!*ptr || *ptr == '<') return S_OK; + reader->nodetype = XmlNodeType_Text; + reader->resume[XmlReadResume_Body] = start; + reader->resumestate = XmlReadResumeState_CharData; + reader_set_strvalue(reader, StringValue_LocalName, &strval_empty); + reader_set_strvalue(reader, StringValue_QualifiedName, &strval_empty); + reader_set_strvalue(reader, StringValue_Value, NULL); + } + + while (*ptr) + { + /* CDATA closing sequence ']]>' is not allowed */ + if (ptr[0] == ']' && ptr[1] == ']' && ptr[2] == '>') + return WC_E_CDSECTEND; + + /* Found next markup part */ + if (ptr[0] == '<') + { + strval value; + + reader_init_strvalue(start, ptr-start, &value); + reader_set_strvalue(reader, StringValue_Value, &value); + return S_OK; + } + + reader_skipn(reader, 1); + ptr++; + } + + return S_OK; } /* [43] content ::= CharData? ((element | Reference | CDSect | PI | Comment) CharData?)* */ @@ -1881,6 +2258,8 @@ case XmlReadResumeState_PIBody: case XmlReadResumeState_PITarget: return reader_parse_pi(reader); + case XmlReadResumeState_CharData: + return reader_parse_chardata(reader); default: ERR("unknown resume state %d\n", reader->resumestate); } @@ -1914,6 +2293,9 @@ static HRESULT reader_parse_nextnode(xmlreader *reader) { HRESULT hr; + + if (!is_reader_pending(reader)) + reader_clear_attrs(reader); while (1) { @@ -1978,6 +2360,15 @@ return reader_parse_element(reader); case XmlReadInState_Content: return reader_parse_content(reader); + case XmlReadInState_MiscEnd: + hr = reader_parse_misc(reader); + if (FAILED(hr)) return hr; + + if (hr == S_FALSE) + reader->instate = XmlReadInState_Eof; + return hr; + case XmlReadInState_Eof: + return S_FALSE; default: FIXME("internal state %d not handled\n", reader->instate); return E_NOTIMPL; @@ -2107,7 +2498,7 @@ { xmlreader *This = impl_from_IXmlReader(iface); - TRACE("(%p %u %p)\n", This, property, value); + TRACE("(%p)->(%s %p)\n", This, debugstr_prop(property), value); if (!value) return E_INVALIDARG; @@ -2131,7 +2522,7 @@ { xmlreader *This = impl_from_IXmlReader(iface); - TRACE("(%p %u %lu)\n", iface, property, value); + TRACE("(%p)->(%s %lu)\n", This, debugstr_prop(property), value); switch (property) { @@ -2160,7 +2551,11 @@ hr = reader_parse_nextnode(This); if (oldtype == XmlNodeType_None && This->nodetype != oldtype) This->state = XmlReadState_Interactive; - if (hr == S_OK) *nodetype = This->nodetype; + if (hr == S_OK) + { + TRACE("node type %s\n", debugstr_nodetype(This->nodetype)); + *nodetype = This->nodetype; + } return hr; } @@ -2170,10 +2565,7 @@ xmlreader *This = impl_from_IXmlReader(iface); TRACE("(%p)->(%p)\n", This, node_type); - /* When we're on attribute always return attribute type, container node type is kept. - Note that container is not necessarily an element, and attribute doesn't mean it's - an attribute in XML spec terms. */ - *node_type = This->attr ? XmlNodeType_Attribute : This->nodetype; + *node_type = reader_get_nodetype(This); return This->state == XmlReadState_Closed ? S_FALSE : S_OK; } @@ -2185,6 +2577,9 @@ if (!This->attr_count) return S_FALSE; This->attr = LIST_ENTRY(list_head(&This->attrs), struct attribute, entry); + reader_set_strvalue(This, StringValue_LocalName, &This->attr->localname); + reader_set_strvalue(This, StringValue_Value, &This->attr->value); + return S_OK; } @@ -2202,7 +2597,11 @@ next = list_next(&This->attrs, &This->attr->entry); if (next) + { This->attr = LIST_ENTRY(next, struct attribute, entry); + reader_set_strvalue(This, StringValue_LocalName, &This->attr->localname); + reader_set_strvalue(This, StringValue_Value, &This->attr->value); + } return next ? S_OK : S_FALSE; } @@ -2218,11 +2617,21 @@ static HRESULT WINAPI xmlreader_MoveToElement(IXmlReader* iface) { xmlreader *This = impl_from_IXmlReader(iface); + struct element *elem; TRACE("(%p)\n", This); if (!This->attr_count) return S_FALSE; This->attr = NULL; + + /* FIXME: support other node types with 'attributes' like DTD */ + elem = LIST_ENTRY(list_head(&This->elements), struct element, entry); + if (elem) + { + reader_set_strvalue(This, StringValue_QualifiedName, &elem->qname); + reader_set_strvalue(This, StringValue_LocalName, &elem->localname); + } + return S_OK; } @@ -2250,16 +2659,18 @@ 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, - LPCWSTR *prefix, - UINT *prefix_length) -{ - FIXME("(%p %p %p): stub\n", iface, prefix, prefix_length); - return E_NOTIMPL; + if (len) *len = This->strvalues[StringValue_LocalName].len; + return S_OK; +} + +static HRESULT WINAPI xmlreader_GetPrefix(IXmlReader* iface, LPCWSTR *prefix, UINT *len) +{ + xmlreader *This = impl_from_IXmlReader(iface); + + TRACE("(%p)->(%p %p)\n", This, prefix, len); + *prefix = This->strvalues[StringValue_Prefix].str; + if (len) *len = This->strvalues[StringValue_Prefix].len; + return S_OK; } static HRESULT WINAPI xmlreader_GetValue(IXmlReader* iface, const WCHAR **value, UINT *len) @@ -2330,13 +2741,16 @@ static BOOL WINAPI xmlreader_IsDefault(IXmlReader* iface) { FIXME("(%p): stub\n", iface); - return E_NOTIMPL; + return FALSE; } static BOOL WINAPI xmlreader_IsEmptyElement(IXmlReader* iface) { - FIXME("(%p): stub\n", iface); - return E_NOTIMPL; + xmlreader *This = impl_from_IXmlReader(iface); + TRACE("(%p)\n", This); + /* Empty elements are not placed in stack, it's stored as a global reader flag that makes sense + when current node is start tag of an element */ + return (reader_get_nodetype(This) == XmlNodeType_Element) ? This->empty_element : FALSE; } static HRESULT WINAPI xmlreader_GetLineNumber(IXmlReader* iface, UINT *lineNumber) @@ -2516,6 +2930,8 @@ reader->attr = NULL; list_init(&reader->elements); reader->depth = 0; + reader->max_depth = 256; + reader->empty_element = FALSE; memset(reader->resume, 0, sizeof(reader->resume)); for (i = 0; i < StringValue_Last; i++) 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] Sat Sep 28 15:42:58 2013 @@ -39,8 +39,6 @@ case DLL_PROCESS_ATTACH: DisableThreadLibraryCalls(hinstDLL); break; - case DLL_PROCESS_DETACH: - break; } return TRUE; Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Sat Sep 28 15:42:58 2013 @@ -216,7 +216,7 @@ reactos/dll/win32/xinput1_2 # Synced to Wine-1.7.1 reactos/dll/win32/xinput1_3 # Synced to Wine-1.7.1 reactos/dll/win32/xinput9_1_0 # Synced to Wine-1.7.1 -reactos/dll/win32/xmllite # Synced to Wine-1.5.26 +reactos/dll/win32/xmllite # Synced to Wine-1.7.1 reactos/dll/cpl/inetcpl # Synced to Wine-1.3.21

1 0

[akhaldi] 60438: [XINPUT1_3_WINETEST] * Import from Wine 1.7.1. CORE-7469
by akhaldi＠svn.reactos.org 28 Sep '13

28 Sep '13

Author: akhaldi Date: Sat Sep 28 15:39:51 2013 New Revision: 60438 URL: http://svn.reactos.org/svn/reactos?rev=60438&view=rev Log: [XINPUT1_3_WINETEST] * Import from Wine 1.7.1. CORE-7469 Added: trunk/rostests/winetests/xinput1_3/ trunk/rostests/winetests/xinput1_3/CMakeLists.txt (with props) trunk/rostests/winetests/xinput1_3/testlist.c (with props) trunk/rostests/winetests/xinput1_3/xinput.c (with props) Modified: trunk/rostests/winetests/CMakeLists.txt Modified: trunk/rostests/winetests/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/CMakeLists.txt?… ============================================================================== --- trunk/rostests/winetests/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/winetests/CMakeLists.txt [iso-8859-1] Sat Sep 28 15:39:51 2013 @@ -104,4 +104,5 @@ add_subdirectory(wlanapi) add_subdirectory(wldap32) add_subdirectory(ws2_32) +add_subdirectory(xinput1_3) add_subdirectory(xmllite) Added: trunk/rostests/winetests/xinput1_3/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/xinput1_3/CMake… ============================================================================== --- trunk/rostests/winetests/xinput1_3/CMakeLists.txt (added) +++ trunk/rostests/winetests/xinput1_3/CMakeLists.txt [iso-8859-1] Sat Sep 28 15:39:51 2013 @@ -0,0 +1,5 @@ + +add_executable(xinput1_3_winetest xinput.c testlist.c) +set_module_type(xinput1_3_winetest win32cui) +add_importlibs(xinput1_3_winetest user32 msvcrt kernel32) +add_cd_file(TARGET xinput1_3_winetest DESTINATION reactos/bin FOR all) Propchange: trunk/rostests/winetests/xinput1_3/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/winetests/xinput1_3/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/xinput1_3/testl… ============================================================================== --- trunk/rostests/winetests/xinput1_3/testlist.c (added) +++ trunk/rostests/winetests/xinput1_3/testlist.c [iso-8859-1] Sat Sep 28 15:39:51 2013 @@ -0,0 +1,12 @@ +/* Automatically generated file; DO NOT EDIT!! */ + +#define STANDALONE +#include <wine/test.h> + +extern void func_xinput(void); + +const struct test winetest_testlist[] = +{ + { "xinput", func_xinput }, + { 0, 0 } +}; Propchange: trunk/rostests/winetests/xinput1_3/testlist.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/winetests/xinput1_3/xinput.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/xinput1_3/xinpu… ============================================================================== --- trunk/rostests/winetests/xinput1_3/xinput.c (added) +++ trunk/rostests/winetests/xinput1_3/xinput.c [iso-8859-1] Sat Sep 28 15:39:51 2013 @@ -0,0 +1,223 @@ +/* + * The Wine project - Xinput Joystick Library + * Copyright 2008 Andrew Fenn + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <windows.h> +#include <stdio.h> + +#include "xinput.h" +#include "wine/test.h" + +static DWORD (WINAPI *pXInputGetState)(DWORD, XINPUT_STATE*); +static DWORD (WINAPI *pXInputGetCapabilities)(DWORD,DWORD,XINPUT_CAPABILITIES*); +static DWORD (WINAPI *pXInputSetState)(DWORD, XINPUT_VIBRATION*); +static void (WINAPI *pXInputEnable)(BOOL); +static DWORD (WINAPI *pXInputGetKeystroke)(DWORD, DWORD, PXINPUT_KEYSTROKE); +static DWORD (WINAPI *pXInputGetDSoundAudioDeviceGuids)(DWORD, GUID*, GUID*); +static DWORD (WINAPI *pXInputGetBatteryInformation)(DWORD, BYTE, XINPUT_BATTERY_INFORMATION*); + +static void test_set_state(void) +{ + XINPUT_VIBRATION vibrator; + DWORD controllerNum; + DWORD result; + + for(controllerNum=0; controllerNum < XUSER_MAX_COUNT; controllerNum++) + { + ZeroMemory(&vibrator, sizeof(XINPUT_VIBRATION)); + + vibrator.wLeftMotorSpeed = 0; + vibrator.wRightMotorSpeed = 0; + result = pXInputSetState(controllerNum, &vibrator); + ok(result == ERROR_SUCCESS || result == ERROR_DEVICE_NOT_CONNECTED, "XInputSetState failed with (%d)\n", result); + + pXInputEnable(0); + + vibrator.wLeftMotorSpeed = 65535; + vibrator.wRightMotorSpeed = 65535; + result = pXInputSetState(controllerNum, &vibrator); + ok(result == ERROR_SUCCESS || result == ERROR_DEVICE_NOT_CONNECTED, "XInputSetState failed with (%d)\n", result); + + pXInputEnable(1); + } + + result = pXInputSetState(XUSER_MAX_COUNT+1, &vibrator); + ok(result == ERROR_BAD_ARGUMENTS, "XInputSetState returned (%d)\n", result); +} + +static void test_get_state(void) +{ + + XINPUT_STATE controllerState; + DWORD controllerNum; + DWORD result; + + for(controllerNum=0; controllerNum < XUSER_MAX_COUNT; controllerNum++) + { + ZeroMemory(&controllerState, sizeof(XINPUT_STATE)); + + result = pXInputGetState(controllerNum, &controllerState); + ok(result == ERROR_SUCCESS || result == ERROR_DEVICE_NOT_CONNECTED, "XInputGetState failed with (%d)\n", result); + + if (ERROR_DEVICE_NOT_CONNECTED == result) + { + skip("Controller %d is not connected\n", controllerNum); + } + else + { + trace("-- Results for controller %d --\n", controllerNum); + trace("XInputGetState: %d\n", result); + trace("State->dwPacketNumber: %d\n", controllerState.dwPacketNumber); + trace("Gamepad Variables --\n"); + trace("Gamepad.wButtons: %#x\n", controllerState.Gamepad.wButtons); + trace("Gamepad.bLeftTrigger: 0x%08x\n", controllerState.Gamepad.bLeftTrigger); + trace("Gamepad.bRightTrigger: 0x%08x\n", controllerState.Gamepad.bRightTrigger); + trace("Gamepad.sThumbLX: %d\n", controllerState.Gamepad.sThumbLX); + trace("Gamepad.sThumbLY: %d\n", controllerState.Gamepad.sThumbLY); + trace("Gamepad.sThumbRX: %d\n", controllerState.Gamepad.sThumbRX); + trace("Gamepad.sThumbRY: %d\n", controllerState.Gamepad.sThumbRY); + } + } + + ZeroMemory(&controllerState, sizeof(XINPUT_STATE)); + result = pXInputGetState(XUSER_MAX_COUNT+1, &controllerState); + ok(result == ERROR_BAD_ARGUMENTS, "XInputGetState returned (%d)\n", result); +} + +static void test_get_keystroke(void) +{ + XINPUT_KEYSTROKE keystroke; + DWORD controllerNum; + DWORD result; + + for(controllerNum=0; controllerNum < XUSER_MAX_COUNT; controllerNum++) + { + ZeroMemory(&keystroke, sizeof(XINPUT_KEYSTROKE)); + + result = pXInputGetKeystroke(controllerNum, XINPUT_FLAG_GAMEPAD, &keystroke); + ok(result == ERROR_SUCCESS || result == ERROR_DEVICE_NOT_CONNECTED, "XInputGetKeystroke failed with (%d)\n", result); + + if (ERROR_DEVICE_NOT_CONNECTED == result) + { + skip("Controller %d is not connected\n", controllerNum); + } + } + + ZeroMemory(&keystroke, sizeof(XINPUT_KEYSTROKE)); + result = pXInputGetKeystroke(XUSER_MAX_COUNT+1, XINPUT_FLAG_GAMEPAD, &keystroke); + ok(result == ERROR_BAD_ARGUMENTS, "XInputGetKeystroke returned (%d)\n", result); +} + +static void test_get_capabilities(void) +{ + XINPUT_CAPABILITIES capabilities; + DWORD controllerNum; + DWORD result; + + for(controllerNum=0; controllerNum < XUSER_MAX_COUNT; controllerNum++) + { + ZeroMemory(&capabilities, sizeof(XINPUT_CAPABILITIES)); + + result = pXInputGetCapabilities(controllerNum, XINPUT_FLAG_GAMEPAD, &capabilities); + ok(result == ERROR_SUCCESS || result == ERROR_DEVICE_NOT_CONNECTED, "XInputGetCapabilities failed with (%d)\n", result); + + if (ERROR_DEVICE_NOT_CONNECTED == result) + { + skip("Controller %d is not connected\n", controllerNum); + } + } + + ZeroMemory(&capabilities, sizeof(XINPUT_CAPABILITIES)); + result = pXInputGetCapabilities(XUSER_MAX_COUNT+1, XINPUT_FLAG_GAMEPAD, &capabilities); + ok(result == ERROR_BAD_ARGUMENTS, "XInputGetCapabilities returned (%d)\n", result); +} + +static void test_get_dsoundaudiodevice(void) +{ + DWORD controllerNum; + DWORD result; + GUID soundRender; + GUID soundCapture; + + for(controllerNum=0; controllerNum < XUSER_MAX_COUNT; controllerNum++) + { + result = pXInputGetDSoundAudioDeviceGuids(controllerNum, &soundRender, &soundCapture); + ok(result == ERROR_SUCCESS || result == ERROR_DEVICE_NOT_CONNECTED, "XInputGetDSoundAudioDeviceGuids failed with (%d)\n", result); + + if (ERROR_DEVICE_NOT_CONNECTED == result) + { + skip("Controller %d is not connected\n", controllerNum); + } + } + + result = pXInputGetDSoundAudioDeviceGuids(XUSER_MAX_COUNT+1, &soundRender, &soundCapture); + ok(result == ERROR_BAD_ARGUMENTS, "XInputGetDSoundAudioDeviceGuids returned (%d)\n", result); +} + +static void test_get_batteryinformation(void) +{ + DWORD controllerNum; + DWORD result; + XINPUT_BATTERY_INFORMATION batteryInfo; + + for(controllerNum=0; controllerNum < XUSER_MAX_COUNT; controllerNum++) + { + ZeroMemory(&batteryInfo, sizeof(XINPUT_BATTERY_INFORMATION)); + + result = pXInputGetBatteryInformation(controllerNum, BATTERY_DEVTYPE_GAMEPAD, &batteryInfo); + ok(result == ERROR_SUCCESS || result == ERROR_DEVICE_NOT_CONNECTED, "XInputGetBatteryInformation failed with (%d)\n", result); + + if (ERROR_DEVICE_NOT_CONNECTED == result) + { + ok(batteryInfo.BatteryLevel == BATTERY_TYPE_DISCONNECTED, "Failed to report device as being disconnected.\n"); + skip("Controller %d is not connected\n", controllerNum); + } + } + + result = pXInputGetBatteryInformation(XUSER_MAX_COUNT+1, BATTERY_DEVTYPE_GAMEPAD, &batteryInfo); + ok(result == ERROR_BAD_ARGUMENTS, "XInputGetBatteryInformation returned (%d)\n", result); +} + +START_TEST(xinput) +{ + HMODULE hXinput; + hXinput = LoadLibraryA( "xinput1_3.dll" ); + + if (!hXinput) + { + win_skip("Could not load xinput1_3.dll\n"); + return; + } + + pXInputEnable = (void*)GetProcAddress(hXinput, "XInputEnable"); + pXInputSetState = (void*)GetProcAddress(hXinput, "XInputSetState"); + pXInputGetState = (void*)GetProcAddress(hXinput, "XInputGetState"); + pXInputGetKeystroke = (void*)GetProcAddress(hXinput, "XInputGetKeystroke"); + pXInputGetCapabilities = (void*)GetProcAddress(hXinput, "XInputGetCapabilities"); + pXInputGetDSoundAudioDeviceGuids = (void*)GetProcAddress(hXinput, "XInputGetDSoundAudioDeviceGuids"); + pXInputGetBatteryInformation = (void*)GetProcAddress(hXinput, "XInputGetBatteryInformation"); + + test_set_state(); + test_get_state(); + test_get_keystroke(); + test_get_capabilities(); + test_get_dsoundaudiodevice(); + test_get_batteryinformation(); + + FreeLibrary(hXinput); +} Propchange: trunk/rostests/winetests/xinput1_3/xinput.c ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[akhaldi] 60437: [XINPUT*] * Sync with Wine 1.7.1. CORE-7469
by akhaldi＠svn.reactos.org 28 Sep '13

28 Sep '13

Author: akhaldi Date: Sat Sep 28 15:38:10 2013 New Revision: 60437 URL: http://svn.reactos.org/svn/reactos?rev=60437&view=rev Log: [XINPUT*] * Sync with Wine 1.7.1. CORE-7469 Modified: trunk/reactos/dll/win32/xinput1_1/CMakeLists.txt trunk/reactos/dll/win32/xinput1_1/xinput1_1_main.c trunk/reactos/dll/win32/xinput1_2/CMakeLists.txt trunk/reactos/dll/win32/xinput1_2/xinput1_2_main.c trunk/reactos/dll/win32/xinput1_3/CMakeLists.txt trunk/reactos/dll/win32/xinput1_3/xinput1_3_main.c trunk/reactos/dll/win32/xinput9_1_0/CMakeLists.txt trunk/reactos/dll/win32/xinput9_1_0/xinput9_1_0_main.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/xinput1_1/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/xinput1_1/CMakeL… ============================================================================== --- trunk/reactos/dll/win32/xinput1_1/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/xinput1_1/CMakeLists.txt [iso-8859-1] Sat Sep 28 15:38:10 2013 @@ -1,16 +1,13 @@ add_definitions(-D__WINESRC__) include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) - spec2def(xinput1_1.dll xinput1_1.spec) list(APPEND SOURCE xinput1_1_main.c - version.rc ${CMAKE_CURRENT_BINARY_DIR}/xinput1_1.def) -add_library(xinput1_1 SHARED ${SOURCE}) - +add_library(xinput1_1 SHARED ${SOURCE} version.rc) set_module_type(xinput1_1 win32dll) -add_importlibs(xinput1_1 msvcrt kernel32 xinput1_3) +add_importlibs(xinput1_1 xinput1_3 msvcrt kernel32) add_cd_file(TARGET xinput1_1 DESTINATION reactos/system32 FOR all) Modified: trunk/reactos/dll/win32/xinput1_1/xinput1_1_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/xinput1_1/xinput… ============================================================================== --- trunk/reactos/dll/win32/xinput1_1/xinput1_1_main.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/xinput1_1/xinput1_1_main.c [iso-8859-1] Sat Sep 28 15:38:10 2013 @@ -32,8 +32,6 @@ case DLL_PROCESS_ATTACH: DisableThreadLibraryCalls(inst); break; - case DLL_PROCESS_DETACH: - break; } return TRUE; } Modified: trunk/reactos/dll/win32/xinput1_2/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/xinput1_2/CMakeL… ============================================================================== --- trunk/reactos/dll/win32/xinput1_2/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/xinput1_2/CMakeLists.txt [iso-8859-1] Sat Sep 28 15:38:10 2013 @@ -1,16 +1,13 @@ add_definitions(-D__WINESRC__) include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) - spec2def(xinput1_2.dll xinput1_2.spec) list(APPEND SOURCE xinput1_2_main.c - version.rc ${CMAKE_CURRENT_BINARY_DIR}/xinput1_2.def) -add_library(xinput1_2 SHARED ${SOURCE}) - +add_library(xinput1_2 SHARED ${SOURCE} version.rc) set_module_type(xinput1_2 win32dll) -add_importlibs(xinput1_2 msvcrt kernel32 xinput1_3) +add_importlibs(xinput1_2 xinput1_3 msvcrt kernel32) add_cd_file(TARGET xinput1_2 DESTINATION reactos/system32 FOR all) Modified: trunk/reactos/dll/win32/xinput1_2/xinput1_2_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/xinput1_2/xinput… ============================================================================== --- trunk/reactos/dll/win32/xinput1_2/xinput1_2_main.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/xinput1_2/xinput1_2_main.c [iso-8859-1] Sat Sep 28 15:38:10 2013 @@ -32,8 +32,6 @@ case DLL_PROCESS_ATTACH: DisableThreadLibraryCalls(inst); break; - case DLL_PROCESS_DETACH: - break; } return TRUE; } Modified: trunk/reactos/dll/win32/xinput1_3/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/xinput1_3/CMakeL… ============================================================================== --- trunk/reactos/dll/win32/xinput1_3/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/xinput1_3/CMakeLists.txt [iso-8859-1] Sat Sep 28 15:38:10 2013 @@ -1,17 +1,13 @@ add_definitions(-D__WINESRC__) include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) - spec2def(xinput1_3.dll xinput1_3.spec ADD_IMPORTLIB) list(APPEND SOURCE xinput1_3_main.c - version.rc ${CMAKE_CURRENT_BINARY_DIR}/xinput1_3.def) -add_library(xinput1_3 SHARED ${SOURCE}) - - +add_library(xinput1_3 SHARED ${SOURCE} version.rc) set_module_type(xinput1_3 win32dll) target_link_libraries(xinput1_3 wine) add_importlibs(xinput1_3 msvcrt kernel32 ntdll) Modified: trunk/reactos/dll/win32/xinput1_3/xinput1_3_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/xinput1_3/xinput… ============================================================================== --- trunk/reactos/dll/win32/xinput1_3/xinput1_3_main.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/xinput1_3/xinput1_3_main.c [iso-8859-1] Sat Sep 28 15:38:10 2013 @@ -39,8 +39,6 @@ return FALSE; /* prefer native version */ case DLL_PROCESS_ATTACH: DisableThreadLibraryCalls(inst); - break; - case DLL_PROCESS_DETACH: break; } return TRUE; Modified: trunk/reactos/dll/win32/xinput9_1_0/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/xinput9_1_0/CMak… ============================================================================== --- trunk/reactos/dll/win32/xinput9_1_0/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/xinput9_1_0/CMakeLists.txt [iso-8859-1] Sat Sep 28 15:38:10 2013 @@ -1,16 +1,13 @@ add_definitions(-D__WINESRC__) include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) - spec2def(xinput9_1_0.dll xinput9_1_0.spec) list(APPEND SOURCE xinput9_1_0_main.c - version.rc ${CMAKE_CURRENT_BINARY_DIR}/xinput9_1_0.def) -add_library(xinput9_1_0 SHARED ${SOURCE}) - +add_library(xinput9_1_0 SHARED ${SOURCE} version.rc) set_module_type(xinput9_1_0 win32dll) add_importlibs(xinput9_1_0 msvcrt kernel32 xinput1_3) add_cd_file(TARGET xinput9_1_0 DESTINATION reactos/system32 FOR all) Modified: trunk/reactos/dll/win32/xinput9_1_0/xinput9_1_0_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/xinput9_1_0/xinp… ============================================================================== --- trunk/reactos/dll/win32/xinput9_1_0/xinput9_1_0_main.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/xinput9_1_0/xinput9_1_0_main.c [iso-8859-1] Sat Sep 28 15:38:10 2013 @@ -32,8 +32,6 @@ case DLL_PROCESS_ATTACH: DisableThreadLibraryCalls(inst); break; - case DLL_PROCESS_DETACH: - break; } return TRUE; } Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Sat Sep 28 15:38:10 2013 @@ -212,10 +212,10 @@ reactos/dll/win32/wmi # Synced to Wine-1.7.1 reactos/dll/win32/wtsapi32 # Synced to Wine-1.7.1 reactos/dll/win32/wuapi # Synced to Wine-1.7.1 -reactos/dll/win32/xinput1_1 # Synced to Wine-1.5.19 -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/xinput1_1 # Synced to Wine-1.7.1 +reactos/dll/win32/xinput1_2 # Synced to Wine-1.7.1 +reactos/dll/win32/xinput1_3 # Synced to Wine-1.7.1 +reactos/dll/win32/xinput9_1_0 # Synced to Wine-1.7.1 reactos/dll/win32/xmllite # Synced to Wine-1.5.26 reactos/dll/cpl/inetcpl # Synced to Wine-1.3.21

1 0

[akhaldi] 60436: [WUAPI] * Sync with Wine 1.7.1. CORE-7469
by akhaldi＠svn.reactos.org 28 Sep '13

28 Sep '13

Author: akhaldi Date: Sat Sep 28 15:35:15 2013 New Revision: 60436 URL: http://svn.reactos.org/svn/reactos?rev=60436&view=rev Log: [WUAPI] * Sync with Wine 1.7.1. CORE-7469 Modified: trunk/reactos/dll/win32/wuapi/CMakeLists.txt trunk/reactos/dll/win32/wuapi/main.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/wuapi/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wuapi/CMakeLists… ============================================================================== --- trunk/reactos/dll/win32/wuapi/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wuapi/CMakeLists.txt [iso-8859-1] Sat Sep 28 15:35:15 2013 @@ -1,17 +1,9 @@ - -add_typelib(wuapi_tlb.idl) add_definitions( -D__WINESRC__ -DCOM_NO_WINDOWS_H) -remove_definitions(-D_WIN32_WINNT=0x502) -add_definitions(-D_WIN32_WINNT=0x600) - -include_directories( - ${REACTOS_SOURCE_DIR}/include/reactos/wine) - - +include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) spec2def(wuapi.dll wuapi.spec) list(APPEND SOURCE @@ -22,18 +14,13 @@ session.c systeminfo.c updates.c - wuapi.rc ${CMAKE_CURRENT_BINARY_DIR}/wuapi.def) +add_typelib(wuapi_tlb.idl) set_source_files_properties(wuapi.rc PROPERTIES OBJECT_DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/wuapi_tlb.tlb) - -add_library(wuapi SHARED ${SOURCE}) - +add_library(wuapi SHARED ${SOURCE} wuapi.rc) set_module_type(wuapi win32dll) target_link_libraries(wuapi uuid wine wuguid) -add_importlibs(wuapi ole32 advapi32 msvcrt kernel32 ntdll) - -# wuapi_tlb.tlb needs stdole2.tlb -add_dependencies(wuapi stdole2) - +add_importlibs(wuapi msvcrt kernel32 ntdll) +add_dependencies(wuapi stdole2) # wuapi_tlb.tlb needs stdole2.tlb add_cd_file(TARGET wuapi DESTINATION reactos/system32 FOR all) Modified: trunk/reactos/dll/win32/wuapi/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wuapi/main.c?rev… ============================================================================== --- trunk/reactos/dll/win32/wuapi/main.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wuapi/main.c [iso-8859-1] Sat Sep 28 15:35:15 2013 @@ -132,8 +132,6 @@ instance = hinst; DisableThreadLibraryCalls( hinst ); break; - case DLL_PROCESS_DETACH: - break; } return TRUE; } Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Sat Sep 28 15:35:15 2013 @@ -211,7 +211,7 @@ reactos/dll/win32/wldap32 # Synced to Wine-1.7.1 reactos/dll/win32/wmi # Synced to Wine-1.7.1 reactos/dll/win32/wtsapi32 # Synced to Wine-1.7.1 -reactos/dll/win32/wuapi # Synced to Wine-1.5.19 +reactos/dll/win32/wuapi # Synced to Wine-1.7.1 reactos/dll/win32/xinput1_1 # Synced to Wine-1.5.19 reactos/dll/win32/xinput1_2 # Synced to Wine-1.5.19 reactos/dll/win32/xinput1_3 # Synced to Wine-1.5.19

1 0

[akhaldi] 60435: [WTSAPI32] * Sync with Wine 1.7.1. CORE-7469
by akhaldi＠svn.reactos.org 28 Sep '13

28 Sep '13

Author: akhaldi Date: Sat Sep 28 15:34:01 2013 New Revision: 60435 URL: http://svn.reactos.org/svn/reactos?rev=60435&view=rev Log: [WTSAPI32] * Sync with Wine 1.7.1. CORE-7469 Modified: trunk/reactos/dll/win32/wtsapi32/CMakeLists.txt trunk/reactos/dll/win32/wtsapi32/wtsapi32.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/wtsapi32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wtsapi32/CMakeLi… ============================================================================== --- trunk/reactos/dll/win32/wtsapi32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wtsapi32/CMakeLists.txt [iso-8859-1] Sat Sep 28 15:34:01 2013 @@ -1,7 +1,6 @@ add_definitions(-D__WINESRC__) include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) - spec2def(wtsapi32.dll wtsapi32.spec) list(APPEND SOURCE @@ -10,11 +9,7 @@ ${CMAKE_CURRENT_BINARY_DIR}/wtsapi32.def) add_library(wtsapi32 SHARED ${SOURCE}) - set_module_type(wtsapi32 win32dll) - target_link_libraries(wtsapi32 wine) - -add_importlibs(wtsapi32 advapi32 msvcrt kernel32 ntdll) - +add_importlibs(wtsapi32 msvcrt kernel32 ntdll) add_cd_file(TARGET wtsapi32 DESTINATION reactos/system32 FOR all) Modified: trunk/reactos/dll/win32/wtsapi32/wtsapi32.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wtsapi32/wtsapi3… ============================================================================== --- trunk/reactos/dll/win32/wtsapi32/wtsapi32.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wtsapi32/wtsapi32.c [iso-8859-1] Sat Sep 28 15:34:01 2013 @@ -25,27 +25,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(wtsapi); -static HMODULE WTSAPI32_hModule; - -BOOL WINAPI DllMain (HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) -{ - TRACE("%p,%x,%p\n", hinstDLL, fdwReason, lpvReserved); - - switch (fdwReason) { - case DLL_PROCESS_ATTACH: - { - DisableThreadLibraryCalls(hinstDLL); - WTSAPI32_hModule = hinstDLL; - break; - } - case DLL_PROCESS_DETACH: - { - break; - } - } - - return TRUE; -} /************************************************************ * WTSCloseServer (WTSAPI32.@) Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Sat Sep 28 15:34:01 2013 @@ -210,7 +210,7 @@ reactos/dll/win32/wintrust # Synced to Wine-1.7.1 reactos/dll/win32/wldap32 # Synced to Wine-1.7.1 reactos/dll/win32/wmi # Synced to Wine-1.7.1 -reactos/dll/win32/wtsapi32 # Synced to Wine-1.5.4 +reactos/dll/win32/wtsapi32 # Synced to Wine-1.7.1 reactos/dll/win32/wuapi # Synced to Wine-1.5.19 reactos/dll/win32/xinput1_1 # Synced to Wine-1.5.19 reactos/dll/win32/xinput1_2 # Synced to Wine-1.5.19

1 0

[akhaldi] 60434: [WMI] * Sync with Wine 1.7.1. CORE-7469
by akhaldi＠svn.reactos.org 28 Sep '13

28 Sep '13

Author: akhaldi Date: Sat Sep 28 15:32:10 2013 New Revision: 60434 URL: http://svn.reactos.org/svn/reactos?rev=60434&view=rev Log: [WMI] * Sync with Wine 1.7.1. CORE-7469 Modified: trunk/reactos/dll/win32/wmi/wmi.spec trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/wmi/wmi.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wmi/wmi.spec?rev… ============================================================================== --- trunk/reactos/dll/win32/wmi/wmi.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wmi/wmi.spec [iso-8859-1] Sat Sep 28 15:32:10 2013 @@ -11,12 +11,12 @@ @ stdcall ProcessTrace(ptr long ptr ptr) advapi32.ProcessTrace @ stdcall QueryAllTracesA(ptr long ptr) advapi32.QueryAllTracesA @ stdcall QueryAllTracesW(ptr long ptr) advapi32.QueryAllTracesW -@ stdcall RegisterTraceGuidsA(ptr ptr ptr long ptr ptr ptr ptr) advapi32.RegisterTraceGuidsA -@ stdcall RegisterTraceGuidsW(ptr ptr ptr long ptr ptr ptr ptr) advapi32.RegisterTraceGuidsW +@ stdcall RegisterTraceGuidsA(ptr ptr ptr long ptr str str ptr) advapi32.RegisterTraceGuidsA +@ stdcall RegisterTraceGuidsW(ptr ptr ptr long ptr wstr wstr ptr) advapi32.RegisterTraceGuidsW @ stdcall RemoveTraceCallback(ptr) advapi32.RemoveTraceCallback @ stdcall SetTraceCallback(ptr ptr) advapi32.SetTraceCallback -@ stdcall StartTraceA(ptr ptr ptr) advapi32.StartTraceA -@ stdcall StartTraceW(ptr ptr ptr) advapi32.StartTraceW +@ stdcall StartTraceA(ptr str ptr) advapi32.StartTraceA +@ stdcall StartTraceW(ptr wstr ptr) advapi32.StartTraceW @ stdcall TraceEvent(long ptr) advapi32.TraceEvent @ stdcall TraceEventInstance(long ptr ptr ptr) advapi32.TraceEventInstance @ stdcall UnregisterTraceGuids(long) advapi32.UnregisterTraceGuids Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Sat Sep 28 15:32:10 2013 @@ -209,7 +209,7 @@ reactos/dll/win32/winmm/wavemap # Forked at Wine-20050628 reactos/dll/win32/wintrust # Synced to Wine-1.7.1 reactos/dll/win32/wldap32 # Synced to Wine-1.7.1 -reactos/dll/win32/wmi # Synced to Wine-1.5.19 +reactos/dll/win32/wmi # Synced to Wine-1.7.1 reactos/dll/win32/wtsapi32 # Synced to Wine-1.5.4 reactos/dll/win32/wuapi # Synced to Wine-1.5.19 reactos/dll/win32/xinput1_1 # Synced to Wine-1.5.19

1 0

[akhaldi] 60433: [WLDAP32_WINETEST] * Sync with Wine 1.7.1. CORE-7469
by akhaldi＠svn.reactos.org 28 Sep '13

28 Sep '13

Author: akhaldi Date: Sat Sep 28 15:31:01 2013 New Revision: 60433 URL: http://svn.reactos.org/svn/reactos?rev=60433&view=rev Log: [WLDAP32_WINETEST] * Sync with Wine 1.7.1. CORE-7469 Modified: trunk/rostests/winetests/wldap32/CMakeLists.txt trunk/rostests/winetests/wldap32/parse.c trunk/rostests/winetests/wldap32/testlist.c Modified: trunk/rostests/winetests/wldap32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/wldap32/CMakeLi… ============================================================================== --- trunk/rostests/winetests/wldap32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/winetests/wldap32/CMakeLists.txt [iso-8859-1] Sat Sep 28 15:31:01 2013 @@ -1,10 +1,5 @@ - -add_definitions( - -D__ROS_LONG64__ - -D_DLL -D__USE_CRTIMP) add_executable(wldap32_winetest parse.c testlist.c) -target_link_libraries(wldap32_winetest wine) set_module_type(wldap32_winetest win32cui) -add_importlibs(wldap32_winetest wldap32 msvcrt kernel32 ntdll) +add_importlibs(wldap32_winetest wldap32 msvcrt kernel32) add_cd_file(TARGET wldap32_winetest DESTINATION reactos/bin FOR all) Modified: trunk/rostests/winetests/wldap32/parse.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/wldap32/parse.c… ============================================================================== --- trunk/rostests/winetests/wldap32/parse.c [iso-8859-1] (original) +++ trunk/rostests/winetests/wldap32/parse.c [iso-8859-1] Sat Sep 28 15:31:01 2013 @@ -86,6 +86,43 @@ ldap_controls_free( server_ctrls ); } +static void test_ldap_search_extW( LDAP *ld ) +{ + ULONG ret, message, timelimit; + WCHAR base[] = {0}, filter[] = {'o','u','=','*',0}; + + timelimit = 20; + ret = ldap_search_extW( ld, base, LDAP_SCOPE_SUBTREE, filter, NULL, 0, NULL, NULL, timelimit, 0, &message ); + if (ret == LDAP_SERVER_DOWN || ret == LDAP_UNAVAILABLE) + { + skip("test server can't be reached\n"); + return; + } + ok( !ret, "ldap_search_extW failed 0x%08x\n", ret ); + + timelimit = 0; + ret = ldap_search_extW( ld, base, LDAP_SCOPE_SUBTREE, filter, NULL, 0, NULL, NULL, timelimit, 0, &message ); + ok( !ret, "ldap_search_extW failed 0x%08x\n", ret ); +} + +static void test_ldap_set_optionW( LDAP *ld ) +{ + ULONG ret, oldvalue; + + ret = ldap_get_optionW( ld, LDAP_OPT_REFERRALS, &oldvalue ); + if (ret == LDAP_SERVER_DOWN || ret == LDAP_UNAVAILABLE) + { + skip("test server can't be reached\n"); + return; + } + + ret = ldap_set_optionW( ld, LDAP_OPT_REFERRALS, LDAP_OPT_OFF ); + ok( !ret || broken(ret == LDAP_PARAM_ERROR) /* nt4, win2k */, "ldap_set_optionW failed 0x%08x\n", ret ); + + ret = ldap_set_optionW( ld, LDAP_OPT_REFERRALS, (void *)&oldvalue ); + ok( !ret, "ldap_set_optionW failed 0x%08x\n", ret ); +} + START_TEST (parse) { LDAP *ld; @@ -94,5 +131,7 @@ ok( ld != NULL, "ldap_init failed\n" ); test_ldap_parse_sort_control( ld ); + test_ldap_search_extW( ld ); + test_ldap_set_optionW( ld ); ldap_unbind( ld ); } Modified: trunk/rostests/winetests/wldap32/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/wldap32/testlis… ============================================================================== --- trunk/rostests/winetests/wldap32/testlist.c [iso-8859-1] (original) +++ trunk/rostests/winetests/wldap32/testlist.c [iso-8859-1] Sat Sep 28 15:31:01 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_parse(void);

1 0

[akhaldi] 60432: [WLDAP32] * Sync with Wine 1.7.1. CORE-7469
by akhaldi＠svn.reactos.org 28 Sep '13

28 Sep '13

Author: akhaldi Date: Sat Sep 28 15:30:23 2013 New Revision: 60432 URL: http://svn.reactos.org/svn/reactos?rev=60432&view=rev Log: [WLDAP32] * Sync with Wine 1.7.1. CORE-7469 Modified: trunk/reactos/dll/win32/wldap32/CMakeLists.txt trunk/reactos/dll/win32/wldap32/init.c trunk/reactos/dll/win32/wldap32/main.c trunk/reactos/dll/win32/wldap32/option.c trunk/reactos/dll/win32/wldap32/parse.c trunk/reactos/dll/win32/wldap32/search.c trunk/reactos/dll/win32/wldap32/wldap32.h trunk/reactos/dll/win32/wldap32/wldap32.spec trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/wldap32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wldap32/CMakeLis… ============================================================================== --- trunk/reactos/dll/win32/wldap32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wldap32/CMakeLists.txt [iso-8859-1] Sat Sep 28 15:30:23 2013 @@ -24,11 +24,10 @@ rename.c search.c value.c - wldap32.rc ${CMAKE_CURRENT_BINARY_DIR}/wldap32_stubs.c ${CMAKE_CURRENT_BINARY_DIR}/wldap32.def) -add_library(wldap32 SHARED ${SOURCE}) +add_library(wldap32 SHARED ${SOURCE} wldap32.rc) set_module_type(wldap32 win32dll) target_link_libraries(wldap32 wine) add_importlibs(wldap32 user32 msvcrt kernel32 ntdll) Modified: trunk/reactos/dll/win32/wldap32/init.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wldap32/init.c?r… ============================================================================== --- trunk/reactos/dll/win32/wldap32/init.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wldap32/init.c [iso-8859-1] Sat Sep 28 15:30:23 2013 @@ -19,22 +19,21 @@ */ #include <config.h> - //#include "wine/port.h" -#include <wine/debug.h> - + +//#include <stdio.h> //#include <stdarg.h> - -//#include "windef.h" +#ifdef HAVE_LDAP_H +#include <ldap.h> +#endif + +#include <windef.h> //#include "winbase.h" //#include "winnls.h" -#ifdef HAVE_LDAP_H -#include <ldap.h> -#endif - #include "winldap_private.h" //#include "wldap32.h" +#include <wine/debug.h> #ifdef HAVE_LDAP /* Should eventually be determined by the algorithm documented on MSDN. */ @@ -124,7 +123,7 @@ } /* Flatten an array of hostnames into a space separated string of URLs. - * Prepend a given scheme and append a given portnumber to each hostname + * Prepend a given scheme and append a given port number to each hostname * if necessary. */ static char *join_hostnames( const char *scheme, char **hostnames, ULONG portnumber ) @@ -244,7 +243,7 @@ * * PARAMS * hostname [I] Name of the host to connect to. - * portnumber [I] Portnumber to use. + * portnumber [I] Port number to use. * * RETURNS * Success: Pointer to an LDAP context. @@ -254,8 +253,8 @@ * The hostname string can be a space separated string of hostnames, * in which case the LDAP runtime will try to connect to the hosts * in order, until a connection can be made. A hostname may have a - * trailing portnumber (separated from the hostname by a ':'), which - * will take precedence over the portnumber supplied as a parameter + * trailing port number (separated from the hostname by a ':'), which + * will take precedence over the port number supplied as a parameter * to this function. */ WLDAP32_LDAP * CDECL cldap_openW( PWCHAR hostname, ULONG portnumber ) @@ -352,7 +351,7 @@ * * PARAMS * hostname [I] Name of the host to connect to. - * portnumber [I] Portnumber to use. + * portnumber [I] Port number to use. * * RETURNS * Success: Pointer to an LDAP context. @@ -362,8 +361,8 @@ * The hostname string can be a space separated string of hostnames, * in which case the LDAP runtime will try to connect to the hosts * in order, until a connection can be made. A hostname may have a - * trailing portnumber (separated from the hostname by a ':'), which - * will take precedence over the portnumber supplied as a parameter + * trailing port number (separated from the hostname by a ':'), which + * will take precedence over the port number supplied as a parameter * to this function. The connection will not be made until the first * LDAP function that needs it is called. */ @@ -435,7 +434,7 @@ * * PARAMS * hostname [I] Name of the host to connect to. - * portnumber [I] Portnumber to use. + * portnumber [I] Port number to use. * * RETURNS * Success: Pointer to an LDAP context. @@ -445,8 +444,8 @@ * The hostname string can be a space separated string of hostnames, * in which case the LDAP runtime will try to connect to the hosts * in order, until a connection can be made. A hostname may have a - * trailing portnumber (separated from the hostname by a ':'), which - * will take precedence over the portnumber supplied as a parameter + * trailing port number (separated from the hostname by a ':'), which + * will take precedence over the port number supplied as a parameter * to this function. */ WLDAP32_LDAP * CDECL ldap_openW( PWCHAR hostname, ULONG portnumber ) @@ -516,7 +515,7 @@ * * PARAMS * hostname [I] Name of the host to connect to. - * portnumber [I] Portnumber to use. + * portnumber [I] Port number to use. * secure [I] Ask the server to create an SSL connection. * * RETURNS @@ -527,8 +526,8 @@ * The hostname string can be a space separated string of hostnames, * in which case the LDAP runtime will try to connect to the hosts * in order, until a connection can be made. A hostname may have a - * trailing portnumber (separated from the hostname by a ':'), which - * will take precedence over the portnumber supplied as a parameter + * trailing port number (separated from the hostname by a ':'), which + * will take precedence over the port number supplied as a parameter * to this function. The connection will not be made until the first * LDAP function that needs it is called. */ Modified: trunk/reactos/dll/win32/wldap32/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wldap32/main.c?r… ============================================================================== --- trunk/reactos/dll/win32/wldap32/main.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wldap32/main.c [iso-8859-1] Sat Sep 28 15:30:23 2013 @@ -40,8 +40,6 @@ hwldap32 = hinst; DisableThreadLibraryCalls( hinst ); break; - case DLL_PROCESS_DETACH: - break; } return TRUE; } Modified: trunk/reactos/dll/win32/wldap32/option.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wldap32/option.c… ============================================================================== --- trunk/reactos/dll/win32/wldap32/option.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wldap32/option.c [iso-8859-1] Sat Sep 28 15:30:23 2013 @@ -319,7 +319,7 @@ TRACE( "(%p, 0x%08x, %p)\n", ld, option, value ); - if (!ld || !value) return WLDAP32_LDAP_PARAM_ERROR; + if (!ld) return WLDAP32_LDAP_PARAM_ERROR; switch (option) { @@ -422,7 +422,7 @@ TRACE( "(%p, 0x%08x, %p)\n", ld, option, value ); - if (!ld || !value) return WLDAP32_LDAP_PARAM_ERROR; + if (!ld) return WLDAP32_LDAP_PARAM_ERROR; switch (option) { Modified: trunk/reactos/dll/win32/wldap32/parse.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wldap32/parse.c?… ============================================================================== --- trunk/reactos/dll/win32/wldap32/parse.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wldap32/parse.c [iso-8859-1] Sat Sep 28 15:30:23 2013 @@ -444,7 +444,7 @@ #ifdef HAVE_LDAP_PARSE_VLV_CONTROL if (!(ret = ldap_parse_vlv_control( ld, controlU, &pos, &count, - context, errcode ))) + (struct berval **)context, errcode ))) { *targetpos = pos; *listcount = count; Modified: trunk/reactos/dll/win32/wldap32/search.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wldap32/search.c… ============================================================================== --- trunk/reactos/dll/win32/wldap32/search.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wldap32/search.c [iso-8859-1] Sat Sep 28 15:30:23 2013 @@ -243,7 +243,7 @@ #ifdef HAVE_LDAP char *baseU = NULL, *filterU = NULL, **attrsU = NULL; LDAPControl **serverctrlsU = NULL, **clientctrlsU = NULL; - struct timeval tv; + struct timeval tv, *tvp = NULL; ret = WLDAP32_LDAP_NO_MEMORY; @@ -274,11 +274,15 @@ if (!clientctrlsU) goto exit; } - tv.tv_sec = timelimit; - tv.tv_usec = 0; + if (timelimit) + { + tv.tv_sec = timelimit; + tv.tv_usec = 0; + tvp = &tv; + } ret = map_error( ldap_search_ext( ld, baseU, scope, filterU, attrsU, attrsonly, - serverctrlsU, clientctrlsU, &tv, sizelimit, (int *)message )); + serverctrlsU, clientctrlsU, tvp, sizelimit, (int *)message )); exit: strfreeU( baseU ); Modified: trunk/reactos/dll/win32/wldap32/wldap32.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wldap32/wldap32.… ============================================================================== --- trunk/reactos/dll/win32/wldap32/wldap32.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wldap32/wldap32.h [iso-8859-1] Sat Sep 28 15:30:23 2013 @@ -18,7 +18,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -ULONG map_error( int ); +extern HINSTANCE hwldap32 DECLSPEC_HIDDEN; + +ULONG map_error( int ) DECLSPEC_HIDDEN; /* A set of helper functions to convert LDAP data structures * to and from ansi (A), wide character (W) and utf8 (U) encodings. @@ -854,5 +856,4 @@ HeapFree( GetProcessHeap(), 0, sortkeyarray ); } } - #endif /* HAVE_LDAP */ Modified: trunk/reactos/dll/win32/wldap32/wldap32.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wldap32/wldap32.… ============================================================================== --- trunk/reactos/dll/win32/wldap32/wldap32.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wldap32/wldap32.spec [iso-8859-1] Sat Sep 28 15:30:23 2013 @@ -52,7 +52,7 @@ 62 cdecl ldap_add_extW(ptr wstr ptr ptr ptr ptr) 63 cdecl ldap_add_ext_s(ptr str ptr ptr ptr) ldap_add_ext_sA 64 cdecl ldap_add_ext_sA(ptr str ptr ptr ptr) - 65 cdecl ldap_add_ext_sW(ptr str ptr ptr ptr) + 65 cdecl ldap_add_ext_sW(ptr wstr ptr ptr ptr) 66 cdecl ldap_add_sA(ptr str ptr) 67 cdecl ldap_modrdn2(ptr str ptr long) ldap_modrdn2A 68 cdecl ldap_modrdn2_s(ptr str ptr long) ldap_modrdn2_sA @@ -206,7 +206,7 @@ 216 cdecl ldap_simple_bind_sW(ptr wstr wstr) 217 cdecl ldap_sslinit(str long long) ldap_sslinitA 218 cdecl ldap_sslinitA(str long long) -219 cdecl ldap_sslinitW(str long long) +219 cdecl ldap_sslinitW(wstr long long) 220 cdecl ldap_ufn2dn(str ptr) ldap_ufn2dnA 221 cdecl ldap_ufn2dnA(str ptr) 222 cdecl ldap_ufn2dnW(wstr ptr) Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Sat Sep 28 15:30:23 2013 @@ -208,7 +208,7 @@ reactos/dll/win32/winmm/midimap # Forked at Wine-20050628 reactos/dll/win32/winmm/wavemap # Forked at Wine-20050628 reactos/dll/win32/wintrust # Synced to Wine-1.7.1 -reactos/dll/win32/wldap32 # Autosync +reactos/dll/win32/wldap32 # Synced to Wine-1.7.1 reactos/dll/win32/wmi # Synced to Wine-1.5.19 reactos/dll/win32/wtsapi32 # Synced to Wine-1.5.4 reactos/dll/win32/wuapi # Synced to Wine-1.5.19

1 0

[akhaldi] 60431: [WINTRUST_WINETEST] * Sync with Wine 1.7.1. CORE-7469
by akhaldi＠svn.reactos.org 28 Sep '13

28 Sep '13

Author: akhaldi Date: Sat Sep 28 15:28:59 2013 New Revision: 60431 URL: http://svn.reactos.org/svn/reactos?rev=60431&view=rev Log: [WINTRUST_WINETEST] * Sync with Wine 1.7.1. CORE-7469 Modified: trunk/rostests/winetests/wintrust/CMakeLists.txt trunk/rostests/winetests/wintrust/crypt.c trunk/rostests/winetests/wintrust/softpub.c trunk/rostests/winetests/wintrust/testlist.c Modified: trunk/rostests/winetests/wintrust/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/wintrust/CMakeL… ============================================================================== --- trunk/rostests/winetests/wintrust/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/winetests/wintrust/CMakeLists.txt [iso-8859-1] Sat Sep 28 15:28:59 2013 @@ -1,5 +1,3 @@ - -add_definitions(-D__ROS_LONG64__) list(APPEND SOURCE asn.c @@ -9,7 +7,6 @@ testlist.c) add_executable(wintrust_winetest ${SOURCE}) -target_link_libraries(wintrust_winetest wine) set_module_type(wintrust_winetest win32cui) -add_importlibs(wintrust_winetest wintrust crypt32 advapi32 msvcrt kernel32 ntdll) +add_importlibs(wintrust_winetest wintrust crypt32 advapi32 msvcrt kernel32) add_cd_file(TARGET wintrust_winetest DESTINATION reactos/bin FOR all) Modified: trunk/rostests/winetests/wintrust/crypt.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/wintrust/crypt.… ============================================================================== --- trunk/rostests/winetests/wintrust/crypt.c [iso-8859-1] (original) +++ trunk/rostests/winetests/wintrust/crypt.c [iso-8859-1] Sat Sep 28 15:28:59 2013 @@ -203,7 +203,7 @@ /* NULL GUID */ ret = pCryptCATAdminAcquireContext(&hca, NULL, 0); - ok(ret, "Expected success\n"); + ok(ret, "Expected success, got FALSE with %d\n", GetLastError()); ok(hca != NULL, "Expected a context handle, got NULL\n"); /* All NULL */ @@ -273,23 +273,23 @@ } ret = pCryptCATAdminReleaseContext(hca, 0); - ok(ret, "Expected success\n"); + ok(ret, "Expected success, got FALSE with %d\n", GetLastError()); /* Correct context handle and GUID */ ret = pCryptCATAdminAcquireContext(&hca, &unknown, 0); - ok(ret, "Expected success\n"); + ok(ret, "Expected success, got FALSE with %d\n", GetLastError()); ok(hca != NULL, "Expected a context handle, got NULL\n"); ret = pCryptCATAdminReleaseContext(hca, 0); - ok(ret, "Expected success\n"); + ok(ret, "Expected success, got FALSE with %d\n", GetLastError()); /* Flags not equal to 0 */ ret = pCryptCATAdminAcquireContext(&hca, &unknown, 1); - ok(ret, "Expected success\n"); + ok(ret, "Expected success, got FALSE with %d\n", GetLastError()); ok(hca != NULL, "Expected a context handle, got NULL\n"); ret = pCryptCATAdminReleaseContext(hca, 0); - ok(ret, "Expected success\n"); + ok(ret, "Expected success, got FALSE with %d\n", GetLastError()); } /* TODO: Check whether SHA-1 is the algorithm that's always used */ @@ -340,7 +340,7 @@ ok(file != INVALID_HANDLE_VALUE, "CreateFile failed %u\n", GetLastError()); SetLastError(0xdeadbeef); ret = pCryptCATAdminCalcHashFromFileHandle(file, &hashsize, NULL, 0); - ok(ret, "Expected success %u\n", GetLastError()); + ok(ret, "Expected success, got FALSE with %d\n", GetLastError()); ok(hashsize == 20," Expected a hash size of 20, got %d\n", hashsize); ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, "Expected ERROR_INSUFFICIENT_BUFFER, got %d\n", GetLastError()); @@ -354,7 +354,7 @@ hash = HeapAlloc(GetProcessHeap(), 0, hashsize); SetLastError(0xdeadbeef); ret = pCryptCATAdminCalcHashFromFileHandle(file, &hashsize, hash, 0); - ok(ret, "Expected success %u\n", GetLastError()); + ok(ret, "Expected success, got FALSE with %d\n", GetLastError()); ok(hashsize == 20," Expected a hash size of 20, got %d\n", hashsize); ok(GetLastError() == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", GetLastError()); @@ -376,7 +376,7 @@ hash = HeapAlloc(GetProcessHeap(), 0, hashsize); SetLastError(0xdeadbeef); ret = pCryptCATAdminCalcHashFromFileHandle(file, &hashsize, hash, 0); - ok(ret, "Expected success\n"); + ok(ret, "Expected success, got FALSE with %d\n", GetLastError()); ok(GetLastError() == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", GetLastError()); ok(hashsize == sizeof(expectedhash) && @@ -526,7 +526,7 @@ ok(hcatinfo == NULL, "CryptCATAdminAddCatalog succeeded\n"); ok(error == ERROR_INVALID_PARAMETER, "got %u expected ERROR_INVALID_PARAMETER\n", GetLastError()); - MultiByteToWideChar(0, 0, tmpfile, -1, tmpfileW, MAX_PATH); + MultiByteToWideChar(CP_ACP, 0, tmpfile, -1, tmpfileW, MAX_PATH); SetLastError(0xdeadbeef); hcatinfo = pCryptCATAdminAddCatalog(hcatadmin, tmpfileW, basenameW, 0); @@ -558,6 +558,11 @@ /* Unique name will be created */ hcatinfo = pCryptCATAdminAddCatalog(hcatadmin, tmpfileW, NULL, 0); + if (!hcatinfo && (GetLastError() == ERROR_ACCESS_DENIED)) + { + win_skip("Not enough rights\n"); + goto cleanup; + } todo_wine ok(hcatinfo != NULL, "CryptCATAdminAddCatalog failed %u\n", GetLastError()); info.cbStruct = sizeof(info); @@ -568,10 +573,10 @@ ok(ret, "CryptCATCatalogInfoFromContext failed %u\n", GetLastError()); ok(info.wszCatalogFile[0] != 0, "Expected a filename\n"); } - WideCharToMultiByte(CP_ACP, 0, info.wszCatalogFile, -1, catfile, MAX_PATH, 0, 0); + WideCharToMultiByte(CP_ACP, 0, info.wszCatalogFile, -1, catfile, MAX_PATH, NULL, NULL); if ((p = strrchr(catfile, '\\'))) p++; memset(catfileW, 0, sizeof(catfileW)); - MultiByteToWideChar(0, 0, p, -1, catfileW, MAX_PATH); + MultiByteToWideChar(CP_ACP, 0, p, -1, catfileW, MAX_PATH); /* Set the file attributes so we can check what happens with them during the 'copy' */ attrs = FILE_ATTRIBUTE_READONLY; @@ -596,7 +601,7 @@ ret = pCryptCATCatalogInfoFromContext(hcatinfo, &info, 0); ok(ret, "CryptCATCatalogInfoFromContext failed %u\n", GetLastError()); ok(info.wszCatalogFile[0] != 0, "Expected a filename\n"); - WideCharToMultiByte(CP_ACP, 0, info.wszCatalogFile, -1, catfile, MAX_PATH, 0, 0); + WideCharToMultiByte(CP_ACP, 0, info.wszCatalogFile, -1, catfile, MAX_PATH, NULL, NULL); if ((p = strrchr(catfile, '\\'))) p++; ok(!lstrcmpA(basename, p), "Expected %s, got %s\n", basename, p); @@ -620,6 +625,7 @@ attrs = GetFileAttributes(catfilepath); ok(attrs == INVALID_FILE_ATTRIBUTES, "Expected %s to be removed\n", catfilepath); +cleanup: ret = pCryptCATAdminReleaseContext(hcatadmin, 0); ok(ret, "CryptCATAdminReleaseContext failed %u\n", GetLastError()); @@ -760,7 +766,7 @@ ret = pCryptCATCDFClose(catcdf); todo_wine { - ok(ret, "Expected success\n"); + ok(ret, "Expected success, got FALSE with %d\n", GetLastError()); ok(GetLastError() == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", GetLastError()); } Modified: trunk/rostests/winetests/wintrust/softpub.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/wintrust/softpu… ============================================================================== --- trunk/rostests/winetests/wintrust/softpub.c [iso-8859-1] (original) +++ trunk/rostests/winetests/wintrust/softpub.c [iso-8859-1] Sat Sep 28 15:28:59 2013 @@ -274,7 +274,7 @@ /* Workaround missing W-functions for win9x */ GetWindowsDirectoryA(notepadPath, MAX_PATH); lstrcatA(notepadPath, notepad); - MultiByteToWideChar(0, 0, notepadPath, -1, notepadPathW, size); + MultiByteToWideChar(CP_ACP, 0, notepadPath, -1, notepadPathW, size); } /* Creates a test file and returns a handle to it. The file's path is returned @@ -425,29 +425,118 @@ } static const BYTE selfSignedCert[] = { - 0x30, 0x82, 0x01, 0x1f, 0x30, 0x81, 0xce, 0xa0, 0x03, 0x02, 0x01, 0x02, 0x02, - 0x10, 0xeb, 0x0d, 0x57, 0x2a, 0x9c, 0x09, 0xba, 0xa4, 0x4a, 0xb7, 0x25, 0x49, - 0xd9, 0x3e, 0xb5, 0x73, 0x30, 0x09, 0x06, 0x05, 0x2b, 0x0e, 0x03, 0x02, 0x1d, - 0x05, 0x00, 0x30, 0x15, 0x31, 0x13, 0x30, 0x11, 0x06, 0x03, 0x55, 0x04, 0x03, - 0x13, 0x0a, 0x4a, 0x75, 0x61, 0x6e, 0x20, 0x4c, 0x61, 0x6e, 0x67, 0x00, 0x30, - 0x1e, 0x17, 0x0d, 0x30, 0x36, 0x30, 0x36, 0x32, 0x39, 0x30, 0x35, 0x30, 0x30, - 0x34, 0x36, 0x5a, 0x17, 0x0d, 0x30, 0x37, 0x30, 0x36, 0x32, 0x39, 0x31, 0x31, - 0x30, 0x30, 0x34, 0x36, 0x5a, 0x30, 0x15, 0x31, 0x13, 0x30, 0x11, 0x06, 0x03, - 0x55, 0x04, 0x03, 0x13, 0x0a, 0x4a, 0x75, 0x61, 0x6e, 0x20, 0x4c, 0x61, 0x6e, - 0x67, 0x00, 0x30, 0x5c, 0x30, 0x0d, 0x06, 0x09, 0x2a, 0x86, 0x48, 0x86, 0xf7, - 0x0d, 0x01, 0x01, 0x01, 0x05, 0x00, 0x03, 0x4b, 0x00, 0x30, 0x48, 0x02, 0x41, - 0x00, 0xe2, 0x54, 0x3a, 0xa7, 0x83, 0xb1, 0x27, 0x14, 0x3e, 0x59, 0xbb, 0xb4, - 0x53, 0xe6, 0x1f, 0xe7, 0x5d, 0xf1, 0x21, 0x68, 0xad, 0x85, 0x53, 0xdb, 0x6b, - 0x1e, 0xeb, 0x65, 0x97, 0x03, 0x86, 0x60, 0xde, 0xf3, 0x6c, 0x38, 0x75, 0xe0, - 0x4c, 0x61, 0xbb, 0xbc, 0x62, 0x17, 0xa9, 0xcd, 0x79, 0x3f, 0x21, 0x4e, 0x96, - 0xcb, 0x0e, 0xdc, 0x61, 0x94, 0x30, 0x18, 0x10, 0x6b, 0xd0, 0x1c, 0x10, 0x79, - 0x02, 0x03, 0x01, 0x00, 0x01, 0x30, 0x09, 0x06, 0x05, 0x2b, 0x0e, 0x03, 0x02, - 0x1d, 0x05, 0x00, 0x03, 0x41, 0x00, 0x25, 0x90, 0x53, 0x34, 0xd9, 0x56, 0x41, - 0x5e, 0xdb, 0x7e, 0x01, 0x36, 0xec, 0x27, 0x61, 0x5e, 0xb7, 0x4d, 0x90, 0x66, - 0xa2, 0xe1, 0x9d, 0x58, 0x76, 0xd4, 0x9c, 0xba, 0x2c, 0x84, 0xc6, 0x83, 0x7a, - 0x22, 0x0d, 0x03, 0x69, 0x32, 0x1a, 0x6d, 0xcb, 0x0c, 0x15, 0xb3, 0x6b, 0xc7, - 0x0a, 0x8c, 0xb4, 0x5c, 0x34, 0x78, 0xe0, 0x3c, 0x9c, 0xe9, 0xf3, 0x30, 0x9f, - 0xa8, 0x76, 0x57, 0x92, 0x36 }; + 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x42, 0x45, 0x47, 0x49, 0x4e, 0x20, 0x43, + 0x45, 0x52, 0x54, 0x49, 0x46, 0x49, 0x43, 0x41, 0x54, 0x45, 0x2d, 0x2d, + 0x2d, 0x2d, 0x2d, 0x0a, 0x4d, 0x49, 0x49, 0x44, 0x70, 0x7a, 0x43, 0x43, + 0x41, 0x6f, 0x2b, 0x67, 0x41, 0x77, 0x49, 0x42, 0x41, 0x67, 0x49, 0x4a, + 0x41, 0x4c, 0x59, 0x51, 0x67, 0x65, 0x66, 0x7a, 0x51, 0x41, 0x61, 0x43, + 0x4d, 0x41, 0x30, 0x47, 0x43, 0x53, 0x71, 0x47, 0x53, 0x49, 0x62, 0x33, + 0x44, 0x51, 0x45, 0x42, 0x42, 0x51, 0x55, 0x41, 0x4d, 0x47, 0x6f, 0x78, + 0x43, 0x7a, 0x41, 0x4a, 0x42, 0x67, 0x4e, 0x56, 0x0a, 0x42, 0x41, 0x59, + 0x54, 0x41, 0x6b, 0x46, 0x56, 0x4d, 0x52, 0x4d, 0x77, 0x45, 0x51, 0x59, + 0x44, 0x56, 0x51, 0x51, 0x49, 0x44, 0x41, 0x70, 0x54, 0x62, 0x32, 0x31, + 0x6c, 0x4c, 0x56, 0x4e, 0x30, 0x59, 0x58, 0x52, 0x6c, 0x4d, 0x53, 0x45, + 0x77, 0x48, 0x77, 0x59, 0x44, 0x56, 0x51, 0x51, 0x4b, 0x44, 0x42, 0x68, + 0x4a, 0x62, 0x6e, 0x52, 0x6c, 0x63, 0x6d, 0x35, 0x6c, 0x64, 0x43, 0x42, + 0x58, 0x0a, 0x61, 0x57, 0x52, 0x6e, 0x61, 0x58, 0x52, 0x7a, 0x49, 0x46, + 0x42, 0x30, 0x65, 0x53, 0x42, 0x4d, 0x64, 0x47, 0x51, 0x78, 0x49, 0x7a, + 0x41, 0x68, 0x42, 0x67, 0x4e, 0x56, 0x42, 0x41, 0x4d, 0x4d, 0x47, 0x6e, + 0x4e, 0x6c, 0x62, 0x47, 0x5a, 0x7a, 0x61, 0x57, 0x64, 0x75, 0x5a, 0x57, + 0x51, 0x75, 0x64, 0x47, 0x56, 0x7a, 0x64, 0x43, 0x35, 0x33, 0x61, 0x57, + 0x35, 0x6c, 0x61, 0x48, 0x45, 0x75, 0x0a, 0x62, 0x33, 0x4a, 0x6e, 0x4d, + 0x42, 0x34, 0x58, 0x44, 0x54, 0x45, 0x7a, 0x4d, 0x44, 0x59, 0x79, 0x4d, + 0x54, 0x45, 0x78, 0x4d, 0x6a, 0x55, 0x78, 0x4d, 0x46, 0x6f, 0x58, 0x44, + 0x54, 0x49, 0x7a, 0x4d, 0x44, 0x59, 0x78, 0x4f, 0x54, 0x45, 0x78, 0x4d, + 0x6a, 0x55, 0x78, 0x4d, 0x46, 0x6f, 0x77, 0x61, 0x6a, 0x45, 0x4c, 0x4d, + 0x41, 0x6b, 0x47, 0x41, 0x31, 0x55, 0x45, 0x42, 0x68, 0x4d, 0x43, 0x0a, + 0x51, 0x56, 0x55, 0x78, 0x45, 0x7a, 0x41, 0x52, 0x42, 0x67, 0x4e, 0x56, + 0x42, 0x41, 0x67, 0x4d, 0x43, 0x6c, 0x4e, 0x76, 0x62, 0x57, 0x55, 0x74, + 0x55, 0x33, 0x52, 0x68, 0x64, 0x47, 0x55, 0x78, 0x49, 0x54, 0x41, 0x66, + 0x42, 0x67, 0x4e, 0x56, 0x42, 0x41, 0x6f, 0x4d, 0x47, 0x45, 0x6c, 0x75, + 0x64, 0x47, 0x56, 0x79, 0x62, 0x6d, 0x56, 0x30, 0x49, 0x46, 0x64, 0x70, + 0x5a, 0x47, 0x64, 0x70, 0x0a, 0x64, 0x48, 0x4d, 0x67, 0x55, 0x48, 0x52, + 0x35, 0x49, 0x45, 0x78, 0x30, 0x5a, 0x44, 0x45, 0x6a, 0x4d, 0x43, 0x45, + 0x47, 0x41, 0x31, 0x55, 0x45, 0x41, 0x77, 0x77, 0x61, 0x63, 0x32, 0x56, + 0x73, 0x5a, 0x6e, 0x4e, 0x70, 0x5a, 0x32, 0x35, 0x6c, 0x5a, 0x43, 0x35, + 0x30, 0x5a, 0x58, 0x4e, 0x30, 0x4c, 0x6e, 0x64, 0x70, 0x62, 0x6d, 0x56, + 0x6f, 0x63, 0x53, 0x35, 0x76, 0x63, 0x6d, 0x63, 0x77, 0x0a, 0x67, 0x67, + 0x45, 0x69, 0x4d, 0x41, 0x30, 0x47, 0x43, 0x53, 0x71, 0x47, 0x53, 0x49, + 0x62, 0x33, 0x44, 0x51, 0x45, 0x42, 0x41, 0x51, 0x55, 0x41, 0x41, 0x34, + 0x49, 0x42, 0x44, 0x77, 0x41, 0x77, 0x67, 0x67, 0x45, 0x4b, 0x41, 0x6f, + 0x49, 0x42, 0x41, 0x51, 0x44, 0x77, 0x4e, 0x6d, 0x2b, 0x46, 0x7a, 0x78, + 0x6e, 0x6b, 0x48, 0x57, 0x2f, 0x4e, 0x70, 0x37, 0x59, 0x48, 0x34, 0x4d, + 0x79, 0x45, 0x0a, 0x77, 0x4d, 0x6c, 0x49, 0x67, 0x71, 0x30, 0x66, 0x45, + 0x77, 0x70, 0x47, 0x6f, 0x41, 0x75, 0x78, 0x44, 0x64, 0x61, 0x46, 0x55, + 0x32, 0x6f, 0x70, 0x76, 0x41, 0x51, 0x56, 0x61, 0x2b, 0x41, 0x43, 0x46, + 0x38, 0x63, 0x6f, 0x38, 0x4d, 0x4a, 0x6c, 0x33, 0x78, 0x77, 0x76, 0x46, + 0x44, 0x2b, 0x67, 0x61, 0x46, 0x45, 0x7a, 0x59, 0x78, 0x53, 0x58, 0x30, + 0x43, 0x47, 0x72, 0x4a, 0x45, 0x4c, 0x63, 0x0a, 0x74, 0x34, 0x4d, 0x69, + 0x30, 0x68, 0x4b, 0x50, 0x76, 0x42, 0x70, 0x65, 0x73, 0x59, 0x6c, 0x46, + 0x4d, 0x51, 0x65, 0x6b, 0x2b, 0x63, 0x70, 0x51, 0x50, 0x33, 0x4b, 0x35, + 0x75, 0x36, 0x71, 0x58, 0x5a, 0x52, 0x49, 0x67, 0x48, 0x75, 0x59, 0x45, + 0x4c, 0x2f, 0x73, 0x55, 0x6f, 0x39, 0x32, 0x70, 0x44, 0x30, 0x7a, 0x4a, + 0x65, 0x4c, 0x47, 0x41, 0x31, 0x49, 0x30, 0x4b, 0x5a, 0x34, 0x73, 0x2f, + 0x0a, 0x51, 0x7a, 0x77, 0x61, 0x4f, 0x38, 0x62, 0x62, 0x4b, 0x6d, 0x37, + 0x42, 0x72, 0x6e, 0x56, 0x77, 0x30, 0x6e, 0x5a, 0x2f, 0x4b, 0x41, 0x5a, + 0x6a, 0x75, 0x78, 0x75, 0x6f, 0x4e, 0x33, 0x52, 0x64, 0x72, 0x69, 0x30, + 0x4a, 0x48, 0x77, 0x7a, 0x6a, 0x41, 0x55, 0x34, 0x2b, 0x71, 0x57, 0x65, + 0x55, 0x63, 0x2f, 0x64, 0x33, 0x45, 0x70, 0x4f, 0x47, 0x78, 0x69, 0x42, + 0x77, 0x5a, 0x4e, 0x61, 0x7a, 0x0a, 0x39, 0x6f, 0x4a, 0x41, 0x37, 0x54, + 0x2f, 0x51, 0x6f, 0x62, 0x75, 0x61, 0x4e, 0x53, 0x6b, 0x65, 0x55, 0x48, + 0x43, 0x61, 0x50, 0x53, 0x6a, 0x44, 0x37, 0x71, 0x7a, 0x6c, 0x43, 0x4f, + 0x52, 0x48, 0x47, 0x68, 0x75, 0x31, 0x76, 0x79, 0x79, 0x35, 0x31, 0x45, + 0x36, 0x79, 0x46, 0x43, 0x4e, 0x47, 0x66, 0x65, 0x7a, 0x71, 0x2f, 0x4d, + 0x59, 0x34, 0x4e, 0x4b, 0x68, 0x77, 0x72, 0x61, 0x59, 0x64, 0x0a, 0x62, + 0x79, 0x49, 0x2f, 0x6c, 0x42, 0x46, 0x62, 0x36, 0x35, 0x6b, 0x5a, 0x45, + 0x66, 0x49, 0x4b, 0x4b, 0x54, 0x7a, 0x79, 0x36, 0x76, 0x30, 0x44, 0x65, + 0x79, 0x50, 0x37, 0x52, 0x6b, 0x34, 0x75, 0x48, 0x44, 0x38, 0x77, 0x62, + 0x49, 0x79, 0x50, 0x32, 0x47, 0x6c, 0x42, 0x30, 0x67, 0x37, 0x2f, 0x69, + 0x79, 0x33, 0x4c, 0x61, 0x74, 0x49, 0x74, 0x49, 0x70, 0x2b, 0x49, 0x35, + 0x53, 0x50, 0x56, 0x0a, 0x41, 0x67, 0x4d, 0x42, 0x41, 0x41, 0x47, 0x6a, + 0x55, 0x44, 0x42, 0x4f, 0x4d, 0x42, 0x30, 0x47, 0x41, 0x31, 0x55, 0x64, + 0x44, 0x67, 0x51, 0x57, 0x42, 0x42, 0x53, 0x36, 0x49, 0x4c, 0x5a, 0x2f, + 0x71, 0x38, 0x66, 0x2f, 0x4b, 0x45, 0x68, 0x4b, 0x76, 0x68, 0x69, 0x2b, + 0x73, 0x6b, 0x59, 0x45, 0x31, 0x79, 0x48, 0x71, 0x39, 0x7a, 0x41, 0x66, + 0x42, 0x67, 0x4e, 0x56, 0x48, 0x53, 0x4d, 0x45, 0x0a, 0x47, 0x44, 0x41, + 0x57, 0x67, 0x42, 0x53, 0x36, 0x49, 0x4c, 0x5a, 0x2f, 0x71, 0x38, 0x66, + 0x2f, 0x4b, 0x45, 0x68, 0x4b, 0x76, 0x68, 0x69, 0x2b, 0x73, 0x6b, 0x59, + 0x45, 0x31, 0x79, 0x48, 0x71, 0x39, 0x7a, 0x41, 0x4d, 0x42, 0x67, 0x4e, + 0x56, 0x48, 0x52, 0x4d, 0x45, 0x42, 0x54, 0x41, 0x44, 0x41, 0x51, 0x48, + 0x2f, 0x4d, 0x41, 0x30, 0x47, 0x43, 0x53, 0x71, 0x47, 0x53, 0x49, 0x62, + 0x33, 0x0a, 0x44, 0x51, 0x45, 0x42, 0x42, 0x51, 0x55, 0x41, 0x41, 0x34, + 0x49, 0x42, 0x41, 0x51, 0x41, 0x79, 0x5a, 0x59, 0x77, 0x47, 0x4b, 0x46, + 0x34, 0x34, 0x43, 0x68, 0x47, 0x51, 0x72, 0x6e, 0x74, 0x57, 0x6c, 0x38, + 0x48, 0x53, 0x4a, 0x30, 0x63, 0x69, 0x55, 0x58, 0x4d, 0x44, 0x4b, 0x32, + 0x46, 0x6c, 0x6f, 0x74, 0x47, 0x49, 0x6a, 0x30, 0x32, 0x6c, 0x4d, 0x39, + 0x38, 0x71, 0x45, 0x49, 0x65, 0x68, 0x0a, 0x56, 0x67, 0x66, 0x41, 0x34, + 0x7a, 0x69, 0x37, 0x4d, 0x45, 0x6c, 0x51, 0x61, 0x76, 0x6b, 0x52, 0x76, + 0x32, 0x54, 0x43, 0x50, 0x50, 0x55, 0x51, 0x62, 0x35, 0x51, 0x64, 0x61, + 0x6f, 0x37, 0x57, 0x78, 0x37, 0x6c, 0x66, 0x61, 0x54, 0x6f, 0x5a, 0x68, + 0x4f, 0x54, 0x2b, 0x4e, 0x52, 0x68, 0x32, 0x6b, 0x35, 0x78, 0x2b, 0x6b, + 0x6a, 0x5a, 0x46, 0x77, 0x38, 0x70, 0x45, 0x48, 0x74, 0x35, 0x51, 0x0a, + 0x69, 0x68, 0x62, 0x46, 0x4c, 0x35, 0x58, 0x2b, 0x57, 0x7a, 0x6f, 0x2b, + 0x42, 0x36, 0x36, 0x59, 0x79, 0x49, 0x76, 0x68, 0x77, 0x54, 0x63, 0x48, + 0x30, 0x46, 0x2b, 0x6e, 0x66, 0x55, 0x71, 0x66, 0x74, 0x38, 0x59, 0x74, + 0x72, 0x2f, 0x38, 0x37, 0x47, 0x45, 0x62, 0x73, 0x41, 0x48, 0x6a, 0x48, + 0x43, 0x36, 0x4c, 0x2b, 0x77, 0x6b, 0x31, 0x76, 0x4e, 0x6e, 0x64, 0x49, + 0x59, 0x47, 0x30, 0x51, 0x0a, 0x79, 0x62, 0x73, 0x7a, 0x78, 0x49, 0x72, + 0x32, 0x6d, 0x46, 0x45, 0x49, 0x4a, 0x6f, 0x69, 0x51, 0x44, 0x44, 0x67, + 0x66, 0x6c, 0x71, 0x67, 0x64, 0x76, 0x4c, 0x54, 0x32, 0x79, 0x64, 0x46, + 0x6d, 0x79, 0x33, 0x73, 0x32, 0x68, 0x49, 0x74, 0x51, 0x6c, 0x49, 0x71, + 0x4b, 0x4c, 0x42, 0x36, 0x49, 0x4a, 0x51, 0x49, 0x75, 0x69, 0x37, 0x72, + 0x37, 0x34, 0x76, 0x64, 0x72, 0x63, 0x58, 0x71, 0x58, 0x0a, 0x44, 0x7a, + 0x68, 0x6d, 0x4c, 0x66, 0x67, 0x6a, 0x67, 0x4c, 0x77, 0x33, 0x2b, 0x55, + 0x79, 0x69, 0x59, 0x74, 0x44, 0x54, 0x76, 0x63, 0x78, 0x65, 0x7a, 0x62, + 0x4c, 0x73, 0x76, 0x51, 0x6f, 0x52, 0x6b, 0x74, 0x77, 0x4b, 0x5a, 0x4c, + 0x44, 0x54, 0x42, 0x42, 0x35, 0x76, 0x59, 0x32, 0x78, 0x4b, 0x36, 0x6b, + 0x4f, 0x4f, 0x44, 0x70, 0x7a, 0x50, 0x48, 0x73, 0x4b, 0x67, 0x30, 0x42, + 0x59, 0x77, 0x0a, 0x4d, 0x6b, 0x48, 0x56, 0x56, 0x54, 0x34, 0x79, 0x2f, + 0x4d, 0x59, 0x36, 0x63, 0x63, 0x4b, 0x51, 0x2f, 0x4c, 0x56, 0x74, 0x32, + 0x66, 0x4a, 0x49, 0x74, 0x69, 0x41, 0x71, 0x49, 0x47, 0x32, 0x38, 0x64, + 0x37, 0x31, 0x53, 0x0a, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x45, 0x4e, 0x44, + 0x20, 0x43, 0x45, 0x52, 0x54, 0x49, 0x46, 0x49, 0x43, 0x41, 0x54, 0x45, + 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x0a +}; static void testCertTrust(SAFE_PROVIDER_FUNCTIONS *funcs, GUID *actionID) { @@ -616,7 +705,7 @@ { 0x31, 0xC0, /* xor eax, eax */ 0xFF, 0x25, EXIT_PROCESS&0xFF, (EXIT_PROCESS>>8)&0xFF, (EXIT_PROCESS>>16)&0xFF, - (EXIT_PROCESS>>24)&0xFF, /* jmp ExitProcess */ + (EXIT_PROCESS>>24)&0xFF, /* jmp ExitProcess */ 0 }, /* .idata section */ @@ -667,7 +756,6 @@ ret = CryptSIPCreateIndirectData_p(&subjinfo, NULL, NULL); ok(!ret && GetLastError() == ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); - file = create_temp_file(temp_file); if (file == INVALID_HANDLE_VALUE) { Modified: trunk/rostests/winetests/wintrust/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/wintrust/testli… ============================================================================== --- trunk/rostests/winetests/wintrust/testlist.c [iso-8859-1] (original) +++ trunk/rostests/winetests/wintrust/testlist.c [iso-8859-1] Sat Sep 28 15:28:59 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_asn(void); extern void func_crypt(void);

1 0

[akhaldi] 60430: [WINTRUST] * Sync with Wine 1.7.1. CORE-7469
by akhaldi＠svn.reactos.org 28 Sep '13

28 Sep '13

Author: akhaldi Date: Sat Sep 28 15:28:15 2013 New Revision: 60430 URL: http://svn.reactos.org/svn/reactos?rev=60430&view=rev Log: [WINTRUST] * Sync with Wine 1.7.1. CORE-7469 Modified: trunk/reactos/dll/win32/wintrust/CMakeLists.txt trunk/reactos/dll/win32/wintrust/asn.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/wintrust/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wintrust/CMakeLi… ============================================================================== --- trunk/reactos/dll/win32/wintrust/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wintrust/CMakeLists.txt [iso-8859-1] Sat Sep 28 15:28:15 2013 @@ -1,7 +1,6 @@ add_definitions(-D__WINESRC__) include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) - spec2def(wintrust.dll wintrust.spec ADD_IMPORTLIB) list(APPEND SOURCE @@ -10,16 +9,14 @@ register.c softpub.c wintrust_main.c - version.rc ${CMAKE_CURRENT_BINARY_DIR}/wintrust_stubs.c ${CMAKE_CURRENT_BINARY_DIR}/wintrust.def) -add_library(wintrust SHARED ${SOURCE}) +add_library(wintrust SHARED ${SOURCE} version.rc) set_module_type(wintrust win32dll) target_link_libraries(wintrust wine ${PSEH_LIB}) -# FIXME: imagehlp should be delay-imported. See bug 7171 +# FIXME: imagehlp should be delay-imported. See CORE-6504 #add_delay_importlibs(wintrust cryptui imagehlp) add_delay_importlibs(wintrust cryptui) add_importlibs(wintrust imagehlp crypt32 user32 advapi32 msvcrt kernel32 ntdll) - add_cd_file(TARGET wintrust DESTINATION reactos/system32 FOR all) Modified: trunk/reactos/dll/win32/wintrust/asn.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wintrust/asn.c?r… ============================================================================== --- trunk/reactos/dll/win32/wintrust/asn.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wintrust/asn.c [iso-8859-1] Sat Sep 28 15:28:15 2013 @@ -2342,7 +2342,7 @@ else { *pcbStructInfo = sizeof(BOOL); - *(BOOL *)pvStructInfo = pbEncoded[2] ? TRUE : FALSE; + *(BOOL *)pvStructInfo = pbEncoded[2] != 0; ret = TRUE; } TRACE("returning %d (%08x)\n", ret, GetLastError()); Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Sat Sep 28 15:28:15 2013 @@ -207,7 +207,7 @@ reactos/dll/win32/winmm # Forked at Wine-20050628 reactos/dll/win32/winmm/midimap # Forked at Wine-20050628 reactos/dll/win32/winmm/wavemap # Forked at Wine-20050628 -reactos/dll/win32/wintrust # Synced to Wine-1.5.4 +reactos/dll/win32/wintrust # Synced to Wine-1.7.1 reactos/dll/win32/wldap32 # Autosync reactos/dll/win32/wmi # Synced to Wine-1.5.19 reactos/dll/win32/wtsapi32 # Synced to Wine-1.5.4

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs