Ros-diffs April 2014

ros-diffs@reactos.org

15 participants
492 discussions

[akhaldi] 62868: [XMLLITE] * Sync with Wine 1.7.17. CORE-8080

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Tue Apr 22 11:25:12 2014 New Revision: 62868 URL: http://svn.reactos.org/svn/reactos?rev=62868&view=rev Log: [XMLLITE] * Sync with Wine 1.7.17. CORE-8080 Modified: trunk/reactos/dll/win32/xmllite/guid.c trunk/reactos/dll/win32/xmllite/reader.c trunk/reactos/dll/win32/xmllite/writer.c trunk/reactos/dll/win32/xmllite/xmllite.spec trunk/reactos/dll/win32/xmllite/xmllite_private.h trunk/reactos/include/psdk/xmllite.idl trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/xmllite/guid.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/xmllite/guid.c?r… ============================================================================== --- trunk/reactos/dll/win32/xmllite/guid.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/xmllite/guid.c [iso-8859-1] Tue Apr 22 11:25:12 2014 @@ -14,5 +14,7 @@ /* reader.c */ DEFINE_GUID(IID_IXmlReaderInput, 0x0b3ccc9b, 0x9214, 0x428b, 0xa2, 0xae, 0xef, 0x3a, 0xa8, 0x71, 0xaf, 0xda); +/* writer.c */ +DEFINE_GUID(IID_IXmlWriterOutput, 0xc1131708, 0x0f59, 0x477f, 0x93, 0x59, 0x7d, 0x33, 0x24, 0x51, 0xbc, 0x1a); /* NO CODE HERE, THIS IS JUST REQUIRED FOR THE GUID DEFINITIONS */ 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 Apr 22 11:25:12 2014 @@ -30,13 +30,6 @@ typedef enum { - XmlEncoding_UTF16, - XmlEncoding_UTF8, - XmlEncoding_Unknown -} xml_encoding; - -typedef enum -{ XmlReadInState_Initial, XmlReadInState_XmlDecl, XmlReadInState_Misc_DTD, @@ -58,7 +51,8 @@ XmlReadResumeState_CDATA, XmlReadResumeState_Comment, XmlReadResumeState_STag, - XmlReadResumeState_CharData + XmlReadResumeState_CharData, + XmlReadResumeState_Whitespace } XmlReaderResumeState; /* saved pointer index to resume from particular input position */ @@ -91,7 +85,7 @@ static const char *debugstr_nodetype(XmlNodeType nodetype) { - static const char* type_names[] = + static const char * const type_names[] = { "None", "Element", @@ -114,17 +108,14 @@ }; if (nodetype > _XmlNodeType_Last) - { - static char buf[25]; - sprintf(buf, "unknown type=%d", nodetype); - return buf; - } + return wine_dbg_sprintf("unknown type=%d", nodetype); + return type_names[nodetype]; } static const char *debugstr_prop(XmlReaderProperty prop) { - static const char* prop_names[] = + static const char * const prop_names[] = { "MultiLanguage", "ConformanceLevel", @@ -137,11 +128,8 @@ }; if (prop > _XmlReaderProperty_Last) - { - static char buf[25]; - sprintf(buf, "unknown property=%d", prop); - return buf; - } + return wine_dbg_sprintf("unknown property=%d", prop); + return prop_names[prop]; } @@ -160,7 +148,7 @@ typedef struct { char *data; - char *cur; + UINT cur; unsigned int allocated; unsigned int written; } encoded_buffer; @@ -199,11 +187,11 @@ { WCHAR *str; /* allocated null-terminated string */ UINT len; /* length in WCHARs, altered after ReadValueChunk */ - WCHAR *start; /* input position where value starts */ + UINT start; /* input position where value starts */ } strval; static WCHAR emptyW[] = {0}; -static const strval strval_empty = {emptyW, 0, emptyW}; +static const strval strval_empty = { emptyW }; struct attribute { @@ -239,7 +227,7 @@ UINT depth; UINT max_depth; BOOL empty_element; - WCHAR *resume[XmlReadResume_Last]; /* pointers used to resume reader */ + UINT resume[XmlReadResume_Last]; /* offsets used to resume reader */ } xmlreader; struct input_buffer @@ -260,14 +248,6 @@ return CONTAINING_RECORD(iface, xmlreaderinput, IXmlReaderInput_iface); } -static inline void *m_alloc(IMalloc *imalloc, size_t len) -{ - if (imalloc) - return IMalloc_Alloc(imalloc, len); - else - return heap_alloc(len); -} - static inline void *m_realloc(IMalloc *imalloc, void *mem, size_t len) { if (imalloc) @@ -276,14 +256,6 @@ return heap_realloc(mem, len); } -static inline void m_free(IMalloc *imalloc, void *mem) -{ - if (imalloc) - IMalloc_Free(imalloc, mem); - else - heap_free(mem); -} - /* reader memory allocation functions */ static inline void *reader_alloc(xmlreader *reader, size_t len) { @@ -295,6 +267,18 @@ m_free(reader->imalloc, mem); } +/* Just return pointer from offset, no attempt to read more. */ +static inline WCHAR *reader_get_ptr2(const xmlreader *reader, UINT offset) +{ + encoded_buffer *buffer = &reader->input->buffer->utf16; + return (WCHAR*)buffer->data + offset; +} + +static inline WCHAR *reader_get_strptr(const xmlreader *reader, const strval *v) +{ + return v->str ? v->str : reader_get_ptr2(reader, v->start); +} + static HRESULT reader_strvaldup(xmlreader *reader, const strval *src, strval *dest) { *dest = *src; @@ -303,8 +287,9 @@ { 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)); + memcpy(dest->str, reader_get_strptr(reader, src), dest->len*sizeof(WCHAR)); dest->str[dest->len] = 0; + dest->start = 0; } return S_OK; @@ -350,6 +335,7 @@ } list_init(&reader->attrs); reader->attr_count = 0; + reader->attr = NULL; } /* attribute data holds pointers to buffer data, so buffer shrink is not possible @@ -379,10 +365,30 @@ } } -static inline void reader_init_strvalue(WCHAR *str, UINT len, strval *v) -{ - v->start = v->str = str; +/* returns length in WCHARs from 'start' to current buffer offset */ +static inline UINT reader_get_len(const xmlreader *reader, UINT start) +{ + return reader->input->buffer->utf16.cur - start; +} + +static inline void reader_init_strvalue(UINT start, UINT len, strval *v) +{ + v->start = start; v->len = len; + v->str = NULL; +} + +static inline const char* debug_strval(const xmlreader *reader, const strval *v) +{ + return debugstr_wn(reader_get_strptr(reader, v), v->len); +} + +/* used to initialize from constant string */ +static inline void reader_init_cstrvalue(WCHAR *str, UINT len, strval *v) +{ + v->start = 0; + v->len = len; + v->str = str; } static void reader_free_strvalue(xmlreader *reader, XmlReaderStringValue type) @@ -399,10 +405,10 @@ /* 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) +static inline int strval_eq(const xmlreader *reader, const strval *str1, const strval *str2) { if (str1->len != str2->len) return 0; - return !memcmp(str1->str, str2->str, str1->len*sizeof(WCHAR)); + return !memcmp(reader_get_strptr(reader, str1), reader_get_strptr(reader, str2), str1->len*sizeof(WCHAR)); } static void reader_clear_elements(xmlreader *reader) @@ -488,7 +494,7 @@ if (!value) { v->str = NULL; - v->start = NULL; + v->start = 0; v->len = 0; return; } @@ -507,7 +513,7 @@ else { v->str = reader_alloc(reader, (value->len + 1)*sizeof(WCHAR)); - memcpy(v->str, value->start, value->len*sizeof(WCHAR)); + memcpy(v->str, reader_get_strptr(reader, value), value->len*sizeof(WCHAR)); v->str[value->len] = 0; v->len = value->len; } @@ -526,7 +532,7 @@ if (!buffer->data) return E_OUTOFMEMORY; memset(buffer->data, 0, 4); - buffer->cur = buffer->data; + buffer->cur = 0; buffer->allocated = initial_len; buffer->written = 0; @@ -551,7 +557,7 @@ return S_OK; } -static xml_encoding parse_encoding_name(const WCHAR *name, int len) +xml_encoding parse_encoding_name(const WCHAR *name, int len) { int min, max, n, c; @@ -660,7 +666,7 @@ 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); + TRACE("written=%d, alloc=%d, requested=%d, read=%d, ret=0x%08x\n", buffer->written, buffer->allocated, len, read, hr); readerinput->pending = hr == E_PENDING; if (FAILED(hr)) return hr; buffer->written += read; @@ -668,11 +674,12 @@ return hr; } -/* grows UTF-16 buffer so it has at least 'length' bytes free on return */ +/* grows UTF-16 buffer so it has at least 'length' WCHAR chars free on return */ static void readerinput_grow(xmlreaderinput *readerinput, int length) { encoded_buffer *buffer = &readerinput->buffer->utf16; + length *= sizeof(WCHAR); /* grow if needed, plus 4 bytes to be sure null terminator will fit in */ if (buffer->allocated < buffer->written + length + 4) { @@ -682,10 +689,10 @@ } } -static inline int readerinput_is_utf8(xmlreaderinput *readerinput) -{ - static char startA[] = {'<','?'}; - static char commentA[] = {'<','!'}; +static inline BOOL readerinput_is_utf8(xmlreaderinput *readerinput) +{ + static const char startA[] = {'<','?'}; + static const char commentA[] = {'<','!'}; encoded_buffer *buffer = &readerinput->buffer->encoded; unsigned char *ptr = (unsigned char*)buffer->data; @@ -704,10 +711,10 @@ static HRESULT readerinput_detectencoding(xmlreaderinput *readerinput, xml_encoding *enc) { encoded_buffer *buffer = &readerinput->buffer->encoded; - static WCHAR startW[] = {'<','?'}; - static WCHAR commentW[] = {'<','!'}; - static char utf8bom[] = {0xef,0xbb,0xbf}; - static char utf16lebom[] = {0xff,0xfe}; + static const WCHAR startW[] = {'<','?'}; + static const WCHAR commentW[] = {'<','!'}; + static const char utf8bom[] = {0xef,0xbb,0xbf}; + static const char utf16lebom[] = {0xff,0xfe}; *enc = XmlEncoding_Unknown; @@ -768,8 +775,8 @@ else len = buffer->written; - TRACE("%d\n", len - (int)(buffer->cur - buffer->data)); - return len - (buffer->cur - buffer->data); + TRACE("%d\n", len - buffer->cur); + return len - buffer->cur; } /* It's possible that raw buffer has some leftovers from last conversion - some char @@ -782,12 +789,12 @@ if (len == -1) len = readerinput_get_convlen(readerinput); - memmove(buffer->data, buffer->cur + (buffer->written - len), len); + memmove(buffer->data, 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, + buffer->written -= len + buffer->cur; + /* after this point we don't need cur offset really, it's used only to mark where actual data begins when first chunk is read */ - buffer->cur = buffer->data; + buffer->cur = 0; } /* note that raw buffer content is kept */ @@ -812,15 +819,15 @@ if (enc == XmlEncoding_UTF16) { readerinput_grow(readerinput, len); - memcpy(dest->data, src->cur, len); + memcpy(dest->data, src->data + src->cur, len); dest->written += len*sizeof(WCHAR); return; } - dest_len = MultiByteToWideChar(cp, 0, src->cur, len, NULL, 0); + dest_len = MultiByteToWideChar(cp, 0, src->data + src->cur, len, NULL, 0); readerinput_grow(readerinput, dest_len); ptr = (WCHAR*)dest->data; - MultiByteToWideChar(cp, 0, src->cur, len, ptr, dest_len); + MultiByteToWideChar(cp, 0, src->data + src->cur, len, ptr, dest_len); ptr[dest_len] = 0; dest->written += dest_len*sizeof(WCHAR); } @@ -831,12 +838,12 @@ 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; + if (buffer->cur*sizeof(WCHAR) > buffer->written / 2) + { + buffer->written -= buffer->cur*sizeof(WCHAR); + memmove(buffer->data, (WCHAR*)buffer->data + buffer->cur, buffer->written); + buffer->cur = 0; + *(WCHAR*)&buffer->data[buffer->written] = 0; } } @@ -860,15 +867,15 @@ if (cp == ~0) { readerinput_grow(readerinput, len); - memcpy(dest->data, src->cur, len); + memcpy(dest->data + dest->written, src->data + src->cur, len); dest->written += len*sizeof(WCHAR); return hr; } - dest_len = MultiByteToWideChar(cp, 0, src->cur, len, NULL, 0); + dest_len = MultiByteToWideChar(cp, 0, src->data + src->cur, len, NULL, 0); readerinput_grow(readerinput, dest_len); - ptr = (WCHAR*)dest->data; - MultiByteToWideChar(cp, 0, src->cur, len, ptr, dest_len); + ptr = (WCHAR*)(dest->data + dest->written); + MultiByteToWideChar(cp, 0, src->data + src->cur, len, ptr, dest_len); ptr[dest_len] = 0; dest->written += dest_len*sizeof(WCHAR); /* get rid of processed data */ @@ -877,16 +884,22 @@ return hr; } -static inline WCHAR *reader_get_cur(xmlreader *reader) -{ - WCHAR *ptr = (WCHAR*)reader->input->buffer->utf16.cur; +static inline UINT reader_get_cur(xmlreader *reader) +{ + return reader->input->buffer->utf16.cur; +} + +static inline WCHAR *reader_get_ptr(xmlreader *reader) +{ + encoded_buffer *buffer = &reader->input->buffer->utf16; + WCHAR *ptr = (WCHAR*)buffer->data + buffer->cur; if (!*ptr) reader_more(reader); - return ptr; + return (WCHAR*)buffer->data + buffer->cur; } static int reader_cmp(xmlreader *reader, const WCHAR *str) { - const WCHAR *ptr = reader_get_cur(reader); + const WCHAR *ptr = reader_get_ptr(reader); return strncmpW(str, ptr, strlenW(str)); } @@ -894,16 +907,16 @@ static void reader_skipn(xmlreader *reader, int n) { encoded_buffer *buffer = &reader->input->buffer->utf16; - const WCHAR *ptr = reader_get_cur(reader); + const WCHAR *ptr = reader_get_ptr(reader); while (*ptr++ && n--) { - buffer->cur += sizeof(WCHAR); + buffer->cur++; reader->pos++; } } -static inline int is_wchar_space(WCHAR ch) +static inline BOOL is_wchar_space(WCHAR ch) { return ch == ' ' || ch == '\t' || ch == '\r' || ch == '\n'; } @@ -912,11 +925,11 @@ static int reader_skipspaces(xmlreader *reader) { encoded_buffer *buffer = &reader->input->buffer->utf16; - const WCHAR *ptr = reader_get_cur(reader), *start = ptr; + const WCHAR *ptr = reader_get_ptr(reader); + UINT start = reader_get_cur(reader); while (is_wchar_space(*ptr)) { - buffer->cur += sizeof(WCHAR); if (*ptr == '\r') reader->pos = 0; else if (*ptr == '\n') @@ -926,30 +939,37 @@ } else reader->pos++; - ptr++; - } - - return ptr - start; + + buffer->cur++; + ptr = reader_get_ptr(reader); + } + + return reader_get_cur(reader) - start; } /* [26] VersionNum ::= '1.' [0-9]+ */ static HRESULT reader_parse_versionnum(xmlreader *reader, strval *val) { - WCHAR *ptr, *ptr2, *start = reader_get_cur(reader); static const WCHAR onedotW[] = {'1','.',0}; + WCHAR *ptr, *ptr2; + UINT start; if (reader_cmp(reader, onedotW)) return WC_E_XMLDECL; + + start = reader_get_cur(reader); /* skip "1." */ reader_skipn(reader, 2); - ptr2 = ptr = reader_get_cur(reader); + ptr2 = ptr = reader_get_ptr(reader); while (*ptr >= '0' && *ptr <= '9') - ptr++; + { + reader_skipn(reader, 1); + ptr = reader_get_ptr(reader); + } if (ptr2 == ptr) return WC_E_DIGIT; - TRACE("version=%s\n", debugstr_wn(start, ptr-start)); - reader_init_strvalue(start, ptr-start, val); - reader_skipn(reader, ptr-ptr2); + reader_init_strvalue(start, reader_get_cur(reader)-start, val); + TRACE("version=%s\n", debug_strval(reader, val)); return S_OK; } @@ -1000,7 +1020,7 @@ } /* ([A-Za-z0-9._] | '-') */ -static inline int is_wchar_encname(WCHAR ch) +static inline BOOL is_wchar_encname(WCHAR ch) { return ((ch >= 'A' && ch <= 'Z') || (ch >= 'a' && ch <= 'z') || @@ -1012,12 +1032,14 @@ /* [81] EncName ::= [A-Za-z] ([A-Za-z0-9._] | '-')* */ static HRESULT reader_parse_encname(xmlreader *reader, strval *val) { - WCHAR *start = reader_get_cur(reader), *ptr; + WCHAR *start = reader_get_ptr(reader), *ptr; xml_encoding enc; int len; if ((*start < 'A' || *start > 'Z') && (*start < 'a' || *start > 'z')) return WC_E_ENCNAME; + + val->start = reader_get_cur(reader); ptr = start; while (is_wchar_encname(*++ptr)) @@ -1044,10 +1066,11 @@ strval name, val; HRESULT hr; - if (!reader_skipspaces(reader)) return WC_E_WHITESPACE; + if (!reader_skipspaces(reader)) return S_FALSE; if (reader_cmp(reader, encodingW)) return S_FALSE; - name.str = reader_get_cur(reader); + name.str = reader_get_ptr(reader); + name.start = reader_get_cur(reader); name.len = 8; /* skip 'encoding' */ reader_skipn(reader, 8); @@ -1078,11 +1101,11 @@ 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}; - WCHAR *start, *ptr; strval name, val; + UINT start; HRESULT hr; - if (!reader_skipspaces(reader)) return WC_E_WHITESPACE; + if (!reader_skipspaces(reader)) return S_FALSE; if (reader_cmp(reader, standaloneW)) return S_FALSE; reader_init_strvalue(reader_get_cur(reader), 10, &name); @@ -1103,10 +1126,8 @@ start = reader_get_cur(reader); /* skip 'yes'|'no' */ 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 = val.start = start; - val.len = ptr-start; + reader_init_strvalue(start, reader_get_cur(reader)-start, &val); + TRACE("standalone=%s\n", debug_strval(reader, &val)); if (reader_cmp(reader, quoteW) && reader_cmp(reader, dblquoteW)) return WC_E_QUOTE; @@ -1155,19 +1176,21 @@ /* [15] Comment ::= '' */ static HRESULT reader_parse_comment(xmlreader *reader) { - WCHAR *start, *ptr; - - if (reader->resume[XmlReadResume_Body]) + WCHAR *ptr; + UINT start; + + if (reader->resumestate == XmlReadResumeState_Comment) { start = reader->resume[XmlReadResume_Body]; - ptr = reader_get_cur(reader); + ptr = reader_get_ptr(reader); } else { /* skip '' */ + reader_init_strvalue(start, reader_get_cur(reader)-start, &value); + TRACE("%s\n", debug_strval(reader, &value)); + + /* skip rest of markup '->' */ 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->resume[XmlReadResume_Body] = 0; reader->resumestate = XmlReadResumeState_Initial; return S_OK; } else return WC_E_COMMENT; } - else - ptr++; } - else - { - reader_skipn(reader, 1); - ptr++; - } + + 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) +static inline BOOL is_char(WCHAR ch) { return (ch == '\t') || (ch == '\r') || (ch == '\n') || (ch >= 0x20 && ch <= 0xd7ff) || @@ -1226,7 +1247,7 @@ } /* [13] PubidChar ::= #x20 | #xD | #xA | [a-zA-Z0-9] | [-'()+,./:=?;!*#@$_%] */ -static inline int is_pubchar(WCHAR ch) +static inline BOOL is_pubchar(WCHAR ch) { return (ch == ' ') || (ch >= 'a' && ch <= 'z') || @@ -1239,7 +1260,7 @@ (ch == '_') || (ch == '\r') || (ch == '\n'); } -static inline int is_namestartchar(WCHAR ch) +static inline BOOL is_namestartchar(WCHAR ch) { return (ch == ':') || (ch >= 'A' && ch <= 'Z') || (ch == '_') || (ch >= 'a' && ch <= 'z') || @@ -1259,7 +1280,7 @@ } /* [4 NS] NCName ::= Name - (Char* ':' Char*) */ -static inline int is_ncnamechar(WCHAR ch) +static inline BOOL is_ncnamechar(WCHAR ch) { return (ch >= 'A' && ch <= 'Z') || (ch == '_') || (ch >= 'a' && ch <= 'z') || @@ -1283,7 +1304,7 @@ (ch >= 0xfdf0 && ch <= 0xfffd); } -static inline int is_namechar(WCHAR ch) +static inline BOOL is_namechar(WCHAR ch) { return (ch == ':') || is_ncnamechar(ch); } @@ -1303,23 +1324,25 @@ [5] Name ::= NameStartChar (NameChar)* */ static HRESULT reader_parse_name(xmlreader *reader, strval *name) { - WCHAR *ptr, *start; + WCHAR *ptr; + UINT start; if (reader->resume[XmlReadResume_Name]) { start = reader->resume[XmlReadResume_Name]; - ptr = reader_get_cur(reader); + ptr = reader_get_ptr(reader); } else { - ptr = start = reader_get_cur(reader); + ptr = reader_get_ptr(reader); + 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); + ptr = reader_get_ptr(reader); } if (is_reader_pending(reader)) @@ -1328,10 +1351,10 @@ 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); + reader->resume[XmlReadResume_Name] = 0; + + reader_init_strvalue(start, reader_get_cur(reader)-start, name); + TRACE("name %s:%d\n", debug_strval(reader, name), name->len); return S_OK; } @@ -1340,7 +1363,9 @@ static HRESULT reader_parse_pitarget(xmlreader *reader, strval *target) { static const WCHAR xmlW[] = {'x','m','l'}; + static const strval xmlval = { (WCHAR*)xmlW, 3 }; strval name; + WCHAR *ptr; HRESULT hr; UINT i; @@ -1348,15 +1373,16 @@ 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)) + if (strval_eq(reader, &name, &xmlval)) return WC_E_LEADINGXML; /* PITarget can't be a qualified name */ + ptr = reader_get_strptr(reader, &name); for (i = 0; i < name.len; i++) - if (name.str[i] == ':') + if (ptr[i] == ':') return i ? NC_E_NAMECOLON : WC_E_PI; - TRACE("pitarget %s:%d\n", debugstr_wn(name.str, name.len), name.len); + TRACE("pitarget %s:%d\n", debug_strval(reader, &name), name.len); *target = name; return S_OK; } @@ -1364,8 +1390,9 @@ /* [16] PI ::= '<?' PITarget (S (Char* - (Char* '?>' Char*)))? '?>' */ static HRESULT reader_parse_pi(xmlreader *reader) { - WCHAR *ptr, *start; strval target; + WCHAR *ptr; + UINT start; HRESULT hr; switch (reader->resumestate) @@ -1382,64 +1409,45 @@ reader_set_strvalue(reader, StringValue_QualifiedName, &target); reader_set_strvalue(reader, StringValue_Value, &strval_empty); reader->resumestate = XmlReadResumeState_PIBody; + reader->resume[XmlReadResume_Body] = reader_get_cur(reader); 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; - 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); - } - + start = reader->resume[XmlReadResume_Body]; + ptr = reader_get_ptr(reader); while (*ptr) { if (ptr[0] == '?') { if (ptr[1] == '>') { + UINT cur = reader_get_cur(reader); strval value; - TRACE("%s\n", debugstr_wn(start, ptr-start)); + /* strip all leading whitespace chars */ + while (start < cur) + { + ptr = reader_get_ptr2(reader, start); + if (!is_wchar_space(*ptr)) break; + start++; + } + + reader_init_strvalue(start, cur-start, &value); + /* skip '?>' */ reader_skipn(reader, 2); + TRACE("%s\n", debug_strval(reader, &value)); reader->nodetype = XmlNodeType_ProcessingInstruction; reader->resumestate = XmlReadResumeState_Initial; - reader->resume[XmlReadResume_Body] = NULL; - reader_init_strvalue(start, ptr-start, &value); + reader->resume[XmlReadResume_Body] = 0; 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); - } + + reader_skipn(reader, 1); + ptr = reader_get_ptr(reader); } return S_OK; @@ -1448,19 +1456,35 @@ /* 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); + switch (reader->resumestate) + { + case XmlReadResumeState_Initial: + reader_shrink(reader); + reader->resumestate = XmlReadResumeState_Whitespace; + reader->resume[XmlReadResume_Body] = reader_get_cur(reader); + 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); + /* fallthrough */ + case XmlReadResumeState_Whitespace: + { + strval value; + UINT start; + + reader_skipspaces(reader); + if (is_reader_pending(reader)) return S_OK; + + start = reader->resume[XmlReadResume_Body]; + reader_init_strvalue(start, reader_get_cur(reader)-start, &value); + reader_set_strvalue(reader, StringValue_Value, &value); + TRACE("%s\n", debug_strval(reader, &value)); + reader->resumestate = XmlReadResumeState_Initial; + } + default: + ; + } + return S_OK; } @@ -1482,6 +1506,8 @@ return reader_parse_pi(reader); case XmlReadResumeState_Comment: return reader_parse_comment(reader); + case XmlReadResumeState_Whitespace: + return reader_parse_whitespace(reader); default: ERR("unknown resume state %d\n", reader->resumestate); } @@ -1489,7 +1515,7 @@ while (1) { - const WCHAR *cur = reader_get_cur(reader); + const WCHAR *cur = reader_get_ptr(reader); if (is_wchar_space(*cur)) hr = reader_parse_whitespace(reader); @@ -1509,23 +1535,25 @@ /* [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; + WCHAR *cur = reader_get_ptr(reader), quote; + UINT start; + + if (*cur != '"' && *cur != '\'') return WC_E_QUOTE; + + quote = *cur; reader_skipn(reader, 1); - cur = start = reader_get_cur(reader); + cur = reader_get_ptr(reader); + start = reader_get_cur(reader); while (is_char(*cur) && *cur != quote) { reader_skipn(reader, 1); - cur = reader_get_cur(reader); - } + cur = reader_get_ptr(reader); + } + reader_init_strvalue(start, reader_get_cur(reader)-start, literal); if (*cur == quote) reader_skipn(reader, 1); - reader_init_strvalue(start, cur-start, literal); - TRACE("%s\n", debugstr_wn(start, cur-start)); + TRACE("%s\n", debug_strval(reader, literal)); return S_OK; } @@ -1533,22 +1561,24 @@ [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; + WCHAR *cur = reader_get_ptr(reader), quote; + UINT start; + + if (*cur != '"' && *cur != '\'') return WC_E_QUOTE; + + quote = *cur; reader_skipn(reader, 1); - cur = start; + start = reader_get_cur(reader); + cur = reader_get_ptr(reader); 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)); + cur = reader_get_ptr(reader); + } + + reader_init_strvalue(start, reader_get_cur(reader)-start, literal); + TRACE("%s\n", debug_strval(reader, literal)); return S_OK; } @@ -1577,7 +1607,7 @@ hr = reader_parse_pub_literal(reader, &pub); if (FAILED(hr)) return hr; - reader_init_strvalue(publicW, strlenW(publicW), &name); + reader_init_cstrvalue(publicW, strlenW(publicW), &name); return reader_add_attr(reader, &name, &pub); } } @@ -1593,7 +1623,7 @@ hr = reader_parse_sys_literal(reader, &sys); if (FAILED(hr)) return hr; - reader_init_strvalue(systemW, strlenW(systemW), &name); + reader_init_cstrvalue(systemW, strlenW(systemW), &name); return reader_add_attr(reader, &name, &sys); } @@ -1629,7 +1659,7 @@ reader_skipspaces(reader); - cur = reader_get_cur(reader); + cur = reader_get_ptr(reader); if (*cur != '>') { FIXME("internal subset parsing not implemented\n"); @@ -1649,22 +1679,24 @@ /* [11 NS] LocalPart ::= NCName */ static HRESULT reader_parse_local(xmlreader *reader, strval *local) { - WCHAR *ptr, *start; + WCHAR *ptr; + UINT start; if (reader->resume[XmlReadResume_Local]) { start = reader->resume[XmlReadResume_Local]; - ptr = reader_get_cur(reader); + ptr = reader_get_ptr(reader); } else { - ptr = start = reader_get_cur(reader); + ptr = reader_get_ptr(reader); + start = reader_get_cur(reader); } while (is_ncnamechar(*ptr)) { reader_skipn(reader, 1); - ptr = reader_get_cur(reader); + ptr = reader_get_ptr(reader); } if (is_reader_pending(reader)) @@ -1673,9 +1705,9 @@ return E_PENDING; } else - reader->resume[XmlReadResume_Local] = NULL; - - reader_init_strvalue(start, ptr-start, local); + reader->resume[XmlReadResume_Local] = 0; + + reader_init_strvalue(start, reader_get_cur(reader)-start, local); return S_OK; } @@ -1686,17 +1718,19 @@ [10 NS] Prefix ::= NCName */ static HRESULT reader_parse_qname(xmlreader *reader, strval *prefix, strval *local, strval *qname) { - WCHAR *ptr, *start; + WCHAR *ptr; + UINT start; HRESULT hr; if (reader->resume[XmlReadResume_Name]) { start = reader->resume[XmlReadResume_Name]; - ptr = reader_get_cur(reader); + ptr = reader_get_ptr(reader); } else { - ptr = start = reader_get_cur(reader); + ptr = reader_get_ptr(reader); + start = reader_get_cur(reader); reader->resume[XmlReadResume_Name] = start; if (!is_ncnamechar(*ptr)) return NC_E_QNAMECHARACTER; } @@ -1716,7 +1750,7 @@ while (is_ncnamechar(*ptr)) { reader_skipn(reader, 1); - ptr = reader_get_cur(reader); + ptr = reader_get_ptr(reader); } if (is_reader_pending(reader)) return E_PENDING; @@ -1724,7 +1758,7 @@ /* got a qualified name */ if (*ptr == ':') { - reader_init_strvalue(start, ptr-start, prefix); + reader_init_strvalue(start, reader_get_cur(reader)-start, prefix); /* skip ':' */ reader_skipn(reader, 1); @@ -1733,25 +1767,25 @@ } else { - reader_init_strvalue(reader->resume[XmlReadResume_Name], ptr-reader->resume[XmlReadResume_Name], local); - reader_init_strvalue(NULL, 0, prefix); + reader_init_strvalue(reader->resume[XmlReadResume_Name], reader_get_cur(reader)-reader->resume[XmlReadResume_Name], local); + reader_init_strvalue(0, 0, prefix); } } - reader_init_strvalue(start, ptr-start, local); + reader_init_strvalue(start, reader_get_cur(reader)-start, local); if (prefix->len) - TRACE("qname %s:%s\n", debugstr_wn(prefix->start, prefix->len), debugstr_wn(local->start, local->len)); + TRACE("qname %s:%s\n", debug_strval(reader, prefix), debug_strval(reader, local)); else - TRACE("ncname %s\n", debugstr_wn(local->start, local->len)); - - reader_init_strvalue(prefix->start ? prefix->start : local->start, + TRACE("ncname %s\n", debug_strval(reader, local)); + + reader_init_strvalue(prefix->len ? 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; + reader->resume[XmlReadResume_Name] = 0; + reader->resume[XmlReadResume_Local] = 0; return S_OK; } @@ -1778,36 +1812,36 @@ *ptr = ' '; } -static WCHAR get_predefined_entity(const strval *name) +static WCHAR get_predefined_entity(const xmlreader *reader, 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]) + WCHAR *str = reader_get_strptr(reader, name); + + switch (*str) { case 'l': - if (strval_eq(name, &lt)) return '<'; + if (strval_eq(reader, name, &lt)) return '<'; break; case 'g': - if (strval_eq(name, &gt)) return '>'; + if (strval_eq(reader, name, &gt)) return '>'; break; case 'a': - if (strval_eq(name, &amp)) + if (strval_eq(reader, name, &amp)) return '&'; - else if (strval_eq(name, &apos)) + else if (strval_eq(reader, name, &apos)) return '\''; break; case 'q': - if (strval_eq(name, &quot)) return '\"'; + if (strval_eq(reader, name, &quot)) return '\"'; break; default: ; @@ -1822,24 +1856,25 @@ static HRESULT reader_parse_reference(xmlreader *reader) { encoded_buffer *buffer = &reader->input->buffer->utf16; - WCHAR *start = reader_get_cur(reader), *ptr; + WCHAR *start = reader_get_ptr(reader), *ptr; + UINT cur = reader_get_cur(reader); WCHAR ch = 0; int len; /* skip '&' */ reader_skipn(reader, 1); - ptr = reader_get_cur(reader); + ptr = reader_get_ptr(reader); if (*ptr == '#') { reader_skipn(reader, 1); - ptr = reader_get_cur(reader); + ptr = reader_get_ptr(reader); /* hex char or decimal */ if (*ptr == 'x') { reader_skipn(reader, 1); - ptr = reader_get_cur(reader); + ptr = reader_get_ptr(reader); while (*ptr != ';') { @@ -1852,7 +1887,7 @@ else return ch ? WC_E_SEMICOLON : WC_E_HEXDIGIT; reader_skipn(reader, 1); - ptr = reader_get_cur(reader); + ptr = reader_get_ptr(reader); } } else @@ -1863,7 +1898,7 @@ { ch = ch*10 + *ptr - '0'; reader_skipn(reader, 1); - ptr = reader_get_cur(reader); + ptr = reader_get_ptr(reader); } else return ch ? WC_E_SEMICOLON : WC_E_DIGIT; @@ -1877,7 +1912,7 @@ len = buffer->written - ((char*)ptr - buffer->data) - sizeof(WCHAR); memmove(start+1, ptr+1, len); - buffer->cur = (char*)(start+1); + buffer->cur = cur + 1; *start = ch; } @@ -1889,22 +1924,22 @@ hr = reader_parse_name(reader, &name); if (FAILED(hr)) return hr; - ptr = reader_get_cur(reader); + ptr = reader_get_ptr(reader); if (*ptr != ';') return WC_E_SEMICOLON; /* predefined entities resolve to a single character */ - ch = get_predefined_entity(&name); + ch = get_predefined_entity(reader, &name); if (ch) { len = buffer->written - ((char*)ptr - buffer->data) - sizeof(WCHAR); memmove(start+1, ptr+1, len); - buffer->cur = (char*)(start+1); + buffer->cur = cur + 1; *start = ch; } else { - FIXME("undeclared entity %s\n", debugstr_wn(name.str, name.len)); + FIXME("undeclared entity %s\n", debug_strval(reader, &name)); return WC_E_UNDECLAREDENTITY; } @@ -1916,26 +1951,28 @@ /* [10 NS] AttValue ::= '"' ([^<&"] | Reference)* '"' | "'" ([^<&'] | Reference)* "'" */ static HRESULT reader_parse_attvalue(xmlreader *reader, strval *value) { - WCHAR *ptr, *start; - WCHAR quote; - - ptr = reader_get_cur(reader); + WCHAR *ptr, quote; + UINT start; + + ptr = reader_get_ptr(reader); /* skip opening quote */ quote = *ptr; if (quote != '\"' && quote != '\'') return WC_E_QUOTE; reader_skipn(reader, 1); - start = ptr = reader_get_cur(reader); + ptr = reader_get_ptr(reader); + start = reader_get_cur(reader); while (*ptr) { if (*ptr == '<') return WC_E_LESSTHAN; if (*ptr == quote) { + reader_init_strvalue(start, reader_get_cur(reader)-start, value); /* skip closing quote */ reader_skipn(reader, 1); - break; + return S_OK; } if (*ptr == '&') @@ -1948,12 +1985,10 @@ reader_normalize_space(reader, ptr); reader_skipn(reader, 1); } - ptr = reader_get_cur(reader); - } - - reader_init_strvalue(start, ptr-start, value); - - return S_OK; + ptr = reader_get_ptr(reader); + } + + return WC_E_QUOTE; } /* [1 NS] NSAttName ::= PrefixedAttName | DefaultAttName @@ -1969,19 +2004,16 @@ 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)) + reader_init_cstrvalue((WCHAR*)xmlnsW, 5, &xmlns); + + if (strval_eq(reader, &prefix, &xmlns)) { FIXME("namespace definitions not supported\n"); return E_NOTIMPL; } - if (strval_eq(&qname, &xmlns)) - { + if (strval_eq(reader, &qname, &xmlns)) FIXME("default namespace definitions not supported\n"); - return E_NOTIMPL; - } hr = reader_parse_eq(reader); if (FAILED(hr)) return hr; @@ -1989,7 +2021,7 @@ 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)); + TRACE("%s=%s\n", debug_strval(reader, &local), debug_strval(reader, &value)); return reader_add_attr(reader, &local, &value); } @@ -2104,7 +2136,7 @@ /* 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; + if (!strval_eq(reader, &elem->qname, &qname)) return WC_E_ELEMENTMATCH; reader_pop_element(reader); @@ -2125,19 +2157,21 @@ [21] CDEnd ::= ']]>' */ static HRESULT reader_parse_cdata(xmlreader *reader) { - WCHAR *start, *ptr; - - if (reader->resume[XmlReadResume_Body]) + WCHAR *ptr; + UINT start; + + if (reader->resumestate == XmlReadResumeState_CDATA) { start = reader->resume[XmlReadResume_Body]; - ptr = reader_get_cur(reader); + ptr = reader_get_ptr(reader); } else { /* skip markup '<![CDATA[' */ reader_skipn(reader, 9); reader_shrink(reader); - ptr = start = reader_get_cur(reader); + ptr = reader_get_ptr(reader); + start = reader_get_cur(reader); reader->nodetype = XmlNodeType_CDATA; reader->resume[XmlReadResume_Body] = start; reader->resumestate = XmlReadResumeState_CDATA; @@ -2152,14 +2186,16 @@ { strval value; - TRACE("%s\n", debugstr_wn(start, ptr-start)); + reader_init_strvalue(start, reader_get_cur(reader)-start, &value); + /* skip ']]>' */ reader_skipn(reader, 3); - reader_init_strvalue(start, ptr-start, &value); + TRACE("%s\n", debug_strval(reader, &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->resume[XmlReadResume_Body] = 0; reader->resumestate = XmlReadResumeState_Initial; return S_OK; } @@ -2182,20 +2218,22 @@ /* [14] CharData ::= [^<&]* - ([^<&]* ']]>' [^<&]*) */ static HRESULT reader_parse_chardata(xmlreader *reader) { - WCHAR *start, *ptr; - - if (reader->resume[XmlReadResume_Body]) + WCHAR *ptr; + UINT start; + + if (reader->resumestate == XmlReadResumeState_CharData) { start = reader->resume[XmlReadResume_Body]; - ptr = reader_get_cur(reader); + ptr = reader_get_ptr(reader); } else { reader_shrink(reader); - ptr = start = reader_get_cur(reader); + ptr = reader_get_ptr(reader); + start = reader_get_cur(reader); /* There's no text */ if (!*ptr || *ptr == '<') return S_OK; - reader->nodetype = XmlNodeType_Text; + reader->nodetype = is_wchar_space(*ptr) ? XmlNodeType_Whitespace : XmlNodeType_Text; reader->resume[XmlReadResume_Body] = start; reader->resumestate = XmlReadResumeState_CharData; reader_set_strvalue(reader, StringValue_LocalName, &strval_empty); @@ -2214,12 +2252,17 @@ { strval value; - reader_init_strvalue(start, ptr-start, &value); + reader_init_strvalue(start, reader_get_cur(reader)-start, &value); reader_set_strvalue(reader, StringValue_Value, &value); + reader->resume[XmlReadResume_Body] = 0; + reader->resumestate = XmlReadResumeState_Initial; return S_OK; } reader_skipn(reader, 1); + + /* this covers a case when text has leading whitespace chars */ + if (!is_wchar_space(*ptr)) reader->nodetype = XmlNodeType_Text; ptr++; } @@ -2682,10 +2725,11 @@ 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; + WCHAR *ptr = reader_alloc(reader, (val->len+1)*sizeof(WCHAR)); + if (!ptr) return E_OUTOFMEMORY; + memcpy(ptr, reader_get_strptr(reader, val), val->len*sizeof(WCHAR)); + ptr[val->len] = 0; + val->str = ptr; } *value = val->str; @@ -2707,7 +2751,7 @@ if (val->len) { len = min(chunk_size, val->len); - memcpy(buffer, val->start, len); + memcpy(buffer, reader_get_ptr2(reader, val->start), len); val->start += len; val->len -= len; if (read) *read = len; Modified: trunk/reactos/dll/win32/xmllite/writer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/xmllite/writer.c… ============================================================================== --- trunk/reactos/dll/win32/xmllite/writer.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/xmllite/writer.c [iso-8859-1] Tue Apr 22 11:25:12 2014 @@ -20,6 +20,18 @@ #include "xmllite_private.h" +/* not defined in public headers */ +DEFINE_GUID(IID_IXmlWriterOutput, 0xc1131708, 0x0f59, 0x477f, 0x93, 0x59, 0x7d, 0x33, 0x24, 0x51, 0xbc, 0x1a); + +typedef struct +{ + IXmlWriterOutput IXmlWriterOutput_iface; + LONG ref; + IUnknown *output; + IMalloc *imalloc; + xml_encoding encoding; +} xmlwriteroutput; + typedef struct _xmlwriter { IXmlWriter IXmlWriter_iface; @@ -29,6 +41,22 @@ static inline xmlwriter *impl_from_IXmlWriter(IXmlWriter *iface) { return CONTAINING_RECORD(iface, xmlwriter, IXmlWriter_iface); +} + +static inline xmlwriteroutput *impl_from_IXmlWriterOutput(IXmlWriterOutput *iface) +{ + return CONTAINING_RECORD(iface, xmlwriteroutput, IXmlWriterOutput_iface); +} + +/* reader input memory allocation functions */ +static inline void *writeroutput_alloc(xmlwriteroutput *output, size_t len) +{ + return m_alloc(output->imalloc, len); +} + +static inline void writeroutput_free(xmlwriteroutput *output, void *mem) +{ + m_free(output->imalloc, mem); } static HRESULT WINAPI xmlwriter_QueryInterface(IXmlWriter *iface, REFIID riid, void **ppvObject) @@ -64,9 +92,7 @@ ref = InterlockedDecrement(&This->ref); if (ref == 0) - { - HeapFree(GetProcessHeap(), 0, This); - } + heap_free(This); return ref; } @@ -376,6 +402,63 @@ xmlwriter_Flush }; +/** IXmlWriterOutput **/ +static HRESULT WINAPI xmlwriteroutput_QueryInterface(IXmlWriterOutput *iface, REFIID riid, void** ppvObject) +{ + xmlwriteroutput *This = impl_from_IXmlWriterOutput(iface); + + TRACE("(%p)->(%s %p)\n", This, debugstr_guid(riid), ppvObject); + + if (IsEqualGUID(riid, &IID_IXmlWriterOutput) || + IsEqualGUID(riid, &IID_IUnknown)) + { + *ppvObject = iface; + } + else + { + WARN("interface %s not implemented\n", debugstr_guid(riid)); + *ppvObject = NULL; + return E_NOINTERFACE; + } + + IUnknown_AddRef(iface); + + return S_OK; +} + +static ULONG WINAPI xmlwriteroutput_AddRef(IXmlWriterOutput *iface) +{ + xmlwriteroutput *This = impl_from_IXmlWriterOutput(iface); + ULONG ref = InterlockedIncrement(&This->ref); + TRACE("(%p)->(%d)\n", This, ref); + return ref; +} + +static ULONG WINAPI xmlwriteroutput_Release(IXmlWriterOutput *iface) +{ + xmlwriteroutput *This = impl_from_IXmlWriterOutput(iface); + LONG ref = InterlockedDecrement(&This->ref); + + TRACE("(%p)->(%d)\n", This, ref); + + if (ref == 0) + { + IMalloc *imalloc = This->imalloc; + if (This->output) IUnknown_Release(This->output); + writeroutput_free(This, This); + if (imalloc) IMalloc_Release(imalloc); + } + + return ref; +} + +static const struct IUnknownVtbl xmlwriteroutputvtbl = +{ + xmlwriteroutput_QueryInterface, + xmlwriteroutput_AddRef, + xmlwriteroutput_Release +}; + HRESULT WINAPI CreateXmlWriter(REFIID riid, void **pObject, IMalloc *pMalloc) { xmlwriter *writer; @@ -390,7 +473,7 @@ return E_FAIL; } - writer = HeapAlloc(GetProcessHeap(), 0, sizeof (*writer)); + writer = heap_alloc(sizeof(*writer)); if(!writer) return E_OUTOFMEMORY; writer->IXmlWriter_iface.lpVtbl = &xmlwriter_vtbl; @@ -402,3 +485,35 @@ return S_OK; } + +HRESULT WINAPI CreateXmlWriterOutputWithEncodingName(IUnknown *stream, + IMalloc *imalloc, + LPCWSTR encoding, + IXmlWriterOutput **output) +{ + xmlwriteroutput *writeroutput; + + TRACE("%p %p %s %p\n", stream, imalloc, debugstr_w(encoding), output); + + if (!stream || !output) return E_INVALIDARG; + + if (imalloc) + writeroutput = IMalloc_Alloc(imalloc, sizeof(*writeroutput)); + else + writeroutput = heap_alloc(sizeof(*writeroutput)); + if(!writeroutput) return E_OUTOFMEMORY; + + writeroutput->IXmlWriterOutput_iface.lpVtbl = &xmlwriteroutputvtbl; + writeroutput->ref = 1; + writeroutput->imalloc = imalloc; + if (imalloc) IMalloc_AddRef(imalloc); + writeroutput->encoding = parse_encoding_name(encoding, -1); + + IUnknown_QueryInterface(stream, &IID_IUnknown, (void**)&writeroutput->output); + + *output = &writeroutput->IXmlWriterOutput_iface; + + TRACE("returning iface %p\n", *output); + + return S_OK; +} Modified: trunk/reactos/dll/win32/xmllite/xmllite.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/xmllite/xmllite.… ============================================================================== --- trunk/reactos/dll/win32/xmllite/xmllite.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/xmllite/xmllite.spec [iso-8859-1] Tue Apr 22 11:25:12 2014 @@ -3,4 +3,4 @@ @ stdcall CreateXmlReaderInputWithEncodingName(ptr ptr ptr long ptr ptr) @ stdcall CreateXmlWriter(ptr ptr ptr) @ stub CreateXmlWriterOutputWithEncodingCodePage -@ stub CreateXmlWriterOutputWithEncodingName +@ stdcall CreateXmlWriterOutputWithEncodingName(ptr ptr wstr ptr) Modified: trunk/reactos/dll/win32/xmllite/xmllite_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/xmllite/xmllite_… ============================================================================== --- trunk/reactos/dll/win32/xmllite/xmllite_private.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/xmllite/xmllite_private.h [iso-8859-1] Tue Apr 22 11:25:12 2014 @@ -55,4 +55,29 @@ return HeapFree(GetProcessHeap(), 0, mem); } +static inline void *m_alloc(IMalloc *imalloc, size_t len) +{ + if (imalloc) + return IMalloc_Alloc(imalloc, len); + else + return heap_alloc(len); +} + +static inline void m_free(IMalloc *imalloc, void *mem) +{ + if (imalloc) + IMalloc_Free(imalloc, mem); + else + heap_free(mem); +} + +typedef enum +{ + XmlEncoding_UTF16, + XmlEncoding_UTF8, + XmlEncoding_Unknown +} xml_encoding; + +xml_encoding parse_encoding_name(const WCHAR *name, int len) DECLSPEC_HIDDEN; + #endif /* __XMLLITE_PRIVATE__ */ Modified: trunk/reactos/include/psdk/xmllite.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/xmllite.idl?r… ============================================================================== --- trunk/reactos/include/psdk/xmllite.idl [iso-8859-1] (original) +++ trunk/reactos/include/psdk/xmllite.idl [iso-8859-1] Tue Apr 22 11:25:12 2014 @@ -76,6 +76,21 @@ HRESULT GetAttributeCount( [out] UINT *attributeCount); HRESULT GetDepth( [out] UINT *depth); BOOL IsEOF(void); +} + +/* IXmlResolver */ +[ + local, + object, + uuid(7279fc82-709d-4095-b63d-69fe4b0d9030), + pointer_default(unique) +] +interface IXmlResolver : IUnknown +{ + HRESULT ResolveUri([in] LPCWSTR base_uri, + [in] LPCWSTR public_id, + [in] LPCWSTR system_id, + [out] IUnknown **input); } /* IXmlReader state */ @@ -278,3 +293,10 @@ HRESULT WriteWhitespace([in] LPCWSTR pwszWhitespace); HRESULT Flush(); } + +/* IXmlWriter construction */ +cpp_quote("STDAPI CreateXmlWriter(REFIID riid, void **ppvObject, IMalloc *pMalloc);") + +cpp_quote("typedef IUnknown IXmlWriterOutput;") +cpp_quote("STDAPI CreateXmlWriterOutputWithEncodingName(IUnknown *stream, IMalloc *pMalloc,") +cpp_quote(" LPCWSTR encoding, IXmlWriterOutput **output);") 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 Apr 22 11:25:12 2014 @@ -220,7 +220,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.7.1 +reactos/dll/win32/xmllite # Synced to Wine-1.7.17 reactos/dll/cpl/inetcpl # Synced to Wine-1.7.1

10 years, 5 months

[akhaldi] 62867: [OPENGL32_WINETEST] * Sync with Wine 1.7.17. CORE-8080

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Tue Apr 22 11:16:47 2014 New Revision: 62867 URL: http://svn.reactos.org/svn/reactos?rev=62867&view=rev Log: [OPENGL32_WINETEST] * Sync with Wine 1.7.17. CORE-8080 Modified: trunk/rostests/winetests/opengl32/CMakeLists.txt trunk/rostests/winetests/opengl32/opengl.c trunk/rostests/winetests/opengl32/testlist.c Modified: trunk/rostests/winetests/opengl32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/opengl32/CMakeL… ============================================================================== --- trunk/rostests/winetests/opengl32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/winetests/opengl32/CMakeLists.txt [iso-8859-1] Tue Apr 22 11:16:47 2014 @@ -1,10 +1,5 @@ - -add_definitions( - -D__ROS_LONG64__ - -D_DLL -D__USE_CRTIMP) add_executable(opengl32_winetest opengl.c testlist.c) -target_link_libraries(opengl32_winetest wine) set_module_type(opengl32_winetest win32cui) -add_importlibs(opengl32_winetest opengl32 gdi32 user32 msvcrt kernel32 ntdll) +add_importlibs(opengl32_winetest opengl32 gdi32 user32 msvcrt kernel32) add_cd_file(TARGET opengl32_winetest DESTINATION reactos/bin FOR all) Modified: trunk/rostests/winetests/opengl32/opengl.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/opengl32/opengl… ============================================================================== --- trunk/rostests/winetests/opengl32/opengl.c [iso-8859-1] (original) +++ trunk/rostests/winetests/opengl32/opengl.c [iso-8859-1] Tue Apr 22 11:16:47 2014 @@ -86,6 +86,10 @@ static HPBUFFERARB* (WINAPI *pwglCreatePbufferARB)(HDC, int, int, int, const int *); static HDC (WINAPI *pwglGetPbufferDCARB)(HPBUFFERARB); +/* WGL_EXT_swap_control */ +static BOOL (WINAPI *pwglSwapIntervalEXT)(int interval); +static int (WINAPI *pwglGetSwapIntervalEXT)(void); + static const char* wgl_extensions = NULL; static void init_functions(void) @@ -113,6 +117,10 @@ GET_PROC(wglCreatePbufferARB) GET_PROC(wglGetPbufferDCARB) GET_PROC(wglReleasePbufferDCARB) + + /* WGL_EXT_swap_control */ + GET_PROC(wglSwapIntervalEXT) + GET_PROC(wglGetSwapIntervalEXT) #undef GET_PROC } @@ -295,8 +303,8 @@ else ok(!res, "Unexpectedly set an alternate pixel format\n"); } - hwnd = CreateWindow("static", "Title", WS_OVERLAPPEDWINDOW, - 10, 10, 200, 200, NULL, NULL, NULL, NULL); + hwnd = CreateWindowA("static", "Title", WS_OVERLAPPEDWINDOW, 10, 10, 200, 200, NULL, NULL, + NULL, NULL); ok(hwnd != NULL, "err: %d\n", GetLastError()); if (hwnd) { @@ -315,8 +323,8 @@ DestroyWindow( hwnd ); } - hwnd = CreateWindow("static", "Title", WS_OVERLAPPEDWINDOW, - 10, 10, 200, 200, NULL, NULL, NULL, NULL); + hwnd = CreateWindowA("static", "Title", WS_OVERLAPPEDWINDOW, 10, 10, 200, 200, NULL, NULL, + NULL, NULL); ok(hwnd != NULL, "err: %d\n", GetLastError()); if (hwnd) { @@ -335,7 +343,7 @@ static void test_sharelists(HDC winhdc) { HGLRC hglrc1, hglrc2, hglrc3; - int res; + BOOL res; hglrc1 = wglCreateContext(winhdc); res = wglShareLists(0, 0); @@ -443,7 +451,7 @@ int iAttribRet[sizeof(iAttribList)/sizeof(iAttribList[0])]; const int iAttribs[] = { WGL_ALPHA_BITS_ARB, 1, 0 }; unsigned int nFormats; - int res; + BOOL res; int iPixelFormat = 0; if (!pwglChoosePixelFormatARB) @@ -478,7 +486,7 @@ int iAttribRet[sizeof(iAttribList)/sizeof(iAttribList[0])]; unsigned int nFormats; int iPixelFormat; - int res; + BOOL res; if (!pwglGetPixelFormatAttribivARB) { @@ -722,7 +730,8 @@ struct wgl_thread_param thread_params; HGLRC hglrc = wglCreateContext(hdc); HANDLE thread_handle; - DWORD res, tid; + BOOL res; + DWORD tid; SetLastError(0xdeadbeef); res = wglDeleteContext(NULL); @@ -747,7 +756,7 @@ */ thread_params.hglrc = hglrc; thread_params.hwnd = hwnd; - thread_params.test_finished = CreateEvent(NULL, FALSE, FALSE, NULL); + thread_params.test_finished = CreateEventW(NULL, FALSE, FALSE, NULL); thread_handle = CreateThread(NULL, 0, wgl_thread, &thread_params, 0, &tid); ok(!!thread_handle, "Failed to create thread, last error %#x.\n", GetLastError()); if(thread_handle) @@ -1099,6 +1108,84 @@ GetClientRect(window, &r); glGetIntegerv(GL_VIEWPORT, (GLint *)&vp); ok(EqualRect(&r, &vp), "Viewport not equal to client rect.\n"); + + ret = wglMakeCurrent(NULL, NULL); + ok(ret, "Failed to clear current context, last error %#x.\n", GetLastError()); + + ret = wglDeleteContext(ctx); + ok(ret, "Failed to delete GL context, last error %#x.\n", GetLastError()); + + ReleaseDC(window, dc); + DestroyWindow(window); +} + +static void test_message_window(void) +{ + PIXELFORMATDESCRIPTOR pf_desc = + { + sizeof(PIXELFORMATDESCRIPTOR), + 1, /* version */ + PFD_DRAW_TO_WINDOW | PFD_SUPPORT_OPENGL | PFD_DOUBLEBUFFER, + PFD_TYPE_RGBA, + 24, /* 24-bit color depth */ + 0, 0, 0, 0, 0, 0, /* color bits */ + 0, /* alpha buffer */ + 0, /* shift bit */ + 0, /* accumulation buffer */ + 0, 0, 0, 0, /* accum bits */ + 32, /* z-buffer */ + 0, /* stencil buffer */ + 0, /* auxiliary buffer */ + PFD_MAIN_PLANE, /* main layer */ + 0, /* reserved */ + 0, 0, 0 /* layer masks */ + }; + int pixel_format; + HWND window; + RECT vp, r; + HGLRC ctx; + BOOL ret; + HDC dc; + GLenum glerr; + + window = CreateWindowA("static", "opengl32_test", + WS_OVERLAPPEDWINDOW, 0, 0, 100, 100, HWND_MESSAGE, 0, 0, 0); + if (!window) + { + win_skip( "HWND_MESSAGE not supported\n" ); + return; + } + dc = GetDC(window); + ok(!!dc, "Failed to get DC.\n"); + + pixel_format = ChoosePixelFormat(dc, &pf_desc); + if (!pixel_format) + { + win_skip("Failed to find pixel format.\n"); + ReleaseDC(window, dc); + DestroyWindow(window); + return; + } + + ret = SetPixelFormat(dc, pixel_format, &pf_desc); + ok(ret, "Failed to set pixel format, last error %#x.\n", GetLastError()); + + ctx = wglCreateContext(dc); + ok(!!ctx, "Failed to create GL context, last error %#x.\n", GetLastError()); + + ret = wglMakeCurrent(dc, ctx); + ok(ret, "Failed to make context current, last error %#x.\n", GetLastError()); + + GetClientRect(window, &r); + glGetIntegerv(GL_VIEWPORT, (GLint *)&vp); + ok(EqualRect(&r, &vp), "Viewport not equal to client rect.\n"); + + glClear(GL_COLOR_BUFFER_BIT); + glFinish(); + glerr = glGetError(); + ok(glerr == GL_NO_ERROR, "Failed glClear, error %#x.\n", glerr); + ret = SwapBuffers(dc); + ok(ret, "Failed SwapBuffers, error %#x.\n", GetLastError()); ret = wglMakeCurrent(NULL, NULL); ok(ret, "Failed to clear current context, last error %#x.\n", GetLastError()); @@ -1400,6 +1487,126 @@ wglMakeCurrent(oldhdc, oldctx); } +static void test_swap_control(HDC oldhdc) +{ + PIXELFORMATDESCRIPTOR pf_desc = + { + sizeof(PIXELFORMATDESCRIPTOR), + 1, /* version */ + PFD_DRAW_TO_WINDOW | PFD_SUPPORT_OPENGL | PFD_DOUBLEBUFFER, + PFD_TYPE_RGBA, + 24, /* 24-bit color depth */ + 0, 0, 0, 0, 0, 0, /* color bits */ + 0, /* alpha buffer */ + 0, /* shift bit */ + 0, /* accumulation buffer */ + 0, 0, 0, 0, /* accum bits */ + 32, /* z-buffer */ + 0, /* stencil buffer */ + 0, /* auxiliary buffer */ + PFD_MAIN_PLANE, /* main layer */ + 0, /* reserved */ + 0, 0, 0 /* layer masks */ + }; + int pixel_format; + HWND window1, window2, old_parent; + HGLRC ctx1, ctx2, oldctx; + BOOL ret; + HDC dc1, dc2; + int interval; + + oldctx = wglGetCurrentContext(); + ok(!!oldctx, "Expected to find a valid current context.\n"); + + window1 = CreateWindowA("static", "opengl32_test", + WS_POPUP, 0, 0, 640, 480, 0, 0, 0, 0); + ok(!!window1, "Failed to create window1, last error %#x.\n", GetLastError()); + + dc1 = GetDC(window1); + ok(!!dc1, "Failed to get DC.\n"); + + pixel_format = ChoosePixelFormat(dc1, &pf_desc); + if (!pixel_format) + { + win_skip("Failed to find pixel format.\n"); + ReleaseDC(window1, dc1); + DestroyWindow(window1); + return; + } + + ret = SetPixelFormat(dc1, pixel_format, &pf_desc); + ok(ret, "Failed to set pixel format, last error %#x.\n", GetLastError()); + + ctx1 = wglCreateContext(dc1); + ok(!!ctx1, "Failed to create GL context, last error %#x.\n", GetLastError()); + + ret = wglMakeCurrent(dc1, ctx1); + ok(ret, "Failed to make context current, last error %#x.\n", GetLastError()); + + interval = pwglGetSwapIntervalEXT(); + ok(interval == 1, "Expected default swap interval 1, got %d\n", interval); + + ret = pwglSwapIntervalEXT(0); + ok(ret, "Failed to set swap interval to 0, last error %#x.\n", GetLastError()); + + interval = pwglGetSwapIntervalEXT(); + ok(interval == 0, "Expected swap interval 0, got %d\n", interval); + + /* Check what interval we get on a second context on the same drawable.*/ + ctx2 = wglCreateContext(dc1); + ok(!!ctx2, "Failed to create GL context, last error %#x.\n", GetLastError()); + + ret = wglMakeCurrent(dc1, ctx2); + ok(ret, "Failed to make context current, last error %#x.\n", GetLastError()); + + interval = pwglGetSwapIntervalEXT(); + ok(interval == 0, "Expected swap interval 0, got %d\n", interval); + + /* A second window is created to see whether its swap interval was affected + * by previous calls. + */ + window2 = CreateWindowA("static", "opengl32_test", + WS_POPUP, 0, 0, 640, 480, 0, 0, 0, 0); + ok(!!window2, "Failed to create window2, last error %#x.\n", GetLastError()); + + dc2 = GetDC(window2); + ok(!!dc2, "Failed to get DC.\n"); + + ret = SetPixelFormat(dc2, pixel_format, &pf_desc); + ok(ret, "Failed to set pixel format, last error %#x.\n", GetLastError()); + + ret = wglMakeCurrent(dc2, ctx1); + ok(ret, "Failed to make context current, last error %#x.\n", GetLastError()); + + /* Since the second window lacks the swap interval, this proves that the interval + * is not global or shared among contexts. + */ + interval = pwglGetSwapIntervalEXT(); + ok(interval == 1, "Expected default swap interval 1, got %d\n", interval); + + /* Test if setting the parent of a window resets the swap interval. */ + ret = wglMakeCurrent(dc1, ctx1); + ok(ret, "Failed to make context current, last error %#x.\n", GetLastError()); + + old_parent = SetParent(window1, window2); + ok(!!old_parent, "Failed to make window1 a child of window2, last error %#x.\n", GetLastError()); + + interval = pwglGetSwapIntervalEXT(); + ok(interval == 0, "Expected swap interval 0, got %d\n", interval); + + ret = wglDeleteContext(ctx1); + ok(ret, "Failed to delete GL context, last error %#x.\n", GetLastError()); + ret = wglDeleteContext(ctx2); + ok(ret, "Failed to delete GL context, last error %#x.\n", GetLastError()); + + ReleaseDC(window1, dc1); + DestroyWindow(window1); + ReleaseDC(window2, dc2); + DestroyWindow(window2); + + wglMakeCurrent(oldhdc, oldctx); +} + START_TEST(opengl) { HWND hwnd; @@ -1424,8 +1631,8 @@ 0, 0, 0 /* layer masks */ }; - hwnd = CreateWindow("static", "Title", WS_OVERLAPPEDWINDOW, - 10, 10, 200, 200, NULL, NULL, NULL, NULL); + hwnd = CreateWindowA("static", "Title", WS_OVERLAPPEDWINDOW, 10, 10, 200, 200, NULL, NULL, + NULL, NULL); ok(hwnd != NULL, "err: %d\n", GetLastError()); if (hwnd) { @@ -1458,6 +1665,7 @@ test_bitmap_rendering( FALSE ); test_minimized(); test_window_dc(); + test_message_window(); test_dc(hwnd, hdc); hglrc = wglCreateContext(hdc); @@ -1516,6 +1724,11 @@ else skip("WGL_ARB_pbuffer not supported, skipping pbuffer test\n"); + if(strstr(wgl_extensions, "WGL_EXT_swap_control")) + test_swap_control(hdc); + else + skip("WGL_EXT_swap_control not supported, skipping test\n"); + cleanup: ReleaseDC(hwnd, hdc); DestroyWindow(hwnd); Modified: trunk/rostests/winetests/opengl32/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/opengl32/testli… ============================================================================== --- trunk/rostests/winetests/opengl32/testlist.c [iso-8859-1] (original) +++ trunk/rostests/winetests/opengl32/testlist.c [iso-8859-1] Tue Apr 22 11:16:47 2014 @@ -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_opengl(void);

10 years, 5 months

[akhaldi] 62866: [SECUR32_WINETEST] * Sync with Wine 1.7.17. CORE-8080

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Tue Apr 22 11:12:43 2014 New Revision: 62866 URL: http://svn.reactos.org/svn/reactos?rev=62866&view=rev Log: [SECUR32_WINETEST] * Sync with Wine 1.7.17. CORE-8080 Added: trunk/rostests/winetests/secur32/negotiate.c (with props) Modified: trunk/rostests/winetests/secur32/CMakeLists.txt trunk/rostests/winetests/secur32/main.c trunk/rostests/winetests/secur32/ntlm.c trunk/rostests/winetests/secur32/schannel.c trunk/rostests/winetests/secur32/secur32.c trunk/rostests/winetests/secur32/testlist.c Modified: trunk/rostests/winetests/secur32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/secur32/CMakeLi… ============================================================================== --- trunk/rostests/winetests/secur32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/winetests/secur32/CMakeLists.txt [iso-8859-1] Tue Apr 22 11:12:43 2014 @@ -1,17 +1,13 @@ - -add_definitions( - -D__ROS_LONG64__ - -D_DLL -D__USE_CRTIMP) list(APPEND SOURCE main.c + negotiate.c ntlm.c schannel.c secur32.c testlist.c) add_executable(secur32_winetest ${SOURCE}) -target_link_libraries(secur32_winetest wine) set_module_type(secur32_winetest win32cui) -add_importlibs(secur32_winetest advapi32 msvcrt kernel32 ntdll) +add_importlibs(secur32_winetest advapi32 ws2_32 msvcrt kernel32) add_cd_file(TARGET secur32_winetest DESTINATION reactos/bin FOR all) Modified: trunk/rostests/winetests/secur32/main.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/secur32/main.c?… ============================================================================== --- trunk/rostests/winetests/secur32/main.c [iso-8859-1] (original) +++ trunk/rostests/winetests/secur32/main.c [iso-8859-1] Tue Apr 22 11:12:43 2014 @@ -22,7 +22,7 @@ #include <stdarg.h> #include <stdio.h> -#include <assert.h> + #include <windef.h> #include <winbase.h> #include <sspi.h> @@ -108,7 +108,7 @@ /* Helper for testQuerySecurityPagageInfo */ static SECURITY_STATUS setupPackageA(SEC_CHAR *p_package_name, - PSecPkgInfo *p_pkg_info) + PSecPkgInfoA *p_pkg_info) { SECURITY_STATUS ret; @@ -121,7 +121,7 @@ static void testInitSecurityInterface(void) { - PSecurityFunctionTable sec_fun_table = NULL; + PSecurityFunctionTableA sec_fun_table = NULL; sec_fun_table = pInitSecurityInterfaceA(); ok(sec_fun_table != NULL, "InitSecurityInterface() returned NULL.\n"); @@ -133,7 +133,7 @@ SECURITY_STATUS sec_status; ULONG num_packages, i; - PSecPkgInfo pkg_info = NULL; + PSecPkgInfoA pkg_info = NULL; trace("Running testEnumerateSecurityPackages\n"); @@ -197,7 +197,7 @@ static void testQuerySecurityPackageInfo(void) { SECURITY_STATUS sec_status; - PSecPkgInfo pkg_info; + PSecPkgInfoA pkg_info; static SEC_CHAR ntlm[] = "NTLM", winetest[] = "Winetest"; Added: trunk/rostests/winetests/secur32/negotiate.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/secur32/negotia… ============================================================================== --- trunk/rostests/winetests/secur32/negotiate.c (added) +++ trunk/rostests/winetests/secur32/negotiate.c [iso-8859-1] Tue Apr 22 11:12:43 2014 @@ -0,0 +1,387 @@ +/* + * Tests for the Negotiate security provider + * + * Copyright 2005, 2006 Kai Blin + * Copyright 2012 Hans Leidekker for CodeWeavers + * + * 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 <stdarg.h> +#include <stdio.h> +#include <windef.h> +#include <winbase.h> +#define SECURITY_WIN32 +#include <sspi.h> +#include <rpc.h> +#include <rpcdce.h> +#include <secext.h> + +#include "wine/test.h" + +static HMODULE hsecur32; +static SECURITY_STATUS (SEC_ENTRY * pAcceptSecurityContext)(PCredHandle, PCtxtHandle, + PSecBufferDesc, ULONG, ULONG, PCtxtHandle, PSecBufferDesc, PULONG, PTimeStamp); +static SECURITY_STATUS (SEC_ENTRY * pAcquireCredentialsHandleA)(SEC_CHAR *, SEC_CHAR *, + ULONG, PLUID, PVOID, SEC_GET_KEY_FN, PVOID, PCredHandle, PTimeStamp); +static SECURITY_STATUS (SEC_ENTRY * pCompleteAuthToken)(PCtxtHandle, PSecBufferDesc); +static SECURITY_STATUS (SEC_ENTRY * pDecryptMessage)(PCtxtHandle, PSecBufferDesc, ULONG, PULONG); +static SECURITY_STATUS (SEC_ENTRY * pDeleteSecurityContext)(PCtxtHandle); +static SECURITY_STATUS (SEC_ENTRY * pEncryptMessage)(PCtxtHandle, ULONG, PSecBufferDesc, ULONG); +static SECURITY_STATUS (SEC_ENTRY * pFreeContextBuffer)(PVOID); +static SECURITY_STATUS (SEC_ENTRY * pFreeCredentialsHandle)(PCredHandle); +static SECURITY_STATUS (SEC_ENTRY * pInitializeSecurityContextA)(PCredHandle, PCtxtHandle, + SEC_CHAR *, ULONG, ULONG, ULONG, PSecBufferDesc, ULONG, PCtxtHandle, PSecBufferDesc, + PULONG, PTimeStamp); +static PSecurityFunctionTableA (SEC_ENTRY * pInitSecurityInterfaceA)(void); +static SECURITY_STATUS (SEC_ENTRY * pMakeSignature)(PCtxtHandle, ULONG, PSecBufferDesc, ULONG); +static SECURITY_STATUS (SEC_ENTRY * pQueryContextAttributesA)(PCtxtHandle, ULONG, PVOID); +static SECURITY_STATUS (SEC_ENTRY * pQuerySecurityPackageInfoA)(SEC_CHAR *, PSecPkgInfoA *); +static SECURITY_STATUS (SEC_ENTRY * pVerifySignature)(PCtxtHandle, PSecBufferDesc, ULONG, PULONG); + +static void init_function_ptrs(void) +{ + if (!(hsecur32 = LoadLibraryA("secur32.dll"))) return; + pAcceptSecurityContext = (void *)GetProcAddress(hsecur32, "AcceptSecurityContext"); + pAcquireCredentialsHandleA = (void *)GetProcAddress(hsecur32, "AcquireCredentialsHandleA"); + pCompleteAuthToken = (void *)GetProcAddress(hsecur32, "CompleteAuthToken"); + pDecryptMessage = (void *)GetProcAddress(hsecur32, "DecryptMessage"); + pDeleteSecurityContext = (void *)GetProcAddress(hsecur32, "DeleteSecurityContext"); + pEncryptMessage = (void *)GetProcAddress(hsecur32, "EncryptMessage"); + pFreeContextBuffer = (void *)GetProcAddress(hsecur32, "FreeContextBuffer"); + pFreeCredentialsHandle = (void *)GetProcAddress(hsecur32, "FreeCredentialsHandle"); + pInitializeSecurityContextA = (void *)GetProcAddress(hsecur32, "InitializeSecurityContextA"); + pInitSecurityInterfaceA = (void *)GetProcAddress(hsecur32, "InitSecurityInterfaceA"); + pMakeSignature = (void *)GetProcAddress(hsecur32, "MakeSignature"); + pQueryContextAttributesA = (void *)GetProcAddress(hsecur32, "QueryContextAttributesA"); + pQuerySecurityPackageInfoA = (void *)GetProcAddress(hsecur32, "QuerySecurityPackageInfoA"); + pVerifySignature = (void *)GetProcAddress(hsecur32, "VerifySignature"); +} + +#define NEGOTIATE_BASE_CAPS ( \ + SECPKG_FLAG_INTEGRITY | \ + SECPKG_FLAG_PRIVACY | \ + SECPKG_FLAG_CONNECTION | \ + SECPKG_FLAG_MULTI_REQUIRED | \ + SECPKG_FLAG_EXTENDED_ERROR | \ + SECPKG_FLAG_IMPERSONATION | \ + SECPKG_FLAG_ACCEPT_WIN32_NAME | \ + SECPKG_FLAG_NEGOTIABLE | \ + SECPKG_FLAG_GSS_COMPATIBLE | \ + SECPKG_FLAG_LOGON ) + +#define NTLM_BASE_CAPS ( \ + SECPKG_FLAG_INTEGRITY | \ + SECPKG_FLAG_PRIVACY | \ + SECPKG_FLAG_TOKEN_ONLY | \ + SECPKG_FLAG_CONNECTION | \ + SECPKG_FLAG_MULTI_REQUIRED | \ + SECPKG_FLAG_IMPERSONATION | \ + SECPKG_FLAG_ACCEPT_WIN32_NAME | \ + SECPKG_FLAG_NEGOTIABLE | \ + SECPKG_FLAG_LOGON ) + +struct sspi_data +{ + CredHandle cred; + CtxtHandle ctxt; + PSecBufferDesc in_buf; + PSecBufferDesc out_buf; + PSEC_WINNT_AUTH_IDENTITY_A id; + ULONG max_token; +}; + +static void cleanup_buffers( struct sspi_data *data ) +{ + unsigned int i; + + if (data->in_buf) + { + for (i = 0; i < data->in_buf->cBuffers; ++i) + HeapFree( GetProcessHeap(), 0, data->in_buf->pBuffers[i].pvBuffer ); + HeapFree( GetProcessHeap(), 0, data->in_buf->pBuffers ); + HeapFree( GetProcessHeap(), 0, data->in_buf ); + } + if (data->out_buf) + { + for (i = 0; i < data->out_buf->cBuffers; ++i) + HeapFree( GetProcessHeap(), 0, data->out_buf->pBuffers[i].pvBuffer ); + HeapFree( GetProcessHeap(), 0, data->out_buf->pBuffers ); + HeapFree( GetProcessHeap(), 0, data->out_buf ); + } +} + +static void setup_buffers( struct sspi_data *data, SecPkgInfoA *info ) +{ + SecBuffer *buffer = HeapAlloc( GetProcessHeap(), 0, sizeof(SecBuffer) ); + + data->in_buf = HeapAlloc( GetProcessHeap(), 0, sizeof(SecBufferDesc) ); + data->out_buf = HeapAlloc( GetProcessHeap(), 0, sizeof(SecBufferDesc) ); + data->max_token = info->cbMaxToken; + + data->in_buf->ulVersion = SECBUFFER_VERSION; + data->in_buf->cBuffers = 1; + data->in_buf->pBuffers = buffer; + + buffer->cbBuffer = info->cbMaxToken; + buffer->BufferType = SECBUFFER_TOKEN; + buffer->pvBuffer = HeapAlloc( GetProcessHeap(), 0, info->cbMaxToken ); + + buffer = HeapAlloc( GetProcessHeap(), 0, sizeof(SecBuffer) ); + + data->out_buf->ulVersion = SECBUFFER_VERSION; + data->out_buf->cBuffers = 1; + data->out_buf->pBuffers = buffer; + + buffer->cbBuffer = info->cbMaxToken; + buffer->BufferType = SECBUFFER_TOKEN; + buffer->pvBuffer = HeapAlloc( GetProcessHeap(), 0, info->cbMaxToken ); +} + +static SECURITY_STATUS setup_client( struct sspi_data *data, SEC_CHAR *provider ) +{ + SECURITY_STATUS ret; + SecPkgInfoA *info; + TimeStamp ttl; + + trace( "setting up client\n" ); + + ret = pQuerySecurityPackageInfoA( provider, &info ); + ok( ret == SEC_E_OK, "QuerySecurityPackageInfo returned %08x\n", ret ); + + setup_buffers( data, info ); + pFreeContextBuffer( info ); + + ret = pAcquireCredentialsHandleA( NULL, provider, SECPKG_CRED_OUTBOUND, NULL, + data->id, NULL, NULL, &data->cred, &ttl ); + ok( ret == SEC_E_OK, "AcquireCredentialsHandleA returned %08x\n", ret ); + return ret; +} + +static SECURITY_STATUS setup_server( struct sspi_data *data, SEC_CHAR *provider ) +{ + SECURITY_STATUS ret; + SecPkgInfoA *info; + TimeStamp ttl; + + trace( "setting up server\n" ); + + ret = pQuerySecurityPackageInfoA( provider, &info ); + ok( ret == SEC_E_OK, "QuerySecurityPackageInfo returned %08x\n", ret ); + + setup_buffers( data, info ); + pFreeContextBuffer( info ); + + ret = pAcquireCredentialsHandleA( NULL, provider, SECPKG_CRED_INBOUND, NULL, + NULL, NULL, NULL, &data->cred, &ttl ); + ok( ret == SEC_E_OK, "AcquireCredentialsHandleA returned %08x\n", ret ); + return ret; +} + +static SECURITY_STATUS run_client( struct sspi_data *data, BOOL first ) +{ + SECURITY_STATUS ret; + TimeStamp ttl; + ULONG attr; + + trace( "running client for the %s time\n", first ? "first" : "second" ); + + data->out_buf->pBuffers[0].cbBuffer = data->max_token; + data->out_buf->pBuffers[0].BufferType = SECBUFFER_TOKEN; + + ret = pInitializeSecurityContextA( first ? &data->cred : NULL, first ? NULL : &data->ctxt, + NULL, 0, 0, SECURITY_NETWORK_DREP, first ? NULL : data->in_buf, + 0, &data->ctxt, data->out_buf, &attr, &ttl ); + if (ret == SEC_I_COMPLETE_AND_CONTINUE || ret == SEC_I_COMPLETE_NEEDED) + { + pCompleteAuthToken( &data->ctxt, data->out_buf ); + if (ret == SEC_I_COMPLETE_AND_CONTINUE) + ret = SEC_I_CONTINUE_NEEDED; + else if (ret == SEC_I_COMPLETE_NEEDED) + ret = SEC_E_OK; + } + ok( data->out_buf->pBuffers[0].BufferType == SECBUFFER_TOKEN, + "buffer type changed from SECBUFFER_TOKEN to %u\n", data->out_buf->pBuffers[0].BufferType ); + ok( data->out_buf->pBuffers[0].cbBuffer < data->max_token, + "InitializeSecurityContext didn't change buffer size\n" ); + return ret; +} + +static SECURITY_STATUS run_server( struct sspi_data *data, BOOL first ) +{ + SECURITY_STATUS ret; + TimeStamp ttl; + ULONG attr; + + trace( "running server for the %s time\n", first ? "first" : "second" ); + + ret = pAcceptSecurityContext( &data->cred, first ? NULL : &data->ctxt, + data->in_buf, 0, SECURITY_NETWORK_DREP, + &data->ctxt, data->out_buf, &attr, &ttl ); + if (ret == SEC_I_COMPLETE_AND_CONTINUE || ret == SEC_I_COMPLETE_NEEDED) + { + pCompleteAuthToken( &data->ctxt, data->out_buf ); + if (ret == SEC_I_COMPLETE_AND_CONTINUE) + ret = SEC_I_CONTINUE_NEEDED; + else if (ret == SEC_I_COMPLETE_NEEDED) + ret = SEC_E_OK; + } + return ret; +} + +static void communicate( struct sspi_data *from, struct sspi_data *to ) +{ + trace( "running communicate\n" ); + memset( to->in_buf->pBuffers[0].pvBuffer, 0, to->max_token ); + memcpy( to->in_buf->pBuffers[0].pvBuffer, from->out_buf->pBuffers[0].pvBuffer, + from->out_buf->pBuffers[0].cbBuffer ); + to->in_buf->pBuffers[0].cbBuffer = from->out_buf->pBuffers[0].cbBuffer; + memset( from->out_buf->pBuffers[0].pvBuffer, 0, from->max_token ); +} + +static void test_authentication(void) +{ + SECURITY_STATUS status_c = SEC_I_CONTINUE_NEEDED, + status_s = SEC_I_CONTINUE_NEEDED, status; + struct sspi_data client, server; + SEC_WINNT_AUTH_IDENTITY_A id; + SecPkgContext_NegotiationInfoA info; + SecPkgContext_Sizes sizes; + SecPkgInfoA *pi; + BOOL first = TRUE; + + id.User = (unsigned char *)"user"; + id.UserLength = strlen( "user" ); + id.Domain = (unsigned char *)"domain"; + id.DomainLength = strlen( "domain" ); + id.Password = (unsigned char *)"password"; + id.PasswordLength = strlen( "password" ); + id.Flags = SEC_WINNT_AUTH_IDENTITY_ANSI; + + client.id = &id; + if ((status = setup_client( &client, (SEC_CHAR *)"Negotiate" ))) + { + skip( "setup_client returned %08x, skipping test\n", status ); + return; + } + if ((status = setup_server( &server, (SEC_CHAR *)"Negotiate" ))) + { + skip( "setup_server returned %08x, skipping test\n", status ); + pFreeCredentialsHandle( &client.cred ); + return; + } + + while (status_c == SEC_I_CONTINUE_NEEDED && status_s == SEC_I_CONTINUE_NEEDED) + { + status_c = run_client( &client, first ); + ok( status_c == SEC_E_OK || status_c == SEC_I_CONTINUE_NEEDED, + "client returned %08x, more tests will fail\n", status_c ); + + communicate( &client, &server ); + + status_s = run_server( &server, first ); + ok( status_s == SEC_E_OK || status_s == SEC_I_CONTINUE_NEEDED || + status_s == SEC_E_LOGON_DENIED, + "server returned %08x, more tests will fail\n", status_s ); + + communicate( &server, &client ); + trace( "looping\n"); + first = FALSE; + } + if (status_c != SEC_E_OK) + { + skip( "authentication failed, skipping remaining tests\n" ); + goto done; + } + + sizes.cbMaxToken = 0xdeadbeef; + sizes.cbMaxSignature = 0xdeadbeef; + sizes.cbSecurityTrailer = 0xdeadbeef; + sizes.cbBlockSize = 0xdeadbeef; + status_c = pQueryContextAttributesA( &client.ctxt, SECPKG_ATTR_SIZES, &sizes ); + ok( status_c == SEC_E_OK, "pQueryContextAttributesA returned %08x\n", status_c ); + ok( sizes.cbMaxToken == 2888 || sizes.cbMaxToken == 1904, + "expected 2888 or 1904, got %u\n", sizes.cbMaxToken ); + ok( sizes.cbMaxSignature == 16, "expected 16, got %u\n", sizes.cbMaxSignature ); + ok( sizes.cbSecurityTrailer == 16, "expected 16, got %u\n", sizes.cbSecurityTrailer ); + ok( !sizes.cbBlockSize, "expected 0, got %u\n", sizes.cbBlockSize ); + + memset( &info, 0, sizeof(info) ); + status_c = pQueryContextAttributesA( &client.ctxt, SECPKG_ATTR_NEGOTIATION_INFO, &info ); + ok( status_c == SEC_E_OK, "pQueryContextAttributesA returned %08x\n", status_c ); + + pi = info.PackageInfo; + ok( info.NegotiationState == SECPKG_NEGOTIATION_COMPLETE, "got %u\n", info.NegotiationState ); + ok( pi != NULL, "expected non-NULL PackageInfo\n" ); + if (pi) + { + ok( pi->fCapabilities == NTLM_BASE_CAPS || + pi->fCapabilities == (NTLM_BASE_CAPS|SECPKG_FLAG_READONLY_WITH_CHECKSUM) || + pi->fCapabilities == (NTLM_BASE_CAPS|SECPKG_FLAG_RESTRICTED_TOKENS) || + pi->fCapabilities == (NTLM_BASE_CAPS|SECPKG_FLAG_RESTRICTED_TOKENS| + SECPKG_FLAG_APPCONTAINER_CHECKS), + "got %08x\n", pi->fCapabilities ); + ok( pi->wVersion == 1, "got %u\n", pi->wVersion ); + ok( pi->wRPCID == RPC_C_AUTHN_WINNT, "got %u\n", pi->wRPCID ); + ok( !lstrcmpA( pi->Name, "NTLM" ), "got %s\n", pi->Name ); + } + +done: + cleanup_buffers( &client ); + cleanup_buffers( &server ); + + status_c = pDeleteSecurityContext( &client.ctxt ); + ok( status_c == SEC_E_OK, "DeleteSecurityContext returned %08x\n", status_c ); + + status_s = pDeleteSecurityContext( &server.ctxt ); + ok( status_s == SEC_E_OK, "DeleteSecurityContext returned %08x\n", status_s ); + + status_c = pFreeCredentialsHandle( &client.cred ); + ok( status_c == SEC_E_OK, "FreeCredentialsHandle returned %08x\n", status_c ); + + status_s = pFreeCredentialsHandle(&server.cred); + ok( status_s == SEC_E_OK, "FreeCredentialsHandle returned %08x\n", status_s ); +} + +START_TEST(negotiate) +{ + SecPkgInfoA *info; + + init_function_ptrs(); + + if (!pFreeCredentialsHandle || !pAcquireCredentialsHandleA || !pQuerySecurityPackageInfoA || + !pFreeContextBuffer) + { + win_skip("functions are not available\n"); + return; + } + if (pQuerySecurityPackageInfoA( (SEC_CHAR *)"Negotiate", &info )) + { + ok( 0, "Negotiate package not installed, skipping test\n" ); + return; + } + ok( info->fCapabilities == NEGOTIATE_BASE_CAPS || + info->fCapabilities == (NEGOTIATE_BASE_CAPS|SECPKG_FLAG_READONLY_WITH_CHECKSUM) || + info->fCapabilities == (NEGOTIATE_BASE_CAPS|SECPKG_FLAG_RESTRICTED_TOKENS) || + info->fCapabilities == (NEGOTIATE_BASE_CAPS|SECPKG_FLAG_RESTRICTED_TOKENS| + SECPKG_FLAG_APPCONTAINER_CHECKS), + "got %08x\n", info->fCapabilities ); + ok( info->wVersion == 1, "got %u\n", info->wVersion ); + ok( info->wRPCID == RPC_C_AUTHN_GSS_NEGOTIATE, "got %u\n", info->wRPCID ); + ok( !lstrcmpA( info->Name, "Negotiate" ), "got %s\n", info->Name ); + pFreeContextBuffer( info ); + + test_authentication(); +} Propchange: trunk/rostests/winetests/secur32/negotiate.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/rostests/winetests/secur32/ntlm.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/secur32/ntlm.c?… ============================================================================== --- trunk/rostests/winetests/secur32/ntlm.c [iso-8859-1] (original) +++ trunk/rostests/winetests/secur32/ntlm.c [iso-8859-1] Tue Apr 22 11:12:43 2014 @@ -67,7 +67,7 @@ CtxtHandle ctxt; PSecBufferDesc in_buf; PSecBufferDesc out_buf; - PSEC_WINNT_AUTH_IDENTITY id; + PSEC_WINNT_AUTH_IDENTITY_A id; ULONG max_token; } SspiData; @@ -113,7 +113,7 @@ {0x48, 0x65, 0x6c, 0x6c, 0x6f, 0x2c, 0x20, 0x77, 0x6f, 0x72, 0x6c, 0x64, 0x21}; -static char message[] = "Hello, world!"; +static const char message[] = "Hello, world!"; static char message_header[] = "Header Test"; @@ -565,9 +565,9 @@ static void testInitializeSecurityContextFlags(void) { SECURITY_STATUS sec_status; - PSecPkgInfo pkg_info = NULL; + PSecPkgInfoA pkg_info = NULL; SspiData client; - SEC_WINNT_AUTH_IDENTITY id; + SEC_WINNT_AUTH_IDENTITY_A id; static char sec_pkg_name[] = "NTLM", test_user[] = "testuser", workgroup[] = "WORKGROUP", @@ -578,7 +578,7 @@ if(pQuerySecurityPackageInfoA( sec_pkg_name, &pkg_info) != SEC_E_OK) { - skip("Package not installed, skipping test!\n"); + ok(0, "NTLM package not installed, skipping test.\n"); return; } @@ -788,10 +788,10 @@ SECURITY_STATUS client_stat = SEC_I_CONTINUE_NEEDED; SECURITY_STATUS server_stat = SEC_I_CONTINUE_NEEDED; SECURITY_STATUS sec_status; - PSecPkgInfo pkg_info = NULL; + PSecPkgInfoA pkg_info = NULL; BOOL first = TRUE; SspiData client, server; - SEC_WINNT_AUTH_IDENTITY id; + SEC_WINNT_AUTH_IDENTITY_A id; SecPkgContext_Sizes ctxt_sizes; static char sec_pkg_name[] = "NTLM", test_user[] = "testuser", @@ -800,7 +800,7 @@ if(pQuerySecurityPackageInfoA( sec_pkg_name, &pkg_info)!= SEC_E_OK) { - skip("Package not installed, skipping test.\n"); + ok(0, "NTLM package not installed, skipping test.\n"); return; } @@ -921,10 +921,10 @@ SECURITY_STATUS client_stat = SEC_I_CONTINUE_NEEDED; SECURITY_STATUS server_stat = SEC_I_CONTINUE_NEEDED; SECURITY_STATUS sec_status; - PSecPkgInfo pkg_info = NULL; + PSecPkgInfoA pkg_info = NULL; BOOL first = TRUE; SspiData client, server; - SEC_WINNT_AUTH_IDENTITY id; + SEC_WINNT_AUTH_IDENTITY_A id; static char sec_pkg_name[] = "NTLM"; SecBufferDesc crypt; SecBuffer data[2], fake_data[2], complex_data[4]; @@ -942,7 +942,7 @@ */ if(pQuerySecurityPackageInfoA( sec_pkg_name, &pkg_info) != SEC_E_OK) { - skip("Package not installed, skipping test.\n"); + ok(0, "NTLM package not installed, skipping test.\n"); return; } @@ -968,6 +968,7 @@ } sec_status = setupFakeServer(&server, sec_pkg_name); + ok(sec_status == SEC_E_OK, "setupFakeServer returned %s\n", getSecError(sec_status)); while(client_stat == SEC_I_CONTINUE_NEEDED && server_stat == SEC_I_CONTINUE_NEEDED) { @@ -1003,7 +1004,7 @@ fake_data[0].pvBuffer = HeapAlloc(GetProcessHeap(), 0, fake_data[0].cbBuffer); fake_data[1].BufferType = SECBUFFER_DATA; - fake_data[1].cbBuffer = lstrlen(message); + fake_data[1].cbBuffer = lstrlenA(message); fake_data[1].pvBuffer = HeapAlloc(GetProcessHeap(), 0, fake_data[1].cbBuffer); sec_status = pMakeSignature(&client.ctxt, 0, &crypt, 0); @@ -1018,7 +1019,7 @@ data[0].pvBuffer = HeapAlloc(GetProcessHeap(), 0, data[0].cbBuffer); data[1].BufferType = SECBUFFER_DATA; - data[1].cbBuffer = lstrlen(message); + data[1].cbBuffer = lstrlenA(message); data[1].pvBuffer = HeapAlloc(GetProcessHeap(), 0, data[1].cbBuffer); memcpy(data[1].pvBuffer, message, data[1].cbBuffer); @@ -1057,23 +1058,91 @@ ok(sec_status == SEC_E_OK, "EncryptMessage returned %s, not SEC_E_OK.\n", getSecError(sec_status)); - ok(!memcmp(crypt.pBuffers[0].pvBuffer, crypt_trailer_client, - crypt.pBuffers[0].cbBuffer), "Crypt trailer not as expected.\n"); - if (memcmp(crypt.pBuffers[0].pvBuffer, crypt_trailer_client, - crypt.pBuffers[0].cbBuffer)) - { - int i; - for (i = 0; i < crypt.pBuffers[0].cbBuffer; i++) + /* first 8 bytes must always be the same */ + ok(!memcmp(crypt.pBuffers[0].pvBuffer, crypt_trailer_client, 8), "Crypt trailer not as expected.\n"); + + /* the rest depends on the session key */ + if (!memcmp(crypt.pBuffers[0].pvBuffer, crypt_trailer_client, crypt.pBuffers[0].cbBuffer)) + { + ok(!memcmp(crypt.pBuffers[0].pvBuffer, crypt_trailer_client, + crypt.pBuffers[0].cbBuffer), "Crypt trailer not as expected.\n"); + ok(!memcmp(crypt.pBuffers[1].pvBuffer, crypt_message_client, + crypt.pBuffers[1].cbBuffer), "Crypt message not as expected.\n"); + if (memcmp(crypt.pBuffers[1].pvBuffer, crypt_message_client, + crypt.pBuffers[1].cbBuffer)) { - if (i % 8 == 0) printf(" "); - printf("0x%02x,", ((unsigned char *)crypt.pBuffers[0].pvBuffer)[i]); - if (i % 8 == 7) printf("\n"); + int i; + for (i = 0; i < crypt.pBuffers[1].cbBuffer; i++) + { + if (i % 8 == 0) printf(" "); + printf("0x%02x,", ((unsigned char *)crypt.pBuffers[1].pvBuffer)[i]); + if (i % 8 == 7) printf("\n"); + } + printf("\n"); } - printf("\n"); - } - ok(!memcmp(crypt.pBuffers[1].pvBuffer, crypt_message_client, + + data[0].cbBuffer = sizeof(crypt_trailer_server); + data[1].cbBuffer = sizeof(crypt_message_server); + memcpy(data[0].pvBuffer, crypt_trailer_server, data[0].cbBuffer); + memcpy(data[1].pvBuffer, crypt_message_server, data[1].cbBuffer); + + sec_status = pDecryptMessage(&client.ctxt, &crypt, 0, &qop); + + ok(sec_status == SEC_E_OK, "DecryptMessage returned %s, not SEC_E_OK.\n", + getSecError(sec_status)); + ok(!memcmp(crypt.pBuffers[1].pvBuffer, message_binary, + crypt.pBuffers[1].cbBuffer), + "Failed to decrypt message correctly.\n"); + } + else trace( "A different session key is being used\n" ); + + trace("Testing with more than one buffer.\n"); + + crypt.cBuffers = sizeof(complex_data)/sizeof(complex_data[0]); + crypt.pBuffers = complex_data; + + complex_data[0].BufferType = SECBUFFER_DATA|SECBUFFER_READONLY_WITH_CHECKSUM; + complex_data[0].cbBuffer = sizeof(message_header); + complex_data[0].pvBuffer = message_header; + + complex_data[1].BufferType = SECBUFFER_DATA; + complex_data[1].cbBuffer = lstrlenA(message); + complex_data[1].pvBuffer = HeapAlloc(GetProcessHeap(), 0, data[1].cbBuffer); + memcpy(complex_data[1].pvBuffer, message, complex_data[1].cbBuffer); + + complex_data[2].BufferType = SECBUFFER_DATA|SECBUFFER_READONLY_WITH_CHECKSUM; + complex_data[2].cbBuffer = sizeof(message_header); + complex_data[2].pvBuffer = message_header; + + complex_data[3].BufferType = SECBUFFER_TOKEN; + complex_data[3].cbBuffer = ctxt_sizes.cbSecurityTrailer; + complex_data[3].pvBuffer = HeapAlloc(GetProcessHeap(), 0, complex_data[3].cbBuffer); + + /* We should get a dummy signature again. */ + sec_status = pMakeSignature(&client.ctxt, 0, &crypt, 0); + ok(sec_status == SEC_E_OK, "MakeSignature returned %s, not SEC_E_OK.\n", + getSecError(sec_status)); + ok(!memcmp(crypt.pBuffers[3].pvBuffer, message_signature, + crypt.pBuffers[3].cbBuffer), "Signature is not as expected.\n"); + + /* Being a dummy signature, it will verify right away, as if the server + * sent it */ + sec_status = pVerifySignature(&client.ctxt, &crypt, 0, &qop); + ok(sec_status == SEC_E_OK, "VerifySignature returned %s, not SEC_E_OK\n", + getSecError(sec_status)); + + sec_status = pEncryptMessage(&client.ctxt, 0, &crypt, 0); + ok(sec_status == SEC_E_OK, "EncryptMessage returned %s, not SEC_E_OK.\n", + getSecError(sec_status)); + + ok(!memcmp(crypt.pBuffers[3].pvBuffer, crypt_trailer_client2, 8), "Crypt trailer not as expected.\n"); + + if (memcmp(crypt.pBuffers[3].pvBuffer, crypt_trailer_client2, + crypt.pBuffers[3].cbBuffer)) goto end; + + ok(!memcmp(crypt.pBuffers[1].pvBuffer, crypt_message_client2, crypt.pBuffers[1].cbBuffer), "Crypt message not as expected.\n"); - if (memcmp(crypt.pBuffers[1].pvBuffer, crypt_message_client, + if (memcmp(crypt.pBuffers[1].pvBuffer, crypt_message_client2, crypt.pBuffers[1].cbBuffer)) { int i; @@ -1086,88 +1155,6 @@ printf("\n"); } - data[0].cbBuffer = sizeof(crypt_trailer_server); - data[1].cbBuffer = sizeof(crypt_message_server); - memcpy(data[0].pvBuffer, crypt_trailer_server, data[0].cbBuffer); - memcpy(data[1].pvBuffer, crypt_message_server, data[1].cbBuffer); - - sec_status = pDecryptMessage(&client.ctxt, &crypt, 0, &qop); - - ok(sec_status == SEC_E_OK, "DecryptMessage returned %s, not SEC_E_OK.\n", - getSecError(sec_status)); - ok(!memcmp(crypt.pBuffers[1].pvBuffer, message_binary, - crypt.pBuffers[1].cbBuffer), - "Failed to decrypt message correctly.\n"); - - trace("Testing with more than one buffer.\n"); - - crypt.cBuffers = sizeof(complex_data)/sizeof(complex_data[0]); - crypt.pBuffers = complex_data; - - complex_data[0].BufferType = SECBUFFER_DATA|SECBUFFER_READONLY_WITH_CHECKSUM; - complex_data[0].cbBuffer = sizeof(message_header); - complex_data[0].pvBuffer = message_header; - - complex_data[1].BufferType = SECBUFFER_DATA; - complex_data[1].cbBuffer = lstrlen(message); - complex_data[1].pvBuffer = HeapAlloc(GetProcessHeap(), 0, data[1].cbBuffer); - memcpy(complex_data[1].pvBuffer, message, complex_data[1].cbBuffer); - - complex_data[2].BufferType = SECBUFFER_DATA|SECBUFFER_READONLY_WITH_CHECKSUM; - complex_data[2].cbBuffer = sizeof(message_header); - complex_data[2].pvBuffer = message_header; - - complex_data[3].BufferType = SECBUFFER_TOKEN; - complex_data[3].cbBuffer = ctxt_sizes.cbSecurityTrailer; - complex_data[3].pvBuffer = HeapAlloc(GetProcessHeap(), 0, complex_data[3].cbBuffer); - - /* We should get a dummy signature again. */ - sec_status = pMakeSignature(&client.ctxt, 0, &crypt, 0); - ok(sec_status == SEC_E_OK, "MakeSignature returned %s, not SEC_E_OK.\n", - getSecError(sec_status)); - ok(!memcmp(crypt.pBuffers[3].pvBuffer, message_signature, - crypt.pBuffers[3].cbBuffer), "Signature is not as expected.\n"); - - /* Being a dummy signature, it will verify right away, as if the server - * sent it */ - sec_status = pVerifySignature(&client.ctxt, &crypt, 0, &qop); - ok(sec_status == SEC_E_OK, "VerifySignature returned %s, not SEC_E_OK\n", - getSecError(sec_status)); - - sec_status = pEncryptMessage(&client.ctxt, 0, &crypt, 0); - ok(sec_status == SEC_E_OK, "EncryptMessage returned %s, not SEC_E_OK.\n", - getSecError(sec_status)); - - ok(!memcmp(crypt.pBuffers[3].pvBuffer, crypt_trailer_client2, - crypt.pBuffers[3].cbBuffer), "Crypt trailer not as expected.\n"); - if (memcmp(crypt.pBuffers[3].pvBuffer, crypt_trailer_client2, - crypt.pBuffers[3].cbBuffer)) - { - int i; - for (i = 0; i < crypt.pBuffers[3].cbBuffer; i++) - { - if (i % 8 == 0) printf(" "); - printf("0x%02x,", ((unsigned char *)crypt.pBuffers[3].pvBuffer)[i]); - if (i % 8 == 7) printf("\n"); - } - printf("\n"); - } - - ok(!memcmp(crypt.pBuffers[1].pvBuffer, crypt_message_client2, - crypt.pBuffers[1].cbBuffer), "Crypt message not as expected.\n"); - if (memcmp(crypt.pBuffers[1].pvBuffer, crypt_message_client2, - crypt.pBuffers[1].cbBuffer)) - { - int i; - for (i = 0; i < crypt.pBuffers[1].cbBuffer; i++) - { - if (i % 8 == 0) printf(" "); - printf("0x%02x,", ((unsigned char *)crypt.pBuffers[1].pvBuffer)[i]); - if (i % 8 == 7) printf("\n"); - } - printf("\n"); - } - memcpy(complex_data[1].pvBuffer, crypt_message_server2, complex_data[1].cbBuffer); memcpy(complex_data[3].pvBuffer, crypt_trailer_server2, complex_data[3].cbBuffer); @@ -1191,7 +1178,7 @@ HeapFree(GetProcessHeap(), 0, complex_data[3].pvBuffer); } -static void testAcquireCredentialsHandle(void) +static BOOL testAcquireCredentialsHandle(void) { CredHandle cred; TimeStamp ttl; @@ -1200,13 +1187,13 @@ test_pass[] = "testpass", sec_pkg_name[] = "NTLM"; SECURITY_STATUS ret; - SEC_WINNT_AUTH_IDENTITY id; - PSecPkgInfo pkg_info = NULL; + SEC_WINNT_AUTH_IDENTITY_A id; + PSecPkgInfoA pkg_info = NULL; if(pQuerySecurityPackageInfoA(sec_pkg_name, &pkg_info) != SEC_E_OK) { - skip("NTLM package not installed, skipping test\n"); - return; + ok(0, "NTLM package not installed, skipping test\n"); + return FALSE; } pFreeContextBuffer(pkg_info); @@ -1257,6 +1244,7 @@ ok(ret == SEC_E_OK, "AcquireCredentialsHande() returned %s\n", getSecError(ret)); pFreeCredentialsHandle(&cred); + return TRUE; } static void test_cred_multiple_use(void) @@ -1266,8 +1254,8 @@ test_pass[] = "testpass", sec_pkg_name[] = "NTLM"; SECURITY_STATUS ret; - SEC_WINNT_AUTH_IDENTITY id; - PSecPkgInfo pkg_info = NULL; + SEC_WINNT_AUTH_IDENTITY_A id; + PSecPkgInfoA pkg_info = NULL; CredHandle cred; CtxtHandle ctxt1; CtxtHandle ctxt2; @@ -1278,7 +1266,7 @@ if(pQuerySecurityPackageInfoA(sec_pkg_name, &pkg_info) != SEC_E_OK) { - skip("NTLM package not installed, skipping test\n"); + ok(0, "NTLM package not installed, skipping test\n"); return; } buffers[0].cbBuffer = pkg_info->cbMaxToken; @@ -1327,7 +1315,7 @@ static void test_null_auth_data(void) { SECURITY_STATUS status; - PSecPkgInfo info; + PSecPkgInfoA info; CredHandle cred; CtxtHandle ctx; SecBufferDesc buffer_desc; @@ -1339,7 +1327,7 @@ if(pQuerySecurityPackageInfoA((SEC_CHAR *)"NTLM", &info) != SEC_E_OK) { - skip("NTLM package not installed, skipping test\n"); + ok(0, "NTLM package not installed, skipping test\n"); return; } @@ -1382,7 +1370,8 @@ pInitializeSecurityContextA && pCompleteAuthToken && pQuerySecurityPackageInfoA) { - testAcquireCredentialsHandle(); + if(!testAcquireCredentialsHandle()) + goto cleanup; testInitializeSecurityContextFlags(); if(pAcceptSecurityContext) { @@ -1401,6 +1390,7 @@ else win_skip("Needed functions are not available\n"); +cleanup: if(secdll) FreeLibrary(secdll); } Modified: trunk/rostests/winetests/secur32/schannel.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/secur32/schanne… ============================================================================== --- trunk/rostests/winetests/secur32/schannel.c [iso-8859-1] (original) +++ trunk/rostests/winetests/secur32/schannel.c [iso-8859-1] Tue Apr 22 11:12:43 2014 @@ -24,6 +24,8 @@ #define SECURITY_WIN32 #include <security.h> #include <schannel.h> +#include <winsock2.h> +#include <ws2tcpip.h> #include "wine/test.h" @@ -34,14 +36,20 @@ static FREE_CONTEXT_BUFFER_FN pFreeContextBuffer; static FREE_CREDENTIALS_HANDLE_FN pFreeCredentialsHandle; static QUERY_CREDENTIALS_ATTRIBUTES_FN_A pQueryCredentialsAttributesA; +static INITIALIZE_SECURITY_CONTEXT_FN_A pInitializeSecurityContextA; +static QUERY_CONTEXT_ATTRIBUTES_FN_A pQueryContextAttributesA; +static DELETE_SECURITY_CONTEXT_FN pDeleteSecurityContext; +static DECRYPT_MESSAGE_FN pDecryptMessage; +static ENCRYPT_MESSAGE_FN pEncryptMessage; static PCCERT_CONTEXT (WINAPI *pCertCreateCertificateContext)(DWORD,const BYTE*,DWORD); static BOOL (WINAPI *pCertFreeCertificateContext)(PCCERT_CONTEXT); static BOOL (WINAPI *pCertSetCertificateContextProperty)(PCCERT_CONTEXT,DWORD,DWORD,const void*); +static PCCERT_CONTEXT (WINAPI *pCertEnumCertificatesInStore)(HCERTSTORE,PCCERT_CONTEXT); static BOOL (WINAPI *pCryptAcquireContextW)(HCRYPTPROV*, LPCWSTR, LPCWSTR, DWORD, DWORD); static BOOL (WINAPI *pCryptDestroyKey)(HCRYPTKEY); -static BOOL (WINAPI *pCryptImportKey)(HCRYPTPROV,CONST BYTE*,DWORD,HCRYPTKEY,DWORD,HCRYPTKEY*); +static BOOL (WINAPI *pCryptImportKey)(HCRYPTPROV,const BYTE*,DWORD,HCRYPTKEY,DWORD,HCRYPTKEY*); static BOOL (WINAPI *pCryptReleaseContext)(HCRYPTPROV,ULONG_PTR); static const BYTE bigCert[] = { 0x30, 0x7a, 0x02, 0x01, 0x01, 0x30, 0x02, 0x06, @@ -115,7 +123,7 @@ secdll = LoadLibraryA("secur32.dll"); if(!secdll) secdll = LoadLibraryA("security.dll"); - advapi32dll = GetModuleHandleA("advapi32.dll"); + advapi32dll = LoadLibraryA("advapi32.dll"); #define GET_PROC(h, func) p ## func = (void*)GetProcAddress(h, #func) @@ -126,6 +134,11 @@ GET_PROC(secdll, FreeContextBuffer); GET_PROC(secdll, FreeCredentialsHandle); GET_PROC(secdll, QueryCredentialsAttributesA); + GET_PROC(secdll, InitializeSecurityContextA); + GET_PROC(secdll, QueryContextAttributesA); + GET_PROC(secdll, DeleteSecurityContext); + GET_PROC(secdll, DecryptMessage); + GET_PROC(secdll, EncryptMessage); } GET_PROC(advapi32dll, CryptAcquireContextW); @@ -136,6 +149,7 @@ GET_PROC(crypt32dll, CertFreeCertificateContext); GET_PROC(crypt32dll, CertSetCertificateContextProperty); GET_PROC(crypt32dll, CertCreateCertificateContext); + GET_PROC(crypt32dll, CertEnumCertificatesInStore); #undef GET_PROC } @@ -152,6 +166,31 @@ trace("strength %d - %d\n", strength.dwMinimumCipherStrength, strength.dwMaximumCipherStrength); } +static void test_supported_protocols(CredHandle *handle, unsigned exprots) +{ + SecPkgCred_SupportedProtocols protocols; + SECURITY_STATUS status; + + status = pQueryCredentialsAttributesA(handle, SECPKG_ATTR_SUPPORTED_PROTOCOLS, &protocols); + ok(status == SEC_E_OK, "QueryCredentialsAttributes failed: %08x\n", status); + + if(exprots) + ok(protocols.grbitProtocol == exprots, "protocols.grbitProtocol = %x, expected %x\n", protocols.grbitProtocol, exprots); + + trace("Supported protocols:\n"); + +#define X(flag, name) do { if(protocols.grbitProtocol & flag) { trace(name "\n"); protocols.grbitProtocol &= ~flag; } }while(0) + X(SP_PROT_SSL2_CLIENT, "SSL 2 client"); + X(SP_PROT_SSL3_CLIENT, "SSL 3 client"); + X(SP_PROT_TLS1_0_CLIENT, "TLS 1.0 client"); + X(SP_PROT_TLS1_1_CLIENT, "TLS 1.1 client"); + X(SP_PROT_TLS1_2_CLIENT, "TLS 1.2 client"); +#undef X + + if(protocols.grbitProtocol) + trace("Unknown flags: %x\n", protocols.grbitProtocol); +} + static void testAcquireSecurityContext(void) { BOOL has_schannel = FALSE; @@ -159,6 +198,7 @@ ULONG i; SECURITY_STATUS st; CredHandle cred; + SecPkgCredentials_NamesA names; TimeStamp exp; SCHANNEL_CRED schanCred; PCCERT_CONTEXT certs[2]; @@ -229,34 +269,41 @@ /* Crashes on Win2K */ st = pAcquireCredentialsHandleA(NULL, unisp_name_a, 0, NULL, NULL, NULL, NULL, NULL, NULL); - ok(st == SEC_E_NO_CREDENTIALS, "Expected SEC_E_NO_CREDENTIALS, got %08x\n", - st); - } - st = pAcquireCredentialsHandleA(NULL, unisp_name_a, SECPKG_CRED_BOTH, NULL, - NULL, NULL, NULL, NULL, NULL); - ok(st == SEC_E_NO_CREDENTIALS, "Expected SEC_E_NO_CREDENTIALS, got %08x\n", - st); - st = pAcquireCredentialsHandleA(NULL, unisp_name_a, SECPKG_CRED_INBOUND, - NULL, NULL, NULL, NULL, NULL, NULL); - ok(st == SEC_E_NO_CREDENTIALS, "Expected SEC_E_NO_CREDENTIALS, got %08x\n", - st); - if (0) - { + ok(st == SEC_E_NO_CREDENTIALS, "Expected SEC_E_NO_CREDENTIALS, got %08x\n", st); + + /* Crashes on WinNT */ + st = pAcquireCredentialsHandleA(NULL, unisp_name_a, SECPKG_CRED_BOTH, NULL, + NULL, NULL, NULL, NULL, NULL); + ok(st == SEC_E_NO_CREDENTIALS, "Expected SEC_E_NO_CREDENTIALS, got %08x\n", st); + + st = pAcquireCredentialsHandleA(NULL, unisp_name_a, SECPKG_CRED_INBOUND, + NULL, NULL, NULL, NULL, NULL, NULL); + ok(st == SEC_E_NO_CREDENTIALS, "Expected SEC_E_NO_CREDENTIALS, got %08x\n", st); + /* Crashes */ - st = pAcquireCredentialsHandleA(NULL, unisp_name_a, SECPKG_CRED_OUTBOUND, + pAcquireCredentialsHandleA(NULL, unisp_name_a, SECPKG_CRED_OUTBOUND, NULL, NULL, NULL, NULL, NULL, NULL); } st = pAcquireCredentialsHandleA(NULL, unisp_name_a, SECPKG_CRED_OUTBOUND, NULL, NULL, NULL, NULL, &cred, NULL); ok(st == SEC_E_OK, "AcquireCredentialsHandleA failed: %08x\n", st); - if(st == SEC_E_OK) + if(st == SEC_E_OK) { + st = pQueryCredentialsAttributesA(&cred, SECPKG_ATTR_SUPPORTED_PROTOCOLS, NULL); + ok(st == SEC_E_INTERNAL_ERROR, "QueryCredentialsAttributes failed: %08x, expected SEC_E_INTERNAL_ERROR\n", st); + + test_supported_protocols(&cred, 0); pFreeCredentialsHandle(&cred); + } memset(&cred, 0, sizeof(cred)); st = pAcquireCredentialsHandleA(NULL, unisp_name_a, SECPKG_CRED_OUTBOUND, NULL, NULL, NULL, NULL, &cred, &exp); ok(st == SEC_E_OK, "AcquireCredentialsHandleA failed: %08x\n", st); /* expriy is indeterminate in win2k3 */ trace("expiry: %08x%08x\n", exp.HighPart, exp.LowPart); + + st = pQueryCredentialsAttributesA(&cred, SECPKG_CRED_ATTR_NAMES, &names); + ok(st == SEC_E_NO_CREDENTIALS || st == SEC_E_UNSUPPORTED_FUNCTION /* before Vista */, "expected SEC_E_NO_CREDENTIALS, got %08x\n", st); + pFreeCredentialsHandle(&cred); /* Bad version in SCHANNEL_CRED */ @@ -264,13 +311,13 @@ st = pAcquireCredentialsHandleA(NULL, unisp_name_a, SECPKG_CRED_OUTBOUND, NULL, &schanCred, NULL, NULL, NULL, NULL); ok(st == SEC_E_INTERNAL_ERROR || - st == SEC_E_UNKNOWN_CREDENTIALS /* Vista/win2k8 */, - "Expected SEC_E_INTERNAL_ERROR or SEC_E_UNKNOWN_CREDENTIALS, got %08x\n", st); + st == SEC_E_UNKNOWN_CREDENTIALS /* Vista/win2k8 */ || + st == SEC_E_INVALID_TOKEN /* WinNT */, "st = %08x\n", st); st = pAcquireCredentialsHandleA(NULL, unisp_name_a, SECPKG_CRED_INBOUND, NULL, &schanCred, NULL, NULL, NULL, NULL); ok(st == SEC_E_INTERNAL_ERROR || - st == SEC_E_UNKNOWN_CREDENTIALS /* Vista/win2k8 */, - "Expected SEC_E_INTERNAL_ERROR or SEC_E_UNKNOWN_CREDENTIALS, got %08x\n", st); + st == SEC_E_UNKNOWN_CREDENTIALS /* Vista/win2k8 */ || + st == SEC_E_INVALID_TOKEN /* WinNT */, "st = %08x\n", st); /* No cert in SCHANNEL_CRED succeeds for outbound.. */ schanCred.dwVersion = SCHANNEL_CRED_VERSION; @@ -289,7 +336,7 @@ { /* Crashes with bad paCred pointer */ schanCred.cCreds = 1; - st = pAcquireCredentialsHandleA(NULL, unisp_name_a, SECPKG_CRED_OUTBOUND, + pAcquireCredentialsHandleA(NULL, unisp_name_a, SECPKG_CRED_OUTBOUND, NULL, &schanCred, NULL, NULL, NULL, NULL); } @@ -300,14 +347,14 @@ schanCred.paCred = &certs[0]; st = pAcquireCredentialsHandleA(NULL, unisp_name_a, SECPKG_CRED_OUTBOUND, NULL, &schanCred, NULL, NULL, NULL, NULL); - ok(st == SEC_E_UNKNOWN_CREDENTIALS || st == SEC_E_NO_CREDENTIALS, - "Expected SEC_E_UNKNOWN_CREDENTIALS or SEC_E_NO_CREDENTIALS, got %08x\n", - st); + ok(st == SEC_E_UNKNOWN_CREDENTIALS || + st == SEC_E_NO_CREDENTIALS || + st == SEC_E_INVALID_TOKEN /* WinNT */, "st = %08x\n", st); st = pAcquireCredentialsHandleA(NULL, unisp_name_a, SECPKG_CRED_INBOUND, NULL, &schanCred, NULL, NULL, NULL, NULL); - ok(st == SEC_E_UNKNOWN_CREDENTIALS || st == SEC_E_NO_CREDENTIALS, - "Expected SEC_E_UNKNOWN_CREDENTIALS or SEC_E_NO_CREDENTIALS, got %08x\n", - st); + ok(st == SEC_E_UNKNOWN_CREDENTIALS || + st == SEC_E_NO_CREDENTIALS || + st == SEC_E_INVALID_TOKEN /* WinNT */, "st = %08x\n", st); /* Good cert, but missing private key. Windows fails with * SEC_E_NO_CREDENTIALS, but I'll accept SEC_E_UNKNOWN_CREDENTIALS too. @@ -333,14 +380,15 @@ ret = pCertSetCertificateContextProperty(certs[1], CERT_KEY_PROV_INFO_PROP_ID, 0, &keyProvInfo); schanCred.dwVersion = SCH_CRED_V3; + ok(ret, "CertSetCertificateContextProperty failed: %08x\n", GetLastError()); st = pAcquireCredentialsHandleA(NULL, unisp_name_a, SECPKG_CRED_OUTBOUND, NULL, &schanCred, NULL, NULL, &cred, NULL); - ok(st == SEC_E_UNKNOWN_CREDENTIALS, - "Expected SEC_E_UNKNOWN_CREDENTIALS, got %08x\n", st); + ok(st == SEC_E_UNKNOWN_CREDENTIALS || st == SEC_E_INTERNAL_ERROR /* WinNT */, + "Expected SEC_E_UNKNOWN_CREDENTIALS or SEC_E_INTERNAL_ERROR, got %08x\n", st); st = pAcquireCredentialsHandleA(NULL, unisp_name_a, SECPKG_CRED_INBOUND, NULL, &schanCred, NULL, NULL, &cred, NULL); - ok(st == SEC_E_UNKNOWN_CREDENTIALS, - "Expected SEC_E_UNKNOWN_CREDENTIALS, got %08x\n", st); + ok(st == SEC_E_UNKNOWN_CREDENTIALS || st == SEC_E_INTERNAL_ERROR /* WinNT */, + "Expected SEC_E_UNKNOWN_CREDENTIALS or SEC_E_INTERNAL_ERROR, got %08x\n", st); } ret = pCryptAcquireContextW(&csp, cspNameW, MS_DEF_PROV_W, PROV_RSA_FULL, @@ -359,32 +407,34 @@ if (0) { /* Crashes */ + pAcquireCredentialsHandleA(NULL, unisp_name_a, SECPKG_CRED_INBOUND, + NULL, &schanCred, NULL, NULL, NULL, NULL); + + /* Crashes on WinNT */ + /* Good cert with private key, bogus version */ + schanCred.dwVersion = SCH_CRED_V1; + st = pAcquireCredentialsHandleA(NULL, unisp_name_a, SECPKG_CRED_OUTBOUND, + NULL, &schanCred, NULL, NULL, &cred, NULL); + ok(st == SEC_E_INTERNAL_ERROR || + st == SEC_E_UNKNOWN_CREDENTIALS /* Vista/win2k8 */, + "Expected SEC_E_INTERNAL_ERROR or SEC_E_UNKNOWN_CREDENTIALS, got %08x\n", st); st = pAcquireCredentialsHandleA(NULL, unisp_name_a, SECPKG_CRED_INBOUND, - NULL, &schanCred, NULL, NULL, NULL, NULL); + NULL, &schanCred, NULL, NULL, &cred, NULL); + ok(st == SEC_E_INTERNAL_ERROR || + st == SEC_E_UNKNOWN_CREDENTIALS /* Vista/win2k8 */, + "Expected SEC_E_INTERNAL_ERROR or SEC_E_UNKNOWN_CREDENTIALS, got %08x\n", st); + schanCred.dwVersion = SCH_CRED_V2; + st = pAcquireCredentialsHandleA(NULL, unisp_name_a, SECPKG_CRED_OUTBOUND, + NULL, &schanCred, NULL, NULL, &cred, NULL); + ok(st == SEC_E_INTERNAL_ERROR || + st == SEC_E_UNKNOWN_CREDENTIALS /* Vista/win2k8 */, + "Expected SEC_E_INTERNAL_ERROR or SEC_E_UNKNOWN_CREDENTIALS, got %08x\n", st); + st = pAcquireCredentialsHandleA(NULL, unisp_name_a, SECPKG_CRED_INBOUND, + NULL, &schanCred, NULL, NULL, &cred, NULL); + ok(st == SEC_E_INTERNAL_ERROR || + st == SEC_E_UNKNOWN_CREDENTIALS /* Vista/win2k8 */, + "Expected SEC_E_INTERNAL_ERROR or SEC_E_UNKNOWN_CREDENTIALS, got %08x\n", st); } - /* Good cert with private key, bogus version */ - schanCred.dwVersion = SCH_CRED_V1; - st = pAcquireCredentialsHandleA(NULL, unisp_name_a, SECPKG_CRED_OUTBOUND, - NULL, &schanCred, NULL, NULL, &cred, NULL); - ok(st == SEC_E_INTERNAL_ERROR || - st == SEC_E_UNKNOWN_CREDENTIALS /* Vista/win2k8 */, - "Expected SEC_E_INTERNAL_ERROR or SEC_E_UNKNOWN_CREDENTIALS, got %08x\n", st); - st = pAcquireCredentialsHandleA(NULL, unisp_name_a, SECPKG_CRED_INBOUND, - NULL, &schanCred, NULL, NULL, &cred, NULL); - ok(st == SEC_E_INTERNAL_ERROR || - st == SEC_E_UNKNOWN_CREDENTIALS /* Vista/win2k8 */, - "Expected SEC_E_INTERNAL_ERROR or SEC_E_UNKNOWN_CREDENTIALS, got %08x\n", st); - schanCred.dwVersion = SCH_CRED_V2; - st = pAcquireCredentialsHandleA(NULL, unisp_name_a, SECPKG_CRED_OUTBOUND, - NULL, &schanCred, NULL, NULL, &cred, NULL); - ok(st == SEC_E_INTERNAL_ERROR || - st == SEC_E_UNKNOWN_CREDENTIALS /* Vista/win2k8 */, - "Expected SEC_E_INTERNAL_ERROR or SEC_E_UNKNOWN_CREDENTIALS, got %08x\n", st); - st = pAcquireCredentialsHandleA(NULL, unisp_name_a, SECPKG_CRED_INBOUND, - NULL, &schanCred, NULL, NULL, &cred, NULL); - ok(st == SEC_E_INTERNAL_ERROR || - st == SEC_E_UNKNOWN_CREDENTIALS /* Vista/win2k8 */, - "Expected SEC_E_INTERNAL_ERROR or SEC_E_UNKNOWN_CREDENTIALS, got %08x\n", st); /* Succeeds on V3 or higher */ schanCred.dwVersion = SCH_CRED_V3; @@ -417,21 +467,21 @@ st = pAcquireCredentialsHandleA(NULL, unisp_name_a, SECPKG_CRED_OUTBOUND, NULL, &schanCred, NULL, NULL, &cred, NULL); ok(st == SEC_E_UNKNOWN_CREDENTIALS || - st == SEC_E_NO_CREDENTIALS /* Vista/win2k8 */, - "Expected SEC_E_UNKNOWN_CREDENTIALS or SEC_E_NO_CREDENTIALS, got %08x\n", st); + st == SEC_E_NO_CREDENTIALS /* Vista/win2k8 */ || + st == SEC_E_INVALID_TOKEN /* WinNT */, "st = %08x\n", st); st = pAcquireCredentialsHandleA(NULL, unisp_name_a, SECPKG_CRED_INBOUND, NULL, &schanCred, NULL, NULL, &cred, NULL); ok(st == SEC_E_UNKNOWN_CREDENTIALS || - st == SEC_E_NO_CREDENTIALS, - "Expected SEC_E_UNKNOWN_CREDENTIALS, got %08x\n", st); + st == SEC_E_NO_CREDENTIALS || + st == SEC_E_INVALID_TOKEN /* WinNT */, "st = %08x\n", st); tmp = certs[0]; certs[0] = certs[1]; certs[1] = tmp; st = pAcquireCredentialsHandleA(NULL, unisp_name_a, SECPKG_CRED_OUTBOUND, NULL, &schanCred, NULL, NULL, &cred, NULL); ok(st == SEC_E_UNKNOWN_CREDENTIALS || - st == SEC_E_NO_CREDENTIALS, - "Expected SEC_E_UNKNOWN_CREDENTIALS, got %08x\n", st); + st == SEC_E_NO_CREDENTIALS || + st == SEC_E_INVALID_TOKEN /* WinNT */, "st = %08x\n", st); st = pAcquireCredentialsHandleA(NULL, unisp_name_a, SECPKG_CRED_INBOUND, NULL, &schanCred, NULL, NULL, &cred, NULL); ok(st == SEC_E_UNKNOWN_CREDENTIALS, @@ -454,11 +504,407 @@ } } +static void test_remote_cert(PCCERT_CONTEXT remote_cert) +{ + PCCERT_CONTEXT iter = NULL; + BOOL incl_remote = FALSE; + unsigned cert_cnt = 0; + + ok(remote_cert->hCertStore != NULL, "hCertStore == NULL\n"); + + while((iter = pCertEnumCertificatesInStore(remote_cert->hCertStore, iter))) { + if(iter == remote_cert) + incl_remote = TRUE; + cert_cnt++; + } + + ok(cert_cnt == 2, "cert_cnt = %u\n", cert_cnt); + ok(incl_remote, "context does not contain cert itself\n"); +} + +static const char http_request[] = "HEAD /test.html HTTP/1.1\r\nHost: www.winehq.org\r\nConnection: close\r\n\r\n"; + +static void init_cred(SCHANNEL_CRED *cred) +{ + cred->dwVersion = SCHANNEL_CRED_VERSION; + cred->cCreds = 0; + cred->paCred = 0; + cred->hRootStore = NULL; + cred->cMappers = 0; + cred->aphMappers = NULL; + cred->cSupportedAlgs = 0; + cred->palgSupportedAlgs = NULL; + cred->grbitEnabledProtocols = SP_PROT_SSL3_CLIENT; + cred->dwMinimumCipherStrength = 0; + cred->dwMaximumCipherStrength = 0; + cred->dwSessionLifespan = 0; + cred->dwFlags = 0; +} + +static void init_buffers(SecBufferDesc *desc, unsigned count, unsigned size) +{ + desc->ulVersion = SECBUFFER_VERSION; + desc->cBuffers = count; + desc->pBuffers = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, count*sizeof(SecBuffer)); + + desc->pBuffers[0].cbBuffer = size; + desc->pBuffers[0].pvBuffer = HeapAlloc(GetProcessHeap(), 0, size); +} + +static void reset_buffers(SecBufferDesc *desc) +{ + unsigned i; + + for (i = 0; i < desc->cBuffers; ++i) + { + desc->pBuffers[i].BufferType = SECBUFFER_EMPTY; + if (i > 0) + { + desc->pBuffers[i].cbBuffer = 0; + desc->pBuffers[i].pvBuffer = NULL; + } + } +} + +static void free_buffers(SecBufferDesc *desc) +{ + HeapFree(GetProcessHeap(), 0, desc->pBuffers[0].pvBuffer); + HeapFree(GetProcessHeap(), 0, desc->pBuffers); +} + +static int receive_data(SOCKET sock, SecBuffer *buf) +{ + unsigned received = 0; + + while (1) + { + unsigned char *data = buf->pvBuffer; + unsigned expected = 0; + int ret; + + ret = recv(sock, (char *)data+received, buf->cbBuffer-received, 0); + if (ret == -1) + { + skip("recv failed\n"); + return -1; + } + else if(ret == 0) + { + skip("connection closed\n"); + return -1; + } + received += ret; + + while (expected < received) + { + unsigned frame_size = 5 + ((data[3]<<8) | data[4]); + expected += frame_size; + data += frame_size; + } + + if (expected == received) + break; + } + + buf->cbBuffer = received; + + return received; +} + +static void test_communication(void) +{ + int ret; + + WSADATA wsa_data; + SOCKET sock; + struct hostent *host; + struct sockaddr_in addr; + + SECURITY_STATUS status; + ULONG attrs; + + SCHANNEL_CRED cred; + CredHandle cred_handle; + CtxtHandle context; + SecPkgCredentials_NamesA names; + SecPkgContext_StreamSizes sizes; + SecPkgContext_ConnectionInfo conn_info; + CERT_CONTEXT *cert; + + SecBufferDesc buffers[2]; + SecBuffer *buf; + unsigned buf_size = 4000; + unsigned char *data; + unsigned data_size; + + if (!pAcquireCredentialsHandleA || !pFreeCredentialsHandle || + !pInitializeSecurityContextA || !pDeleteSecurityContext || + !pQueryContextAttributesA || !pDecryptMessage || !pEncryptMessage) + { + skip("Required secur32 functions not available\n"); + return; + } + + /* Create a socket and connect to www.winehq.org */ + ret = WSAStartup(0x0202, &wsa_data); + if (ret) + { + skip("Can't init winsock 2.2\n"); + return; + } + + host = gethostbyname("www.winehq.org"); + if (!host) + { + skip("Can't resolve www.winehq.org\n"); + return; + } + + addr.sin_family = host->h_addrtype; + addr.sin_addr = *(struct in_addr *)host->h_addr_list[0]; + addr.sin_port = htons(443); + sock = socket(host->h_addrtype, SOCK_STREAM, 0); + if (sock == SOCKET_ERROR) + { + skip("Can't create socket\n"); + return; + } + + ret = connect(sock, (struct sockaddr *)&addr, sizeof(addr)); + if (ret == SOCKET_ERROR) + { + skip("Can't connect to www.winehq.org\n"); + return; + } + + /* Create client credentials */ + init_cred(&cred); + cred.dwFlags = SCH_CRED_NO_DEFAULT_CREDS|SCH_CRED_MANUAL_CRED_VALIDATION; + + status = pAcquireCredentialsHandleA(NULL, (SEC_CHAR *)UNISP_NAME_A, SECPKG_CRED_OUTBOUND, NULL, + &cred, NULL, NULL, &cred_handle, NULL); + ok(status == SEC_E_OK, "AcquireCredentialsHandleA failed: %08x\n", status); + if (status != SEC_E_OK) return; + + test_supported_protocols(&cred_handle, SP_PROT_SSL3_CLIENT); + + /* Initialize the connection */ + init_buffers(&buffers[0], 4, buf_size); + init_buffers(&buffers[1], 4, buf_size); + + buffers[0].pBuffers[0].BufferType = SECBUFFER_TOKEN; + status = pInitializeSecurityContextA(&cred_handle, NULL, (SEC_CHAR *)"localhost", + ISC_REQ_CONFIDENTIALITY|ISC_REQ_STREAM, + 0, 0, NULL, 0, &context, &buffers[0], &attrs, NULL); + ok(status == SEC_I_CONTINUE_NEEDED, "Expected SEC_I_CONTINUE_NEEDED, got %08x\n", status); + + buffers[1].cBuffers = 1; + buffers[1].pBuffers[0].BufferType = SECBUFFER_TOKEN; + buffers[0].pBuffers[0].cbBuffer = 1; + status = pInitializeSecurityContextA(&cred_handle, &context, (SEC_CHAR *)"localhost", + ISC_REQ_CONFIDENTIALITY|ISC_REQ_STREAM, + 0, 0, &buffers[1], 0, NULL, &buffers[0], &attrs, NULL); + ok(status == SEC_E_INVALID_TOKEN, "Expected SEC_E_INVALID_TOKEN, got %08x\n", status); +todo_wine + ok(buffers[0].pBuffers[0].cbBuffer == 0, "Output buffer size was not set to 0.\n"); + + status = pInitializeSecurityContextA(&cred_handle, &context, (SEC_CHAR *)"localhost", + ISC_REQ_CONFIDENTIALITY|ISC_REQ_STREAM, + 0, 0, &buffers[1], 0, NULL, &buffers[0], &attrs, NULL); +todo_wine + ok(status == SEC_E_INSUFFICIENT_MEMORY || status == SEC_E_INVALID_TOKEN, + "Expected SEC_E_INSUFFICIENT_MEMORY or SEC_E_INVALID_TOKEN, got %08x\n", status); + + buffers[0].pBuffers[0].cbBuffer = buf_size; + + status = pInitializeSecurityContextA(&cred_handle, NULL, (SEC_CHAR *)"localhost", + ISC_REQ_CONFIDENTIALITY|ISC_REQ_STREAM, + 0, 0, NULL, 0, &context, &buffers[0], &attrs, NULL); + ok(status == SEC_I_CONTINUE_NEEDED, "Expected SEC_I_CONTINUE_NEEDED, got %08x\n", status); + + buf = &buffers[0].pBuffers[0]; + send(sock, buf->pvBuffer, buf->cbBuffer, 0); + buf->cbBuffer = buf_size; + + status = pInitializeSecurityContextA(&cred_handle, &context, (SEC_CHAR *)"localhost", + ISC_REQ_CONFIDENTIALITY|ISC_REQ_STREAM, + 0, 0, NULL, 0, NULL, &buffers[0], &attrs, NULL); + ok(status == SEC_E_INCOMPLETE_MESSAGE, "Got unexpected status %#x.\n", status); + ok(buffers[0].pBuffers[0].cbBuffer == buf_size, "Output buffer size changed.\n"); + ok(buffers[0].pBuffers[0].BufferType == SECBUFFER_TOKEN, "Output buffer type changed.\n"); + + buffers[1].cBuffers = 4; + buffers[1].pBuffers[0].cbBuffer = 0; + + status = pInitializeSecurityContextA(&cred_handle, &context, (SEC_CHAR *)"localhost", + ISC_REQ_CONFIDENTIALITY|ISC_REQ_STREAM, + 0, 0, &buffers[1], 0, NULL, &buffers[0], &attrs, NULL); + ok(status == SEC_E_INCOMPLETE_MESSAGE, "Got unexpected status %#x.\n", status); + ok(buffers[0].pBuffers[0].cbBuffer == buf_size, "Output buffer size changed.\n"); + ok(buffers[0].pBuffers[0].BufferType == SECBUFFER_TOKEN, "Output buffer type changed.\n"); + + buf = &buffers[1].pBuffers[0]; + buf->cbBuffer = buf_size; + ret = receive_data(sock, buf); + if (ret == -1) + return; + + buffers[1].pBuffers[0].cbBuffer = 4; + status = pInitializeSecurityContextA(&cred_handle, &context, (SEC_CHAR *)"localhost", + ISC_REQ_CONFIDENTIALITY|ISC_REQ_STREAM, + 0, 0, &buffers[1], 0, NULL, &buffers[0], &attrs, NULL); + ok(status == SEC_E_INCOMPLETE_MESSAGE, "Got unexpected status %#x.\n", status); + ok(buffers[0].pBuffers[0].cbBuffer == buf_size, "Output buffer size changed.\n"); + ok(buffers[0].pBuffers[0].BufferType == SECBUFFER_TOKEN, "Output buffer type changed.\n"); + + buffers[1].pBuffers[0].cbBuffer = 5; + status = pInitializeSecurityContextA(&cred_handle, &context, (SEC_CHAR *)"localhost", + ISC_REQ_CONFIDENTIALITY|ISC_REQ_STREAM, + 0, 0, &buffers[1], 0, NULL, &buffers[0], &attrs, NULL); + ok(status == SEC_E_INCOMPLETE_MESSAGE, "Got unexpected status %#x.\n", status); + ok(buffers[0].pBuffers[0].cbBuffer == buf_size, "Output buffer size changed.\n"); + ok(buffers[0].pBuffers[0].BufferType == SECBUFFER_TOKEN, "Output buffer type changed.\n"); + + buffers[1].pBuffers[0].cbBuffer = ret; + status = pInitializeSecurityContextA(&cred_handle, &context, (SEC_CHAR *)"localhost", + ISC_REQ_CONFIDENTIALITY|ISC_REQ_STREAM, + 0, 0, &buffers[1], 0, NULL, &buffers[0], &attrs, NULL); + buffers[1].pBuffers[0].cbBuffer = buf_size; + while (status == SEC_I_CONTINUE_NEEDED) + { + buf = &buffers[0].pBuffers[0]; + send(sock, buf->pvBuffer, buf->cbBuffer, 0); + buf->cbBuffer = buf_size; + + buf = &buffers[1].pBuffers[0]; + ret = receive_data(sock, buf); + if (ret == -1) + return; + + buf->BufferType = SECBUFFER_TOKEN; + + status = pInitializeSecurityContextA(&cred_handle, &context, (SEC_CHAR *)"localhost", + ISC_REQ_CONFIDENTIALITY|ISC_REQ_STREAM, + 0, 0, &buffers[1], 0, NULL, &buffers[0], &attrs, NULL); + buffers[1].pBuffers[0].cbBuffer = buf_size; + } + + ok(status == SEC_E_OK || broken(status == SEC_E_INVALID_TOKEN) /* WinNT */, + "InitializeSecurityContext failed: %08x\n", status); + if(status != SEC_E_OK) { + win_skip("Handshake failed\n"); + return; + } + + status = pQueryCredentialsAttributesA(&cred_handle, SECPKG_CRED_ATTR_NAMES, &names); + ok(status == SEC_E_NO_CREDENTIALS || status == SEC_E_UNSUPPORTED_FUNCTION /* before Vista */, "expected SEC_E_NO_CREDENTIALS, got %08x\n", status); + + status = pQueryContextAttributesA(&context, SECPKG_ATTR_REMOTE_CERT_CONTEXT, (void*)&cert); + ok(status == SEC_E_OK, "QueryContextAttributesW(SECPKG_ATTR_REMOTE_CERT_CONTEXT) failed: %08x\n", status); + if(status == SEC_E_OK) { + test_remote_cert(cert); + pCertFreeCertificateContext(cert); + } + + status = pQueryContextAttributesA(&context, SECPKG_ATTR_CONNECTION_INFO, (void*)&conn_info); + ok(status == SEC_E_OK, "QueryContextAttributesW(SECPKG_ATTR_CONNECTION_INFO) failed: %08x\n", status); + if(status == SEC_E_OK) { + ok(conn_info.dwCipherStrength == 128 || conn_info.dwCipherStrength == 168, + "conn_info.dwCipherStrength = %d\n", conn_info.dwCipherStrength); + ok(conn_info.dwHashStrength >= 128, "conn_info.dwHashStrength = %d\n", conn_info.dwHashStrength); + } + + status = pQueryContextAttributesA(&context, SECPKG_ATTR_STREAM_SIZES, &sizes); + ok(status == SEC_E_OK, "QueryContextAttributesW(SECPKG_ATTR_STREAM_SIZES) failed: %08x\n", status); + + reset_buffers(&buffers[0]); + + /* Send a simple request so we get data for testing DecryptMessage */ + buf = &buffers[0].pBuffers[0]; + data = buf->pvBuffer; + buf->BufferType = SECBUFFER_STREAM_HEADER; + buf->cbBuffer = sizes.cbHeader; + ++buf; + buf->BufferType = SECBUFFER_DATA; + buf->pvBuffer = data + sizes.cbHeader; + buf->cbBuffer = sizeof(http_request) - 1; + memcpy(buf->pvBuffer, http_request, sizeof(http_request) - 1); + ++buf; + buf->BufferType = SECBUFFER_STREAM_TRAILER; + buf->pvBuffer = data + sizes.cbHeader + sizeof(http_request) -1; + buf->cbBuffer = sizes.cbTrailer; + + status = pEncryptMessage(&context, 0, &buffers[0], 0); + ok(status == SEC_E_OK, "EncryptMessage failed: %08x\n", status); + if (status != SEC_E_OK) + return; + + buf = &buffers[0].pBuffers[0]; + send(sock, buf->pvBuffer, buffers[0].pBuffers[0].cbBuffer + buffers[0].pBuffers[1].cbBuffer + buffers[0].pBuffers[2].cbBuffer, 0); + + reset_buffers(&buffers[0]); + buf->cbBuffer = buf_size; + data_size = receive_data(sock, buf); + + /* Too few buffers */ + --buffers[0].cBuffers; + status = pDecryptMessage(&context, &buffers[0], 0, NULL); + ok(status == SEC_E_INVALID_TOKEN, "Expected SEC_E_INVALID_TOKEN, got %08x\n", status); + + /* No data buffer */ + ++buffers[0].cBuffers; + status = pDecryptMessage(&context, &buffers[0], 0, NULL); + ok(status == SEC_E_INVALID_TOKEN, "Expected SEC_E_INVALID_TOKEN, got %08x\n", status); + + /* Two data buffers */ + buffers[0].pBuffers[0].BufferType = SECBUFFER_DATA; + buffers[0].pBuffers[1].BufferType = SECBUFFER_DATA; + status = pDecryptMessage(&context, &buffers[0], 0, NULL); + ok(status == SEC_E_INVALID_TOKEN, "Expected SEC_E_INVALID_TOKEN, got %08x\n", status); + + /* Too few empty buffers */ + buffers[0].pBuffers[1].BufferType = SECBUFFER_EXTRA; + status = pDecryptMessage(&context, &buffers[0], 0, NULL); + ok(status == SEC_E_INVALID_TOKEN, "Expected SEC_E_INVALID_TOKEN, got %08x\n", status); + + /* Incomplete data */ + buffers[0].pBuffers[1].BufferType = SECBUFFER_EMPTY; + buffers[0].pBuffers[0].cbBuffer = (data[3]<<8) | data[4]; + status = pDecryptMessage(&context, &buffers[0], 0, NULL); + ok(status == SEC_E_INCOMPLETE_MESSAGE, "Expected SEC_E_INCOMPLETE_MESSAGE, got %08x\n", status); + ok(buffers[0].pBuffers[0].BufferType == SECBUFFER_MISSING, "Expected first buffer to be SECBUFFER_MISSING\n"); + ok(buffers[0].pBuffers[0].cbBuffer == 5, "Expected first buffer to be a five bytes\n"); + + buffers[0].pBuffers[0].cbBuffer = data_size; + buffers[0].pBuffers[0].BufferType = SECBUFFER_DATA; + buffers[0].pBuffers[1].BufferType = SECBUFFER_EMPTY; + status = pDecryptMessage(&context, &buffers[0], 0, NULL); + ok(status == SEC_E_OK, "DecryptMessage failed: %08x\n", status); + if (status == SEC_E_OK) + { + ok(buffers[0].pBuffers[0].BufferType == SECBUFFER_STREAM_HEADER, "Expected first buffer to be SECBUFFER_STREAM_HEADER\n"); + ok(buffers[0].pBuffers[1].BufferType == SECBUFFER_DATA, "Expected second buffer to be SECBUFFER_DATA\n"); + ok(buffers[0].pBuffers[2].BufferType == SECBUFFER_STREAM_TRAILER, "Expected third buffer to be SECBUFFER_STREAM_TRAILER\n"); + + data = buffers[0].pBuffers[1].pvBuffer; + data[buffers[0].pBuffers[1].cbBuffer] = 0; + } + + pDeleteSecurityContext(&context); + pFreeCredentialsHandle(&cred_handle); + + free_buffers(&buffers[0]); + free_buffers(&buffers[1]); + + closesocket(sock); +} + START_TEST(schannel) { InitFunctionPtrs(); testAcquireSecurityContext(); + test_communication(); if(secdll) FreeLibrary(secdll); Modified: trunk/rostests/winetests/secur32/secur32.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/secur32/secur32… ============================================================================== --- trunk/rostests/winetests/secur32/secur32.c [iso-8859-1] (original) +++ trunk/rostests/winetests/secur32/secur32.c [iso-8859-1] Tue Apr 22 11:12:43 2014 @@ -118,7 +118,7 @@ } if (0) /* Crashes on Windows */ - rc = pGetUserNameExA(NameSamCompatible, NULL, NULL); + pGetUserNameExA(NameSamCompatible, NULL, NULL); size = 0; rc = pGetUserNameExA(NameSamCompatible, NULL, &size); @@ -128,7 +128,7 @@ if (0) /* Crashes on Windows with big enough size */ { /* Returned size is already big enough */ - rc = pGetUserNameExA(NameSamCompatible, NULL, &size); + pGetUserNameExA(NameSamCompatible, NULL, &size); } size = 0; @@ -165,7 +165,7 @@ } if (0) /* Crashes on Windows */ - rc = pGetUserNameExW(NameSamCompatible, NULL, NULL); + pGetUserNameExW(NameSamCompatible, NULL, NULL); size = 0; rc = pGetUserNameExW(NameSamCompatible, NULL, &size); @@ -175,7 +175,7 @@ if (0) /* Crashes on Windows with big enough size */ { /* Returned size is already big enough */ - rc = pGetUserNameExW(NameSamCompatible, NULL, &size); + pGetUserNameExW(NameSamCompatible, NULL, &size); } size = 0; @@ -198,14 +198,12 @@ sftA = pInitSecurityInterfaceA(); ok(sftA != NULL, "pInitSecurityInterfaceA failed\n"); ok(sftA->dwVersion == SECURITY_SUPPORT_PROVIDER_INTERFACE_VERSION, "wrong dwVersion %d in security function table\n", sftA->dwVersion); - ok(!sftA->Reserved2 || broken(sftA->Reserved2 != NULL) /* WinME */, + ok(!sftA->Reserved2, "Reserved2 should be NULL instead of %p in security function table\n", sftA->Reserved2); - ok(sftA->Reserved3 == sftA->EncryptMessage || - broken(sftA->Reserved3 != sftA->EncryptMessage) /* Win9x */, + ok(sftA->Reserved3 == sftA->EncryptMessage, "Reserved3 should be equal to EncryptMessage in the security function table\n"); - ok(sftA->Reserved4 == sftA->DecryptMessage || - broken(sftA->Reserved4 != sftA->DecryptMessage) /* Win9x */, + ok(sftA->Reserved4 == sftA->DecryptMessage, "Reserved4 should be equal to DecryptMessage in the security function table\n"); if (!pInitSecurityInterfaceW) Modified: trunk/rostests/winetests/secur32/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/secur32/testlis… ============================================================================== --- trunk/rostests/winetests/secur32/testlist.c [iso-8859-1] (original) +++ trunk/rostests/winetests/secur32/testlist.c [iso-8859-1] Tue Apr 22 11:12:43 2014 @@ -1,21 +1,20 @@ /* Automatically generated file; DO NOT EDIT!! */ -#define WIN32_LEAN_AND_MEAN -#include <windows.h> +#define STANDALONE +#include <wine/test.h> -#define STANDALONE -#include "wine/test.h" - +extern void func_main(void); +extern void func_negotiate(void); +extern void func_ntlm(void); +extern void func_schannel(void); extern void func_secur32(void); -extern void func_schannel(void); -extern void func_ntlm(void); -extern void func_main(void); const struct test winetest_testlist[] = { + { "main", func_main }, + { "negotiate", func_negotiate }, + { "ntlm", func_ntlm }, + { "schannel", func_schannel }, { "secur32", func_secur32 }, - { "schannel", func_schannel }, - { "ntlm", func_ntlm }, - { "main", func_main }, { 0, 0 } };

10 years, 5 months

[fireball] 62865: [ARWINSS] - Properly set and reset Win32 process/thread info. Fixes a crash when first thread in the system terminates (and that's CSRSS thread by design).

by fireball＠svn.reactos.org

Author: fireball Date: Tue Apr 22 10:45:58 2014 New Revision: 62865 URL: http://svn.reactos.org/svn/reactos?rev=62865&view=rev Log: [ARWINSS] - Properly set and reset Win32 process/thread info. Fixes a crash when first thread in the system terminates (and that's CSRSS thread by design). Modified: branches/arwinss/arwinss/server/include/tags.h branches/arwinss/arwinss/server/main/init.c Modified: branches/arwinss/arwinss/server/include/tags.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/arwinss/server/include/… ============================================================================== --- branches/arwinss/arwinss/server/include/tags.h [iso-8859-1] (original) +++ branches/arwinss/arwinss/server/include/tags.h [iso-8859-1] Tue Apr 22 10:45:58 2014 @@ -1,6 +1,6 @@ -#ifndef _WIN32K_TAGS_H -#define _WIN32K_TAGS_H +#pragma once +/* GDI objects from the handle table */ #define TAG_BRUSHOBJ 'OHRB' /* brush object */ #define TAG_CLIP 'PILC' /* clipping */ #define TAG_CLIPOBJ 'OPLC' /* clip object */ @@ -19,6 +19,8 @@ #define TAG_PENSTYLES 'ytsG' /* pen styles */ #define TAG_BRUSH '@alG' #define TAG_BITMAP 'PMTB' /* bitmap */ + +/* Official tags */ #define GDITAG_RBRUSH 'rbdG' - -#endif /* _WIN32K_TAGS_H */ +#define USERTAG_PROCESSINFO 'ipsU' +#define USERTAG_THREADINFO 'itsU' Modified: branches/arwinss/arwinss/server/main/init.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/arwinss/server/main/ini… ============================================================================== --- branches/arwinss/arwinss/server/main/init.c [iso-8859-1] (original) +++ branches/arwinss/arwinss/server/main/init.c [iso-8859-1] Tue Apr 22 10:45:58 2014 @@ -17,7 +17,7 @@ #include <handle.h> #include <user.h> -#define NDEBUG +//#define NDEBUG #include <debug.h> void init_directories(void); @@ -56,7 +56,7 @@ /* FIXME - lock the process */ Win32Thread = ExAllocatePoolWithTag(NonPagedPool, sizeof(THREADINFO), - 't23W'); + USERTAG_THREADINFO); if (!Win32Thread) return STATUS_NO_MEMORY; @@ -93,14 +93,14 @@ DPRINT("Destroying W32 thread TID:%d at IRQ level: %lu\n", Thread->Tcb.Teb->ClientId.UniqueThread, KeGetCurrentIrql()); /* USER thread-level cleanup */ - UserEnterExclusive(); cleanup_clipboard_thread(Win32Thread); destroy_thread_windows(Win32Thread); free_msg_queue(Win32Thread); close_thread_desktop(Win32Thread); - UserLeave(); - - PsSetThreadWin32Thread(Thread, NULL, NULL); + + /* Free THREADINFO */ + PsSetThreadWin32Thread(Thread, NULL, Win32Thread); + ExFreePoolWithTag(Win32Thread, USERTAG_THREADINFO); return STATUS_SUCCESS; } @@ -125,7 +125,8 @@ /* Allocate one if needed */ /* FIXME - lock the process */ Win32Process = ExAllocatePoolWithTag(NonPagedPool, - sizeof(PROCESSINFO), 'p23W'); + sizeof(PROCESSINFO), + USERTAG_PROCESSINFO); if (!Win32Process) return STATUS_NO_MEMORY; @@ -181,6 +182,10 @@ ZwClose(Win32Process->idle_event_handle); } + /* Free the PROCESSINFO */ + PsSetProcessWin32Process(Process, NULL, Win32Process); + ExFreePoolWithTag(Win32Process, USERTAG_PROCESSINFO); + UserLeave(); } @@ -195,7 +200,11 @@ { NTSTATUS Status; - DPRINT("Enter Win32kThreadCallback, current thread id %d, process id %d\n", PsGetCurrentThread()->Tcb.Teb->ClientId.UniqueThread, PsGetCurrentThread()->Tcb.Teb->ClientId.UniqueProcess); + UserEnterExclusive(); + + DPRINT("Enter Win32kThreadCallback, current thread id %d, process id %d, type %d\n", + PsGetCurrentThread()->Tcb.Teb->ClientId.UniqueThread, + PsGetCurrentThread()->Tcb.Teb->ClientId.UniqueProcess, Type); ASSERT(NtCurrentTeb()); @@ -209,6 +218,8 @@ } DPRINT("Leave Win32kThreadCallback\n"); + + UserLeave(); return Status; }

10 years, 5 months

[hbelusca] 62864: [CONSRV] - Selection info is per-terminal. - Lock the console only when needed.

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Tue Apr 22 03:44:13 2014 New Revision: 62864 URL: http://svn.reactos.org/svn/reactos?rev=62864&view=rev Log: [CONSRV] - Selection info is per-terminal. - Lock the console only when needed. Modified: trunk/reactos/win32ss/user/winsrv/consrv/condrv/console.c trunk/reactos/win32ss/user/winsrv/consrv/condrv/dummyfrontend.c trunk/reactos/win32ss/user/winsrv/consrv/frontendctl.c trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/conwnd.c trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/conwnd.h trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/graphics.c trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/guisettings.c trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/guisettings.h trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/guiterm.c trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/text.c trunk/reactos/win32ss/user/winsrv/consrv/frontends/tui/tuiterm.c trunk/reactos/win32ss/user/winsrv/consrv/include/conio.h trunk/reactos/win32ss/user/winsrv/consrv/include/term.h Modified: trunk/reactos/win32ss/user/winsrv/consrv/condrv/console.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv… ============================================================================== --- trunk/reactos/win32ss/user/winsrv/consrv/condrv/console.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/winsrv/consrv/condrv/console.c [iso-8859-1] Tue Apr 22 03:44:13 2014 @@ -575,11 +575,6 @@ Console->LineInsertToggle = Console->InsertMode; // LineWakeupMask - // FIXME: This is terminal-specific !! VV - RtlZeroMemory(&Console->Selection, sizeof(CONSOLE_SELECTION_INFO)); - Console->Selection.dwFlags = CONSOLE_NO_SELECTION; - // dwSelectionCursor - /* Set-up the code page */ Console->CodePage = Console->OutputCodePage = ConsoleInfo->CodePage; Modified: trunk/reactos/win32ss/user/winsrv/consrv/condrv/dummyfrontend.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv… ============================================================================== --- trunk/reactos/win32ss/user/winsrv/consrv/condrv/dummyfrontend.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/winsrv/consrv/condrv/dummyfrontend.c [iso-8859-1] Tue Apr 22 03:44:13 2014 @@ -114,6 +114,13 @@ DummyGetLargestConsoleWindowSize(IN OUT PFRONTEND This, PCOORD pSize) { +} + +static BOOL NTAPI +DummyGetSelectionInfo(IN OUT PFRONTEND This, + PCONSOLE_SELECTION_INFO pSelectionInfo) +{ + return TRUE; } static BOOL NTAPI @@ -183,6 +190,7 @@ DummyChangeIcon, DummyGetConsoleWindowHandle, DummyGetLargestConsoleWindowSize, + DummyGetSelectionInfo, DummySetPalette, DummyGetDisplayMode, DummySetDisplayMode, Modified: trunk/reactos/win32ss/user/winsrv/consrv/frontendctl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv… ============================================================================== --- trunk/reactos/win32ss/user/winsrv/consrv/frontendctl.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/winsrv/consrv/frontendctl.c [iso-8859-1] Tue Apr 22 03:44:13 2014 @@ -308,14 +308,13 @@ PCONSOLE Console; Status = ConSrvGetConsole(ConsoleGetPerProcessData(CsrGetClientThread()->Process), &Console, TRUE); - if (NT_SUCCESS(Status)) - { - memset(&GetSelectionInfoRequest->Info, 0, sizeof(CONSOLE_SELECTION_INFO)); - if (Console->Selection.dwFlags != 0) - GetSelectionInfoRequest->Info = Console->Selection; - ConSrvReleaseConsole(Console, TRUE); - } - + if (!NT_SUCCESS(Status)) return Status; + + Status = (TermGetSelectionInfo(Console, &GetSelectionInfoRequest->Info) + ? STATUS_SUCCESS + : STATUS_UNSUCCESSFUL); + + ConSrvReleaseConsole(Console, TRUE); return Status; } Modified: trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/conwnd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv… ============================================================================== --- trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/conwnd.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/conwnd.c [iso-8859-1] Tue Apr 22 03:44:13 2014 @@ -266,11 +266,15 @@ { INPUT_RECORD er; + DPRINT1("Menu item ID: %d\n", CmdId); + + if (!ConDrvValidateConsoleUnsafe(Console, CONSOLE_RUNNING, TRUE)) return; + er.EventType = MENU_EVENT; er.Event.MenuEvent.dwCommandId = CmdId; - - DPRINT("Menu item ID: %d\n", CmdId); ConioProcessInputEvent(Console, &er); + + LeaveCriticalSection(&Console->Lock); } static VOID @@ -283,36 +287,34 @@ static VOID Mark(PGUI_CONSOLE_DATA GuiData) { - PCONSOLE Console = GuiData->Console; PCONSOLE_SCREEN_BUFFER ActiveBuffer = GuiData->ActiveBuffer; /* Clear the old selection */ // UpdateSelection(GuiData, NULL); - Console->Selection.dwFlags = CONSOLE_NO_SELECTION; + GuiData->Selection.dwFlags = CONSOLE_NO_SELECTION; /* Restart a new selection */ - Console->dwSelectionCursor.X = ActiveBuffer->ViewOrigin.X; - Console->dwSelectionCursor.Y = ActiveBuffer->ViewOrigin.Y; - Console->Selection.dwSelectionAnchor = Console->dwSelectionCursor; - UpdateSelection(GuiData, &Console->Selection.dwSelectionAnchor); + GuiData->dwSelectionCursor.X = ActiveBuffer->ViewOrigin.X; + GuiData->dwSelectionCursor.Y = ActiveBuffer->ViewOrigin.Y; + GuiData->Selection.dwSelectionAnchor = GuiData->dwSelectionCursor; + UpdateSelection(GuiData, &GuiData->Selection.dwSelectionAnchor); } static VOID SelectAll(PGUI_CONSOLE_DATA GuiData) { - PCONSOLE Console = GuiData->Console; PCONSOLE_SCREEN_BUFFER ActiveBuffer = GuiData->ActiveBuffer; /* Clear the old selection */ // UpdateSelection(GuiData, NULL); - Console->Selection.dwFlags = CONSOLE_NO_SELECTION; + GuiData->Selection.dwFlags = CONSOLE_NO_SELECTION; /* * The selection area extends to the whole screen buffer's width. */ - Console->Selection.dwSelectionAnchor.X = 0; - Console->Selection.dwSelectionAnchor.Y = 0; - Console->dwSelectionCursor.X = ActiveBuffer->ScreenBufferSize.X - 1; + GuiData->Selection.dwSelectionAnchor.X = 0; + GuiData->Selection.dwSelectionAnchor.Y = 0; + GuiData->dwSelectionCursor.X = ActiveBuffer->ScreenBufferSize.X - 1; /* * Determine whether the selection must extend to just some part @@ -325,19 +327,19 @@ * We select all the characters from the first line * to the line where the cursor is positioned. */ - Console->dwSelectionCursor.Y = ActiveBuffer->CursorPosition.Y; + GuiData->dwSelectionCursor.Y = ActiveBuffer->CursorPosition.Y; } else /* if (GetType(ActiveBuffer) == GRAPHICS_BUFFER) */ { /* * We select all the screen buffer area. */ - Console->dwSelectionCursor.Y = ActiveBuffer->ScreenBufferSize.Y - 1; + GuiData->dwSelectionCursor.Y = ActiveBuffer->ScreenBufferSize.Y - 1; } /* Restart a new selection */ - Console->Selection.dwFlags |= CONSOLE_MOUSE_SELECTION; - UpdateSelection(GuiData, &Console->dwSelectionCursor); + GuiData->Selection.dwFlags |= CONSOLE_MOUSE_SELECTION; + UpdateSelection(GuiData, &GuiData->dwSelectionCursor); } static LRESULT @@ -345,12 +347,6 @@ { LRESULT Ret = TRUE; PCONSOLE Console = GuiData->Console; - - if (!ConDrvValidateConsoleUnsafe(Console, CONSOLE_RUNNING, TRUE)) - { - Ret = FALSE; - goto Quit; - } /* * In case the selected menu item belongs to the user-reserved menu id range, @@ -360,7 +356,7 @@ if (GuiData->CmdIdLow <= (UINT)wParam && (UINT)wParam <= GuiData->CmdIdHigh) { SendMenuEvent(Console, (UINT)wParam); - goto Unlock_Quit; + goto Quit; } /* ... otherwise, perform actions. */ @@ -403,8 +399,6 @@ break; } -Unlock_Quit: - LeaveCriticalSection(&Console->Lock); Quit: if (!Ret) Ret = DefWindowProcW(GuiData->hWindow, WM_SYSCOMMAND, wParam, lParam); @@ -643,12 +637,12 @@ er.Event.FocusEvent.bSetFocus = SetFocus; ConioProcessInputEvent(Console, &er); + LeaveCriticalSection(&Console->Lock); + if (SetFocus) DPRINT1("TODO: Create console caret\n"); else DPRINT1("TODO: Destroy console caret\n"); - - LeaveCriticalSection(&Console->Lock); } static VOID @@ -671,7 +665,7 @@ PCONSOLE Console = GuiData->Console; RECT oldRect; - SmallRectToRect(GuiData, &oldRect, &Console->Selection.srSelection); + SmallRectToRect(GuiData, &oldRect, &GuiData->Selection.srSelection); if (coord != NULL) { @@ -679,16 +673,16 @@ SMALL_RECT rc; /* Exchange left/top with right/bottom if required */ - rc.Left = min(Console->Selection.dwSelectionAnchor.X, coord->X); - rc.Top = min(Console->Selection.dwSelectionAnchor.Y, coord->Y); - rc.Right = max(Console->Selection.dwSelectionAnchor.X, coord->X); - rc.Bottom = max(Console->Selection.dwSelectionAnchor.Y, coord->Y); + rc.Left = min(GuiData->Selection.dwSelectionAnchor.X, coord->X); + rc.Top = min(GuiData->Selection.dwSelectionAnchor.Y, coord->Y); + rc.Right = max(GuiData->Selection.dwSelectionAnchor.X, coord->X); + rc.Bottom = max(GuiData->Selection.dwSelectionAnchor.Y, coord->Y); SmallRectToRect(GuiData, &newRect, &rc); - if (Console->Selection.dwFlags & CONSOLE_SELECTION_NOT_EMPTY) - { - if (memcmp(&rc, &Console->Selection.srSelection, sizeof(SMALL_RECT)) != 0) + if (GuiData->Selection.dwFlags & CONSOLE_SELECTION_NOT_EMPTY) + { + if (memcmp(&rc, &GuiData->Selection.srSelection, sizeof(SMALL_RECT)) != 0) { HRGN rgn1, rgn2; @@ -712,22 +706,22 @@ InvalidateRect(GuiData->hWindow, &newRect, FALSE); } - Console->Selection.dwFlags |= CONSOLE_SELECTION_NOT_EMPTY; - Console->Selection.srSelection = rc; - Console->dwSelectionCursor = *coord; - - if ((Console->Selection.dwFlags & CONSOLE_SELECTION_IN_PROGRESS) == 0) + GuiData->Selection.dwFlags |= CONSOLE_SELECTION_NOT_EMPTY; + GuiData->Selection.srSelection = rc; + GuiData->dwSelectionCursor = *coord; + + if ((GuiData->Selection.dwFlags & CONSOLE_SELECTION_IN_PROGRESS) == 0) { LPWSTR SelectionType, WindowTitle = NULL; SIZE_T Length = 0; /* Clear the old selection */ - if (Console->Selection.dwFlags & CONSOLE_SELECTION_NOT_EMPTY) + if (GuiData->Selection.dwFlags & CONSOLE_SELECTION_NOT_EMPTY) { InvalidateRect(GuiData->hWindow, &oldRect, FALSE); } - if (Console->Selection.dwFlags & CONSOLE_MOUSE_SELECTION) + if (GuiData->Selection.dwFlags & CONSOLE_MOUSE_SELECTION) { SelectionType = L"Selection - "; } @@ -743,19 +737,19 @@ SetWindowText(GuiData->hWindow, WindowTitle); ConsoleFreeHeap(WindowTitle); - Console->Selection.dwFlags |= CONSOLE_SELECTION_IN_PROGRESS; + GuiData->Selection.dwFlags |= CONSOLE_SELECTION_IN_PROGRESS; ConioPause(Console, PAUSED_FROM_SELECTION); } } else { /* Clear the selection */ - if (Console->Selection.dwFlags & CONSOLE_SELECTION_NOT_EMPTY) + if (GuiData->Selection.dwFlags & CONSOLE_SELECTION_NOT_EMPTY) { InvalidateRect(GuiData->hWindow, &oldRect, FALSE); } - Console->Selection.dwFlags = CONSOLE_NO_SELECTION; + GuiData->Selection.dwFlags = CONSOLE_NO_SELECTION; ConioUnpause(Console, PAUSED_FROM_SELECTION); SetWindowText(GuiData->hWindow, Console->Title.Buffer); @@ -777,17 +771,10 @@ static VOID OnPaint(PGUI_CONSOLE_DATA GuiData) { - BOOL Success = TRUE; - PCONSOLE Console = GuiData->Console; PCONSOLE_SCREEN_BUFFER ActiveBuffer; PAINTSTRUCT ps; RECT rcPaint; - if (!ConDrvValidateConsoleUnsafe(Console, CONSOLE_RUNNING, TRUE)) - { - Success = FALSE; - goto Quit; - } ActiveBuffer = GuiData->ActiveBuffer; BeginPaint(GuiData->hWindow, &ps); @@ -820,9 +807,9 @@ rcPaint.top, SRCCOPY); - if (Console->Selection.dwFlags & CONSOLE_SELECTION_NOT_EMPTY) - { - SmallRectToRect(GuiData, &rcPaint, &Console->Selection.srSelection); + if (GuiData->Selection.dwFlags & CONSOLE_SELECTION_NOT_EMPTY) + { + SmallRectToRect(GuiData, &rcPaint, &GuiData->Selection.srSelection); /* Invert the selection */ if (IntersectRect(&rcPaint, &ps.rcPaint, &rcPaint)) @@ -834,12 +821,6 @@ LeaveCriticalSection(&GuiData->Lock); } EndPaint(GuiData->hWindow, &ps); - -Quit: - if (Success) - LeaveCriticalSection(&Console->Lock); - else - DefWindowProcW(GuiData->hWindow, WM_PAINT, 0, 0); return; } @@ -898,7 +879,7 @@ ActiveBuffer = GuiData->ActiveBuffer; - if (Console->Selection.dwFlags & CONSOLE_SELECTION_IN_PROGRESS) + if (GuiData->Selection.dwFlags & CONSOLE_SELECTION_IN_PROGRESS) { WORD VirtualKeyCode = LOWORD(wParam); @@ -918,7 +899,7 @@ goto Quit; } - if ((Console->Selection.dwFlags & CONSOLE_MOUSE_SELECTION) == 0) + if ((GuiData->Selection.dwFlags & CONSOLE_MOUSE_SELECTION) == 0) { /* Keyboard selection mode */ BOOL Interpreted = FALSE; @@ -929,8 +910,8 @@ case VK_LEFT: { Interpreted = TRUE; - if (Console->dwSelectionCursor.X > 0) - Console->dwSelectionCursor.X--; + if (GuiData->dwSelectionCursor.X > 0) + GuiData->dwSelectionCursor.X--; break; } @@ -938,8 +919,8 @@ case VK_RIGHT: { Interpreted = TRUE; - if (Console->dwSelectionCursor.X < ActiveBuffer->ScreenBufferSize.X - 1) - Console->dwSelectionCursor.X++; + if (GuiData->dwSelectionCursor.X < ActiveBuffer->ScreenBufferSize.X - 1) + GuiData->dwSelectionCursor.X++; break; } @@ -947,8 +928,8 @@ case VK_UP: { Interpreted = TRUE; - if (Console->dwSelectionCursor.Y > 0) - Console->dwSelectionCursor.Y--; + if (GuiData->dwSelectionCursor.Y > 0) + GuiData->dwSelectionCursor.Y--; break; } @@ -956,8 +937,8 @@ case VK_DOWN: { Interpreted = TRUE; - if (Console->dwSelectionCursor.Y < ActiveBuffer->ScreenBufferSize.Y - 1) - Console->dwSelectionCursor.Y++; + if (GuiData->dwSelectionCursor.Y < ActiveBuffer->ScreenBufferSize.Y - 1) + GuiData->dwSelectionCursor.Y++; break; } @@ -965,24 +946,24 @@ case VK_HOME: { Interpreted = TRUE; - Console->dwSelectionCursor.X = 0; - Console->dwSelectionCursor.Y = 0; + GuiData->dwSelectionCursor.X = 0; + GuiData->dwSelectionCursor.Y = 0; break; } case VK_END: { Interpreted = TRUE; - Console->dwSelectionCursor.Y = ActiveBuffer->ScreenBufferSize.Y - 1; + GuiData->dwSelectionCursor.Y = ActiveBuffer->ScreenBufferSize.Y - 1; break; } case VK_PRIOR: { Interpreted = TRUE; - Console->dwSelectionCursor.Y -= ActiveBuffer->ViewSize.Y; - if (Console->dwSelectionCursor.Y < 0) - Console->dwSelectionCursor.Y = 0; + GuiData->dwSelectionCursor.Y -= ActiveBuffer->ViewSize.Y; + if (GuiData->dwSelectionCursor.Y < 0) + GuiData->dwSelectionCursor.Y = 0; break; } @@ -990,9 +971,9 @@ case VK_NEXT: { Interpreted = TRUE; - Console->dwSelectionCursor.Y += ActiveBuffer->ViewSize.Y; - if (Console->dwSelectionCursor.Y >= ActiveBuffer->ScreenBufferSize.Y) - Console->dwSelectionCursor.Y = ActiveBuffer->ScreenBufferSize.Y - 1; + GuiData->dwSelectionCursor.Y += ActiveBuffer->ViewSize.Y; + if (GuiData->dwSelectionCursor.Y >= ActiveBuffer->ScreenBufferSize.Y) + GuiData->dwSelectionCursor.Y = ActiveBuffer->ScreenBufferSize.Y - 1; break; } @@ -1004,9 +985,9 @@ if (Interpreted) { if (!MajPressed) - Console->Selection.dwSelectionAnchor = Console->dwSelectionCursor; - - UpdateSelection(GuiData, &Console->dwSelectionCursor); + GuiData->Selection.dwSelectionAnchor = GuiData->dwSelectionCursor; + + UpdateSelection(GuiData, &GuiData->dwSelectionCursor); } else if (!IsSystemKey(VirtualKeyCode)) { @@ -1032,7 +1013,7 @@ } } - if ((Console->Selection.dwFlags & CONSOLE_SELECTION_IN_PROGRESS) == 0) + if ((GuiData->Selection.dwFlags & CONSOLE_SELECTION_IN_PROGRESS) == 0) { MSG Message; @@ -1265,7 +1246,7 @@ goto Quit; } - if ( (Console->Selection.dwFlags & CONSOLE_SELECTION_IN_PROGRESS) || + if ( (GuiData->Selection.dwFlags & CONSOLE_SELECTION_IN_PROGRESS) || (Console->QuickEdit) ) { switch (msg) @@ -1274,13 +1255,13 @@ { /* Clear the old selection */ // UpdateSelection(GuiData, NULL); - Console->Selection.dwFlags = CONSOLE_NO_SELECTION; + GuiData->Selection.dwFlags = CONSOLE_NO_SELECTION; /* Restart a new selection */ - Console->Selection.dwSelectionAnchor = PointToCoord(GuiData, lParam); + GuiData->Selection.dwSelectionAnchor = PointToCoord(GuiData, lParam); SetCapture(GuiData->hWindow); - Console->Selection.dwFlags |= CONSOLE_MOUSE_SELECTION | CONSOLE_MOUSE_DOWN; - UpdateSelection(GuiData, &Console->Selection.dwSelectionAnchor); + GuiData->Selection.dwFlags |= CONSOLE_MOUSE_SELECTION | CONSOLE_MOUSE_DOWN; + UpdateSelection(GuiData, &GuiData->Selection.dwSelectionAnchor); break; } @@ -1289,10 +1270,10 @@ { // COORD c; - if (!(Console->Selection.dwFlags & CONSOLE_MOUSE_DOWN)) break; + if (!(GuiData->Selection.dwFlags & CONSOLE_MOUSE_DOWN)) break; // c = PointToCoord(GuiData, lParam); - Console->Selection.dwFlags &= ~CONSOLE_MOUSE_DOWN; + GuiData->Selection.dwFlags &= ~CONSOLE_MOUSE_DOWN; // UpdateSelection(GuiData, &c); ReleaseCapture(); @@ -1338,11 +1319,11 @@ * Update the selection started with the single * left-click that preceded this double-click. */ - Console->Selection.dwSelectionAnchor = cL; - Console->dwSelectionCursor = cR; - - Console->Selection.dwFlags |= CONSOLE_MOUSE_SELECTION | CONSOLE_MOUSE_DOWN; - UpdateSelection(GuiData, &Console->dwSelectionCursor); + GuiData->Selection.dwSelectionAnchor = cL; + GuiData->dwSelectionCursor = cR; + + GuiData->Selection.dwFlags |= CONSOLE_MOUSE_SELECTION | CONSOLE_MOUSE_DOWN; + UpdateSelection(GuiData, &GuiData->dwSelectionCursor); /* Ignore the next mouse move signal */ GuiData->IgnoreNextMouseSignal = TRUE; @@ -1354,7 +1335,7 @@ case WM_RBUTTONDOWN: case WM_RBUTTONDBLCLK: { - if (!(Console->Selection.dwFlags & CONSOLE_SELECTION_NOT_EMPTY)) + if (!(GuiData->Selection.dwFlags & CONSOLE_SELECTION_NOT_EMPTY)) { Paste(GuiData); } @@ -1373,7 +1354,7 @@ COORD c; if (!(wParam & MK_LBUTTON)) break; - if (!(Console->Selection.dwFlags & CONSOLE_MOUSE_DOWN)) break; + if (!(GuiData->Selection.dwFlags & CONSOLE_MOUSE_DOWN)) break; c = PointToCoord(GuiData, lParam); /* TODO: Scroll buffer to bring c into view */ UpdateSelection(GuiData, &c); @@ -1674,10 +1655,7 @@ static VOID OnMove(PGUI_CONSOLE_DATA GuiData) { - PCONSOLE Console = GuiData->Console; RECT rcWnd; - - if (!ConDrvValidateConsoleUnsafe(Console, CONSOLE_RUNNING, TRUE)) return; // TODO: Simplify the code. // See: GuiConsoleNotifyWndProc() PM_CREATE_CONSOLE. @@ -1686,8 +1664,6 @@ GetWindowRect(GuiData->hWindow, &rcWnd); GuiData->GuiInfo.WindowOrigin.x = rcWnd.left; GuiData->GuiInfo.WindowOrigin.y = rcWnd.top; - - LeaveCriticalSection(&Console->Lock); } /* @@ -2042,20 +2018,16 @@ /* Enable or disable the Copy and Paste items */ EnableMenuItem(hMenu, ID_SYSTEM_EDIT_COPY , MF_BYCOMMAND | - ((Console->Selection.dwFlags & CONSOLE_SELECTION_IN_PROGRESS) && - (Console->Selection.dwFlags & CONSOLE_SELECTION_NOT_EMPTY) ? MF_ENABLED : MF_GRAYED)); + ((GuiData->Selection.dwFlags & CONSOLE_SELECTION_IN_PROGRESS) && + (GuiData->Selection.dwFlags & CONSOLE_SELECTION_NOT_EMPTY) ? MF_ENABLED : MF_GRAYED)); // FIXME: Following whether the active screen buffer is text-mode // or graphics-mode, search for CF_UNICODETEXT or CF_BITMAP formats. EnableMenuItem(hMenu, ID_SYSTEM_EDIT_PASTE, MF_BYCOMMAND | - (!(Console->Selection.dwFlags & CONSOLE_SELECTION_IN_PROGRESS) && + (!(GuiData->Selection.dwFlags & CONSOLE_SELECTION_IN_PROGRESS) && IsClipboardFormatAvailable(CF_UNICODETEXT) ? MF_ENABLED : MF_GRAYED)); } - if (ConDrvValidateConsoleUnsafe(Console, CONSOLE_RUNNING, TRUE)) - { - SendMenuEvent(Console, WM_INITMENU); - LeaveCriticalSection(&Console->Lock); - } + SendMenuEvent(Console, WM_INITMENU); break; } @@ -2063,11 +2035,7 @@ { if (HIWORD(wParam) == 0xFFFF) // Allow all the menu flags { - if (ConDrvValidateConsoleUnsafe(Console, CONSOLE_RUNNING, TRUE)) - { - SendMenuEvent(Console, WM_MENUSELECT); - LeaveCriticalSection(&Console->Lock); - } + SendMenuEvent(Console, WM_MENUSELECT); } break; } @@ -2170,11 +2138,7 @@ case PM_APPLY_CONSOLE_INFO: { - if (ConDrvValidateConsoleUnsafe(Console, CONSOLE_RUNNING, TRUE)) - { - GuiApplyUserSettings(GuiData, (HANDLE)wParam, (BOOL)lParam); - LeaveCriticalSection(&Console->Lock); - } + GuiApplyUserSettings(GuiData, (HANDLE)wParam, (BOOL)lParam); break; } Modified: trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/conwnd.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv… ============================================================================== --- trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/conwnd.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/conwnd.h [iso-8859-1] Tue Apr 22 03:44:13 2014 @@ -63,6 +63,8 @@ PCONSOLE Console; /* Pointer to the owned console */ PCONSOLE_SCREEN_BUFFER ActiveBuffer; /* Pointer to the active screen buffer (then maybe the previous Console member is redundant?? Or not...) */ + CONSOLE_SELECTION_INFO Selection; /* Contains information about the selection */ + COORD dwSelectionCursor; /* Selection cursor position, most of the time different from Selection.dwSelectionAnchor */ GUI_CONSOLE_INFO GuiInfo; /* GUI terminal settings */ } GUI_CONSOLE_DATA, *PGUI_CONSOLE_DATA; Modified: trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/graphics.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv… ============================================================================== --- trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/graphics.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/graphics.c [iso-8859-1] Tue Apr 22 03:44:13 2014 @@ -25,8 +25,6 @@ * This function supposes that the system clipboard was opened. */ - PCONSOLE Console = Buffer->Header.Console; - HDC hMemDC; HBITMAP hBitmapTarget, hBitmapOld; HPALETTE hPalette, hPaletteOld; @@ -34,13 +32,13 @@ if (Buffer->BitMap == NULL) return; - selWidth = Console->Selection.srSelection.Right - Console->Selection.srSelection.Left + 1; - selHeight = Console->Selection.srSelection.Bottom - Console->Selection.srSelection.Top + 1; + selWidth = GuiData->Selection.srSelection.Right - GuiData->Selection.srSelection.Left + 1; + selHeight = GuiData->Selection.srSelection.Bottom - GuiData->Selection.srSelection.Top + 1; DPRINT1("Selection is (%d|%d) to (%d|%d)\n", - Console->Selection.srSelection.Left, - Console->Selection.srSelection.Top, - Console->Selection.srSelection.Right, - Console->Selection.srSelection.Bottom); + GuiData->Selection.srSelection.Left, + GuiData->Selection.srSelection.Top, + GuiData->Selection.srSelection.Right, + GuiData->Selection.srSelection.Bottom); hMemDC = CreateCompatibleDC(GuiData->hMemDC); if (hMemDC == NULL) return; @@ -74,8 +72,8 @@ StretchDIBits(hMemDC, 0, 0, selWidth, selHeight, - Console->Selection.srSelection.Left, - Console->Selection.srSelection.Top, + GuiData->Selection.srSelection.Left, + GuiData->Selection.srSelection.Top, selWidth, selHeight, Buffer->BitMap, Buffer->BitMapInfo, @@ -87,8 +85,8 @@ 0, 0, selWidth, selHeight, /* Coordinates / size of the corresponding image portion, in the graphics screen-buffer's frame */ - Console->Selection.srSelection.Left, - Console->Selection.srSelection.Top, + GuiData->Selection.srSelection.Left, + GuiData->Selection.srSelection.Top, 0, Buffer->ScreenBufferSize.Y, // == Buffer->BitMapInfo->bmiHeader.biHeight Buffer->BitMap, @@ -128,7 +126,12 @@ PRECT rcView, PRECT rcFramebuffer) { + PCONSOLE Console = Buffer->Header.Console; + // ASSERT(Console == GuiData->Console); + if (Buffer->BitMap == NULL) return; + + if (!ConDrvValidateConsoleUnsafe(Console, CONSOLE_RUNNING, TRUE)) return; rcFramebuffer->left = Buffer->ViewOrigin.X * 1 + rcView->left; rcFramebuffer->top = Buffer->ViewOrigin.Y * 1 + rcView->top; @@ -160,6 +163,8 @@ /* Release the mutex */ NtReleaseMutant(Buffer->Mutex, NULL); + + LeaveCriticalSection(&Console->Lock); } /* EOF */ Modified: trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/guisettings.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv… ============================================================================== --- trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/guisettings.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/guisettings.c [iso-8859-1] Tue Apr 22 03:44:13 2014 @@ -238,6 +238,8 @@ DPRINT("GuiConsoleShowConsoleProperties entered\n"); + if (!ConDrvValidateConsoleUnsafe(Console, CONSOLE_RUNNING, TRUE)) return; + /* * Create a memory section to share with the applet, and map it. */ @@ -253,7 +255,7 @@ if (!NT_SUCCESS(Status)) { DPRINT1("Error: Impossible to create a shared section ; Status = %lu\n", Status); - return; + goto Quit; } Status = NtMapViewOfSection(hSection, @@ -269,8 +271,7 @@ if (!NT_SUCCESS(Status)) { DPRINT1("Error: Impossible to map the shared section ; Status = %lu\n", Status); - NtClose(hSection); - return; + goto Quit; } @@ -408,11 +409,13 @@ Quit: /* We have finished, close the section handle */ - NtClose(hSection); + if (hSection) NtClose(hSection); + + LeaveCriticalSection(&Console->Lock); return; } -NTSTATUS +VOID GuiApplyUserSettings(PGUI_CONSOLE_DATA GuiData, HANDLE hClientSection, BOOL SaveSettings) @@ -427,6 +430,8 @@ PTERMINAL_INFO TermInfo = NULL; PGUI_CONSOLE_INFO GuiInfo = NULL; + if (!ConDrvValidateConsoleUnsafe(Console, CONSOLE_RUNNING, TRUE)) return; + /* Get the console leader process, our client */ ProcessData = ConDrvGetConsoleLeaderProcess(Console); @@ -439,7 +444,7 @@ if (!NT_SUCCESS(Status)) { DPRINT1("Error when mapping client handle, Status = %lu\n", Status); - return Status; + goto Quit; } /* Get a view of the shared section */ @@ -456,8 +461,7 @@ if (!NT_SUCCESS(Status)) { DPRINT1("Error when mapping view of file, Status = %lu\n", Status); - NtClose(hSection); - return Status; + goto Quit; } _SEH2_TRY @@ -530,9 +534,14 @@ Quit: /* Finally, close the section and return */ - NtUnmapViewOfSection(NtCurrentProcess(), pConInfo); - NtClose(hSection); - return Status; + if (hSection) + { + NtUnmapViewOfSection(NtCurrentProcess(), pConInfo); + NtClose(hSection); + } + + LeaveCriticalSection(&Console->Lock); + return; } /* EOF */ Modified: trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/guisettings.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv… ============================================================================== --- trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/guisettings.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/guisettings.h [iso-8859-1] Tue Apr 22 03:44:13 2014 @@ -55,7 +55,7 @@ VOID GuiConsoleShowConsoleProperties(PGUI_CONSOLE_DATA GuiData, BOOL Defaults); -NTSTATUS +VOID GuiApplyUserSettings(PGUI_CONSOLE_DATA GuiData, HANDLE hClientSection, BOOL SaveSettings); Modified: trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/guiterm.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv… ============================================================================== --- trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/guiterm.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/guiterm.c [iso-8859-1] Tue Apr 22 03:44:13 2014 @@ -532,6 +532,10 @@ /* There is no user-reserved menu id range by default */ GuiData->CmdIdLow = GuiData->CmdIdHigh = 0; + /* Initialize the selection */ + RtlZeroMemory(&GuiData->Selection, sizeof(CONSOLE_SELECTION_INFO)); + GuiData->Selection.dwFlags = CONSOLE_NO_SELECTION; + /* * We need to wait until the GUI has been fully initialized * to retrieve custom settings i.e. WindowSize etc... @@ -936,6 +940,21 @@ pSize->X = (SHORT)(width / (int)WidthUnit ) /* HACK */ + 2; pSize->Y = (SHORT)(height / (int)HeightUnit) /* HACK */ + 1; +} + +static BOOL NTAPI +GuiGetSelectionInfo(IN OUT PFRONTEND This, + PCONSOLE_SELECTION_INFO pSelectionInfo) +{ + PGUI_CONSOLE_DATA GuiData = This->Data; + + if (pSelectionInfo == NULL) return FALSE; + + ZeroMemory(pSelectionInfo, sizeof(CONSOLE_SELECTION_INFO)); + if (GuiData->Selection.dwFlags != CONSOLE_NO_SELECTION) + RtlCopyMemory(pSelectionInfo, &GuiData->Selection, sizeof(CONSOLE_SELECTION_INFO)); + + return TRUE; } static BOOL NTAPI @@ -1084,6 +1103,7 @@ GuiChangeIcon, GuiGetConsoleWindowHandle, GuiGetLargestConsoleWindowSize, + GuiGetSelectionInfo, GuiSetPalette, GuiGetDisplayMode, GuiSetDisplayMode, Modified: trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/text.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv… ============================================================================== --- trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/text.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/text.c [iso-8859-1] Tue Apr 22 03:44:13 2014 @@ -20,7 +20,7 @@ /* FUNCTIONS ******************************************************************/ -COLORREF RGBFromAttrib2(PCONSOLE Console, WORD Attribute) +COLORREF PaletteRGBFromAttrib(PCONSOLE Console, WORD Attribute) { HPALETTE hPalette = Console->ActiveBuffer->PaletteHandle; PALETTEENTRY pe; @@ -39,8 +39,6 @@ * This function supposes that the system clipboard was opened. */ - PCONSOLE Console = Buffer->Header.Console; - /* * Pressing the Shift key while copying text, allows us to copy * text without newline characters (inline-text copy mode). @@ -53,13 +51,13 @@ ULONG selWidth, selHeight; ULONG xPos, yPos, size; - selWidth = Console->Selection.srSelection.Right - Console->Selection.srSelection.Left + 1; - selHeight = Console->Selection.srSelection.Bottom - Console->Selection.srSelection.Top + 1; + selWidth = GuiData->Selection.srSelection.Right - GuiData->Selection.srSelection.Left + 1; + selHeight = GuiData->Selection.srSelection.Bottom - GuiData->Selection.srSelection.Top + 1; DPRINT("Selection is (%d|%d) to (%d|%d)\n", - Console->Selection.srSelection.Left, - Console->Selection.srSelection.Top, - Console->Selection.srSelection.Right, - Console->Selection.srSelection.Bottom); + GuiData->Selection.srSelection.Left, + GuiData->Selection.srSelection.Top, + GuiData->Selection.srSelection.Right, + GuiData->Selection.srSelection.Bottom); #ifdef IS_WHITESPACE #undef IS_WHITESPACE @@ -99,8 +97,8 @@ ULONG length = selWidth; ptr = ConioCoordToPointer(Buffer, - Console->Selection.srSelection.Left, - Console->Selection.srSelection.Top + yPos); + GuiData->Selection.srSelection.Left, + GuiData->Selection.srSelection.Top + yPos); /* Trim whitespace from the right */ while (length > 0) @@ -230,6 +228,8 @@ if (Buffer->Buffer == NULL) return; + if (!ConDrvValidateConsoleUnsafe(Console, CONSOLE_RUNNING, TRUE)) return; + rcFramebuffer->left = Buffer->ViewOrigin.X * GuiData->CharWidth + rcView->left; rcFramebuffer->top = Buffer->ViewOrigin.Y * GuiData->CharHeight + rcView->top; rcFramebuffer->right = Buffer->ViewOrigin.X * GuiData->CharWidth + rcView->right; @@ -245,8 +245,8 @@ LastAttribute = ConioCoordToPointer(Buffer, LeftChar, TopLine)->Attributes; - SetTextColor(GuiData->hMemDC, RGBFromAttrib2(Console, TextAttribFromAttrib(LastAttribute))); - SetBkColor(GuiData->hMemDC, RGBFromAttrib2(Console, BkgdAttribFromAttrib(LastAttribute))); + SetTextColor(GuiData->hMemDC, PaletteRGBFromAttrib(Console, TextAttribFromAttrib(LastAttribute))); + SetBkColor(GuiData->hMemDC, PaletteRGBFromAttrib(Console, BkgdAttribFromAttrib(LastAttribute))); OldFont = SelectObject(GuiData->hMemDC, GuiData->Font); @@ -275,8 +275,8 @@ Attribute = From->Attributes; if (Attribute != LastAttribute) { - SetTextColor(GuiData->hMemDC, RGBFromAttrib2(Console, TextAttribFromAttrib(Attribute))); - SetBkColor(GuiData->hMemDC, RGBFromAttrib2(Console, BkgdAttribFromAttrib(Attribute))); + SetTextColor(GuiData->hMemDC, PaletteRGBFromAttrib(Console, TextAttribFromAttrib(Attribute))); + SetBkColor(GuiData->hMemDC, PaletteRGBFromAttrib(Console, BkgdAttribFromAttrib(Attribute))); LastAttribute = Attribute; } } @@ -308,7 +308,7 @@ Attribute = ConioCoordToPointer(Buffer, Buffer->CursorPosition.X, Buffer->CursorPosition.Y)->Attributes; if (Attribute == DEFAULT_SCREEN_ATTRIB) Attribute = Buffer->ScreenDefaultAttrib; - CursorBrush = CreateSolidBrush(RGBFromAttrib2(Console, TextAttribFromAttrib(Attribute))); + CursorBrush = CreateSolidBrush(PaletteRGBFromAttrib(Console, TextAttribFromAttrib(Attribute))); OldBrush = SelectObject(GuiData->hMemDC, CursorBrush); PatBlt(GuiData->hMemDC, @@ -323,6 +323,8 @@ } SelectObject(GuiData->hMemDC, OldFont); + + LeaveCriticalSection(&Console->Lock); } /* EOF */ Modified: trunk/reactos/win32ss/user/winsrv/consrv/frontends/tui/tuiterm.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv… ============================================================================== --- trunk/reactos/win32ss/user/winsrv/consrv/frontends/tui/tuiterm.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/winsrv/consrv/frontends/tui/tuiterm.c [iso-8859-1] Tue Apr 22 03:44:13 2014 @@ -747,6 +747,13 @@ } static BOOL NTAPI +TuiGetSelectionInfo(IN OUT PFRONTEND This, + PCONSOLE_SELECTION_INFO pSelectionInfo) +{ + return TRUE; +} + +static BOOL NTAPI TuiSetPalette(IN OUT PFRONTEND This, HPALETTE PaletteHandle, UINT PaletteUsage) @@ -813,6 +820,7 @@ TuiChangeIcon, TuiGetConsoleWindowHandle, TuiGetLargestConsoleWindowSize, + TuiGetSelectionInfo, TuiSetPalette, TuiGetDisplayMode, TuiSetDisplayMode, Modified: trunk/reactos/win32ss/user/winsrv/consrv/include/conio.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv… ============================================================================== --- trunk/reactos/win32ss/user/winsrv/consrv/include/conio.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/winsrv/consrv/include/conio.h [iso-8859-1] Tue Apr 22 03:44:13 2014 @@ -228,6 +228,8 @@ HWND (NTAPI *GetConsoleWindowHandle)(IN OUT PFRONTEND This); VOID (NTAPI *GetLargestConsoleWindowSize)(IN OUT PFRONTEND This, PCOORD pSize); + BOOL (NTAPI *GetSelectionInfo)(IN OUT PFRONTEND This, + PCONSOLE_SELECTION_INFO pSelectionInfo); BOOL (NTAPI *SetPalette)(IN OUT PFRONTEND This, HPALETTE PaletteHandle, UINT PaletteUsage); @@ -305,9 +307,6 @@ BOOLEAN InsertMode; UINT CodePage; - CONSOLE_SELECTION_INFO Selection; /* Contains information about the selection */ - COORD dwSelectionCursor; /* Selection cursor position, most of the time different from Selection.dwSelectionAnchor */ - /******************************* Screen buffers *******************************/ LIST_ENTRY BufferList; /* List of all screen buffers for this console */ PCONSOLE_SCREEN_BUFFER ActiveBuffer; /* Pointer to currently active screen buffer */ Modified: trunk/reactos/win32ss/user/winsrv/consrv/include/term.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv… ============================================================================== --- trunk/reactos/win32ss/user/winsrv/consrv/include/term.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/winsrv/consrv/include/term.h [iso-8859-1] Tue Apr 22 03:44:13 2014 @@ -38,6 +38,8 @@ (Console)->TermIFace.Vtbl->GetConsoleWindowHandle(&(Console)->TermIFace) #define TermGetLargestConsoleWindowSize(Console, pSize) \ (Console)->TermIFace.Vtbl->GetLargestConsoleWindowSize(&(Console)->TermIFace, (pSize)) +#define TermGetSelectionInfo(Console, pSelectionInfo) \ + (Console)->TermIFace.Vtbl->GetSelectionInfo(&(Console)->TermIFace, (pSelectionInfo)) #define TermSetPalette(Console, PaletteHandle, PaletteUsage) \ (Console)->TermIFace.Vtbl->SetPalette(&(Console)->TermIFace, (PaletteHandle), (PaletteUsage)) #define TermGetDisplayMode(Console) \

10 years, 5 months

[hbelusca] 62863: [CONSRV]... and fix comments (forgotten in revision 62861).

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Tue Apr 22 00:55:03 2014 New Revision: 62863 URL: http://svn.reactos.org/svn/reactos?rev=62863&view=rev Log: [CONSRV]... and fix comments (forgotten in revision 62861). Modified: trunk/reactos/win32ss/user/winsrv/consrv/include/conio.h Modified: trunk/reactos/win32ss/user/winsrv/consrv/include/conio.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv… ============================================================================== --- trunk/reactos/win32ss/user/winsrv/consrv/include/conio.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/winsrv/consrv/include/conio.h [iso-8859-1] Tue Apr 22 00:55:03 2014 @@ -282,8 +282,8 @@ CONSOLE_STATE State; /* State of the console */ LIST_ENTRY ProcessList; /* List of processes owning the console. The first one is the so-called "Console Leader Process" */ - PCONSOLE_PROCESS_DATA NotifiedLastCloseProcess; /* Pointer to the unique process that needs to be notified when all the other processes have been detached from the console */ - BOOLEAN NotifyLastClose; /* TRUE if the console should send a control event to the last attached process after all the others detached, if it wanted to be notified */ + PCONSOLE_PROCESS_DATA NotifiedLastCloseProcess; /* Pointer to the unique process that needs to be notified when the console leader process is killed */ + BOOLEAN NotifyLastClose; /* TRUE if the console should send a control event when the console leader process is killed */ FRONTEND TermIFace; /* Frontend-specific interface */

10 years, 5 months

[hbelusca] 62862: Code formatting.

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Tue Apr 22 00:47:24 2014 New Revision: 62862 URL: http://svn.reactos.org/svn/reactos?rev=62862&view=rev Log: Code formatting. Modified: trunk/reactos/win32ss/user/winsrv/consrv/console.c Modified: trunk/reactos/win32ss/user/winsrv/consrv/console.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv… ============================================================================== --- trunk/reactos/win32ss/user/winsrv/consrv/console.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/winsrv/consrv/console.c [iso-8859-1] Tue Apr 22 00:47:24 2014 @@ -651,8 +651,8 @@ /* Only one process is allowed to be registered for last close notification */ if (!Console->NotifyLastClose) { + Console->NotifyLastClose = TRUE; Console->NotifiedLastCloseProcess = ProcessData; - Console->NotifyLastClose = TRUE; Status = STATUS_SUCCESS; } else

10 years, 5 months

[hbelusca] 62861: [CONSRV] - Introduce a helper function to query the console leader process (instead of using duplicated code). - Fix the algorithm of the last close notification, as demonstrated ...

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Tue Apr 22 00:46:49 2014 New Revision: 62861 URL: http://svn.reactos.org/svn/reactos?rev=62861&view=rev Log: [CONSRV] - Introduce a helper function to query the console leader process (instead of using duplicated code). - Fix the algorithm of the last close notification, as demonstrated by the tests I did on windows 2003 (test app is provided in CORE-7250): a console app that registered for the last close notification, closes only if the process that was the console leader process at the time the app registered for the notification, is killed. In this case, we notify the app, and we clear some flags. On the contrary, if we close the app that registered for the notification, we just clear the flags without doing extra operations. Modified: trunk/reactos/win32ss/user/winsrv/consrv/condrv/console.c trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/conwnd.c trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/guisettings.c trunk/reactos/win32ss/user/winsrv/consrv/handle.c trunk/reactos/win32ss/user/winsrv/consrv/include/conio.h Modified: trunk/reactos/win32ss/user/winsrv/consrv/condrv/console.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv… ============================================================================== --- trunk/reactos/win32ss/user/winsrv/consrv/condrv/console.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/winsrv/consrv/condrv/console.c [iso-8859-1] Tue Apr 22 00:46:49 2014 @@ -1091,6 +1091,16 @@ return STATUS_SUCCESS; } +PCONSOLE_PROCESS_DATA NTAPI +ConDrvGetConsoleLeaderProcess(IN PCONSOLE Console) +{ + if (Console == NULL) return NULL; + + return CONTAINING_RECORD(Console->ProcessList.Blink, + CONSOLE_PROCESS_DATA, + ConsoleLink); +} + NTSTATUS NTAPI ConDrvGetConsoleProcessList(IN PCONSOLE Console, IN OUT PULONG ProcessIdsList, Modified: trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/conwnd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv… ============================================================================== --- trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/conwnd.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/conwnd.c [iso-8859-1] Tue Apr 22 00:46:49 2014 @@ -48,9 +48,7 @@ PCONSOLE_PROCESS_DATA ProcessData; CLIENT_ID ConsoleLeaderCID; - ProcessData = CONTAINING_RECORD(GuiData->Console->ProcessList.Blink, - CONSOLE_PROCESS_DATA, - ConsoleLink); + ProcessData = ConDrvGetConsoleLeaderProcess(GuiData->Console); ConsoleLeaderCID = ProcessData->Process->ClientId; SetWindowLongPtrW(GuiData->hWindow, GWLP_CONSOLE_LEADER_PID, (LONG_PTR)(ConsoleLeaderCID.UniqueProcess)); Modified: trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/guisettings.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv… ============================================================================== --- trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/guisettings.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/guisettings.c [iso-8859-1] Tue Apr 22 00:46:49 2014 @@ -356,9 +356,7 @@ NtUnmapViewOfSection(NtCurrentProcess(), pSharedInfo); /* Get the console leader process, our client */ - ProcessData = CONTAINING_RECORD(Console->ProcessList.Blink, - CONSOLE_PROCESS_DATA, - ConsoleLink); + ProcessData = ConDrvGetConsoleLeaderProcess(Console); /* Duplicate the section handle for the client */ Status = NtDuplicateObject(NtCurrentProcess(), @@ -430,9 +428,7 @@ PGUI_CONSOLE_INFO GuiInfo = NULL; /* Get the console leader process, our client */ - ProcessData = CONTAINING_RECORD(Console->ProcessList.Blink, - CONSOLE_PROCESS_DATA, - ConsoleLink); + ProcessData = ConDrvGetConsoleLeaderProcess(Console); /* Duplicate the section handle for ourselves */ Status = NtDuplicateObject(ProcessData->Process->ProcessHandle, Modified: trunk/reactos/win32ss/user/winsrv/consrv/handle.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv… ============================================================================== --- trunk/reactos/win32ss/user/winsrv/consrv/handle.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/winsrv/consrv/handle.c [iso-8859-1] Tue Apr 22 00:46:49 2014 @@ -633,10 +633,6 @@ return Status; } -NTSTATUS -ConDrvConsoleCtrlEvent(IN ULONG CtrlEvent, - IN PCONSOLE_PROCESS_DATA ProcessData); - VOID FASTCALL ConSrvRemoveConsole(PCONSOLE_PROCESS_DATA ProcessData) @@ -652,6 +648,9 @@ ProcessData->ConsoleHandle, CONSOLE_RUNNING, TRUE)) { + /* Retrieve the console leader process */ + PCONSOLE_PROCESS_DATA ConsoleLeaderProcess = ConDrvGetConsoleLeaderProcess(Console); + DPRINT("ConSrvRemoveConsole - Locking OK\n"); /* Close all console handles and free the handles table */ @@ -660,35 +659,40 @@ /* Detach the process from the console */ ProcessData->ConsoleHandle = NULL; - /* Remove ourselves from the console's list of processes */ + /* Remove the process from the console's list of processes */ RemoveEntryList(&ProcessData->ConsoleLink); + + /* Check whether the console should send a last close notification */ + if (Console->NotifyLastClose) + { + /* If we are removing the process which wants the last close notification... */ + if (ProcessData == Console->NotifiedLastCloseProcess) + { + /* ... just reset the flag and the pointer... */ + Console->NotifyLastClose = FALSE; + Console->NotifiedLastCloseProcess = NULL; + } + /* + * ... otherwise, if we are removing the console leader process + * (that cannot be the process wanting the notification, because + * the previous case already dealt with it)... + */ + else if (ProcessData == ConsoleLeaderProcess) + { + /* + * ... reset the flag first (so that we avoid multiple notifications) + * and then send the last close notification. + */ + Console->NotifyLastClose = FALSE; + ConDrvConsoleCtrlEvent(CTRL_LAST_CLOSE_EVENT, Console->NotifiedLastCloseProcess); + + /* Only now, reset the pointer */ + Console->NotifiedLastCloseProcess = NULL; + } + } /* Update the internal info of the terminal */ TermRefreshInternalInfo(Console); - - /* - * Check if there is only one process still attached to the console, - * and that the console should send a control event in this case. - */ - if ((Console->ProcessList.Flink != &Console->ProcessList) && - (Console->ProcessList.Flink->Flink == &Console->ProcessList) && - // (Console->ProcessList.Flink == Console->ProcessList.Blink) && - Console->NotifyLastClose) - { - PCONSOLE_PROCESS_DATA LastProcess = CONTAINING_RECORD(Console->ProcessList.Flink, - CONSOLE_PROCESS_DATA, - ConsoleLink); - /* If the remaining process is the one that wanted the notification... */ - if (LastProcess == Console->NotifiedLastCloseProcess) - { - /* ... notify it that it's the only one remaining on the console */ - ConDrvConsoleCtrlEvent(CTRL_LAST_CLOSE_EVENT, LastProcess); - } - - /* In any case reset the pointer and the flag */ - Console->NotifiedLastCloseProcess = NULL; - Console->NotifyLastClose = FALSE; - } /* Release the console */ DPRINT("ConSrvRemoveConsole - Decrement Console->ReferenceCount = %lu\n", Console->ReferenceCount); Modified: trunk/reactos/win32ss/user/winsrv/consrv/include/conio.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv… ============================================================================== --- trunk/reactos/win32ss/user/winsrv/consrv/include/conio.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/winsrv/consrv/include/conio.h [iso-8859-1] Tue Apr 22 00:46:49 2014 @@ -343,6 +343,11 @@ VOID FASTCALL ConioPause(PCONSOLE Console, UINT Flags); VOID FASTCALL ConioUnpause(PCONSOLE Console, UINT Flags); +PCONSOLE_PROCESS_DATA NTAPI +ConDrvGetConsoleLeaderProcess(IN PCONSOLE Console); +NTSTATUS +ConDrvConsoleCtrlEvent(IN ULONG CtrlEvent, + IN PCONSOLE_PROCESS_DATA ProcessData); NTSTATUS NTAPI ConDrvConsoleProcessCtrlEvent(IN PCONSOLE Console, IN ULONG ProcessGroupId,

10 years, 5 months

[akhaldi] 62860: [WS2_32_WINETEST] * Sync with Wine 1.7.17. CORE-8080

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Mon Apr 21 20:07:13 2014 New Revision: 62860 URL: http://svn.reactos.org/svn/reactos?rev=62860&view=rev Log: [WS2_32_WINETEST] * Sync with Wine 1.7.17. CORE-8080 Modified: trunk/rostests/winetests/ws2_32/protocol.c trunk/rostests/winetests/ws2_32/sock.c Modified: trunk/rostests/winetests/ws2_32/protocol.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/ws2_32/protocol… ============================================================================== --- trunk/rostests/winetests/ws2_32/protocol.c [iso-8859-1] (original) +++ trunk/rostests/winetests/ws2_32/protocol.c [iso-8859-1] Mon Apr 21 20:07:13 2014 @@ -60,9 +60,10 @@ static void test_WSAEnumProtocolsA(void) { - INT ret; + INT ret, i, j, found; DWORD len = 0, error; WSAPROTOCOL_INFOA info, *buffer; + INT ptest[] = {0xdead, IPPROTO_TCP, 0xcafe, IPPROTO_UDP, 0xbeef, 0}; ret = WSAEnumProtocolsA( NULL, NULL, &len ); ok( ret == SOCKET_ERROR, "WSAEnumProtocolsA() succeeded unexpectedly\n"); @@ -80,8 +81,6 @@ if (buffer) { - INT i; - ret = WSAEnumProtocolsA( NULL, buffer, &len ); ok( ret != SOCKET_ERROR, "WSAEnumProtocolsA() failed unexpectedly: %d\n", WSAGetLastError() ); @@ -96,13 +95,42 @@ HeapFree( GetProcessHeap(), 0, buffer ); } + + /* Test invalid protocols in the list */ + ret = WSAEnumProtocolsA( ptest, NULL, &len ); + ok( ret == SOCKET_ERROR, "WSAEnumProtocolsA() succeeded unexpectedly\n"); + error = WSAGetLastError(); + ok( error == WSAENOBUFS || broken(error == WSAEFAULT) /* NT4 */, + "Expected 10055, received %d\n", error); + + buffer = HeapAlloc( GetProcessHeap(), 0, len ); + + if (buffer) + { + ret = WSAEnumProtocolsA( ptest, buffer, &len ); + ok( ret != SOCKET_ERROR, "WSAEnumProtocolsA() failed unexpectedly: %d\n", + WSAGetLastError() ); + ok( ret >= 2, "Expected at least 2 items, received %d\n", ret); + + for (i = found = 0; i < ret; i++) + for (j = 0; j < sizeof(ptest) / sizeof(ptest[0]); j++) + if (buffer[i].iProtocol == ptest[j]) + { + found |= 1 << j; + break; + } + ok(found == 0x0A, "Expected 2 bits represented as 0xA, received 0x%x\n", found); + + HeapFree( GetProcessHeap(), 0, buffer ); + } } static void test_WSAEnumProtocolsW(void) { - INT ret; + INT ret, i, j, found; DWORD len = 0, error; WSAPROTOCOL_INFOW info, *buffer; + INT ptest[] = {0xdead, IPPROTO_TCP, 0xcafe, IPPROTO_UDP, 0xbeef, 0}; ret = WSAEnumProtocolsW( NULL, NULL, &len ); ok( ret == SOCKET_ERROR, "WSAEnumProtocolsW() succeeded unexpectedly\n"); @@ -120,8 +148,6 @@ if (buffer) { - INT i; - ret = WSAEnumProtocolsW( NULL, buffer, &len ); ok( ret != SOCKET_ERROR, "WSAEnumProtocolsW() failed unexpectedly: %d\n", WSAGetLastError() ); @@ -136,6 +162,34 @@ HeapFree( GetProcessHeap(), 0, buffer ); } + + /* Test invalid protocols in the list */ + ret = WSAEnumProtocolsW( ptest, NULL, &len ); + ok( ret == SOCKET_ERROR, "WSAEnumProtocolsW() succeeded unexpectedly\n"); + error = WSAGetLastError(); + ok( error == WSAENOBUFS || broken(error == WSAEFAULT) /* NT4 */, + "Expected 10055, received %d\n", error); + + buffer = HeapAlloc( GetProcessHeap(), 0, len ); + + if (buffer) + { + ret = WSAEnumProtocolsW( ptest, buffer, &len ); + ok( ret != SOCKET_ERROR, "WSAEnumProtocolsW() failed unexpectedly: %d\n", + WSAGetLastError() ); + ok( ret >= 2, "Expected at least 2 items, received %d\n", ret); + + for (i = found = 0; i < ret; i++) + for (j = 0; j < sizeof(ptest) / sizeof(ptest[0]); j++) + if (buffer[i].iProtocol == ptest[j]) + { + found |= 1 << j; + break; + } + ok(found == 0x0A, "Expected 2 bits represented as 0xA, received 0x%x\n", found); + + HeapFree( GetProcessHeap(), 0, buffer ); + } } START_TEST( protocol ) Modified: trunk/rostests/winetests/ws2_32/sock.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/ws2_32/sock.c?r… ============================================================================== --- trunk/rostests/winetests/ws2_32/sock.c [iso-8859-1] (original) +++ trunk/rostests/winetests/ws2_32/sock.c [iso-8859-1] Mon Apr 21 20:07:13 2014 @@ -20,16 +20,21 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#undef _WIN32_WINNT +#define _WIN32_WINNT 0x0600 + #include <ntstatus.h> #define WIN32_NO_STATUS +#include <wine/test.h> #include <winsock2.h> -#include <windows.h> +#include <winternl.h> #include <ws2tcpip.h> +#include <wsipx.h> +#include <wsnwlink.h> #include <mswsock.h> #include <mstcpip.h> #include <stdio.h> -#include "wine/test.h" -#include <ndk/umtypes.h> + // ReactOS: Wine has this in mstcpip.h, but it doesn't belong there #define WSA_CMSG_ALIGN(len) (((len) + sizeof(SIZE_T) - 1) & ~(sizeof(SIZE_T) - 1)) @@ -68,6 +73,9 @@ static void (WINAPI *pFreeAddrInfoW)(PADDRINFOW); static int (WINAPI *pGetAddrInfoW)(LPCWSTR,LPCWSTR,const ADDRINFOW *,PADDRINFOW *); static PCSTR (WINAPI *pInetNtop)(INT,LPVOID,LPSTR,ULONG); +static int (WINAPI *pWSALookupServiceBeginW)(LPWSAQUERYSETW,DWORD,LPHANDLE); +static int (WINAPI *pWSALookupServiceEnd)(HANDLE); +static int (WINAPI *pWSALookupServiceNextW)(HANDLE,DWORD,LPDWORD,LPWSAQUERYSETW); /**************** Structs and typedefs ***************/ @@ -150,6 +158,38 @@ BOOL ReadKilled; } select_thread_params; +/* Tests used in both getaddrinfo and GetAddrInfoW */ +static const struct addr_hint_tests +{ + int family, socktype, protocol; + DWORD error; +} hinttests[] = { + {AF_UNSPEC, SOCK_STREAM, IPPROTO_TCP, 0 }, + {AF_UNSPEC, SOCK_STREAM, IPPROTO_UDP, 0 }, + {AF_UNSPEC, SOCK_DGRAM, IPPROTO_TCP, 0 }, + {AF_UNSPEC, SOCK_DGRAM, IPPROTO_UDP, 0 }, + {AF_INET, SOCK_STREAM, IPPROTO_TCP, 0 }, + {AF_INET, SOCK_STREAM, IPPROTO_UDP, 0 }, + {AF_INET, SOCK_DGRAM, IPPROTO_TCP, 0 }, + {AF_INET, SOCK_DGRAM, IPPROTO_UDP, 0 }, + {AF_UNSPEC, 0, IPPROTO_TCP, 0 }, + {AF_UNSPEC, 0, IPPROTO_UDP, 0 }, + {AF_UNSPEC, SOCK_STREAM, 0, 0 }, + {AF_UNSPEC, SOCK_DGRAM, 0, 0 }, + {AF_INET, 0, IPPROTO_TCP, 0 }, + {AF_INET, 0, IPPROTO_UDP, 0 }, + {AF_INET, SOCK_STREAM, 0, 0 }, + {AF_INET, SOCK_DGRAM, 0, 0 }, + {AF_UNSPEC, 999, IPPROTO_TCP, WSAESOCKTNOSUPPORT }, + {AF_UNSPEC, 999, IPPROTO_UDP, WSAESOCKTNOSUPPORT }, + {AF_INET, 999, IPPROTO_TCP, WSAESOCKTNOSUPPORT }, + {AF_INET, 999, IPPROTO_UDP, WSAESOCKTNOSUPPORT }, + {AF_UNSPEC, SOCK_STREAM, 999, 0 }, + {AF_UNSPEC, SOCK_STREAM, 999, 0 }, + {AF_INET, SOCK_DGRAM, 999, 0 }, + {AF_INET, SOCK_DGRAM, 999, 0 }, +}; + /**************** Static variables ***************/ static DWORD tls; /* Thread local storage index */ @@ -263,22 +303,12 @@ ok ( n <= 0, "garbage data received: %d bytes\n", n ); } -static int do_oob_send ( SOCKET s, char *buf, int buflen, int sendlen ) +static int do_synchronous_send ( SOCKET s, char *buf, int buflen, int sendlen, int flags ) { char* last = buf + buflen, *p; int n = 1; for ( p = buf; n > 0 && p < last; p += n ) - n = send ( s, p, min ( sendlen, last - p ), MSG_OOB ); - wsa_ok ( n, 0 <=, "do_oob_send (%x): error %d\n" ); - return p - buf; -} - -static int do_synchronous_send ( SOCKET s, char *buf, int buflen, int sendlen ) -{ - char* last = buf + buflen, *p; - int n = 1; - for ( p = buf; n > 0 && p < last; p += n ) - n = send ( s, p, min ( sendlen, last - p ), 0 ); + n = send ( s, p, min ( sendlen, last - p ), flags ); wsa_ok ( n, 0 <=, "do_synchronous_send (%x): error %d\n" ); return p - buf; } @@ -315,6 +345,62 @@ ok ( tmp == 0, "check_so_opentype: wrong startup value of SO_OPENTYPE: %d\n", tmp ); } +static void compare_addrinfo (ADDRINFO *a, ADDRINFO *b) +{ + for (; a && b ; a = a->ai_next, b = b->ai_next) + { + ok(a->ai_flags == b->ai_flags, + "Wrong flags %d != %d\n", a->ai_flags, b->ai_flags); + ok(a->ai_family == b->ai_family, + "Wrong family %d != %d\n", a->ai_family, b->ai_family); + ok(a->ai_socktype == b->ai_socktype, + "Wrong socktype %d != %d\n", a->ai_socktype, b->ai_socktype); + ok(a->ai_protocol == b->ai_protocol, + "Wrong protocol %d != %d\n", a->ai_protocol, b->ai_protocol); + ok(a->ai_addrlen == b->ai_addrlen, + "Wrong addrlen %lu != %lu\n", a->ai_addrlen, b->ai_addrlen); + ok(!memcmp(a->ai_addr, b->ai_addr, min(a->ai_addrlen, b->ai_addrlen)), + "Wrong address data\n"); + if (a->ai_canonname && b->ai_canonname) + { + ok(!strcmp(a->ai_canonname, b->ai_canonname), "Wrong canonical name '%s' != '%s'\n", + a->ai_canonname, b->ai_canonname); + } + else + ok(!a->ai_canonname && !b->ai_canonname, "Expected both names absent (%p != %p)\n", + a->ai_canonname, b->ai_canonname); + } + ok(!a && !b, "Expected both addresses null (%p != %p)\n", a, b); +} + +static void compare_addrinfow (ADDRINFOW *a, ADDRINFOW *b) +{ + for (; a && b ; a = a->ai_next, b = b->ai_next) + { + ok(a->ai_flags == b->ai_flags, + "Wrong flags %d != %d\n", a->ai_flags, b->ai_flags); + ok(a->ai_family == b->ai_family, + "Wrong family %d != %d\n", a->ai_family, b->ai_family); + ok(a->ai_socktype == b->ai_socktype, + "Wrong socktype %d != %d\n", a->ai_socktype, b->ai_socktype); + ok(a->ai_protocol == b->ai_protocol, + "Wrong protocol %d != %d\n", a->ai_protocol, b->ai_protocol); + ok(a->ai_addrlen == b->ai_addrlen, + "Wrong addrlen %lu != %lu\n", a->ai_addrlen, b->ai_addrlen); + ok(!memcmp(a->ai_addr, b->ai_addr, min(a->ai_addrlen, b->ai_addrlen)), + "Wrong address data\n"); + if (a->ai_canonname && b->ai_canonname) + { + ok(!lstrcmpW(a->ai_canonname, b->ai_canonname), "Wrong canonical name '%s' != '%s'\n", + wine_dbgstr_w(a->ai_canonname), wine_dbgstr_w(b->ai_canonname)); + } + else + ok(!a->ai_canonname && !b->ai_canonname, "Expected both names absent (%p != %p)\n", + a->ai_canonname, b->ai_canonname); + } + ok(!a && !b, "Expected both addresses null (%p != %p)\n", a, b); +} + /**************** Server utility functions ***************/ /* @@ -461,7 +547,7 @@ ok ( pos == -1, "simple_server (%x): test pattern error: %d\n", id, pos); /* Echo data back */ - n_sent = do_synchronous_send ( mem->sock[0].s, mem->sock[0].buf, n_expected, par->buflen ); + n_sent = do_synchronous_send ( mem->sock[0].s, mem->sock[0].buf, n_expected, par->buflen, 0 ); ok ( n_sent == n_expected, "simple_server (%x): sent less data than expected: %d of %d\n", id, n_sent, n_expected ); @@ -483,7 +569,7 @@ test_params *gen = par->general; server_memory *mem; u_long atmark = 0; - int pos, n_recvd, n_expected = gen->n_chunks * gen->chunk_size, tmp, + int pos, n_sent, n_recvd, n_expected = gen->n_chunks * gen->chunk_size, tmp, id = GetCurrentThreadId(); trace ( "oob_server (%x) starting\n", id ); @@ -508,17 +594,23 @@ ok ( mem->sock[0].peer.sin_addr.s_addr == inet_addr ( gen->inet_addr ), "oob_server (%x): strange peer address\n", id ); - /* check atmark state */ + /* check initial atmark state */ ioctlsocket ( mem->sock[0].s, SIOCATMARK, &atmark ); ok ( atmark == 1, "oob_server (%x): unexpectedly at the OOB mark: %i\n", id, atmark ); - /* Receive normal data and check atmark state */ + /* Receive normal data */ n_recvd = do_synchronous_recv ( mem->sock[0].s, mem->sock[0].buf, n_expected, par->buflen ); ok ( n_recvd == n_expected, - "simple_server (%x): received less data than expected: %d of %d\n", id, n_recvd, n_expected ); + "oob_server (%x): received less data than expected: %d of %d\n", id, n_recvd, n_expected ); pos = test_buffer ( mem->sock[0].buf, gen->chunk_size, gen->n_chunks ); - ok ( pos == -1, "simple_server (%x): test pattern error: %d\n", id, pos); - + ok ( pos == -1, "oob_server (%x): test pattern error: %d\n", id, pos); + + /* Echo data back */ + n_sent = do_synchronous_send ( mem->sock[0].s, mem->sock[0].buf, n_expected, par->buflen, 0 ); + ok ( n_sent == n_expected, + "oob_server (%x): sent less data than expected: %d of %d\n", id, n_sent, n_expected ); + + /* check atmark state */ ioctlsocket ( mem->sock[0].s, SIOCATMARK, &atmark ); ok ( atmark == 1, "oob_server (%x): unexpectedly at the OOB mark: %i\n", id, atmark ); @@ -705,7 +797,7 @@ trace ( "simple_client (%x) connected\n", id ); /* send data to server */ - n_sent = do_synchronous_send ( mem->s, mem->send_buf, n_expected, par->buflen ); + n_sent = do_synchronous_send ( mem->s, mem->send_buf, n_expected, par->buflen, 0 ); ok ( n_sent == n_expected, "simple_client (%x): sent less data than expected: %d of %d\n", id, n_sent, n_expected ); @@ -734,7 +826,7 @@ { test_params *gen = par->general; client_memory *mem; - int n_sent, n_expected = gen->n_chunks * gen->chunk_size, id; + int pos, n_sent, n_recvd, n_expected = gen->n_chunks * gen->chunk_size, id; id = GetCurrentThreadId(); trace ( "oob_client (%x): starting\n", id ); @@ -755,12 +847,19 @@ trace ( "oob_client (%x) connected\n", id ); /* send data to server */ - n_sent = do_synchronous_send ( mem->s, mem->send_buf, n_expected, par->buflen ); + n_sent = do_synchronous_send ( mem->s, mem->send_buf, n_expected, par->buflen, 0 ); ok ( n_sent == n_expected, "oob_client (%x): sent less data than expected: %d of %d\n", id, n_sent, n_expected ); + /* Receive data echoed back & check it */ + n_recvd = do_synchronous_recv ( mem->s, mem->recv_buf, n_expected, par->buflen ); + ok ( n_recvd == n_expected, + "simple_client (%x): received less data than expected: %d of %d\n", id, n_recvd, n_expected ); + pos = test_buffer ( mem->recv_buf, gen->chunk_size, gen->n_chunks ); + ok ( pos == -1, "simple_client (%x): test pattern error: %d\n", id, pos); + /* send out-of-band data to server */ - n_sent = do_oob_send ( mem->s, mem->send_buf, n_expected, par->buflen ); + n_sent = do_synchronous_send ( mem->s, mem->send_buf, n_expected, par->buflen, MSG_OOB ); ok ( n_sent == n_expected, "oob_client (%x): sent less data than expected: %d of %d\n", id, n_sent, n_expected ); @@ -803,7 +902,7 @@ trace ( "simple_client (%x) connected\n", id ); /* send data to server */ - n_sent = do_synchronous_send ( mem->s, mem->send_buf, n_expected, par->buflen ); + n_sent = do_synchronous_send ( mem->s, mem->send_buf, n_expected, par->buflen, 0 ); ok ( n_sent == n_expected, "simple_client (%x): sent less data than expected: %d of %d\n", id, n_sent, n_expected ); @@ -974,14 +1073,17 @@ /* Tests for WSAStartup */ static void test_WithoutWSAStartup(void) { - LPVOID ptr; + DWORD err; WSASetLastError(0xdeadbeef); - ptr = gethostbyname("localhost"); - - ok(ptr == NULL, "gethostbyname() succeeded unexpectedly: %d\n", WSAGetLastError()); - ok(WSAGetLastError() == WSANOTINITIALISED, "gethostbyname() failed with unexpected error: %d\n", - WSAGetLastError()); + ok(WSASocketA(0, 0, 0, NULL, 0, 0) == INVALID_SOCKET, "WSASocketA should have failed\n"); + err = WSAGetLastError(); + ok(err == WSANOTINITIALISED, "Expected 10093, received %d\n", err); + + WSASetLastError(0xdeadbeef); + ok(gethostbyname("localhost") == NULL, "gethostbyname() succeeded unexpectedly\n"); + err = WSAGetLastError(); + ok(err == WSANOTINITIALISED, "Expected 10093, received %d\n", err); } static void test_WithWSAStartup(void) @@ -990,6 +1092,8 @@ WORD version = MAKEWORD( 2, 2 ); INT res; LPVOID ptr; + SOCKET src, dst; + DWORD error; res = WSAStartup( version, &data ); ok(res == 0, "WSAStartup() failed unexpectedly: %d\n", res); @@ -997,6 +1101,34 @@ ptr = gethostbyname("localhost"); ok(ptr != NULL, "gethostbyname() failed unexpectedly: %d\n", WSAGetLastError()); + ok(!tcp_socketpair(&src, &dst), "creating socket pair failed\n"); + + res = send(src, "TEST", 4, 0); + ok(res == 4, "send failed with error %d\n", WSAGetLastError()); + + WSACleanup(); + + res = WSAStartup( version, &data ); + ok(res == 0, "WSAStartup() failed unexpectedly: %d\n", res); + + /* show that sockets are destroyed automatically after WSACleanup */ + todo_wine { + SetLastError(0xdeadbeef); + res = send(src, "TEST", 4, 0); + error = WSAGetLastError(); + ok(res == SOCKET_ERROR, "send should have failed\n"); + ok(error == WSAENOTSOCK, "expected 10038, got %d\n", error); + + SetLastError(0xdeadbeef); + res = closesocket(dst); + error = WSAGetLastError(); + ok(res == SOCKET_ERROR, "closesocket should have failed\n"); + ok(error == WSAENOTSOCK, "expected 10038, got %d\n", error); + } + + closesocket(src); + closesocket(dst); + WSACleanup(); } @@ -1006,13 +1138,16 @@ { WORD ver = MAKEWORD (2, 2); WSADATA data; - HMODULE hws2_32 = GetModuleHandle("ws2_32.dll"); + HMODULE hws2_32 = GetModuleHandleA("ws2_32.dll"); pfreeaddrinfo = (void *)GetProcAddress(hws2_32, "freeaddrinfo"); pgetaddrinfo = (void *)GetProcAddress(hws2_32, "getaddrinfo"); pFreeAddrInfoW = (void *)GetProcAddress(hws2_32, "FreeAddrInfoW"); pGetAddrInfoW = (void *)GetProcAddress(hws2_32, "GetAddrInfoW"); pInetNtop = (void *)GetProcAddress(hws2_32, "inet_ntop"); + pWSALookupServiceBeginW = (void *)GetProcAddress(hws2_32, "WSALookupServiceBeginW"); + pWSALookupServiceEnd = (void *)GetProcAddress(hws2_32, "WSALookupServiceEnd"); + pWSALookupServiceNextW = (void *)GetProcAddress(hws2_32, "WSALookupServiceNextW"); ok ( WSAStartup ( ver, &data ) == 0, "WSAStartup failed\n" ); tls = TlsAlloc(); @@ -1239,29 +1374,40 @@ closesocket(s); /* test SO_PROTOCOL_INFOA invalid parameters */ + ok(getsockopt(INVALID_SOCKET, SOL_SOCKET, SO_PROTOCOL_INFOA, NULL, NULL), + "getsockopt should have failed\n"); + err = WSAGetLastError(); + ok(err == WSAENOTSOCK, "expected 10038, got %d instead\n", err); + size = sizeof(WSAPROTOCOL_INFOA); + ok(getsockopt(INVALID_SOCKET, SOL_SOCKET, SO_PROTOCOL_INFOA, (char *) &infoA, &size), + "getsockopt should have failed\n"); + ok(size == sizeof(WSAPROTOCOL_INFOA), "got size %d\n", size); + err = WSAGetLastError(); + ok(err == WSAENOTSOCK, "expected 10038, got %d instead\n", err); s = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP); ok(getsockopt(s, SOL_SOCKET, SO_PROTOCOL_INFOA, NULL, NULL), "getsockopt should have failed\n"); err = WSAGetLastError(); -todo_wine ok(err == WSAEFAULT, "expected 10014, got %d instead\n", err); ok(getsockopt(s, SOL_SOCKET, SO_PROTOCOL_INFOA, (char *) &infoA, NULL), "getsockopt should have failed\n"); err = WSAGetLastError(); -todo_wine ok(err == WSAEFAULT, "expected 10014, got %d instead\n", err); ok(getsockopt(s, SOL_SOCKET, SO_PROTOCOL_INFOA, NULL, &size), "getsockopt should have failed\n"); err = WSAGetLastError(); -todo_wine ok(err == WSAEFAULT, "expected 10014, got %d instead\n", err); - size = sizeof(WSAPROTOCOL_INFOA) / 2; ok(getsockopt(s, SOL_SOCKET, SO_PROTOCOL_INFOA, (char *) &infoA, &size), "getsockopt should have failed\n"); err = WSAGetLastError(); -todo_wine ok(err == WSAEFAULT, "expected 10014, got %d instead\n", err); + ok(size == sizeof(WSAPROTOCOL_INFOA), "got size %d\n", size); + size = sizeof(WSAPROTOCOL_INFOA) * 2; + err = getsockopt(s, SOL_SOCKET, SO_PROTOCOL_INFOA, (char *) &infoA, &size); + ok(!err,"getsockopt failed with %d\n", WSAGetLastError()); + ok(size == sizeof(WSAPROTOCOL_INFOA) * 2, "got size %d\n", size); + closesocket(s); /* test SO_PROTOCOL_INFO structure returned for different protocols */ @@ -1277,38 +1423,46 @@ infoA.szProtocol[0] = 0; size = sizeof(WSAPROTOCOL_INFOA); err = getsockopt(s, SOL_SOCKET, SO_PROTOCOL_INFOA, (char *) &infoA, &size); -todo_wine ok(!err,"getsockopt failed with %d\n", WSAGetLastError()); + ok(size == sizeof(WSAPROTOCOL_INFOA), "got size %d\n", size); infoW.szProtocol[0] = 0; size = sizeof(WSAPROTOCOL_INFOW); err = getsockopt(s, SOL_SOCKET, SO_PROTOCOL_INFOW, (char *) &infoW, &size); -todo_wine ok(!err,"getsockopt failed with %d\n", WSAGetLastError()); + ok(size == sizeof(WSAPROTOCOL_INFOW), "got size %d\n", size); trace("provider name '%s', family %d, type %d, proto %d\n", infoA.szProtocol, prottest[i].family, prottest[i].type, prottest[i].proto); - todo_wine { - ok(infoA.szProtocol[0], "WSAPROTOCOL_INFOA was not filled\n"); - ok(infoW.szProtocol[0], "WSAPROTOCOL_INFOW was not filled\n"); - } + ok(infoA.szProtocol[0] || broken(!infoA.szProtocol[0]) /* NT4 */, + "WSAPROTOCOL_INFOA was not filled\n"); + ok(infoW.szProtocol[0] || broken(!infoA.szProtocol[0]) /* NT4 */, + "WSAPROTOCOL_INFOW was not filled\n"); WideCharToMultiByte(CP_ACP, 0, infoW.szProtocol, -1, providername, sizeof(providername), NULL, NULL); ok(!strcmp(infoA.szProtocol,providername), "different provider names '%s' != '%s'\n", infoA.szProtocol, providername); - todo_wine { ok(!memcmp(&infoA, &infoW, FIELD_OFFSET(WSAPROTOCOL_INFOA, szProtocol)), "SO_PROTOCOL_INFO[A/W] comparison failed\n"); - ok(infoA.iAddressFamily == prottest[i].family, "socket family invalid, expected %d received %d\n", - prottest[i].family, infoA.iAddressFamily); - ok(infoA.iSocketType == prottest[i].type, "socket type invalid, expected %d received %d\n", + + /* Remove IF when WSAEnumProtocols support IPV6 data */ + if (prottest[i].family == AF_INET6) + { + todo_wine + ok(infoA.iAddressFamily == prottest[i].family, "socket family invalid, expected %d received %d\n", + prottest[i].family, infoA.iAddressFamily); + } + else + { + ok(infoA.iAddressFamily == prottest[i].family, "socket family invalid, expected %d received %d\n", + prottest[i].family, infoA.iAddressFamily); + } ok(infoA.iSocketType == prottest[i].type, "socket type invalid, expected %d received %d\n", prottest[i].type, infoA.iSocketType); ok(infoA.iProtocol == prottest[i].proto, "socket protocol invalid, expected %d received %d\n", prottest[i].proto, infoA.iProtocol); - } closesocket(s); } @@ -1364,7 +1518,8 @@ struct sockaddr_in s1addr, s2addr, s3addr; GUID WSARecvMsg_GUID = WSAID_WSARECVMSG; LPFN_WSARECVMSG pWSARecvMsg = NULL; - unsigned int rc, foundhdr, yes = 1; + unsigned int rc, yes = 1; + BOOL foundhdr; DWORD dwBytes, dwSize, dwFlags; socklen_t addrlen; WSACMSGHDR *cmsg; @@ -1375,7 +1530,7 @@ int i, err; memset(&ov, 0, sizeof(ov)); - ov.hEvent = CreateEvent(NULL, FALSE, FALSE, NULL); + ov.hEvent = CreateEventA(NULL, FALSE, FALSE, NULL); if (ov.hEvent == INVALID_HANDLE_VALUE) { skip("Could not create event object, some tests will be skipped. errno = %d\n", GetLastError()); @@ -1708,7 +1863,8 @@ int i, j; struct servent *pserv[2]; - ok ( WaitForSingleObject ( *starttest, TEST_TIMEOUT * 1000 ) != WAIT_TIMEOUT, "test_getservbyname: timeout waiting for start signal\n"); + ok ( WaitForSingleObject ( *starttest, TEST_TIMEOUT * 1000 ) != WAIT_TIMEOUT, + "test_getservbyname: timeout waiting for start signal\n" ); /* ensure that necessary buffer resizes are completed */ for ( j = 0; j < 2; j++) { @@ -1718,14 +1874,19 @@ for ( i = 0; i < NUM_QUERIES / 2; i++ ) { for ( j = 0; j < 2; j++ ) { pserv[j] = getservbyname ( serv[j].name, serv[j].proto ); - ok ( pserv[j] != NULL, "getservbyname could not retrieve information for %s: %d\n", serv[j].name, WSAGetLastError() ); + ok ( pserv[j] != NULL || broken(pserv[j] == NULL) /* win8, fixed in win81 */, + "getservbyname could not retrieve information for %s: %d\n", serv[j].name, WSAGetLastError() ); if ( !pserv[j] ) continue; - ok ( pserv[j]->s_port == htons(serv[j].port), "getservbyname returned the wrong port for %s: %d\n", serv[j].name, ntohs(pserv[j]->s_port) ); - ok ( !strcmp ( pserv[j]->s_proto, serv[j].proto ), "getservbyname returned the wrong protocol for %s: %s\n", serv[j].name, pserv[j]->s_proto ); - ok ( !strcmp ( pserv[j]->s_name, serv[j].name ), "getservbyname returned the wrong name for %s: %s\n", serv[j].name, pserv[j]->s_name ); + ok ( pserv[j]->s_port == htons(serv[j].port), + "getservbyname returned the wrong port for %s: %d\n", serv[j].name, ntohs(pserv[j]->s_port) ); + ok ( !strcmp ( pserv[j]->s_proto, serv[j].proto ), + "getservbyname returned the wrong protocol for %s: %s\n", serv[j].name, pserv[j]->s_proto ); + ok ( !strcmp ( pserv[j]->s_name, serv[j].name ), + "getservbyname returned the wrong name for %s: %s\n", serv[j].name, pserv[j]->s_name ); } - ok ( pserv[0] == pserv[1], "getservbyname: winsock resized servent buffer when not necessary\n" ); + ok ( pserv[0] == pserv[1] || broken(pserv[0] != pserv[1]) /* win8, fixed in win81 */, + "getservbyname: winsock resized servent buffer when not necessary\n" ); } return 0; @@ -1737,7 +1898,7 @@ HANDLE starttest, thread[NUM_THREADS]; DWORD thread_id[NUM_THREADS]; - starttest = CreateEvent ( NULL, 1, 0, "test_getservbyname_starttest" ); + starttest = CreateEventA ( NULL, 1, 0, "test_getservbyname_starttest" ); /* create threads */ for ( i = 0; i < NUM_THREADS; i++ ) { @@ -1762,13 +1923,12 @@ UINT pi_size; SetLastError(0xdeadbeef); - ok(WSASocketA(0, 0, 0, NULL, 0, 0) == INVALID_SOCKET, "WSASocketA should have failed\n"); + ok(WSASocketA(0, 0, 0, NULL, 0, 0) == INVALID_SOCKET, + "WSASocketA should have failed\n"); err = WSAGetLastError(); -todo_wine ok(err == WSAEINVAL, "Expected 10022, received %d\n", err); sock = WSASocketA(AF_INET, 0, 0, NULL, 0, 0); -todo_wine ok(sock != INVALID_SOCKET, "WSASocketA should have succeeded\n"); closesocket(sock); @@ -1776,19 +1936,77 @@ ok(sock != INVALID_SOCKET, "WSASocketA should have succeeded\n"); closesocket(sock); + SetLastError(0xdeadbeef); + ok(WSASocketA(0, SOCK_STREAM, -1, NULL, 0, 0) == INVALID_SOCKET, + "WSASocketA should have failed\n"); + err = WSAGetLastError(); + ok(err == WSAEPROTONOSUPPORT, "Expected 10043, received %d\n", err); + + SetLastError(0xdeadbeef); + ok(WSASocketA(0, -1, IPPROTO_UDP, NULL, 0, 0) == INVALID_SOCKET, + "WSASocketA should have failed\n"); + err = WSAGetLastError(); + ok(err == WSAESOCKTNOSUPPORT, "Expected 10044, received %d\n", err); + + SetLastError(0xdeadbeef); + ok(WSASocketA(0, -1, 0, NULL, 0, 0) == INVALID_SOCKET, + "WSASocketA should have failed\n"); + err = WSAGetLastError(); + ok(err == WSAEINVAL, "Expected 10022, received %d\n", err); + + SetLastError(0xdeadbeef); + ok(WSASocketA(AF_INET, -1, 0, NULL, 0, 0) == INVALID_SOCKET, + "WSASocketA should have failed\n"); + err = WSAGetLastError(); + ok(err == WSAESOCKTNOSUPPORT, "Expected 10044, received %d\n", err); + + SetLastError(0xdeadbeef); + ok(WSASocketA(AF_INET, 0, -1, NULL, 0, 0) == INVALID_SOCKET, + "WSASocketA should have failed\n"); + err = WSAGetLastError(); + ok(err == WSAEPROTONOSUPPORT, "Expected 10043, received %d\n", err); + + SetLastError(0xdeadbeef); + ok(WSASocketA(0, -1, -1, NULL, 0, 0) == INVALID_SOCKET, + "WSASocketA should have failed\n"); + err = WSAGetLastError(); + ok(err == WSAESOCKTNOSUPPORT, "Expected 10044, received %d\n", err); + + SetLastError(0xdeadbeef); + ok(WSASocketA(-1, SOCK_STREAM, IPPROTO_UDP, NULL, 0, 0) == INVALID_SOCKET, + "WSASocketA should have failed\n"); + err = WSAGetLastError(); + ok(err == WSAEAFNOSUPPORT, "Expected 10047, received %d\n", err); + sock = WSASocketA(AF_INET, 0, IPPROTO_TCP, NULL, 0, 0); -todo_wine ok(sock != INVALID_SOCKET, "WSASocketA should have succeeded\n"); closesocket(sock); SetLastError(0xdeadbeef); - ok(WSASocketA(0, SOCK_STREAM, 0, NULL, 0, 0) == INVALID_SOCKET, "WSASocketA should have failed\n"); + ok(WSASocketA(0, SOCK_STREAM, 0, NULL, 0, 0) == INVALID_SOCKET, + "WSASocketA should have failed\n"); err = WSAGetLastError(); -todo_wine ok(err == WSAEINVAL, "Expected 10022, received %d\n", err); + SetLastError(0xdeadbeef); + ok(WSASocketA(0, 0, 0xdead, NULL, 0, 0) == INVALID_SOCKET, + "WSASocketA should have failed\n"); + err = WSAGetLastError(); + ok(err == WSAEPROTONOSUPPORT, "Expected 10043, received %d\n", err); + + SetLastError(0xdeadbeef); + ok(WSASocketA(AF_INET, 0xdead, 0, NULL, 0, 0) == INVALID_SOCKET, + "WSASocketA should have failed\n"); + err = WSAGetLastError(); + ok(err == WSAESOCKTNOSUPPORT, "Expected 10044, received %d\n", err); + + SetLastError(0xdeadbeef); + ok(WSASocketA(0, 0xdead, 0, NULL, 0, 0) == INVALID_SOCKET, + "WSASocketA should have failed\n"); + err = WSAGetLastError(); + ok(err == WSAEINVAL, "Expected 10022, received %d\n", err); + sock = WSASocketA(0, 0, IPPROTO_TCP, NULL, 0, 0); -todo_wine ok(sock != INVALID_SOCKET, "WSASocketA should have succeeded\n"); closesocket(sock); @@ -1797,7 +2015,6 @@ ok(WSASocketA(AF_INET, SOCK_STREAM, IPPROTO_UDP, NULL, 0, 0) == INVALID_SOCKET, "WSASocketA should have failed\n"); err = WSAGetLastError(); -todo_wine ok(err == WSAEPROTONOSUPPORT, "Expected 10043, received %d\n", err); /* SOCK_DGRAM does not support IPPROTO_TCP */ @@ -1805,7 +2022,6 @@ ok(WSASocketA(AF_INET, SOCK_DGRAM, IPPROTO_TCP, NULL, 0, 0) == INVALID_SOCKET, "WSASocketA should have failed\n"); err = WSAGetLastError(); -todo_wine ok(err == WSAEPROTONOSUPPORT, "Expected 10043, received %d\n", err); /* Set pi_size explicitly to a value below 2*sizeof(WSAPROTOCOL_INFOA) @@ -1843,11 +2059,33 @@ closesocket(sock); /* find what parameters are used first: plain parameters or protocol info struct */ + pi[0].iProtocol = -1; + pi[0].iSocketType = -1; + pi[0].iAddressFamily = -1; + ok(WSASocketA(0, 0, IPPROTO_UDP, &pi[0], 0, 0) == INVALID_SOCKET, + "WSASocketA should have failed\n"); + err = WSAGetLastError(); + ok(err == WSAEAFNOSUPPORT, "Expected 10047, received %d\n", err); + + pi[0].iProtocol = 0; + pi[0].iSocketType = 0; + pi[0].iAddressFamily = 0; + sock = WSASocketA(0, 0, IPPROTO_UDP, &pi[0], 0, 0); + if(sock != INVALID_SOCKET) + { + win_skip("must work only in OS <= 2003\n"); + closesocket(sock); + } + else + { + err = WSAGetLastError(); + ok(err == WSAEAFNOSUPPORT, "Expected 10047, received %d\n", err); + } + pi[0].iProtocol = IPPROTO_UDP; pi[0].iSocketType = SOCK_DGRAM; pi[0].iAddressFamily = AF_INET; sock = WSASocketA(0, 0, 0, &pi[0], 0, 0); -todo_wine { ok(sock != INVALID_SOCKET, "Failed to create socket: %d\n", WSAGetLastError()); size = sizeof(socktype); @@ -1857,7 +2095,7 @@ ok(socktype == SOCK_DGRAM, "Wrong socket type, expected %d received %d\n", SOCK_DGRAM, socktype); closesocket(sock); -} + sock = WSASocketA(AF_INET, SOCK_STREAM, IPPROTO_TCP, &pi[0], 0, 0); ok(sock != INVALID_SOCKET, "Failed to create socket: %d\n", WSAGetLastError()); @@ -1894,11 +2132,9 @@ * from WSAEnumProtocols that has the flag PFL_MATCHES_PROTOCOL_ZERO * is returned */ sock = WSASocketA(AF_INET, 0, 0, NULL, 0, 0); -todo_wine ok(sock != INVALID_SOCKET, "Failed to create socket: %d\n", WSAGetLastError()); -todo_wine { size = sizeof(socktype); socktype = 0xdead; err = getsockopt(sock, SOL_SOCKET, SO_TYPE, (char *) &socktype, &size); @@ -1913,7 +2149,6 @@ } } ok(i != items, "Creating a socket without protocol and socket type didn't work\n"); -} closesocket(sock); /* when no socket type is specified the first entry from WSAEnumProtocols @@ -1921,14 +2156,12 @@ for (i = 0; i < sizeof(autoprotocols) / sizeof(autoprotocols[0]); i++) { sock = WSASocketA(0, 0, autoprotocols[i], NULL, 0, 0); -todo_wine ok(sock != INVALID_SOCKET, "Failed to create socket for protocol %d, received %d\n", autoprotocols[i], WSAGetLastError()); size = sizeof(socktype); socktype = 0xdead; err = getsockopt(sock, SOL_SOCKET, SO_TYPE, (char *) &socktype, &size); -todo_wine ok(!err, "getsockopt failed with %d\n", WSAGetLastError()); for (err = 1, j = 0; j < items; j++) @@ -1938,19 +2171,292 @@ if (socktype == pi[j].iSocketType) err = 0; else -todo_wine ok(0, "Wrong socket type, expected %d received %d\n", pi[j].iSocketType, socktype); break; } } -todo_wine ok(!err, "Protocol %d not found in WSAEnumProtocols\n", autoprotocols[i]); closesocket(sock); } HeapFree(GetProcessHeap(), 0, pi); + + SetLastError(0xdeadbeef); + /* starting on vista the socket function returns error during the socket + creation and no longer in the socket operations (sendto, readfrom) */ + sock = WSASocketA(AF_INET, SOCK_RAW, IPPROTO_ICMP, NULL, 0, 0); + if (sock == INVALID_SOCKET) + { + err = WSAGetLastError(); + ok(err == WSAEACCES, "Expected 10013, received %d\n", err); + skip("SOCK_RAW is not supported\n"); + } + else + { + trace("SOCK_RAW is supported\n"); + + size = sizeof(socktype); + socktype = 0xdead; + err = getsockopt(sock, SOL_SOCKET, SO_TYPE, (char *) &socktype, &size); + ok(!err, "getsockopt failed with %d\n", WSAGetLastError()); + ok(socktype == SOCK_RAW, "Wrong socket type, expected %d received %d\n", + SOCK_RAW, socktype); + closesocket(sock); + + todo_wine { + sock = WSASocketA(0, 0, IPPROTO_RAW, NULL, 0, 0); + ok(sock != INVALID_SOCKET, "Failed to create socket: %d\n", + WSAGetLastError()); + size = sizeof(socktype); + socktype = 0xdead; + err = getsockopt(sock, SOL_SOCKET, SO_TYPE, (char *) &socktype, &size); + ok(!err, "getsockopt failed with %d\n", WSAGetLastError()); + ok(socktype == SOCK_RAW, "Wrong socket type, expected %d received %d\n", + SOCK_RAW, socktype); + closesocket(sock); + } + + sock = WSASocketA(AF_INET, SOCK_RAW, IPPROTO_TCP, NULL, 0, 0); + ok(sock != INVALID_SOCKET, "Failed to create socket: %d\n", + WSAGetLastError()); + size = sizeof(socktype); + socktype = 0xdead; + err = getsockopt(sock, SOL_SOCKET, SO_TYPE, (char *) &socktype, &size); + ok(!err, "getsockopt failed with %d\n", WSAGetLastError()); + ok(socktype == SOCK_RAW, "Wrong socket type, expected %d received %d\n", + SOCK_RAW, socktype); + closesocket(sock); + } + + /* IPX socket tests */ + + SetLastError(0xdeadbeef); + sock = WSASocketA(AF_IPX, SOCK_DGRAM, NSPROTO_IPX, NULL, 0, 0); + if (sock == INVALID_SOCKET) + { + err = WSAGetLastError(); + ok(err == WSAEAFNOSUPPORT || broken(err == WSAEPROTONOSUPPORT), "Expected 10047, received %d\n", err); + skip("IPX is not supported\n"); + } + else + { + WSAPROTOCOL_INFOA info; + closesocket(sock); + + trace("IPX is supported\n"); + + sock = WSASocketA(0, 0, NSPROTO_IPX, NULL, 0, 0); + ok(sock != INVALID_SOCKET, "Failed to create socket: %d\n", + WSAGetLastError()); + + size = sizeof(socktype); + socktype = 0xdead; + err = getsockopt(sock, SOL_SOCKET, SO_TYPE, (char *) &socktype, &size); + ok(!err,"getsockopt failed with %d\n", WSAGetLastError()); + ok(socktype == SOCK_DGRAM, "Wrong socket type, expected %d received %d\n", + SOCK_DGRAM, socktype); + + /* check socket family, type and protocol */ + size = sizeof(WSAPROTOCOL_INFOA); + err = getsockopt(sock, SOL_SOCKET, SO_PROTOCOL_INFOA, (char *) &info, &size); + ok(!err,"getsockopt failed with %d\n", WSAGetLastError()); + ok(info.iProtocol == NSPROTO_IPX, "expected protocol %d, received %d\n", + NSPROTO_IPX, info.iProtocol); + ok(info.iAddressFamily == AF_IPX, "expected family %d, received %d\n", + AF_IPX, info.iProtocol); + ok(info.iSocketType == SOCK_DGRAM, "expected type %d, received %d\n", + SOCK_DGRAM, info.iSocketType); + closesocket(sock); + + /* SOCK_STREAM does not support NSPROTO_IPX */ + SetLastError(0xdeadbeef); + ok(WSASocketA(AF_IPX, SOCK_STREAM, NSPROTO_IPX, NULL, 0, 0) == INVALID_SOCKET, + "WSASocketA should have failed\n"); + err = WSAGetLastError(); + ok(err == WSAEPROTONOSUPPORT, "Expected 10043, received %d\n", err); + + /* test extended IPX support - that is adding any number between 0 and 255 + * to the IPX protocol value will make it be used as IPX packet type */ + for(i = 0;i <= 255;i += 17) + { + SetLastError(0xdeadbeef); + sock = WSASocketA(0, 0, NSPROTO_IPX + i, NULL, 0, 0); + ok(sock != INVALID_SOCKET, "Failed to create socket: %d\n", + WSAGetLastError()); + + size = sizeof(int); + socktype = -1; + err = getsockopt(sock, NSPROTO_IPX, IPX_PTYPE, (char *) &socktype, &size); + ok(!err, "getsockopt failed with %d\n", WSAGetLastError()); + ok(socktype == i, "Wrong IPX packet type, expected %d received %d\n", + i, socktype); + + closesocket(sock); + } + } +} + +static void test_WSADuplicateSocket(void) +{ + SOCKET source, dupsock; + WSAPROTOCOL_INFOA info; + DWORD err; + struct sockaddr_in addr; + int socktype, size, addrsize, ret; + char teststr[] = "TEST", buffer[16]; + + source = WSASocketA(AF_INET, SOCK_STREAM, IPPROTO_TCP, NULL, 0, 0); + ok(source != INVALID_SOCKET, "WSASocketA should have succeeded\n"); + + /* test invalid parameters */ + SetLastError(0xdeadbeef); + ok(WSADuplicateSocketA(0, 0, NULL), "WSADuplicateSocketA should have failed\n"); + err = WSAGetLastError(); + ok(err == WSAENOTSOCK, "expected 10038, received %d\n", err); + + SetLastError(0xdeadbeef); + ok(WSADuplicateSocketA(source, 0, NULL), + "WSADuplicateSocketA should have failed\n"); + err = WSAGetLastError(); + ok(err == WSAEINVAL, "expected 10022, received %d\n", err); + + SetLastError(0xdeadbeef); + ok(WSADuplicateSocketA(source, ~0, &info), + "WSADuplicateSocketA should have failed\n"); + err = WSAGetLastError(); + ok(err == WSAEINVAL, "expected 10022, received %d\n", err); + + SetLastError(0xdeadbeef); + ok(WSADuplicateSocketA(0, GetCurrentProcessId(), &info), + "WSADuplicateSocketA should have failed\n"); + err = WSAGetLastError(); + ok(err == WSAENOTSOCK, "expected 10038, received %d\n", err); + + SetLastError(0xdeadbeef); + ok(WSADuplicateSocketA(source, GetCurrentProcessId(), NULL), + "WSADuplicateSocketA should have failed\n"); + err = WSAGetLastError(); + ok(err == WSAEFAULT, "expected 10014, received %d\n", err); + + /* test returned structure */ + memset(&info, 0, sizeof(info)); + ok(!WSADuplicateSocketA(source, GetCurrentProcessId(), &info), + "WSADuplicateSocketA should have worked\n"); + + ok(info.iProtocol == IPPROTO_TCP, "expected protocol %d, received %d\n", + IPPROTO_TCP, info.iProtocol); + ok(info.iAddressFamily == AF_INET, "expected family %d, received %d\n", + AF_INET, info.iProtocol); + ok(info.iSocketType == SOCK_STREAM, "expected type %d, received %d\n", + SOCK_STREAM, info.iSocketType); + + dupsock = WSASocketA(0, 0, 0, &info, 0, 0); + ok(dupsock != INVALID_SOCKET, "WSASocketA should have succeeded\n"); + + closesocket(dupsock); + closesocket(source); + + /* create a socket, bind it, duplicate it then send data on source and + * receve in the duplicated socket */ + source = WSASocketA(AF_INET, SOCK_DGRAM, IPPROTO_UDP, NULL, 0, 0); + ok(source != INVALID_SOCKET, "WSASocketA should have succeeded\n"); + + memset(&info, 0, sizeof(info)); + ok(!WSADuplicateSocketA(source, GetCurrentProcessId(), &info), + "WSADuplicateSocketA should have worked\n"); + + ok(info.iProtocol == IPPROTO_UDP, "expected protocol %d, received %d\n", + IPPROTO_UDP, info.iProtocol); + ok(info.iAddressFamily == AF_INET, "expected family %d, received %d\n", + AF_INET, info.iProtocol); + ok(info.iSocketType == SOCK_DGRAM, "expected type %d, received %d\n", + SOCK_DGRAM, info.iSocketType); + + memset(&addr, 0, sizeof(addr)); + addr.sin_family = AF_INET; + addr.sin_addr.s_addr = inet_addr("127.0.0.1"); + ok(!bind(source, (struct sockaddr*)&addr, sizeof(addr)), + "bind should have worked\n"); + + /* read address to find out the port number to be used in sendto */ + memset(&addr, 0, sizeof(addr)); + addrsize = sizeof(addr); + ok(!getsockname(source, (struct sockaddr *) &addr, &addrsize), + "getsockname should have worked\n"); + ok(addr.sin_port, "socket port should be != 0\n"); + + dupsock = WSASocketA(0, 0, 0, &info, 0, 0); + ok(dupsock != INVALID_SOCKET, "WSASocketA should have succeeded\n"); + + size = sizeof(int); + ret = getsockopt(dupsock, SOL_SOCKET, SO_TYPE, (char *) &socktype, &size); + ok(!ret, "getsockopt failed with %d\n", WSAGetLastError()); + ok(socktype == SOCK_DGRAM, "Wrong socket type, expected %d received %d\n", + SOCK_DGRAM, socktype); + + set_blocking(source, TRUE); + + /* send data on source socket */ + addrsize = sizeof(addr); + size = sendto(source, teststr, sizeof(teststr), 0, (struct sockaddr *) &addr, addrsize); + ok(size == sizeof(teststr), "got %d (err %d)\n", size, WSAGetLastError()); + + /* receive on duplicated socket */ + addrsize = sizeof(addr); + memset(buffer, 0, sizeof(buffer)); + size = recvfrom(dupsock, buffer, sizeof(teststr), 0, (struct sockaddr *) &addr, &addrsize); + ok(size == sizeof(teststr), "got %d (err %d)\n", size, WSAGetLastError()); + buffer[sizeof(teststr) - 1] = 0; + ok(!strcmp(buffer, teststr), "expected '%s', received '%s'\n", teststr, buffer); + + closesocket(dupsock); + closesocket(source); + + /* show that the source socket need to be bound before the duplicated + * socket is created */ + source = WSASocketA(AF_INET, SOCK_DGRAM, IPPROTO_UDP, NULL, 0, 0); + ok(source != INVALID_SOCKET, "WSASocketA should have succeeded\n"); + + memset(&info, 0, sizeof(info)); + ok(!WSADuplicateSocketA(source, GetCurrentProcessId(), &info), + "WSADuplicateSocketA should have worked\n"); + + dupsock = WSASocketA(0, 0, 0, &info, 0, 0); + ok(dupsock != INVALID_SOCKET, "WSASocketA should have succeeded\n"); + + memset(&addr, 0, sizeof(addr)); + addr.sin_family = AF_INET; + addr.sin_addr.s_addr = inet_addr("127.0.0.1"); + ok(!bind(source, (struct sockaddr*)&addr, sizeof(addr)), + "bind should have worked\n"); + + /* read address to find out the port number to be used in sendto */ + memset(&addr, 0, sizeof(addr)); + addrsize = sizeof(addr); + ok(!getsockname(source, (struct sockaddr *) &addr, &addrsize), + "getsockname should have worked\n"); + ok(addr.sin_port, "socket port should be != 0\n"); + + set_blocking(source, TRUE); + + addrsize = sizeof(addr); + size = sendto(source, teststr, sizeof(teststr), 0, (struct sockaddr *) &addr, addrsize); + ok(size == sizeof(teststr), "got %d (err %d)\n", size, WSAGetLastError()); + + SetLastError(0xdeadbeef); + addrsize = sizeof(addr); + memset(buffer, 0, sizeof(buffer)); + todo_wine { + ok(recvfrom(dupsock, buffer, sizeof(teststr), 0, (struct sockaddr *) &addr, &addrsize) == -1, + "recvfrom should have failed\n"); + err = WSAGetLastError(); + ok(err == WSAEINVAL, "expected 10022, received %d\n", err); + } + + closesocket(dupsock); + closesocket(source); } static void test_WSAAddressToStringA(void) @@ -2809,59 +3315,98 @@ static int CALLBACK AlwaysDeferConditionFunc(LPWSABUF lpCallerId, LPWSABUF lpCallerData, LPQOS pQos, LPQOS lpGQOS, LPWSABUF lpCalleeId, LPWSABUF lpCalleeData, - GROUP FAR * g, DWORD_PTR dwCallbackData) + GROUP *g, DWORD_PTR dwCallbackData) { return CF_DEFER; } +static SOCKET setup_server_socket(struct sockaddr_in *addr, int *len) +{ + int ret, val; + SOCKET server_socket; + + server_socket = socket(AF_INET, SOCK_STREAM, 0); + if (server_socket == INVALID_SOCKET) + { + trace("error creating server socket: %d\n", WSAGetLastError()); + return INVALID_SOCKET; + } + + val = 1; + ret = setsockopt(server_socket, SOL_SOCKET, SO_REUSEADDR, (char *)&val, sizeof(val)); + if (ret) + { + trace("error setting SO_REUSEADDR: %d\n", WSAGetLastError()); + closesocket(server_socket); + return INVALID_SOCKET; + } + + ret = bind(server_socket, (struct sockaddr *)addr, *len); + if (ret) + { + trace("error binding server socket: %d\n", WSAGetLastError()); + } + + ret = getsockname(server_socket, (struct sockaddr *)addr, len); + if (ret) + { + skip("failed to lookup bind address: %d\n", WSAGetLastError()); + closesocket(server_socket); + return INVALID_SOCKET; + } + + ret = listen(server_socket, 5); + if (ret) + { + trace("error making server socket listen: %d\n", WSAGetLastError()); + closesocket(server_socket); + return INVALID_SOCKET; + } + + return server_socket; +} + +static SOCKET setup_connector_socket(struct sockaddr_in *addr, int len) +{ + int ret; + SOCKET connector; + + connector = socket(AF_INET, SOCK_STREAM, 0); + ok(connector != INVALID_SOCKET, "failed to create connector socket %d\n", WSAGetLastError()); + + ret = connect(connector, (struct sockaddr *)addr, len); + ok(!ret, "connecting to accepting socket failed %d\n", WSAGetLastError()); + + return connector; +} + static void test_accept(void) { int ret; - SOCKET server_socket = INVALID_SOCKET, accepted = INVALID_SOCKET, connector = INVALID_SOCKET; + SOCKET server_socket, accepted = INVALID_SOCKET, connector; struct sockaddr_in address; + SOCKADDR_STORAGE ss; int socklen; select_thread_params thread_params; HANDLE thread_handle = NULL; DWORD id; - server_socket = socket(AF_INET, SOCK_STREAM, 0); - if (server_socket == INVALID_SOCKET) - { - trace("error creating server socket: %d\n", WSAGetLastError()); - goto done; - } - memset(&address, 0, sizeof(address)); address.sin_addr.s_addr = inet_addr("127.0.0.1"); address.sin_family = AF_INET; - ret = bind(server_socket, (struct sockaddr*) &address, sizeof(address)); - if (ret != 0) - { - trace("error binding server socket: %d\n", WSAGetLastError()); - goto done; - } socklen = sizeof(address); - ret = getsockname(server_socket, (struct sockaddr*)&address, &socklen); - if (ret != 0) { - skip("failed to lookup bind address, error %d\n", WSAGetLastError()); - goto done; - } - - ret = listen(server_socket, 5); - if (ret != 0) - { - trace("error making server socket listen: %d\n", WSAGetLastError()); - goto done; - } + server_socket = setup_server_socket(&address, &socklen); + if (server_socket == INVALID_SOCKET) + { + trace("error creating server socket: %d\n", WSAGetLastError()); + return; + } + + connector = setup_connector_socket(&address, socklen); + if (connector == INVALID_SOCKET) goto done; trace("Blocking accept next\n"); - - connector = socket(AF_INET, SOCK_STREAM, 0); - ok(connector != INVALID_SOCKET, "Failed to create connector socket, error %d\n", WSAGetLastError()); - - ret = connect(connector, (struct sockaddr*)&address, sizeof(address)); - ok(ret == 0, "connecting to accepting socket failed, error %d\n", WSAGetLastError()); accepted = WSAAccept(server_socket, NULL, NULL, AlwaysDeferConditionFunc, 0); ok(accepted == INVALID_SOCKET && WSAGetLastError() == WSATRY_AGAIN, "Failed to defer connection, %d\n", WSAGetLastError()); @@ -2897,6 +3442,80 @@ WaitForSingleObject(thread_handle, 1000); ok(thread_params.ReadKilled || broken(!thread_params.ReadKilled) /* Win98/ME, after accept */, "closesocket did not wakeup accept\n"); + + closesocket(accepted); + closesocket(connector); + accepted = connector = server_socket = INVALID_SOCKET; + + socklen = sizeof(address); + server_socket = setup_server_socket(&address, &socklen); + if (server_socket == INVALID_SOCKET) goto done; + + connector = setup_connector_socket(&address, socklen); + if (connector == INVALID_SOCKET) goto done; + + socklen = 0; + accepted = WSAAccept(server_socket, (struct sockaddr *)&ss, &socklen, NULL, 0); + ok(accepted == INVALID_SOCKET && WSAGetLastError() == WSAEFAULT, "got %d\n", WSAGetLastError()); + ok(!socklen, "got %d\n", socklen); + closesocket(connector); + connector = INVALID_SOCKET; + + socklen = sizeof(address); + connector = setup_connector_socket(&address, socklen); + if (connector == INVALID_SOCKET) goto done; + + accepted = WSAAccept(server_socket, NULL, NULL, NULL, 0); + ok(accepted != INVALID_SOCKET, "Failed to accept connection, %d\n", WSAGetLastError()); + closesocket(accepted); + closesocket(connector); + accepted = connector = INVALID_SOCKET; + + socklen = sizeof(address); + connector = setup_connector_socket(&address, socklen); + if (connector == INVALID_SOCKET) goto done; + + socklen = sizeof(ss); + memset(&ss, 0, sizeof(ss)); + accepted = WSAAccept(server_socket, (struct sockaddr *)&ss, &socklen, NULL, 0); + ok(accepted != INVALID_SOCKET, "Failed to accept connection, %d\n", WSAGetLastError()); + ok(socklen != sizeof(ss), "unexpected length\n"); + ok(ss.ss_family, "family not set\n"); + closesocket(accepted); + closesocket(connector); + accepted = connector = INVALID_SOCKET; + + socklen = sizeof(address); + connector = setup_connector_socket(&address, socklen); + if (connector == INVALID_SOCKET) goto done; + + socklen = 0; + accepted = accept(server_socket, (struct sockaddr *)&ss, &socklen); + ok(accepted == INVALID_SOCKET && WSAGetLastError() == WSAEFAULT, "got %d\n", WSAGetLastError()); + ok(!socklen, "got %d\n", socklen); + closesocket(connector); + accepted = connector = INVALID_SOCKET; + + socklen = sizeof(address); + connector = setup_connector_socket(&address, socklen); + if (connector == INVALID_SOCKET) goto done; + + accepted = accept(server_socket, NULL, NULL); + ok(accepted != INVALID_SOCKET, "Failed to accept connection, %d\n", WSAGetLastError()); + closesocket(accepted); + closesocket(connector); + accepted = connector = INVALID_SOCKET; + + socklen = sizeof(address); + connector = setup_connector_socket(&address, socklen); + if (connector == INVALID_SOCKET) goto done; + + socklen = sizeof(ss); + memset(&ss, 0, sizeof(ss)); + accepted = accept(server_socket, (struct sockaddr *)&ss, &socklen); + ok(accepted != INVALID_SOCKET, "Failed to accept connection, %d\n", WSAGetLastError()); + ok(socklen != sizeof(ss), "unexpected length\n"); + ok(ss.ss_family, "family not set\n"); done: if (accepted != INVALID_SOCKET) @@ -3343,7 +3962,7 @@ static void test_ioctlsocket(void) { - SOCKET sock; + SOCKET sock, src, dst; struct tcp_keepalive kalive; int ret, optval; static const LONG cmds[] = {FIONBIO, FIONREAD, SIOCATMARK}; @@ -3427,9 +4046,35 @@ ok(ret == 0 || broken(ret == SOCKET_ERROR), "WSAIoctl failed unexpectedly\n"); closesocket(sock); -} - -static int drain_pause=0; + + if (tcp_socketpair(&src, &dst) != 0) + { + ok(0, "creating socket pair failed, skipping test\n"); + return; + } + + /* test FIONREAD on TCP sockets */ + optval = 0xdeadbeef; + ret = WSAIoctl(dst, FIONREAD, NULL, 0, &optval, sizeof(optval), &arg, NULL, NULL); + ok(ret == 0, "WSAIoctl failed unexpectedly with error %d\n", WSAGetLastError()); + ok(optval == 0, "FIONREAD should have returned 0 bytes, got %d instead\n", optval); + + optval = 0xdeadbeef; + ok(send(src, "TEST", 4, 0) == 4, "failed to send test data\n"); + Sleep(100); + ret = WSAIoctl(dst, FIONREAD, NULL, 0, &optval, sizeof(optval), &arg, NULL, NULL); + ok(ret == 0, "WSAIoctl failed unexpectedly with error %d\n", WSAGetLastError()); + ok(optval == 4, "FIONREAD should have returned 4 bytes, got %d instead\n", optval); + + closesocket(dst); + optval = 0xdeadbeef; + ret = WSAIoctl(dst, FIONREAD, NULL, 0, &optval, sizeof(optval), &arg, NULL, NULL); + ok(ret == SOCKET_ERROR, "WSAIoctl succeeded unexpectedly\n"); + ok(optval == 0xdeadbeef, "FIONREAD should not have changed last error, got %d instead\n", optval); + closesocket(src); +} + +static BOOL drain_pause = FALSE; static DWORD WINAPI drain_socket_thread(LPVOID arg) { char buffer[1024]; @@ -3511,7 +4156,7 @@ buf.buf = buffer; buf.len = buflen; - ov.hEvent = CreateEvent(NULL, FALSE, FALSE, NULL); + ov.hEvent = CreateEventA(NULL, FALSE, FALSE, NULL); ok(ov.hEvent != NULL, "could not create event object, errno = %d\n", GetLastError()); if (!ov.hEvent) goto end; @@ -3607,7 +4252,7 @@ return 0; } - return DefWindowProc(hwnd, msg, wparam, lparam); + return DefWindowProcA(hwnd, msg, wparam, lparam); } static void get_event_details(int event, int *bit, char *name) @@ -3863,7 +4508,7 @@ struct sockaddr_in addr; HANDLE hThread = NULL; HANDLE hEvent = INVALID_HANDLE_VALUE, hEvent2 = INVALID_HANDLE_VALUE; - WNDCLASSEX wndclass; + WNDCLASSEXA wndclass; HWND hWnd = NULL; char *buffer = NULL; int bufferSize = 1024*1024; @@ -3933,16 +4578,17 @@ wndclass.lpfnWndProc = ws2_test_WndProc; wndclass.cbClsExtra = 0; wndclass.cbWndExtra = 0; - wndclass.hInstance = GetModuleHandle(NULL); - wndclass.hIcon = LoadIcon(NULL, IDI_APPLICATION); - wndclass.hIconSm = LoadIcon(NULL, IDI_APPLICATION); - wndclass.hCursor = LoadCursor(NULL, IDC_ARROW); + wndclass.hInstance = GetModuleHandleA(NULL); + wndclass.hIcon = LoadIconA(NULL, (LPCSTR)IDI_APPLICATION); + wndclass.hIconSm = LoadIconA(NULL, (LPCSTR)IDI_APPLICATION); + wndclass.hCursor = LoadCursorA(NULL, (LPCSTR)IDC_ARROW); wndclass.hbrBackground = (HBRUSH)(COLOR_WINDOW + 1); wndclass.lpszClassName = szClassName; wndclass.lpszMenuName = NULL; - RegisterClassEx(&wndclass); - - hWnd = CreateWindow(szClassName, "WS2Test", WS_OVERLAPPEDWINDOW, 0, 0, 500, 500, NULL, NULL, GetModuleHandle(NULL), NULL); + RegisterClassExA(&wndclass); + + hWnd = CreateWindowA(szClassName, "WS2Test", WS_OVERLAPPEDWINDOW, + 0, 0, 500, 500, NULL, NULL, GetModuleHandleA(NULL), NULL); if (!hWnd) { ok(0, "failed to create window: %d\n", GetLastError()); @@ -4091,14 +4737,14 @@ goto end; } - ov.hEvent = CreateEvent(NULL, FALSE, FALSE, NULL); + ov.hEvent = CreateEventA(NULL, FALSE, FALSE, NULL); if (ov.hEvent == NULL) { ok(0, "could not create event object, errno = %d\n", GetLastError()); goto end; } - ov2.hEvent = CreateEvent(NULL, FALSE, FALSE, NULL); + ov2.hEvent = CreateEventA(NULL, FALSE, FALSE, NULL); if (ov2.hEvent == NULL) { ok(0, "could not create event object, errno = %d\n", GetLastError()); @@ -4257,12 +4903,12 @@ * take some of it, and we will get a short write. This will trigger * another FD_WRITE event as soon as data is sent and more space becomes * available, but not any earlier. */ - drain_pause=1; + drain_pause = TRUE; do { ret = send(src, buffer, bufferSize, 0); } while (ret == bufferSize); - drain_pause=0; + drain_pause = FALSE; if (ret >= 0 || WSAGetLastError() == WSAEWOULDBLOCK) { Sleep(400); /* win9x */ @@ -4461,6 +5107,181 @@ closesocket(v6); } +static void test_WSASendMsg(void) +{ + SOCKET sock, dst; + struct sockaddr_in sendaddr, sockaddr; + GUID WSASendMsg_GUID = WSAID_WSASENDMSG; + LPFN_WSASENDMSG pWSASendMsg = NULL; + char teststr[12] = "hello world", buffer[32]; + WSABUF iovec[2]; + WSAMSG msg; + DWORD bytesSent, err; + int ret, addrlen; + + /* FIXME: Missing OVERLAPPED and OVERLAPPED COMPLETION ROUTINE tests */ + + sock = socket(AF_INET, SOCK_DGRAM, 0); + ok(sock != INVALID_SOCKET, "socket() failed\n"); + + /* Obtain the WSASendMsg function */ + WSAIoctl(sock, SIO_GET_EXTENSION_FUNCTION_POINTER, &WSASendMsg_GUID, sizeof(WSASendMsg_GUID), + &pWSASendMsg, sizeof(pWSASendMsg), &err, NULL, NULL); + if (!pWSASendMsg) + { + closesocket(sock); + win_skip("WSASendMsg is unsupported, some tests will be skipped.\n"); + return; + } + + /* fake address for now */ + sendaddr.sin_family = AF_INET; + sendaddr.sin_port = htons(139); + sendaddr.sin_addr.s_addr = inet_addr("127.0.0.1"); + + memset(&msg, 0, sizeof(msg)); + iovec[0].buf = teststr; + iovec[0].len = sizeof(teststr); + iovec[1].buf = teststr; + iovec[1].len = sizeof(teststr) / 2; + msg.name = (struct sockaddr *) &sendaddr; + msg.namelen = sizeof(sendaddr); + msg.lpBuffers = iovec; + msg.dwBufferCount = 1; /* send only one buffer for now */ + + WSASetLastError(0xdeadbeef); + ret = pWSASendMsg(INVALID_SOCKET, &msg, 0, NULL, NULL, NULL); + ok(ret == SOCKET_ERROR, "WSASendMsg should have failed\n"); + err = WSAGetLastError(); + ok(err == WSAENOTSOCK, "expected 10038, got %d instead\n", err); + + WSASetLastError(0xdeadbeef); + ret = pWSASendMsg(sock, NULL, 0, NULL, NULL, NULL); + ok(ret == SOCKET_ERROR, "WSASendMsg should have failed\n"); + err = WSAGetLastError(); + ok(err == WSAEFAULT, "expected 10014, got %d instead\n", err); + + WSASetLastError(0xdeadbeef); + ret = pWSASendMsg(sock, NULL, 0, &bytesSent, NULL, NULL); + ok(ret == SOCKET_ERROR, "WSASendMsg should have failed\n"); + err = WSAGetLastError(); + ok(err == WSAEFAULT, "expected 10014, got %d instead\n", err); + + WSASetLastError(0xdeadbeef); + ret = pWSASendMsg(sock, &msg, 0, NULL, NULL, NULL); + ok(ret == SOCKET_ERROR, "WSASendMsg should have failed\n"); + err = WSAGetLastError(); + ok(err == WSAEFAULT, "expected 10014, got %d instead\n", err); + + closesocket(sock); + + sock = socket(AF_INET, SOCK_DGRAM, 0); + ok(sock != INVALID_SOCKET, "socket() failed\n"); + + dst = socket(AF_INET, SOCK_DGRAM, 0); + ok(dst != INVALID_SOCKET, "socket() failed\n"); + + memset(&sockaddr, 0, sizeof(sockaddr)); + sockaddr.sin_family = AF_INET; + sockaddr.sin_addr.s_addr = inet_addr("127.0.0.1"); + ok(!bind(dst, (struct sockaddr*)&sockaddr, sizeof(sockaddr)), + "bind should have worked\n"); + + /* read address to find out the port number to be used in send */ + memset(&sendaddr, 0, sizeof(sendaddr)); + addrlen = sizeof(sendaddr); + ok(!getsockname(dst, (struct sockaddr *) &sendaddr, &addrlen), + "getsockname should have worked\n"); + ok(sendaddr.sin_port, "socket port should be != 0\n"); + + /* ensure the sending socket is not bound */ + WSASetLastError(0xdeadbeef); + addrlen = sizeof(sockaddr); + ret = getsockname(sock, (struct sockaddr*)&sockaddr, &addrlen); + ok(ret == SOCKET_ERROR, "getsockname should have failed\n"); + err = WSAGetLastError(); + ok(err == WSAEINVAL, "expected 10022, got %d instead\n", err); + + set_blocking(sock, TRUE); + + bytesSent = 0; + ret = pWSASendMsg(sock, &msg, 0, &bytesSent, NULL, NULL); + ok(!ret, "WSASendMsg should have worked\n"); + ok(bytesSent == iovec[0].len, "incorret bytes sent, expected %d, sent %d\n", + iovec[0].len, bytesSent); + + /* receive data */ + addrlen = sizeof(sockaddr); + memset(buffer, 0, sizeof(buffer)); + ret = recvfrom(dst, buffer, sizeof(buffer), 0, (struct sockaddr *) &sockaddr, &addrlen); + ok(ret == bytesSent, "got %d, expected %d\n", + ret, bytesSent); + + /* A successful call to WSASendMsg must have bound the socket */ + addrlen = sizeof(sockaddr); + sockaddr.sin_port = 0; + sockaddr.sin_addr.s_addr = inet_addr("127.0.0.1"); + ret = getsockname(sock, (struct sockaddr*)&sockaddr, &addrlen); + ok(!ret, "getsockname should have worked\n"); + ok(sockaddr.sin_addr.s_addr == htonl(INADDR_ANY), "expected 0.0.0.0, got %s\n", + inet_ntoa(sockaddr.sin_addr)); + ok(sockaddr.sin_port, "sin_port should be != 0\n"); + + msg.dwBufferCount = 2; /* send both buffers */ + + bytesSent = 0; + ret = pWSASendMsg(sock, &msg, 0, &bytesSent, NULL, NULL); + ok(!ret, "WSASendMsg should have worked\n"); + ok(bytesSent == iovec[0].len + iovec[1].len, "incorret bytes sent, expected %d, sent %d\n", + iovec[0].len + iovec[1].len, bytesSent); + + /* receive data */ + addrlen = sizeof(sockaddr); + memset(buffer, 0, sizeof(buffer)); + ret = recvfrom(dst, buffer, sizeof(buffer), 0, (struct sockaddr *) &sockaddr, &addrlen); + ok(ret == bytesSent, "got %d, expected %d\n", + ret, bytesSent); + + closesocket(sock); + closesocket(dst); + + /* a bad call to WSASendMsg will also bind the socket */ + addrlen = sizeof(sockaddr); + sockaddr.sin_port = 0; + sockaddr.sin_addr.s_addr = inet_addr("127.0.0.1"); + sock = socket(AF_INET, SOCK_DGRAM, 0); + ok(sock != INVALID_SOCKET, "socket() failed\n"); + ok(pWSASendMsg(sock, &msg, 0, NULL, NULL, NULL) == SOCKET_ERROR, "WSASendMsg should have failed\n"); +todo_wine { + ok(!getsockname(sock, (struct sockaddr*)&sockaddr, &addrlen), "getsockname should have worked\n"); + ok(sockaddr.sin_addr.s_addr == htonl(INADDR_ANY), "expected 0.0.0.0, got %s\n", + inet_ntoa(sockaddr.sin_addr)); + ok(sockaddr.sin_port, "sin_port should be > 0\n"); +} + closesocket(sock); + + /* a bad call without msg parameter will not trigger the auto-bind */ + sock = socket(AF_INET, SOCK_DGRAM, 0); + ok(sock != INVALID_SOCKET, "socket() failed\n"); + ok(pWSASendMsg(sock, NULL, 0, NULL, NULL, NULL) == SOCKET_ERROR, "WSASendMsg should have failed\n"); + ok(getsockname(sock, (struct sockaddr*)&sockaddr, &addrlen), "getsockname should have failed\n"); + err = WSAGetLastError(); + ok(err == WSAEINVAL, "expected 10022, got %d instead\n", err); + closesocket(sock); + + /* SOCK_STREAM sockets are not supported */ + bytesSent = 0; + sock = socket(AF_INET, SOCK_STREAM, 0); + ok(sock != INVALID_SOCKET, "socket() failed\n"); + SetLastError(0xdeadbeef); + ret = pWSASendMsg(sock, &msg, 0, &bytesSent, NULL, NULL); + ok(ret == SOCKET_ERROR, "WSASendMsg should have failed\n"); + err = WSAGetLastError(); +todo_wine + ok(err == WSAEINVAL, "expected 10014, got %d instead\n", err); + closesocket(sock); +} + static void test_WSASendTo(void) { SOCKET s; @@ -4545,7 +5366,7 @@ bufs.buf = buf; flags = 0; - ov.hEvent = CreateEvent(NULL, FALSE, FALSE, NULL); + ov.hEvent = CreateEventA(NULL, FALSE, FALSE, NULL); ok(ov.hEvent != NULL, "could not create event object, errno = %d\n", GetLastError()); if (!ov.hEvent) goto end; @@ -4623,9 +5444,11 @@ static const WCHAR port[] = {'8','0',0}; static const WCHAR empty[] = {0}; static const WCHAR localhost[] = {'l','o','c','a','l','h','o','s','t',0}; + static const WCHAR nxdomain[] = + {'n','x','d','o','m','a','i','n','.','c','o','d','e','w','e','a','v','e','r','s','.','c','o','m',0}; static const WCHAR zero[] = {'0',0}; - int ret; - ADDRINFOW *result, hint; + int i, ret; + ADDRINFOW *result, *result2, *p, hint; if (!pGetAddrInfoW || !pFreeAddrInfoW) { @@ -4634,8 +5457,10 @@ } memset(&hint, 0, sizeof(ADDRINFOW)); + result = (ADDRINFOW *)0xdeadbeef; ret = pGetAddrInfoW(NULL, NULL, NULL, &result); ok(ret == WSAHOST_NOT_FOUND, "got %d expected WSAHOST_NOT_FOUND\n", ret); + ok(result == NULL, "got %p\n", result); result = NULL; ret = pGetAddrInfoW(empty, NULL, NULL, &result); @@ -4647,13 +5472,27 @@ ret = pGetAddrInfoW(NULL, zero, NULL, &result); ok(!ret, "GetAddrInfoW failed with %d\n", WSAGetLastError()); ok(result != NULL, "GetAddrInfoW failed\n"); + + result2 = NULL; + ret = pGetAddrInfoW(NULL, empty, NULL, &result2); + ok(!ret, "GetAddrInfoW failed with %d\n", WSAGetLastError()); + ok(result2 != NULL, "GetAddrInfoW failed\n"); + compare_addrinfow(result, result2); pFreeAddrInfoW(result); + pFreeAddrInfoW(result2); result = NULL; ret = pGetAddrInfoW(empty, zero, NULL, &result); ok(!ret, "GetAddrInfoW failed with %d\n", WSAGetLastError()); ok(result != NULL, "GetAddrInfoW failed\n"); + + result2 = NULL; + ret = pGetAddrInfoW(empty, empty, NULL, &result2); + ok(!ret, "GetAddrInfoW failed with %d\n", WSAGetLastError()); + ok(result2 != NULL, "GetAddrInfoW failed\n"); + compare_addrinfow(result, result2); pFreeAddrInfoW(result); + pFreeAddrInfoW(result2); result = NULL; ret = pGetAddrInfoW(localhost, NULL, NULL, &result); @@ -4676,15 +5515,91 @@ pFreeAddrInfoW(result); result = NULL; + ret = pGetAddrInfoW(localhost, NULL, &hint, &result); + ok(!ret, "GetAddrInfoW failed with %d\n", WSAGetLastError()); + pFreeAddrInfoW(result); + + result = NULL; ret = pGetAddrInfoW(localhost, port, &hint, &result); ok(!ret, "GetAddrInfoW failed with %d\n", WSAGetLastError()); pFreeAddrInfoW(result); + + result = (ADDRINFOW *)0xdeadbeef; + ret = pGetAddrInfoW(NULL, NULL, NULL, &result); + if(ret == 0) + { + skip("nxdomain returned success. Broken ISP redirects?\n"); + return; + } + ok(ret == WSAHOST_NOT_FOUND, "got %d expected WSAHOST_NOT_FOUND\n", ret); + ok(result == NULL, "got %p\n", result); + + result = (ADDRINFOW *)0xdeadbeef; + ret = pGetAddrInfoW(nxdomain, NULL, NULL, &result); + if(ret == 0) + { + skip("nxdomain returned success. Broken ISP redirects?\n"); + return; + } + ok(ret == WSAHOST_NOT_FOUND, "got %d expected WSAHOST_NOT_FOUND\n", ret); + ok(result == NULL, "got %p\n", result); + + for (i = 0;i < (sizeof(hinttests) / sizeof(hinttests[0]));i++) + { + hint.ai_family = hinttests[i].family; + hint.ai_socktype = hinttests[i].socktype; + hint.ai_protocol = hinttests[i].protocol; + + result = NULL; + SetLastError(0xdeadbeef); + ret = pGetAddrInfoW(localhost, NULL, &hint, &result); + if (!ret) + { + if (hinttests[i].error) + ok(0, "test %d: GetAddrInfoW succeeded unexpectedly\n", i); + else + { + p = result; + do + { + /* when AF_UNSPEC is used the return will be either AF_INET or AF_INET6 */ + if (hinttests[i].family == AF_UNSPEC) + ok(p->ai_family == AF_INET || p->ai_family == AF_INET6, + "test %d: expected AF_INET or AF_INET6, got %d\n", + i, p->ai_family); + else + ok(p->ai_family == hinttests[i].family, + "test %d: expected family %d, got %d\n", + i, hinttests[i].family, p->ai_family); + + ok(p->ai_socktype == hinttests[i].socktype, + "test %d: expected type %d, got %d\n", + i, hinttests[i].socktype, p->ai_socktype); + ok(p->ai_protocol == hinttests[i].protocol, + "test %d: expected protocol %d, got %d\n", + i, hinttests[i].protocol, p->ai_protocol); + p = p->ai_next; + } + while (p); + } + pFreeAddrInfoW(result); + } + else + { + DWORD err = WSAGetLastError(); + if (hinttests[i].error) + ok(hinttests[i].error == err, "test %d: GetAddrInfoW failed with error %d, expected %d\n", + i, err, hinttests[i].error); + else + ok(0, "test %d: GetAddrInfoW failed with %d (err %d)\n", i, ret, err); + } + } } static void test_getaddrinfo(void) { - int ret; - ADDRINFOA *result, hint; + int i, ret; + ADDRINFOA *result, *result2, *p, hint; if (!pgetaddrinfo || !pfreeaddrinfo) { @@ -4693,8 +5608,10 @@ } memset(&hint, 0, sizeof(ADDRINFOA)); + result = (ADDRINFOA *)0xdeadbeef; ret = pgetaddrinfo(NULL, NULL, NULL, &result); ok(ret == WSAHOST_NOT_FOUND, "got %d expected WSAHOST_NOT_FOUND\n", ret); + ok(result == NULL, "got %p\n", result); result = NULL; ret = pgetaddrinfo("", NULL, NULL, &result); @@ -4706,13 +5623,27 @@ ret = pgetaddrinfo(NULL, "0", NULL, &result); ok(!ret, "getaddrinfo failed with %d\n", WSAGetLastError()); ok(result != NULL, "getaddrinfo failed\n"); + + result2 = NULL; + ret = pgetaddrinfo(NULL, "", NULL, &result2); + ok(!ret, "getaddrinfo failed with %d\n", WSAGetLastError()); + ok(result2 != NULL, "getaddrinfo failed\n"); + compare_addrinfo(result, result2); pfreeaddrinfo(result); + pfreeaddrinfo(result2); result = NULL; ret = pgetaddrinfo("", "0", NULL, &result); ok(!ret, "getaddrinfo failed with %d\n", WSAGetLastError()); ok(result != NULL, "getaddrinfo failed\n"); + + result2 = NULL; + ret = pgetaddrinfo("", "", NULL, &result2); + ok(!ret, "getaddrinfo failed with %d\n", WSAGetLastError()); + ok(result2 != NULL, "getaddrinfo failed\n"); + compare_addrinfo(result, result2); pfreeaddrinfo(result); + pfreeaddrinfo(result2); result = NULL; ret = pgetaddrinfo("localhost", NULL, NULL, &result); @@ -4735,9 +5666,75 @@ pfreeaddrinfo(result); result = NULL; + ret = pgetaddrinfo("localhost", NULL, &hint, &result); + ok(!ret, "getaddrinfo failed with %d\n", WSAGetLastError()); + pfreeaddrinfo(result); + + result = NULL; ret = pgetaddrinfo("localhost", "80", &hint, &result); ok(!ret, "getaddrinfo failed with %d\n", WSAGetLastError()); pfreeaddrinfo(result); + + result = (ADDRINFOA *)0xdeadbeef; + ret = pgetaddrinfo("nxdomain.codeweavers.com", NULL, NULL, &result); + if(ret == 0) + { + skip("nxdomain returned success. Broken ISP redirects?\n"); + return; + } + ok(ret == WSAHOST_NOT_FOUND, "got %d expected WSAHOST_NOT_FOUND\n", ret); + ok(result == NULL, "got %p\n", result); + + for (i = 0;i < (sizeof(hinttests) / sizeof(hinttests[0]));i++) + { + hint.ai_family = hinttests[i].family; + hint.ai_socktype = hinttests[i].socktype; + hint.ai_protocol = hinttests[i].protocol; + + result = NULL; + SetLastError(0xdeadbeef); + ret = pgetaddrinfo("localhost", NULL, &hint, &result); + if(!ret) + { + if (hinttests[i].error) + ok(0, "test %d: getaddrinfo succeeded unexpectedly\n", i); + else + { + p = result; + do + { + /* when AF_UNSPEC is used the return will be either AF_INET or AF_INET6 */ + if (hinttests[i].family == AF_UNSPEC) + ok(p->ai_family == AF_INET || p->ai_family == AF_INET6, + "test %d: expected AF_INET or AF_INET6, got %d\n", + i, p->ai_family); + else + ok(p->ai_family == hinttests[i].family, + "test %d: expected family %d, got %d\n", + i, hinttests[i].family, p->ai_family); + + ok(p->ai_socktype == hinttests[i].socktype, + "test %d: expected type %d, got %d\n", + i, hinttests[i].socktype, p->ai_socktype); + ok(p->ai_protocol == hinttests[i].protocol, + "test %d: expected protocol %d, got %d\n", + i, hinttests[i].protocol, p->ai_protocol); + p = p->ai_next; + } + while (p); + } + pfreeaddrinfo(result); + } + else + { + DWORD err = WSAGetLastError(); + if (hinttests[i].error) + ok(hinttests[i].error == err, "test %d: getaddrinfo failed with error %d, expected %d\n", + i, err, hinttests[i].error); + else + ok(0, "test %d: getaddrinfo failed with %d (err %d)\n", i, ret, err); + } + } } static void test_ConnectEx(void) @@ -4803,7 +5800,7 @@ "returned %d + errno %d\n", bret, WSAGetLastError()); bret = pConnectEx(connector, (struct sockaddr*)&address, addrlen, NULL, 0, &bytesReturned, &overlapped); - todo_wine ok(bret == FALSE && WSAGetLastError() == WSAEINVAL, "ConnectEx on a unbound socket " + ok(bret == FALSE && WSAGetLastError() == WSAEINVAL, "ConnectEx on a unbound socket " "returned %d + errno %d\n", bret, WSAGetLastError()); if (bret == TRUE || WSAGetLastError() != WSAEINVAL) { @@ -4835,7 +5832,7 @@ ok(bret == FALSE && WSAGetLastError() == ERROR_INVALID_PARAMETER, "ConnectEx on a NULL overlapped " "returned %d + errno %d\n", bret, WSAGetLastError()); - overlapped.hEvent = CreateEvent(NULL, FALSE, FALSE, NULL); + overlapped.hEvent = CreateEventA(NULL, FALSE, FALSE, NULL); if (overlapped.hEvent == NULL) { skip("could not create event object, errno = %d\n", GetLastError()); goto end; @@ -5038,10 +6035,23 @@ ok(bret == FALSE && WSAGetLastError() == WSAENOTSOCK, "AcceptEx on invalid listening socket " "returned %d + errno %d\n", bret, WSAGetLastError()); + bret = pAcceptEx(listener, acceptor, buffer, sizeof(buffer) - 2*(sizeof(struct sockaddr_in) + 16), + sizeof(struct sockaddr_in) + 16, sizeof(struct sockaddr_in) + 16, + &bytesReturned, &overlapped); +todo_wine + ok(bret == FALSE && WSAGetLastError() == WSAEINVAL, "AcceptEx on a non-listening socket " + "returned %d + errno %d\n", bret, WSAGetLastError()); + + iret = listen(listener, 5); + if (iret != 0) { + skip("listening failed, errno = %d\n", WSAGetLastError()); + goto end; + } + bret = pAcceptEx(listener, INVALID_SOCKET, buffer, sizeof(buffer) - 2*(sizeof(struct sockaddr_in) + 16), sizeof(struct sockaddr_in) + 16, sizeof(struct sockaddr_in) + 16, &bytesReturned, &overlapped); - ok(bret == FALSE && WSAGetLastError() == WSAEINVAL, "AcceptEx on invalid accepting socket " + ok(bret == FALSE && WSAGetLastError() == WSAENOTSOCK, "AcceptEx on invalid accepting socket " "returned %d + errno %d\n", bret, WSAGetLastError()); bret = pAcceptEx(listener, acceptor, NULL, sizeof(buffer) - 2*(sizeof(struct sockaddr_in) + 16), @@ -5054,13 +6064,31 @@ bret = pAcceptEx(listener, acceptor, buffer, 0, 0, sizeof(struct sockaddr_in) + 16, &bytesReturned, &overlapped); - todo_wine ok(bret == FALSE && WSAGetLastError() == WSAEINVAL, "AcceptEx on too small local address size " - "returned %d + errno %d\n", bret, WSAGetLastError()); + ok(bret == FALSE && (WSAGetLastError() == ERROR_IO_PENDING || broken(WSAGetLastError() == WSAEINVAL)) /* NT4 */, + "AcceptEx on too small local address size returned %d + errno %d\n", + bret, WSAGetLastError()); + bret = CancelIo((HANDLE) listener); + ok(bret, "Failed to cancel pending accept socket\n"); + + bret = pAcceptEx(listener, acceptor, buffer, 0, sizeof(struct sockaddr_in) + 15, + sizeof(struct sockaddr_in) + 16, &bytesReturned, &overlapped); + ok(bret == FALSE && WSAGetLastError() == ERROR_IO_PENDING, "AcceptEx on too small local address " + "size returned %d + errno %d\n", + bret, WSAGetLastError()); + bret = CancelIo((HANDLE) listener); + ok(bret, "Failed to cancel pending accept socket\n"); bret = pAcceptEx(listener, acceptor, buffer, 0, sizeof(struct sockaddr_in) + 16, 0, &bytesReturned, &overlapped); - todo_wine ok(bret == FALSE && WSAGetLastError() == WSAEINVAL, "AcceptEx on too small remote address size " - "returned %d + errno %d\n", bret, WSAGetLastError()); + ok(bret == FALSE && (WSAGetLastError() == WSAEFAULT || broken(WSAGetLastError() == WSAEINVAL)) /* NT4 */, + "AcceptEx on too small remote address size returned %d + errno %d\n", bret, WSAGetLastError()); + + bret = pAcceptEx(listener, acceptor, buffer, 0, sizeof(struct sockaddr_in) + 16, + sizeof(struct sockaddr_in) + 15, &bytesReturned, &overlapped); + ok(bret == FALSE && (WSAGetLastError() == ERROR_IO_PENDING || broken(WSAGetLastError() == WSAEINVAL)) /* NT4 */, + "AcceptEx on too small remote address size returned %d + errno %d\n", bret, WSAGetLastError()); + bret = CancelIo((HANDLE) listener); + ok(bret, "Failed to cancel pending accept socket\n"); bret = pAcceptEx(listener, acceptor, buffer, 0, sizeof(struct sockaddr_in) + 16, sizeof(struct sockaddr_in) + 16, @@ -5068,19 +6096,11 @@ ok(bret == FALSE && WSAGetLastError() == ERROR_INVALID_PARAMETER, "AcceptEx on a NULL overlapped " "returned %d + errno %d\n", bret, WSAGetLastError()); - bret = pAcceptEx(listener, acceptor, buffer, sizeof(buffer) - 2*(sizeof(struct sockaddr_in) + 16), - sizeof(struct sockaddr_in) + 16, sizeof(struct sockaddr_in) + 16, - &bytesReturned, &overlapped); - todo_wine ok(bret == FALSE && WSAGetLastError() == WSAEINVAL, "AcceptEx on a non-listening socket " + bret = pAcceptEx(listener, acceptor, buffer, 0, 0, 0, &bytesReturned, NULL); + ok(bret == FALSE && WSAGetLastError() == ERROR_INVALID_PARAMETER, "AcceptEx on a NULL overlapped " "returned %d + errno %d\n", bret, WSAGetLastError()); - iret = listen(listener, 5); - if (iret != 0) { - skip("listening failed, errno = %d\n", WSAGetLastError()); - goto end; - } - - overlapped.hEvent = CreateEvent(NULL, FALSE, FALSE, NULL); + overlapped.hEvent = CreateEventA(NULL, FALSE, FALSE, NULL); if (overlapped.hEvent == NULL) { skip("could not create event object, errno = %d\n", GetLastError()); goto end; @@ -5446,6 +6466,7 @@ { SOCKET sock; struct sockaddr_in sa, sa_out; + SOCKADDR_STORAGE ss; int sa_len; const char buf[] = "hello world"; int ret; @@ -5504,17 +6525,31 @@ "Expected WSAGetLastError() to return WSAEFAULT, got %d\n", WSAGetLastError()); } - sa_len = 0; - ret = getpeername(sock, (struct sockaddr*)&sa_out, &sa_len); + ret = getpeername(sock, (struct sockaddr*)&sa_out, NULL); ok(ret == SOCKET_ERROR, "Expected getpeername to return 0, got %d\n", ret); ok(WSAGetLastError() == WSAEFAULT, "Expected WSAGetLastError() to return WSAEFAULT, got %d\n", WSAGetLastError()); - sa_len = sizeof(sa_out); - ret = getpeername(sock, (struct sockaddr*)&sa_out, &sa_len); + sa_len = 0; + ret = getpeername(sock, NULL, &sa_len); + ok(ret == SOCKET_ERROR, "Expected getpeername to return 0, got %d\n", ret); + ok(WSAGetLastError() == WSAEFAULT, + "Expected WSAGetLastError() to return WSAEFAULT, got %d\n", WSAGetLastError()); + ok(!sa_len, "got %d\n", sa_len); + + sa_len = 0; + ret = getpeername(sock, (struct sockaddr *)&ss, &sa_len); + ok(ret == SOCKET_ERROR, "Expected getpeername to return 0, got %d\n", ret); + ok(WSAGetLastError() == WSAEFAULT, + "Expected WSAGetLastError() to return WSAEFAULT, got %d\n", WSAGetLastError()); + ok(!sa_len, "got %d\n", sa_len); + + sa_len = sizeof(ss); + ret = getpeername(sock, (struct sockaddr *)&ss, &sa_len); ok(ret == 0, "Expected getpeername to return 0, got %d\n", ret); - ok(!memcmp(&sa, &sa_out, sizeof(sa)), + ok(!memcmp(&sa, &ss, sizeof(sa)), "Expected the returned structure to be identical to the connect structure\n"); + ok(sa_len == sizeof(sa), "got %d\n", sa_len); closesocket(sock); } @@ -5627,16 +6662,16 @@ wndclass.cbClsExtra = 0; wndclass.cbWndExtra = 0; wndclass.hInstance = GetModuleHandleA(NULL); - wndclass.hIcon = LoadIconA(NULL, IDI_APPLICATION); - wndclass.hIconSm = LoadIconA(NULL, IDI_APPLICATION); - wndclass.hCursor = LoadCursorA(NULL, IDC_ARROW); + wndclass.hIcon = LoadIconA(NULL, (LPCSTR)IDI_APPLICATION); + wndclass.hIconSm = LoadIconA(NULL, (LPCSTR)IDI_APPLICATION); + wndclass.hCursor = LoadCursorA(NULL, (LPCSTR)IDC_ARROW); wndclass.hbrBackground = (HBRUSH)(COLOR_WINDOW + 1); wndclass.lpszClassName = class_name; wndclass.lpszMenuName = NULL; RegisterClassExA(&wndclass); - hWnd = CreateWindow(class_name, "ws2_32 async message window", WS_OVERLAPPEDWINDOW, + hWnd = CreateWindowA(class_name, "ws2_32 async message window", WS_OVERLAPPEDWINDOW, 0, 0, 500, 500, NULL, NULL, GetModuleHandleA(NULL), NULL); if (!hWnd) { @@ -5994,8 +7029,8 @@ io_port = CreateIoCompletionPort((HANDLE)src, previous_port, 125, 0); ok(io_port != NULL, "failed to create completion port %u\n", GetLastError()); - WSADuplicateSocket( src, GetCurrentProcessId(), &info ); - dup = WSASocket(AF_INET, SOCK_STREAM, 0, &info, 0, WSA_FLAG_OVERLAPPED); + WSADuplicateSocketA( src, GetCurrentProcessId(), &info ); + dup = WSASocketA(AF_INET, SOCK_STREAM, 0, &info, 0, WSA_FLAG_OVERLAPPED); ok(dup != INVALID_SOCKET, "failed to duplicate socket!\n"); bret = pAcceptEx(dup, dest, buf, sizeof(buf) - 2*(sizeof(struct sockaddr_in) + 16), @@ -6053,8 +7088,8 @@ io_port = CreateIoCompletionPort((HANDLE)src, previous_port, 125, 0); ok(io_port != NULL, "failed to create completion port %u\n", GetLastError()); - WSADuplicateSocket( src, GetCurrentProcessId(), &info ); - dup = WSASocket(AF_INET, SOCK_STREAM, 0, &info, 0, WSA_FLAG_OVERLAPPED); + WSADuplicateSocketA( src, GetCurrentProcessId(), &info ); + dup = WSASocketA(AF_INET, SOCK_STREAM, 0, &info, 0, WSA_FLAG_OVERLAPPED); ok(dup != INVALID_SOCKET, "failed to duplicate socket!\n"); bret = pAcceptEx(dup, dest, buf, sizeof(buf) - 2*(sizeof(struct sockaddr_in) + 16), @@ -6120,8 +7155,8 @@ io_port = CreateIoCompletionPort((HANDLE)src, previous_port, 125, 0); ok(io_port != NULL, "failed to create completion port %u\n", GetLastError()); - WSADuplicateSocket( src, GetCurrentProcessId(), &info ); - dup = WSASocket(AF_INET, SOCK_STREAM, 0, &info, 0, WSA_FLAG_OVERLAPPED); + WSADuplicateSocketA( src, GetCurrentProcessId(), &info ); + dup = WSASocketA(AF_INET, SOCK_STREAM, 0, &info, 0, WSA_FLAG_OVERLAPPED); ok(dup != INVALID_SOCKET, "failed to duplicate socket!\n"); bret = pAcceptEx(dup, dest, buf, sizeof(buf) - 2*(sizeof(struct sockaddr_in) + 16), @@ -6363,13 +7398,17 @@ ok(bret == FALSE, "failed to get completion status %u\n", bret); todo_wine ok(GetLastError() == ERROR_NETNAME_DELETED || GetLastError() == ERROR_OPERATION_ABORTED || - GetLastError() == ERROR_CONNECTION_ABORTED, "Last error was %d\n", GetLastError()); + GetLastError() == ERROR_CONNECTION_ABORTED || + GetLastError() == ERROR_PIPE_NOT_CONNECTED /* win 2000 */, + "Last error was %d\n", GetLastError()); ok(key == 125, "Key is %lu\n", key); ok(num_bytes == 0, "Number of bytes transferred is %u\n", num_bytes); ok(olp == &ov, "Overlapped structure is at %p\n", olp); todo_wine ok(olp && (olp->Internal == (ULONG)STATUS_LOCAL_DISCONNECT || olp->Internal == (ULONG)STATUS_CANCELLED || - olp->Internal == (ULONG)STATUS_CONNECTION_ABORTED), "Internal status is %lx\n", olp ? olp->Internal : 0); + olp->Internal == (ULONG)STATUS_CONNECTION_ABORTED || + olp->Internal == (ULONG)STATUS_PIPE_DISCONNECTED /* win 2000 */), + "Internal status is %lx\n", olp ? olp->Internal : 0); SetLastError(0xdeadbeef); key = 0xdeadbeef; @@ -6393,6 +7432,212 @@ CloseHandle(previous_port); } +static DWORD WINAPI inet_ntoa_thread_proc(void *param) +{ + ULONG addr; + const char *str; + HANDLE *event = param; + + addr = inet_addr("4.3.2.1"); + ok(addr == htonl(0x04030201), "expected 0x04030201, got %08x\n", addr); + str = inet_ntoa(*(struct in_addr *)&addr); + ok(!strcmp(str, "4.3.2.1"), "expected 4.3.2.1, got %s\n", str); + + SetEvent(event[0]); + WaitForSingleObject(event[1], 3000); + + return 0; +} + +static void test_inet_ntoa(void) +{ + ULONG addr; + const char *str; + HANDLE thread, event[2]; + DWORD tid; + + addr = inet_addr("1.2.3.4"); + ok(addr == htonl(0x01020304), "expected 0x01020304, got %08x\n", addr); + str = inet_ntoa(*(struct in_addr *)&addr); + ok(!strcmp(str, "1.2.3.4"), "expected 1.2.3.4, got %s\n", str); + + event[0] = CreateEventW(NULL, TRUE, FALSE, NULL); + event[1] = CreateEventW(NULL, TRUE, FALSE, NULL); + + thread = CreateThread(NULL, 0, inet_ntoa_thread_proc, event, 0, &tid); + WaitForSingleObject(event[0], 3000); + + ok(!strcmp(str, "1.2.3.4"), "expected 1.2.3.4, got %s\n", str); + + SetEvent(event[1]); + WaitForSingleObject(thread, 3000); + + CloseHandle(event[0]); + CloseHandle(event[1]); + CloseHandle(thread); +} + +static void test_WSALookupService(void) +{ + char buffer[4096], strbuff[128]; + WSAQUERYSETW *qs = NULL; + HANDLE hnd; + PNLA_BLOB netdata; + int ret; + DWORD error, offset, bsize; + + if (!pWSALookupServiceBeginW || !pWSALookupServiceEnd || !pWSALookupServiceNextW) + { + win_skip("WSALookupServiceBeginW or WSALookupServiceEnd or WSALookupServiceNextW not found\n"); + return; + } + + qs = (WSAQUERYSETW *)buffer; + memset(qs, 0, sizeof(*qs)); + + /* invalid parameter tests */ + ret = pWSALookupServiceBeginW(NULL, 0, &hnd); + error = WSAGetLastError(); + ok(ret == SOCKET_ERROR, "WSALookupServiceBeginW should have failed\n"); +todo_wine + ok(error == WSAEFAULT, "expected 10014, got %d\n", error); + + ret = pWSALookupServiceBeginW(qs, 0, NULL); + error = WSAGetLastError(); + ok(ret == SOCKET_ERROR, "WSALookupServiceBeginW should have failed\n"); +todo_wine + ok(error == WSAEFAULT, "expected 10014, got %d\n", error); + + ret = pWSALookupServiceBeginW(qs, 0, &hnd); + error = WSAGetLastError(); + ok(ret == SOCKET_ERROR, "WSALookupServiceBeginW should have failed\n"); +todo_wine + ok(error == WSAEINVAL + || broken(error == ERROR_INVALID_PARAMETER) /* == XP */ + || broken(error == WSAEFAULT) /* == NT */ + || broken(error == WSASERVICE_NOT_FOUND) /* == 2000 */, + "expected 10022, got %d\n", error); + + ret = pWSALookupServiceEnd(NULL); + error = WSAGetLastError(); +todo_wine + ok(ret == SOCKET_ERROR, "WSALookupServiceEnd should have failed\n"); +todo_wine + ok(error == ERROR_INVALID_HANDLE, "expected 6, got %d\n", error); + + /* standard network list query */ + qs->dwSize = sizeof(*qs); + hnd = (HANDLE)0xdeadbeef; + ret = pWSALookupServiceBeginW(qs, LUP_RETURN_ALL | LUP_DEEP, &hnd); + error = WSAGetLastError(); + if(ret && error == ERROR_INVALID_PARAMETER) + { + win_skip("the current WSALookupServiceBeginW test is not supported in win <= 2000\n"); + return; + } + +todo_wine + ok(!ret, "WSALookupServiceBeginW failed unexpectedly with error %d\n", error); +todo_wine + ok(hnd != (HANDLE)0xdeadbeef, "Handle was not filled\n"); + + offset = 0; + do + { + memset(qs, 0, sizeof(*qs)); + bsize = sizeof(buffer); + + if (pWSALookupServiceNextW(hnd, 0, &bsize, qs) == SOCKET_ERROR) + { + error = WSAGetLastError(); + if (error == WSA_E_NO_MORE) break; + ok(0, "Error %d happened while listing services\n", error); + break; + } + + WideCharToMultiByte(CP_ACP, 0, qs->lpszServiceInstanceName, -1, + strbuff, sizeof(strbuff), NULL, NULL); + trace("Network Name: %s\n", strbuff); + + /* network data is written in the blob field */ + if (qs->lpBlob) + { + /* each network may have multiple NLA_BLOB information structures */ + do + { + netdata = (PNLA_BLOB) &qs->lpBlob->pBlobData[offset]; + switch (netdata->header.type) + { + case NLA_RAW_DATA: + trace("\tNLA Data Type: NLA_RAW_DATA\n"); + break; + case NLA_INTERFACE: + trace("\tNLA Data Type: NLA_INTERFACE\n"); + trace("\t\tType: %d\n", netdata->data.interfaceData.dwType); + trace("\t\tSpeed: %d\n", netdata->data.interfaceData.dwSpeed); + trace("\t\tAdapter Name: %s\n", netdata->data.interfaceData.adapterName); + break; + case NLA_802_1X_LOCATION: + trace("\tNLA Data Type: NLA_802_1X_LOCATION\n"); + trace("\t\tInformation: %s\n", netdata->data.locationData.information); + break; + case NLA_CONNECTIVITY: + switch (netdata->data.connectivity.type) + { + case NLA_NETWORK_AD_HOC: + trace("\t\tNetwork Type: AD HOC\n"); + break; + case NLA_NETWORK_MANAGED: + trace("\t\tNetwork Type: Managed\n"); + break; + case NLA_NETWORK_UNMANAGED: + trace("\t\tNetwork Type: Unmanaged\n"); + break; + case NLA_NETWORK_UNKNOWN: + trace("\t\tNetwork Type: Unknown\n"); + } + switch (netdata->data.connectivity.internet) + { + case NLA_INTERNET_NO: + trace("\t\tInternet connectivity: No\n"); + break; + case NLA_INTERNET_YES: + trace("\t\tInternet connectivity: Yes\n"); + break; + case NLA_INTERNET_UNKNOWN: + trace("\t\tInternet connectivity: Unknown\n"); + break; + } + break; + case NLA_ICS: + trace("\tNLA Data Type: NLA_ICS\n"); + trace("\t\tSpeed: %d\n", + netdata->data.ICS.remote.speed); + trace("\t\tType: %d\n", + netdata->data.ICS.remote.type); + trace("\t\tState: %d\n", + netdata->data.ICS.remote.state); + WideCharToMultiByte(CP_ACP, 0, netdata->data.ICS.remote.machineName, -1, + strbuff, sizeof(strbuff), NULL, NULL); + trace("\t\tMachine Name: %s\n", strbuff); + WideCharToMultiByte(CP_ACP, 0, netdata->data.ICS.remote.sharedAdapterName, -1, + strbuff, sizeof(strbuff), NULL, NULL); + trace("\t\tShared Adapter Name: %s\n", strbuff); + break; + default: + trace("\tNLA Data Type: Unknown\n"); + break; + } + } + while (offset); + } + } + while (1); + + ret = pWSALookupServiceEnd(hnd); + ok(!ret, "WSALookupServiceEnd failed unexpectedly\n"); +} + /**************** Main program ***************/ START_TEST( sock ) @@ -6406,6 +7651,7 @@ Init(); + test_inet_ntoa(); test_set_getsockopt(); test_so_reuseaddr(); test_ip_pktinfo(); @@ -6422,6 +7668,7 @@ test_getservbyname(); test_WSASocket(); + test_WSADuplicateSocket(); test_WSAAddressToStringA(); test_WSAAddressToStringW(); @@ -6441,6 +7688,7 @@ test_dns(); test_gethostbyname_hack(); + test_WSASendMsg(); test_WSASendTo(); test_WSARecv(); @@ -6455,12 +7703,14 @@ test_sioRoutingInterfaceQuery(); + test_WSALookupService(); + test_WSAAsyncGetServByPort(); test_WSAAsyncGetServByName(); test_completion_port(); - /* this is a io heavy test, do it at the end so the kernel doesn't start dropping packets */ + /* this is an io heavy test, do it at the end so the kernel doesn't start dropping packets */ test_send(); test_synchronous_WSAIoctl();

10 years, 5 months

[akhaldi] 62859: [PSDK] * Import wsnwlink.h from Wine 1.7.17. CORE-8080

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Mon Apr 21 20:05:34 2014 New Revision: 62859 URL: http://svn.reactos.org/svn/reactos?rev=62859&view=rev Log: [PSDK] * Import wsnwlink.h from Wine 1.7.17. CORE-8080 Added: trunk/reactos/include/psdk/wsnwlink.h (with props) Added: trunk/reactos/include/psdk/wsnwlink.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/wsnwlink.h?re… ============================================================================== --- trunk/reactos/include/psdk/wsnwlink.h (added) +++ trunk/reactos/include/psdk/wsnwlink.h [iso-8859-1] Mon Apr 21 20:05:34 2014 @@ -0,0 +1,49 @@ +/* + * Copyright (C) 2003,2004 Roderick Colenbrander + * + * 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 + */ + +#ifndef _WSNWLINK_ +#define _WSNWLINK_ + +#define IPX_PTYPE 0x4000 +#define IPX_FILTERPTYPE 0x4001 +#define IPX_DSTYPE 0x4002 +#define IPX_STOPFILTERPTYPE 0x4003 +#define IPX_EXTENDED_ADDRESS 0x4004 +#define IPX_RECVHDR 0x4005 +#define IPX_MAXSIZE 0x4006 +#define IPX_ADDRESS 0x4007 +#define IPX_GETNETINFO 0x4008 +#define IPX_GETNETINFO_NORIP 0x4009 +#define IPX_SPXGETCONNECTIONSTATUS 0x400b +#define IPX_ADDRESS_NOTIFY 0x400c +#define IPX_MAX_ADAPTER_NUM 0x400d +#define IPX_RERIPNETNUMBER 0x400e +#define IPX_RECEIVE_BROADCAST 0x400f +#define IPX_IMMEDIATESPXACK 0x4010 + +typedef struct _IPX_ADDRESS_DATA { + INT adapternum; + UCHAR netnum[4]; + UCHAR nodenum[6]; + BOOLEAN wan; + BOOLEAN status; + INT maxpkt; + ULONG linkspeed; +} IPX_ADDRESS_DATA, *PIPX_ADDRESS_DATA; + +#endif /* _WSNWLINK_ */ Propchange: trunk/reactos/include/psdk/wsnwlink.h ------------------------------------------------------------------------------ svn:eol-style = native

10 years, 5 months

← Newer
1
...
20
21
22
23
24
25
26
...
50
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs April 2014