Ros-diffs December 2012

ros-diffs@reactos.org

12 participants
287 discussions

[akhaldi] 57872: [XMLLITE]: Sync with Wine 1.5.19.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Tue Dec 11 10:53:36 2012 New Revision: 57872 URL: http://svn.reactos.org/svn/reactos?rev=57872&view=rev Log: [XMLLITE]: Sync with Wine 1.5.19. Modified: trunk/reactos/dll/win32/xmllite/CMakeLists.txt trunk/reactos/dll/win32/xmllite/reader.c trunk/reactos/include/psdk/xmllite.idl trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/xmllite/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/xmllite/CMakeLis… ============================================================================== --- trunk/reactos/dll/win32/xmllite/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/xmllite/CMakeLists.txt [iso-8859-1] Tue Dec 11 10:53:36 2012 @@ -12,12 +12,14 @@ ${CMAKE_CURRENT_BINARY_DIR}/xmllite_stubs.c ${CMAKE_CURRENT_BINARY_DIR}/xmllite.def) +if(NOT MSVC) + # FIXME: http://www.cmake.org/Bug/view.php?id=12998 + #allow_warnings(xmllite) + set_source_files_properties(reader.c PROPERTIES COMPILE_FLAGS "-Wno-error") +endif() + add_library(xmllite SHARED ${SOURCE}) - set_module_type(xmllite win32dll) - target_link_libraries(xmllite wine uuid) - add_importlibs(xmllite msvcrt kernel32 ntdll) - add_cd_file(TARGET xmllite DESTINATION reactos/system32 FOR all) Modified: trunk/reactos/dll/win32/xmllite/reader.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/xmllite/reader.c… ============================================================================== --- trunk/reactos/dll/win32/xmllite/reader.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/xmllite/reader.c [iso-8859-1] Tue Dec 11 10:53:36 2012 @@ -1,7 +1,7 @@ /* * IXmlReader implementation * - * Copyright 2010 Nikolay Sivov + * Copyright 2010, 2012 Nikolay Sivov * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -26,33 +26,104 @@ #include "initguid.h" #include "objbase.h" #include "xmllite.h" +#include "xmllite_private.h" #include "wine/debug.h" +#include "wine/list.h" +#include "wine/unicode.h" WINE_DEFAULT_DEBUG_CHANNEL(xmllite); /* not defined in public headers */ DEFINE_GUID(IID_IXmlReaderInput, 0x0b3ccc9b, 0x9214, 0x428b, 0xa2, 0xae, 0xef, 0x3a, 0xa8, 0x71, 0xaf, 0xda); -static HRESULT xmlreaderinput_query_for_stream(IXmlReaderInput *iface, void **pObj); +typedef enum +{ + XmlEncoding_UTF16, + XmlEncoding_UTF8, + XmlEncoding_Unknown +} xml_encoding; + +static const WCHAR utf16W[] = {'U','T','F','-','1','6',0}; +static const WCHAR utf8W[] = {'U','T','F','-','8',0}; + +static const WCHAR dblquoteW[] = {'\"',0}; +static const WCHAR quoteW[] = {'\'',0}; + +struct xml_encoding_data +{ + const WCHAR *name; + xml_encoding enc; + UINT cp; +}; + +static const struct xml_encoding_data xml_encoding_map[] = { + { utf16W, XmlEncoding_UTF16, ~0 }, + { utf8W, XmlEncoding_UTF8, CP_UTF8 } +}; + +typedef struct +{ + char *data; + char *cur; + unsigned int allocated; + unsigned int written; +} encoded_buffer; + +typedef struct input_buffer input_buffer; + +typedef struct _xmlreaderinput +{ + IXmlReaderInput IXmlReaderInput_iface; + LONG ref; + /* reference passed on IXmlReaderInput creation, is kept when input is created */ + IUnknown *input; + IMalloc *imalloc; + xml_encoding encoding; + BOOL hint; + WCHAR *baseuri; + /* stream reference set after SetInput() call from reader, + stored as sequential stream, cause currently + optimizations possible with IStream aren't implemented */ + ISequentialStream *stream; + input_buffer *buffer; +} xmlreaderinput; + +typedef struct +{ + const WCHAR *str; + UINT len; +} strval; + +struct attribute +{ + struct list entry; + strval localname; + strval value; +}; typedef struct _xmlreader { IXmlReader IXmlReader_iface; LONG ref; - IXmlReaderInput *input; - ISequentialStream *stream;/* stored as sequential stream, cause currently - optimizations possible with IStream aren't implemented */ + xmlreaderinput *input; + IMalloc *imalloc; XmlReadState state; + XmlNodeType nodetype; + DtdProcessing dtdmode; UINT line, pos; /* reader position in XML stream */ + struct list attrs; /* attributes list for current node */ + struct attribute *attr; /* current attribute */ + UINT attr_count; } xmlreader; -typedef struct _xmlreaderinput -{ - IXmlReaderInput IXmlReaderInput_iface; - LONG ref; - IUnknown *input; /* reference passed on IXmlReaderInput creation */ -} xmlreaderinput; +struct input_buffer +{ + encoded_buffer utf16; + encoded_buffer encoded; + UINT code_page; + xmlreaderinput *input; +}; static inline xmlreader *impl_from_IXmlReader(IXmlReader *iface) { @@ -62,6 +133,627 @@ static inline xmlreaderinput *impl_from_IXmlReaderInput(IXmlReaderInput *iface) { 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) + return IMalloc_Realloc(imalloc, mem, len); + else + 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) +{ + return m_alloc(reader->imalloc, len); +} + +static inline void reader_free(xmlreader *reader, void *mem) +{ + m_free(reader->imalloc, mem); +} + +/* reader input memory allocation functions */ +static inline void *readerinput_alloc(xmlreaderinput *input, size_t len) +{ + return m_alloc(input->imalloc, len); +} + +static inline void *readerinput_realloc(xmlreaderinput *input, void *mem, size_t len) +{ + return m_realloc(input->imalloc, mem, len); +} + +static inline void readerinput_free(xmlreaderinput *input, void *mem) +{ + m_free(input->imalloc, mem); +} + +static inline WCHAR *readerinput_strdupW(xmlreaderinput *input, const WCHAR *str) +{ + LPWSTR ret = NULL; + + if(str) { + DWORD size; + + size = (strlenW(str)+1)*sizeof(WCHAR); + ret = readerinput_alloc(input, size); + if (ret) memcpy(ret, str, size); + } + + return ret; +} + +static void reader_clear_attrs(xmlreader *reader) +{ + struct attribute *attr, *attr2; + LIST_FOR_EACH_ENTRY_SAFE(attr, attr2, &reader->attrs, struct attribute, entry) + { + reader_free(reader, attr); + } + list_init(&reader->attrs); + reader->attr_count = 0; +} + +/* attribute data holds pointers to buffer data, so buffer shrink is not possible + while we are on a node with attributes */ +static HRESULT reader_add_attr(xmlreader *reader, strval *localname, strval *value) +{ + struct attribute *attr; + + attr = reader_alloc(reader, sizeof(*attr)); + if (!attr) return E_OUTOFMEMORY; + + attr->localname = *localname; + attr->value = *value; + list_add_tail(&reader->attrs, &attr->entry); + reader->attr_count++; + + return S_OK; +} + +static HRESULT init_encoded_buffer(xmlreaderinput *input, encoded_buffer *buffer) +{ + const int initial_len = 0x2000; + buffer->data = readerinput_alloc(input, initial_len); + if (!buffer->data) return E_OUTOFMEMORY; + + memset(buffer->data, 0, 4); + buffer->cur = buffer->data; + buffer->allocated = initial_len; + buffer->written = 0; + + return S_OK; +} + +static void free_encoded_buffer(xmlreaderinput *input, encoded_buffer *buffer) +{ + readerinput_free(input, buffer->data); +} + +static HRESULT get_code_page(xml_encoding encoding, UINT *cp) +{ + if (encoding == XmlEncoding_Unknown) + { + FIXME("unsupported encoding %d\n", encoding); + return E_NOTIMPL; + } + + *cp = xml_encoding_map[encoding].cp; + + return S_OK; +} + +static xml_encoding parse_encoding_name(const WCHAR *name, int len) +{ + int min, max, n, c; + + if (!name) return XmlEncoding_Unknown; + + min = 0; + max = sizeof(xml_encoding_map)/sizeof(struct xml_encoding_data) - 1; + + while (min <= max) + { + n = (min+max)/2; + + if (len != -1) + c = strncmpiW(xml_encoding_map[n].name, name, len); + else + c = strcmpiW(xml_encoding_map[n].name, name); + if (!c) + return xml_encoding_map[n].enc; + + if (c > 0) + max = n-1; + else + min = n+1; + } + + return XmlEncoding_Unknown; +} + +static HRESULT alloc_input_buffer(xmlreaderinput *input) +{ + input_buffer *buffer; + HRESULT hr; + + input->buffer = NULL; + + buffer = readerinput_alloc(input, sizeof(*buffer)); + if (!buffer) return E_OUTOFMEMORY; + + buffer->input = input; + buffer->code_page = ~0; /* code page is unknown at this point */ + hr = init_encoded_buffer(input, &buffer->utf16); + if (hr != S_OK) { + readerinput_free(input, buffer); + return hr; + } + + hr = init_encoded_buffer(input, &buffer->encoded); + if (hr != S_OK) { + free_encoded_buffer(input, &buffer->utf16); + readerinput_free(input, buffer); + return hr; + } + + input->buffer = buffer; + return S_OK; +} + +static void free_input_buffer(input_buffer *buffer) +{ + free_encoded_buffer(buffer->input, &buffer->encoded); + free_encoded_buffer(buffer->input, &buffer->utf16); + readerinput_free(buffer->input, buffer); +} + +static void readerinput_release_stream(xmlreaderinput *readerinput) +{ + if (readerinput->stream) { + ISequentialStream_Release(readerinput->stream); + readerinput->stream = NULL; + } +} + +/* Queries already stored interface for IStream/ISequentialStream. + Interface supplied on creation will be overwritten */ +static HRESULT readerinput_query_for_stream(xmlreaderinput *readerinput) +{ + HRESULT hr; + + readerinput_release_stream(readerinput); + hr = IUnknown_QueryInterface(readerinput->input, &IID_IStream, (void**)&readerinput->stream); + if (hr != S_OK) + hr = IUnknown_QueryInterface(readerinput->input, &IID_ISequentialStream, (void**)&readerinput->stream); + + return hr; +} + +/* reads a chunk to raw buffer */ +static HRESULT readerinput_growraw(xmlreaderinput *readerinput) +{ + encoded_buffer *buffer = &readerinput->buffer->encoded; + ULONG len = buffer->allocated - buffer->written, read; + HRESULT hr; + + /* always try to get aligned to 4 bytes, so the only case we can get partialy read characters is + variable width encodings like UTF-8 */ + len = (len + 3) & ~3; + /* try to use allocated space or grow */ + if (buffer->allocated - buffer->written < len) + { + buffer->allocated *= 2; + buffer->data = readerinput_realloc(readerinput, buffer->data, buffer->allocated); + len = buffer->allocated - buffer->written; + } + + hr = ISequentialStream_Read(readerinput->stream, buffer->data + buffer->written, len, &read); + if (FAILED(hr)) return hr; + TRACE("requested %d, read %d, ret 0x%08x\n", len, read, hr); + buffer->written += read; + + return hr; +} + +/* grows UTF-16 buffer so it has at least 'length' bytes free on return */ +static void readerinput_grow(xmlreaderinput *readerinput, int length) +{ + encoded_buffer *buffer = &readerinput->buffer->utf16; + + /* grow if needed, plus 4 bytes to be sure null terminator will fit in */ + if (buffer->allocated < buffer->written + length + 4) + { + int grown_size = max(2*buffer->allocated, buffer->allocated + length); + buffer->data = readerinput_realloc(readerinput, buffer->data, grown_size); + buffer->allocated = grown_size; + } +} + +static HRESULT readerinput_detectencoding(xmlreaderinput *readerinput, xml_encoding *enc) +{ + encoded_buffer *buffer = &readerinput->buffer->encoded; + static char startA[] = {'<','?','x','m'}; + static WCHAR startW[] = {'<','?'}; + static char utf8bom[] = {0xef,0xbb,0xbf}; + static char utf16lebom[] = {0xff,0xfe}; + + *enc = XmlEncoding_Unknown; + + if (buffer->written <= 3) return MX_E_INPUTEND; + + /* try start symbols if we have enough data to do that, input buffer should contain + first chunk already */ + if (!memcmp(buffer->data, startA, sizeof(startA))) + *enc = XmlEncoding_UTF8; + else if (!memcmp(buffer->data, startW, sizeof(startW))) + *enc = XmlEncoding_UTF16; + /* try with BOM now */ + else if (!memcmp(buffer->data, utf8bom, sizeof(utf8bom))) + { + buffer->cur += sizeof(utf8bom); + *enc = XmlEncoding_UTF8; + } + else if (!memcmp(buffer->data, utf16lebom, sizeof(utf16lebom))) + { + buffer->cur += sizeof(utf16lebom); + *enc = XmlEncoding_UTF16; + } + + return S_OK; +} + +static int readerinput_get_utf8_convlen(xmlreaderinput *readerinput) +{ + encoded_buffer *buffer = &readerinput->buffer->encoded; + int len = buffer->written; + + /* complete single byte char */ + if (!(buffer->data[len-1] & 0x80)) return len; + + /* find start byte of multibyte char */ + while (--len && !(buffer->data[len] & 0xc0)) + ; + + return len; +} + +/* returns byte length of complete char sequence for specified code page, */ +static int readerinput_get_convlen(xmlreaderinput *readerinput, UINT cp) +{ + encoded_buffer *buffer = &readerinput->buffer->encoded; + int len = buffer->written; + + if (cp == CP_UTF8) + len = readerinput_get_utf8_convlen(readerinput); + else + len = buffer->written; + + return len - (buffer->cur - buffer->data); +} + +/* note that raw buffer content is kept */ +static void readerinput_switchencoding(xmlreaderinput *readerinput, xml_encoding enc) +{ + encoded_buffer *src = &readerinput->buffer->encoded; + encoded_buffer *dest = &readerinput->buffer->utf16; + int len, dest_len; + HRESULT hr; + UINT cp; + + hr = get_code_page(enc, &cp); + if (FAILED(hr)) return; + + len = readerinput_get_convlen(readerinput, cp); + + TRACE("switching to cp %d\n", cp); + + /* just copy in this case */ + if (enc == XmlEncoding_UTF16) + { + readerinput_grow(readerinput, len); + memcpy(dest->data, src->cur, len); + readerinput->buffer->code_page = cp; + return; + } + + dest_len = MultiByteToWideChar(cp, 0, src->cur, len, NULL, 0); + readerinput_grow(readerinput, dest_len); + MultiByteToWideChar(cp, 0, src->cur, len, (WCHAR*)dest->data, dest_len); + dest->data[dest_len] = 0; + readerinput->buffer->code_page = cp; +} + +static inline const WCHAR *reader_get_cur(xmlreader *reader) +{ + return (WCHAR*)reader->input->buffer->utf16.cur; +} + +static int reader_cmp(xmlreader *reader, const WCHAR *str) +{ + const WCHAR *ptr = reader_get_cur(reader); + int i = 0; + + return strncmpW(str, ptr, strlenW(str)); + + while (str[i]) { + if (ptr[i] != str[i]) return 0; + i++; + } + + return 1; +} + +/* moves cursor n WCHARs forward */ +static void reader_skipn(xmlreader *reader, int n) +{ + encoded_buffer *buffer = &reader->input->buffer->utf16; + const WCHAR *ptr = reader_get_cur(reader); + + while (*ptr++ && n--) + { + buffer->cur += sizeof(WCHAR); + reader->pos++; + } +} + +/* [3] S ::= (#x20 | #x9 | #xD | #xA)+ */ +static int reader_skipspaces(xmlreader *reader) +{ + encoded_buffer *buffer = &reader->input->buffer->utf16; + const WCHAR *ptr = reader_get_cur(reader), *start = ptr; + + while (*ptr == ' ' || *ptr == '\t' || *ptr == '\r' || *ptr == '\n') + { + buffer->cur += sizeof(WCHAR); + if (*ptr == '\r') + reader->pos = 0; + else if (*ptr == '\n') + { + reader->line++; + reader->pos = 0; + } + else + reader->pos++; + ptr++; + } + + return ptr - start; +} + +/* [26] VersionNum ::= '1.' [0-9]+ */ +static HRESULT reader_parse_versionnum(xmlreader *reader, strval *val) +{ + const WCHAR *ptr, *ptr2, *start = reader_get_cur(reader); + static const WCHAR onedotW[] = {'1','.',0}; + + if (reader_cmp(reader, onedotW)) return WC_E_XMLDECL; + /* skip "1." */ + reader_skipn(reader, 2); + + ptr2 = ptr = reader_get_cur(reader); + while (*ptr >= '0' && *ptr <= '9') + ptr++; + + if (ptr2 == ptr) return WC_E_DIGIT; + TRACE("version=%s\n", debugstr_wn(start, ptr-start)); + val->str = start; + val->len = ptr-start; + reader_skipn(reader, ptr-ptr2); + return S_OK; +} + +/* [25] Eq ::= S? '=' S? */ +static HRESULT reader_parse_eq(xmlreader *reader) +{ + static const WCHAR eqW[] = {'=',0}; + reader_skipspaces(reader); + if (reader_cmp(reader, eqW)) return WC_E_EQUAL; + /* skip '=' */ + reader_skipn(reader, 1); + reader_skipspaces(reader); + return S_OK; +} + +/* [24] VersionInfo ::= S 'version' Eq ("'" VersionNum "'" | '"' VersionNum '"') */ +static HRESULT reader_parse_versioninfo(xmlreader *reader) +{ + static const WCHAR versionW[] = {'v','e','r','s','i','o','n',0}; + strval val, name; + HRESULT hr; + + if (!reader_skipspaces(reader)) return WC_E_WHITESPACE; + + if (reader_cmp(reader, versionW)) return WC_E_XMLDECL; + name.str = reader_get_cur(reader); + name.len = 7; + /* skip 'version' */ + reader_skipn(reader, 7); + + hr = reader_parse_eq(reader); + if (FAILED(hr)) return hr; + + if (reader_cmp(reader, quoteW) && reader_cmp(reader, dblquoteW)) + return WC_E_QUOTE; + /* skip "'"|'"' */ + reader_skipn(reader, 1); + + hr = reader_parse_versionnum(reader, &val); + if (FAILED(hr)) return hr; + + if (reader_cmp(reader, quoteW) && reader_cmp(reader, dblquoteW)) + return WC_E_QUOTE; + + /* skip "'"|'"' */ + reader_skipn(reader, 1); + + return reader_add_attr(reader, &name, &val); +} + +/* ([A-Za-z0-9._] | '-') */ +static inline int is_wchar_encname(WCHAR ch) +{ + return ((ch >= 'A' && ch <= 'Z') || + (ch >= 'a' && ch <= 'z') || + (ch >= '0' && ch <= '9') || + (ch == '.') || (ch == '_') || + (ch == '-')); +} + +/* [81] EncName ::= [A-Za-z] ([A-Za-z0-9._] | '-')* */ +static HRESULT reader_parse_encname(xmlreader *reader, strval *val) +{ + const WCHAR *start = reader_get_cur(reader), *ptr; + xml_encoding enc; + int len; + + if ((*start < 'A' || *start > 'Z') && (*start < 'a' || *start > 'z')) + return WC_E_ENCNAME; + + ptr = start; + while (is_wchar_encname(*++ptr)) + ; + + len = ptr - start; + enc = parse_encoding_name(start, len); + TRACE("encoding name %s\n", debugstr_wn(start, len)); + val->str = start; + val->len = len; + + if (enc == XmlEncoding_Unknown) + return WC_E_ENCNAME; + + /* skip encoding name */ + reader_skipn(reader, len); + return S_OK; +} + +/* [80] EncodingDecl ::= S 'encoding' Eq ('"' EncName '"' | "'" EncName "'" ) */ +static HRESULT reader_parse_encdecl(xmlreader *reader) +{ + static const WCHAR encodingW[] = {'e','n','c','o','d','i','n','g',0}; + strval name, val; + HRESULT hr; + + if (!reader_skipspaces(reader)) return WC_E_WHITESPACE; + + if (reader_cmp(reader, encodingW)) return S_FALSE; + name.str = reader_get_cur(reader); + name.len = 8; + /* skip 'encoding' */ + reader_skipn(reader, 8); + + hr = reader_parse_eq(reader); + if (FAILED(hr)) return hr; + + if (reader_cmp(reader, quoteW) && reader_cmp(reader, dblquoteW)) + return WC_E_QUOTE; + /* skip "'"|'"' */ + reader_skipn(reader, 1); + + hr = reader_parse_encname(reader, &val); + if (FAILED(hr)) return hr; + + if (reader_cmp(reader, quoteW) && reader_cmp(reader, dblquoteW)) + return WC_E_QUOTE; + + /* skip "'"|'"' */ + reader_skipn(reader, 1); + + return reader_add_attr(reader, &name, &val); +} + +/* [32] SDDecl ::= S 'standalone' Eq (("'" ('yes' | 'no') "'") | ('"' ('yes' | 'no') '"')) */ +static HRESULT reader_parse_sddecl(xmlreader *reader) +{ + static const WCHAR standaloneW[] = {'s','t','a','n','d','a','l','o','n','e',0}; + static const WCHAR yesW[] = {'y','e','s',0}; + static const WCHAR noW[] = {'n','o',0}; + const WCHAR *start, *ptr; + strval name, val; + HRESULT hr; + + if (!reader_skipspaces(reader)) return WC_E_WHITESPACE; + + if (reader_cmp(reader, standaloneW)) return S_FALSE; + name.str = reader_get_cur(reader); + name.len = 10; + /* skip 'standalone' */ + reader_skipn(reader, 10); + + hr = reader_parse_eq(reader); + if (FAILED(hr)) return hr; + + if (reader_cmp(reader, quoteW) && reader_cmp(reader, dblquoteW)) + return WC_E_QUOTE; + /* skip "'"|'"' */ + reader_skipn(reader, 1); + + if (reader_cmp(reader, yesW) && reader_cmp(reader, noW)) + return WC_E_XMLDECL; + + 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 = start; + val.len = ptr-start; + + if (reader_cmp(reader, quoteW) && reader_cmp(reader, dblquoteW)) + return WC_E_QUOTE; + /* skip "'"|'"' */ + reader_skipn(reader, 1); + + return reader_add_attr(reader, &name, &val); +} + +/* [23] XMLDecl ::= '<?xml' VersionInfo EncodingDecl? SDDecl? S? '?>' */ +static HRESULT reader_parse_xmldecl(xmlreader *reader) +{ + static const WCHAR xmldeclW[] = {'<','?','x','m','l',0}; + static const WCHAR declcloseW[] = {'?','>',0}; + HRESULT hr; + + /* check if we have "<?xml" */ + if (reader_cmp(reader, xmldeclW)) return S_FALSE; + + reader_skipn(reader, 5); + hr = reader_parse_versioninfo(reader); + if (FAILED(hr)) + return hr; + + hr = reader_parse_encdecl(reader); + if (FAILED(hr)) + return hr; + + hr = reader_parse_sddecl(reader); + if (FAILED(hr)) + return hr; + + reader_skipspaces(reader); + if (reader_cmp(reader, declcloseW)) return WC_E_XMLDECL; + reader_skipn(reader, 2); + + return S_OK; } static HRESULT WINAPI xmlreader_QueryInterface(IXmlReader *iface, REFIID riid, void** ppvObject) @@ -89,23 +781,25 @@ static ULONG WINAPI xmlreader_AddRef(IXmlReader *iface) { xmlreader *This = impl_from_IXmlReader(iface); - TRACE("%p\n", This); - return InterlockedIncrement(&This->ref); + ULONG ref = InterlockedIncrement(&This->ref); + TRACE("(%p)->(%d)\n", This, ref); + return ref; } static ULONG WINAPI xmlreader_Release(IXmlReader *iface) { xmlreader *This = impl_from_IXmlReader(iface); - LONG ref; - - TRACE("%p\n", This); - - ref = InterlockedDecrement(&This->ref); + LONG ref = InterlockedDecrement(&This->ref); + + TRACE("(%p)->(%d)\n", This, ref); + if (ref == 0) { - if (This->input) IUnknown_Release(This->input); - if (This->stream) IUnknown_Release(This->stream); - HeapFree(GetProcessHeap(), 0, This); + IMalloc *imalloc = This->imalloc; + if (This->input) IUnknown_Release(&This->input->IXmlReaderInput_iface); + reader_clear_attrs(This); + reader_free(This, This); + if (imalloc) IMalloc_Release(imalloc); } return ref; @@ -120,14 +814,9 @@ if (This->input) { - IUnknown_Release(This->input); - This->input = NULL; - } - - if (This->stream) - { - IUnknown_Release(This->stream); - This->stream = NULL; + readerinput_release_stream(This->input); + IUnknown_Release(&This->input->IXmlReaderInput_iface); + This->input = NULL; } This->line = This->pos = 0; @@ -143,14 +832,17 @@ hr = IUnknown_QueryInterface(input, &IID_IXmlReaderInput, (void**)&This->input); if (hr != S_OK) { + IXmlReaderInput *readerinput; + /* create IXmlReaderInput basing on supplied interface */ hr = CreateXmlReaderInputWithEncodingName(input, - NULL, NULL, FALSE, NULL, &This->input); + NULL, NULL, FALSE, NULL, &readerinput); if (hr != S_OK) return hr; + This->input = impl_from_IXmlReaderInput(readerinput); } /* set stream for supplied IXmlReaderInput */ - hr = xmlreaderinput_query_for_stream(This->input, (void**)&This->stream); + hr = readerinput_query_for_stream(This->input); if (hr == S_OK) This->state = XmlReadState_Initial; @@ -167,6 +859,9 @@ switch (property) { + case XmlReaderProperty_DtdProcessing: + *value = This->dtdmode; + break; case XmlReaderProperty_ReadState: *value = This->state; break; @@ -180,32 +875,104 @@ static HRESULT WINAPI xmlreader_SetProperty(IXmlReader* iface, UINT property, LONG_PTR value) { - FIXME("(%p %u %lu): stub\n", iface, property, value); + xmlreader *This = impl_from_IXmlReader(iface); + + TRACE("(%p %u %lu)\n", iface, property, value); + + switch (property) + { + case XmlReaderProperty_DtdProcessing: + if (value < 0 || value > _DtdProcessing_Last) return E_INVALIDARG; + This->dtdmode = value; + break; + default: + FIXME("Unimplemented property (%u)\n", property); + return E_NOTIMPL; + } + + return S_OK; +} + +static HRESULT WINAPI xmlreader_Read(IXmlReader* iface, XmlNodeType *node_type) +{ + xmlreader *This = impl_from_IXmlReader(iface); + + FIXME("(%p)->(%p): stub\n", This, node_type); + + if (This->state == XmlReadState_Closed) return S_FALSE; + + /* if it's a first call for a new input we need to detect stream encoding */ + if (This->state == XmlReadState_Initial) + { + xml_encoding enc; + HRESULT hr; + + hr = readerinput_growraw(This->input); + if (FAILED(hr)) return hr; + + /* try to detect encoding by BOM or data and set input code page */ + hr = readerinput_detectencoding(This->input, &enc); + TRACE("detected encoding %s, 0x%08x\n", debugstr_w(xml_encoding_map[enc].name), hr); + if (FAILED(hr)) return hr; + + /* always switch first time cause we have to put something in */ + readerinput_switchencoding(This->input, enc); + + /* parse xml declaration */ + hr = reader_parse_xmldecl(This); + if (FAILED(hr)) return hr; + + if (hr == S_OK) + { + This->state = XmlReadState_Interactive; + This->nodetype = *node_type = XmlNodeType_XmlDeclaration; + return S_OK; + } + } + return E_NOTIMPL; } -static HRESULT WINAPI xmlreader_Read(IXmlReader* iface, XmlNodeType *node_type) -{ - FIXME("(%p %p): stub\n", iface, node_type); - return E_NOTIMPL; -} - static HRESULT WINAPI xmlreader_GetNodeType(IXmlReader* iface, XmlNodeType *node_type) { - FIXME("(%p %p): stub\n", iface, node_type); - return E_NOTIMPL; + xmlreader *This = impl_from_IXmlReader(iface); + TRACE("(%p)->(%p)\n", This, node_type); + + /* When we're on attribute always return attribute type, container node type is kept. + Note that container is not necessarily an element, and attribute doesn't mean it's + an attribute in XML spec terms. */ + *node_type = This->attr ? XmlNodeType_Attribute : This->nodetype; + return This->state == XmlReadState_Closed ? S_FALSE : S_OK; } static HRESULT WINAPI xmlreader_MoveToFirstAttribute(IXmlReader* iface) { - FIXME("(%p): stub\n", iface); - return E_NOTIMPL; + xmlreader *This = impl_from_IXmlReader(iface); + + TRACE("(%p)\n", This); + + if (!This->attr_count) return S_FALSE; + This->attr = LIST_ENTRY(list_head(&This->attrs), struct attribute, entry); + return S_OK; } static HRESULT WINAPI xmlreader_MoveToNextAttribute(IXmlReader* iface) { - FIXME("(%p): stub\n", iface); - return E_NOTIMPL; + xmlreader *This = impl_from_IXmlReader(iface); + const struct list *next; + + TRACE("(%p)\n", This); + + if (!This->attr_count) return S_FALSE; + + if (!This->attr) + return IXmlReader_MoveToFirstAttribute(iface); + + next = list_next(&This->attrs, &This->attr->entry); + if (next) + This->attr = LIST_ENTRY(next, struct attribute, entry); + + return next ? S_OK : S_FALSE; } static HRESULT WINAPI xmlreader_MoveToAttributeByName(IXmlReader* iface, @@ -218,8 +985,13 @@ static HRESULT WINAPI xmlreader_MoveToElement(IXmlReader* iface) { - FIXME("(%p): stub\n", iface); - return E_NOTIMPL; + xmlreader *This = impl_from_IXmlReader(iface); + + TRACE("(%p)\n", This); + + if (!This->attr_count) return S_FALSE; + This->attr = NULL; + return S_OK; } static HRESULT WINAPI xmlreader_GetQualifiedName(IXmlReader* iface, LPCWSTR *qualifiedName, @@ -316,10 +1088,16 @@ return S_OK; } -static HRESULT WINAPI xmlreader_GetAttributeCount(IXmlReader* iface, UINT *attributeCount) -{ - FIXME("(%p %p): stub\n", iface, attributeCount); - return E_NOTIMPL; +static HRESULT WINAPI xmlreader_GetAttributeCount(IXmlReader* iface, UINT *count) +{ + xmlreader *This = impl_from_IXmlReader(iface); + + TRACE("(%p)->(%p)\n", This, count); + + if (!count) return E_INVALIDARG; + + *count = This->attr_count; + return S_OK; } static HRESULT WINAPI xmlreader_GetDepth(IXmlReader* iface, UINT *depth) @@ -365,21 +1143,6 @@ }; /** IXmlReaderInput **/ - -/* Queries already stored interface for IStream/ISequentialStream. - Interface supplied on creation will be overwritten */ -static HRESULT xmlreaderinput_query_for_stream(IXmlReaderInput *iface, void **pObj) -{ - xmlreaderinput *This = impl_from_IXmlReaderInput(iface); - HRESULT hr; - - hr = IUnknown_QueryInterface(This->input, &IID_IStream, pObj); - if (hr != S_OK) - hr = IUnknown_QueryInterface(This->input, &IID_ISequentialStream, pObj); - - return hr; -} - static HRESULT WINAPI xmlreaderinput_QueryInterface(IXmlReaderInput *iface, REFIID riid, void** ppvObject) { xmlreaderinput *This = impl_from_IXmlReaderInput(iface); @@ -393,7 +1156,7 @@ } else { - FIXME("interface %s not implemented\n", debugstr_guid(riid)); + WARN("interface %s not implemented\n", debugstr_guid(riid)); return E_NOINTERFACE; } @@ -405,22 +1168,27 @@ static ULONG WINAPI xmlreaderinput_AddRef(IXmlReaderInput *iface) { xmlreaderinput *This = impl_from_IXmlReaderInput(iface); - TRACE("%p\n", This); - return InterlockedIncrement(&This->ref); + ULONG ref = InterlockedIncrement(&This->ref); + TRACE("(%p)->(%d)\n", This, ref); + return ref; } static ULONG WINAPI xmlreaderinput_Release(IXmlReaderInput *iface) { xmlreaderinput *This = impl_from_IXmlReaderInput(iface); - LONG ref; - - TRACE("%p\n", This); - - ref = InterlockedDecrement(&This->ref); + LONG ref = InterlockedDecrement(&This->ref); + + TRACE("(%p)->(%d)\n", This, ref); + if (ref == 0) { + IMalloc *imalloc = This->imalloc; if (This->input) IUnknown_Release(This->input); - HeapFree(GetProcessHeap(), 0, This); + if (This->stream) ISequentialStream_Release(This->stream); + if (This->buffer) free_input_buffer(This->buffer); + readerinput_free(This, This->baseuri); + readerinput_free(This, This); + if (imalloc) IMalloc_Release(imalloc); } return ref; @@ -433,13 +1201,11 @@ xmlreaderinput_Release }; -HRESULT WINAPI CreateXmlReader(REFIID riid, void **pObject, IMalloc *pMalloc) +HRESULT WINAPI CreateXmlReader(REFIID riid, void **obj, IMalloc *imalloc) { xmlreader *reader; - TRACE("(%s, %p, %p)\n", wine_dbgstr_guid(riid), pObject, pMalloc); - - if (pMalloc) FIXME("custom IMalloc not supported yet\n"); + TRACE("(%s, %p, %p)\n", wine_dbgstr_guid(riid), obj, imalloc); if (!IsEqualGUID(riid, &IID_IXmlReader)) { @@ -447,42 +1213,68 @@ return E_FAIL; } - reader = HeapAlloc(GetProcessHeap(), 0, sizeof (*reader)); + if (imalloc) + reader = IMalloc_Alloc(imalloc, sizeof(*reader)); + else + reader = heap_alloc(sizeof(*reader)); if(!reader) return E_OUTOFMEMORY; reader->IXmlReader_iface.lpVtbl = &xmlreader_vtbl; reader->ref = 1; - reader->stream = NULL; reader->input = NULL; reader->state = XmlReadState_Closed; + reader->dtdmode = DtdProcessing_Prohibit; reader->line = reader->pos = 0; - - *pObject = &reader->IXmlReader_iface; - - TRACE("returning iface %p\n", *pObject); + reader->imalloc = imalloc; + if (imalloc) IMalloc_AddRef(imalloc); + reader->nodetype = XmlNodeType_None; + list_init(&reader->attrs); + reader->attr_count = 0; + reader->attr = NULL; + + *obj = &reader->IXmlReader_iface; + + TRACE("returning iface %p\n", *obj); return S_OK; } HRESULT WINAPI CreateXmlReaderInputWithEncodingName(IUnknown *stream, - IMalloc *pMalloc, + IMalloc *imalloc, LPCWSTR encoding, BOOL hint, LPCWSTR base_uri, IXmlReaderInput **ppInput) { xmlreaderinput *readerinput; - - FIXME("%p %p %s %d %s %p: stub\n", stream, pMalloc, wine_dbgstr_w(encoding), + HRESULT hr; + + TRACE("%p %p %s %d %s %p\n", stream, imalloc, wine_dbgstr_w(encoding), hint, wine_dbgstr_w(base_uri), ppInput); if (!stream || !ppInput) return E_INVALIDARG; - readerinput = HeapAlloc(GetProcessHeap(), 0, sizeof (*readerinput)); + if (imalloc) + readerinput = IMalloc_Alloc(imalloc, sizeof(*readerinput)); + else + readerinput = heap_alloc(sizeof(*readerinput)); if(!readerinput) return E_OUTOFMEMORY; readerinput->IXmlReaderInput_iface.lpVtbl = &xmlreaderinput_vtbl; readerinput->ref = 1; + readerinput->imalloc = imalloc; + readerinput->stream = NULL; + if (imalloc) IMalloc_AddRef(imalloc); + readerinput->encoding = parse_encoding_name(encoding, -1); + readerinput->hint = hint; + readerinput->baseuri = readerinput_strdupW(readerinput, base_uri); + + hr = alloc_input_buffer(readerinput); + if (hr != S_OK) + { + readerinput_free(readerinput, readerinput); + return hr; + } IUnknown_QueryInterface(stream, &IID_IUnknown, (void**)&readerinput->input); *ppInput = &readerinput->IXmlReaderInput_iface; 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 Dec 11 10:53:36 2012 @@ -79,28 +79,135 @@ } /* IXmlReader state */ -cpp_quote("typedef enum XmlReadState") -cpp_quote("{") -cpp_quote(" XmlReadState_Initial = 0,") -cpp_quote(" XmlReadState_Interactive = 1,") -cpp_quote(" XmlReadState_Error = 2,") -cpp_quote(" XmlReadState_EndOfFile = 3,") -cpp_quote(" XmlReadState_Closed = 4") -cpp_quote("} XmlReadState;") +typedef enum XmlReadState +{ + XmlReadState_Initial, + XmlReadState_Interactive, + XmlReadState_Error, + XmlReadState_EndOfFile, + XmlReadState_Closed +} XmlReadState; + +/* conformance levels */ +typedef enum XmlConformanceLevel +{ + XmlConformanceLevel_Auto, + XmlConformanceLevel_Fragment, + XmlConformanceLevel_Document, + _XmlConformanceLevel_Last = XmlConformanceLevel_Document +} XmlConformanceLevel; + +/* DTD processing mode */ +typedef enum DtdProcessing +{ + DtdProcessing_Prohibit, + DtdProcessing_Parse, + _DtdProcessing_Last = DtdProcessing_Parse +} DtdProcessing; /* IXmlReader properties */ -cpp_quote("typedef enum XmlReaderProperty") -cpp_quote("{") -cpp_quote(" XmlReaderProperty_MultiLanguage = 0,") -cpp_quote(" XmlReaderProperty_ConformanceLevel = XmlReaderProperty_MultiLanguage + 1,") -cpp_quote(" XmlReaderProperty_RandomAccess = XmlReaderProperty_ConformanceLevel + 1,") -cpp_quote(" XmlReaderProperty_XmlResolver = XmlReaderProperty_RandomAccess + 1,") -cpp_quote(" XmlReaderProperty_DtdProcessing = XmlReaderProperty_XmlResolver + 1,") -cpp_quote(" XmlReaderProperty_ReadState = XmlReaderProperty_DtdProcessing + 1,") -cpp_quote(" XmlReaderProperty_MaxElementDepth = XmlReaderProperty_ReadState + 1,") -cpp_quote(" XmlReaderProperty_MaxEntityExpansion = XmlReaderProperty_MaxElementDepth + 1,") -cpp_quote(" _XmlReaderProperty_Last = XmlReaderProperty_MaxEntityExpansion") -cpp_quote("} XmlReaderProperty;") +typedef enum XmlReaderProperty +{ + XmlReaderProperty_MultiLanguage, + XmlReaderProperty_ConformanceLevel, + XmlReaderProperty_RandomAccess, + XmlReaderProperty_XmlResolver, + XmlReaderProperty_DtdProcessing, + XmlReaderProperty_ReadState, + XmlReaderProperty_MaxElementDepth, + XmlReaderProperty_MaxEntityExpansion, + _XmlReaderProperty_Last = XmlReaderProperty_MaxEntityExpansion +} XmlReaderProperty; + +/* reader error codes */ +typedef enum XmlError +{ + MX_E_MX = 0xc00cee00, + MX_E_INPUTEND, + MX_E_ENCODING, + MX_E_ENCODINGSWITCH, + MX_E_ENCODINGSIGNATURE, + WC_E_WC = 0xc00cee20, + WC_E_WHITESPACE, + WC_E_SEMICOLON, + WC_E_GREATERTHAN, + WC_E_QUOTE, + WC_E_EQUAL, + WC_E_LESSTHAN, + WC_E_HEXDIGIT, + WC_E_DIGIT, + WC_E_LEFTBRACKET, + WC_E_LEFTPAREN, + WC_E_XMLCHARACTER, + WC_E_NAMECHARACTER, + WC_E_SYNTAX, + WC_E_CDSECT, + WC_E_COMMENT, + WC_E_CONDSECT, + WC_E_DECLATTLIST, + WC_E_DECLDOCTYPE, + WC_E_DECLELEMENT, + WC_E_DECLENTITY, + WC_E_DECLNOTATION, + WC_E_NDATA, + WC_E_PUBLIC, + WC_E_SYSTEM, + WC_E_NAME, + WC_E_ROOTELEMENT, + WC_E_ELEMENTMATCH, + WC_E_UNIQUEATTRIBUTE, + WC_E_TEXTXMLDECL, + WC_E_LEADINGXML, + WC_E_TEXTDECL, + WC_E_XMLDECL, + WC_E_ENCNAME, + WC_E_PUBLICID, + WC_E_PESINTERNALSUBSET, + WC_E_PESBETWEENDECLS, + WC_E_NORECURSION, + WC_E_ENTITYCONTENT, + WC_E_UNDECLAREDENTITY, + WC_E_PARSEDENTITY, + WC_E_NOEXTERNALENTITYREF, + WC_E_PI, + WC_E_SYSTEMID, + WC_E_QUESTIONMARK, + WC_E_CDSECTEND, + WC_E_MOREDATA, + WC_E_DTDPROHIBITED, + WC_E_INVALIDXMLSPACE, + NC_E_NC = 0xc00cee60, + NC_E_QNAMECHARACTER, + NC_E_QNAMECOLON, + NC_E_NAMECOLON, + NC_E_DECLAREDPREFIX, + NC_E_UNDECLAREDPREFIX, + NC_E_EMPTYURI, + NC_E_XMLPREFIXRESERVED, + NC_E_XMLNSPREFIXRESERVED, + NC_E_XMLURIRESERVED, + NC_E_XMLNSURIRESERVED, + SC_E_SC = 0xc00cee80, + SC_E_MAXELEMENTDEPTH, + SC_E_MAXENTITYEXPANSION, + WR_E_WR = 0xc00cef00, + WR_E_NONWHITESPACE, + WR_E_NSPREFIXDECLARED, + WR_E_NSPREFIXWITHEMPTYNSURI, + WR_E_DUPLICATEATTRIBUTE, + WR_E_XMLNSPREFIXDECLARATION, + WR_E_XMLPREFIXDECLARATION, + WR_E_XMLURIDECLARATION, + WR_E_XMLNSURIDECLARATION, + WR_E_NAMESPACEUNDECLARED, + WR_E_INVALIDXMLSPACE, + WR_E_INVALIDACTION, + WR_E_INVALIDSURROGATEPAIR, + XML_E_INVALID_DECIMAL = 0xc00ce01d, + XML_E_INVALID_HEXIDECIMAL, + XML_E_INVALID_UNICODE, + XML_E_INVALIDENCODING = 0xc00ce06e +} XmlError; /* IXmlReader construction */ cpp_quote("STDAPI CreateXmlReader(REFIID riid, void **ppvObject, IMalloc *pMalloc);") 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 Dec 11 10:53:36 2012 @@ -199,7 +199,7 @@ reactos/dll/win32/xinput1_2 # Synced to Wine-1.5.4 reactos/dll/win32/xinput1_3 # Synced to Wine-1.5.4 reactos/dll/win32/xinput9_1_0 # Synced to Wine-1.5.4 -reactos/dll/win32/xmllite # Synced to Wine-1.5.4 +reactos/dll/win32/xmllite # Synced to Wine-1.5.19 reactos/dll/cpl/inetcpl # Synced to Wine-1.3.21

11 years, 9 months

[akhaldi] 57871: [NETAPI32_WINETEST]: Sync with Wine 1.5.19.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Tue Dec 11 10:19:54 2012 New Revision: 57871 URL: http://svn.reactos.org/svn/reactos?rev=57871&view=rev Log: [NETAPI32_WINETEST]: Sync with Wine 1.5.19. Modified: trunk/rostests/winetests/netapi32/CMakeLists.txt trunk/rostests/winetests/netapi32/access.c trunk/rostests/winetests/netapi32/wksta.c Modified: trunk/rostests/winetests/netapi32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/netapi32/CMakeL… ============================================================================== --- trunk/rostests/winetests/netapi32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/winetests/netapi32/CMakeLists.txt [iso-8859-1] Tue Dec 11 10:19:54 2012 @@ -1,7 +1,5 @@ -add_definitions( - -D__ROS_LONG64__ - -D_DLL -D__USE_CRTIMP) +add_definitions(-D__ROS_LONG64__) list(APPEND SOURCE access.c Modified: trunk/rostests/winetests/netapi32/access.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/netapi32/access… ============================================================================== --- trunk/rostests/winetests/netapi32/access.c [iso-8859-1] (original) +++ trunk/rostests/winetests/netapi32/access.c [iso-8859-1] Tue Dec 11 10:19:54 2012 @@ -29,8 +29,8 @@ #include "wine/test.h" -WCHAR user_name[UNLEN + 1]; -WCHAR computer_name[MAX_COMPUTERNAME_LENGTH + 1]; +static WCHAR user_name[UNLEN + 1]; +static WCHAR computer_name[MAX_COMPUTERNAME_LENGTH + 1]; static const WCHAR sNonexistentUser[] = {'N','o','n','e','x','i','s','t','e','n','t',' ', 'U','s','e','r',0}; @@ -63,6 +63,8 @@ static NET_API_STATUS (WINAPI *pNetUserModalsGet)(LPCWSTR,DWORD,LPBYTE*)=NULL; static NET_API_STATUS (WINAPI *pNetUserAdd)(LPCWSTR,DWORD,LPBYTE,LPDWORD)=NULL; static NET_API_STATUS (WINAPI *pNetUserDel)(LPCWSTR,LPCWSTR)=NULL; +static NET_API_STATUS (WINAPI *pNetLocalGroupGetInfo)(LPCWSTR,LPCWSTR,DWORD,LPBYTE*)=NULL; +static NET_API_STATUS (WINAPI *pNetLocalGroupGetMembers)(LPCWSTR,LPCWSTR,DWORD,LPBYTE*,DWORD,LPDWORD,LPDWORD,PDWORD_PTR)=NULL; static int init_access_tests(void) { @@ -158,6 +160,7 @@ ok(rc == ERROR_BAD_NETPATH || rc == ERROR_NETWORK_UNREACHABLE || rc == RPC_S_SERVER_UNAVAILABLE || + rc == NERR_WkstaNotStarted || /* workstation service not running */ rc == RPC_S_INVALID_NET_ADDR, /* Some Win7 */ "Bad Network Path: rc=%d\n",rc); } @@ -320,6 +323,33 @@ ok(ret == NERR_UserNotFound, "Deleting a nonexistent user returned 0x%08x\n",ret); } +static void run_localgroupgetinfo_tests(void) +{ + NET_API_STATUS status; + static const WCHAR admins[] = {'A','d','m','i','n','i','s','t','r','a','t','o','r','s',0}; + PLOCALGROUP_INFO_1 lgi = NULL; + PLOCALGROUP_MEMBERS_INFO_3 buffer = NULL; + DWORD entries_read = 0, total_entries =0; + int i; + + status = pNetLocalGroupGetInfo(NULL, admins, 1, (LPBYTE *)&lgi); + ok(status == NERR_Success || broken(status == NERR_GroupNotFound), + "NetLocalGroupGetInfo unexpectedly returned %d\n", status); + if (status != NERR_Success) return; + + trace("Local groupname:%s\n", wine_dbgstr_w( lgi->lgrpi1_name)); + trace("Comment: %s\n", wine_dbgstr_w( lgi->lgrpi1_comment)); + + pNetApiBufferFree(lgi); + + status = pNetLocalGroupGetMembers(NULL, admins, 3, (LPBYTE *)&buffer, MAX_PREFERRED_LENGTH, &entries_read, &total_entries, NULL); + ok(status == NERR_Success, "NetLocalGroupGetMembers unexpectedly returned %d\n", status); + ok(entries_read > 0 && total_entries > 0, "Amount of entries is unexpectedly 0\n"); + + for(i=0;i<entries_read;i++) + trace("domain and name: %s\n", wine_dbgstr_w(buffer[i].lgrmi3_domainandname)); +} + START_TEST(access) { HMODULE hnetapi32=LoadLibraryA("netapi32.dll"); @@ -331,6 +361,8 @@ pNetUserModalsGet=(void*)GetProcAddress(hnetapi32,"NetUserModalsGet"); pNetUserAdd=(void*)GetProcAddress(hnetapi32, "NetUserAdd"); pNetUserDel=(void*)GetProcAddress(hnetapi32, "NetUserDel"); + pNetLocalGroupGetInfo=(void*)GetProcAddress(hnetapi32, "NetLocalGroupGetInfo"); + pNetLocalGroupGetMembers=(void*)GetProcAddress(hnetapi32, "NetLocalGroupGetMembers"); /* These functions were introduced with NT. It's safe to assume that * if one is not available, none are. @@ -346,6 +378,7 @@ run_usergetinfo_tests(); run_querydisplayinformation1_tests(); run_usermodalsget_tests(); + run_localgroupgetinfo_tests(); } FreeLibrary(hnetapi32); Modified: trunk/rostests/winetests/netapi32/wksta.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/netapi32/wksta.… ============================================================================== --- trunk/rostests/winetests/netapi32/wksta.c [iso-8859-1] (original) +++ trunk/rostests/winetests/netapi32/wksta.c [iso-8859-1] Tue Dec 11 10:19:54 2012 @@ -31,6 +31,7 @@ #include "lmerr.h" #include "lmwksta.h" #include "lmapibuf.h" +#include "lmjoin.h" static NET_API_STATUS (WINAPI *pNetApiBufferFree)(LPVOID)=NULL; static NET_API_STATUS (WINAPI *pNetApiBufferSize)(LPVOID,LPDWORD)=NULL; @@ -38,9 +39,10 @@ static NET_API_STATUS (WINAPI *pNetWkstaUserGetInfo)(LPWSTR,DWORD,PBYTE*)=NULL; static NET_API_STATUS (WINAPI *pNetWkstaTransportEnum)(LPWSTR,DWORD,LPBYTE*, DWORD,LPDWORD,LPDWORD,LPDWORD)=NULL; - -WCHAR user_name[UNLEN + 1]; -WCHAR computer_name[MAX_COMPUTERNAME_LENGTH + 1]; +static NET_API_STATUS (WINAPI *pNetGetJoinInformation)(LPCWSTR,LPWSTR*,PNETSETUP_JOIN_STATUS); + +static WCHAR user_name[UNLEN + 1]; +static WCHAR computer_name[MAX_COMPUTERNAME_LENGTH + 1]; static int init_wksta_tests(void) { @@ -77,12 +79,17 @@ LPWKSTA_USER_INFO_1 ui1 = NULL; LPWKSTA_USER_INFO_1101 ui1101 = NULL; DWORD dwSize; + NET_API_STATUS rc; /* Level 0 */ - ok(pNetWkstaUserGetInfo(NULL, 0, (LPBYTE *)&ui0) == NERR_Success, - "NetWkstaUserGetInfo is unsuccessful\n"); - - ok(ui0 != NULL, "ui0 is NULL\n"); + rc = pNetWkstaUserGetInfo(NULL, 0, (LPBYTE *)&ui0); + if (rc == NERR_WkstaNotStarted) + { + skip("Workstation service not running\n"); + return; + } + ok(!rc && ui0, "got %d and %p (expected NERR_Success and != NULL\n", rc, ui0); + /* This failure occurred when I ran sshd as service and didn't authenticate * Since the test dereferences ui0, the rest of this test is worthless */ @@ -166,7 +173,7 @@ /* final check: valid return, actually get data back */ apiReturn = pNetWkstaTransportEnum(NULL, 0, &bufPtr, MAX_PREFERRED_LENGTH, &entriesRead, &totalEntries, NULL); - ok(apiReturn == NERR_Success || apiReturn == ERROR_NETWORK_UNREACHABLE, + ok(apiReturn == NERR_Success || apiReturn == ERROR_NETWORK_UNREACHABLE || apiReturn == NERR_WkstaNotStarted, "NetWkstaTransportEnum returned %d\n", apiReturn); if (apiReturn == NERR_Success) { /* WKSTA_TRANSPORT_INFO_0 *transports = (WKSTA_TRANSPORT_INFO_0 *)bufPtr; */ @@ -179,6 +186,28 @@ } } +static void run_wkstajoininfo_tests(void) +{ + NET_API_STATUS ret; + LPWSTR buffer = NULL; + NETSETUP_JOIN_STATUS buffertype = 0xdada; + /* NT4 doesn't have this function */ + if (!pNetGetJoinInformation) { + win_skip("NetGetJoinInformation not available\n"); + return; + } + + ret = pNetGetJoinInformation(NULL, NULL, NULL); + ok(ret == ERROR_INVALID_PARAMETER, "NetJoinGetInformation returned unexpected 0x%08x\n", ret); + ok(buffertype == 0xdada, "buffertype set to unexpected value %d\n", buffertype); + + ret = pNetGetJoinInformation(NULL, &buffer, &buffertype); + ok(ret == NERR_Success, "NetJoinGetInformation returned unexpected 0x%08x\n", ret); + ok(buffertype != 0xdada && buffertype != NetSetupUnknownStatus, "buffertype set to unexpected value %d\n", buffertype); + trace("workstation joined to %s with status %d\n", wine_dbgstr_w(buffer), buffertype); + pNetApiBufferFree(buffer); +} + START_TEST(wksta) { HMODULE hnetapi32=LoadLibraryA("netapi32.dll"); @@ -188,6 +217,7 @@ pNetpGetComputerName=(void*)GetProcAddress(hnetapi32,"NetpGetComputerName"); pNetWkstaUserGetInfo=(void*)GetProcAddress(hnetapi32,"NetWkstaUserGetInfo"); pNetWkstaTransportEnum=(void*)GetProcAddress(hnetapi32,"NetWkstaTransportEnum"); + pNetGetJoinInformation=(void*)GetProcAddress(hnetapi32,"NetGetJoinInformation"); /* These functions were introduced with NT. It's safe to assume that * if one is not available, none are. @@ -205,6 +235,7 @@ win_skip("Function NetpGetComputerName not available\n"); run_wkstausergetinfo_tests(); run_wkstatransportenum_tests(); + run_wkstajoininfo_tests(); } FreeLibrary(hnetapi32);

11 years, 9 months

[akhaldi] 57870: [MAGNIFY] * Reduce palette window size. * Fix some Japanese text. * Brought to you by Hirofumi Katayama. CORE-6802 #resolve #comment Committed in r57870. Thanks ; )

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Tue Dec 11 10:15:46 2012 New Revision: 57870 URL: http://svn.reactos.org/svn/reactos?rev=57870&view=rev Log: [MAGNIFY] * Reduce palette window size. * Fix some Japanese text. * Brought to you by Hirofumi Katayama. CORE-6802 #resolve #comment Committed in r57870. Thanks ;) Modified: trunk/reactos/base/applications/magnify/lang/ja-JP.rc trunk/reactos/base/applications/magnify/magnifier.c Modified: trunk/reactos/base/applications/magnify/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/magnify/… ============================================================================== --- trunk/reactos/base/applications/magnify/lang/ja-JP.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/magnify/lang/ja-JP.rc [iso-8859-1] Tue Dec 11 10:15:46 2012 @@ -38,13 +38,13 @@ LTEXT "æ¡å¤§ç:",IDC_STATIC,6,8,68,8 COMBOBOX IDC_ZOOM,72,6,63,66,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP GROUPBOX "æ¡å¤§ã®å¯¾è±¡",IDC_STATIC,7,25,139,59 - GROUPBOX "è¡¨ ç¤º",IDC_STATIC,7,87,139,57 - CONTROL "ãã¦ã¹ ã«ã¼ã½ ã«ã®åããè¿½ã",IDC_FOLLOWMOUSECHECK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,18,42,114,10 + GROUPBOX "è¡¨ç¤º",IDC_STATIC,7,87,139,57 + CONTROL "ãã¦ã¹ ã«ã¼ã½ã«ã®åããè¿½ã",IDC_FOLLOWMOUSECHECK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,18,42,114,10 CONTROL "ãã¼ãã¼ãã®ãã©ã¼ã«ã¹ãè¿½ã",IDC_FOLLOWKEYBOARDCHECK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,18,54,114,10 CONTROL "ç·¨éä¸ã®ããã¹ããè¿½ã",IDC_FOLLOWTEXTEDITINGCHECK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,18,66,114,10 CONTROL "è²ãåè»¢ãã",IDC_INVERTCOLORSCHECK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,18,102,114,10 CONTROL "æå°åãã¦éå§ãã",IDC_STARTMINIMIZEDCHECK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,18,114,114,10 - CONTROL "æ¡å¤§é¡ãè¡¨ ç¤ºãã",IDC_SHOWMAGNIFIERCHECK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,18,126,114,10 + CONTROL "æ¡å¤§é¡ãè¡¨ç¤ºãã",IDC_SHOWMAGNIFIERCHECK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,18,126,114,10 END IDD_WARNINGDIALOG DIALOGEX 0, 0, 250, 97 @@ -54,8 +54,8 @@ BEGIN DEFPUSHBUTTON "OK",IDOK,193,76,50,14 ICON IDI_ICON,IDC_STATIC,7,17,20,20 - LTEXT "æ¡å¤§é¡ã¯è»½ãè¦è¦éå®³ãããæ¹ã«æä½éã®æ©è½ ãæä¾ããããã«è¨è¨ããã¦ãã¾ããã»ã¨ãã©ã®è¦è¦éå®³èã®æ¹ã®å ´åãæ¥å¸¸å©ç¨ããã«ã¯ããé«æ©è½ ãªæ¡å¤§ã¦ã¼ãã£ãªãã£ãå¿è¦ã¨ãªãã¾ãã",IDC_STATIC,36,7,207,33 - CONTROL "ä»å¾ããã®ã¡ãã»ã¼ã¸ãè¡¨ ç¤ºããªã",IDC_SHOWWARNINGCHECK, "Button",BS_AUTOCHECKBOX | WS_TABSTOP,43,80,137,10 + LTEXT "æ¡å¤§é¡ã¯è»½ãè¦è¦éå®³ãããæ¹ã«æä½éã®æ©è½ãæä¾ããããã«è¨è¨ããã¦ãã¾ããã»ã¨ãã©ã®è¦è¦éå®³èã®æ¹ã®å ´åãæ¥å¸¸å©ç¨ããã«ã¯ããé«æ©è½ãªæ¡å¤§ã¦ã¼ãã£ãªãã£ãå¿è¦ã¨ãªãã¾ãã",IDC_STATIC,36,7,207,33 + CONTROL "ä»å¾ããã®ã¡ãã»ã¼ã¸ãè¡¨ç¤ºããªã",IDC_SHOWWARNINGCHECK, "Button",BS_AUTOCHECKBOX | WS_TABSTOP,43,80,137,10 END STRINGTABLE Modified: trunk/reactos/base/applications/magnify/magnifier.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/magnify/… ============================================================================== --- trunk/reactos/base/applications/magnify/magnifier.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/magnify/magnifier.c [iso-8859-1] Tue Dec 11 10:15:46 2012 @@ -7,6 +7,7 @@ * */ +/* TODO: AppBar */ #include "magnifier.h" const TCHAR szWindowClass[] = TEXT("MAGNIFIER"); @@ -118,18 +119,21 @@ */ BOOL InitInstance(HINSTANCE hInstance, int nCmdShow) { + RECT rcWorkArea; hInst = hInstance; // Store instance handle in our global variable - // Create the Window + SystemParametersInfo(SPI_GETWORKAREA, 0, &rcWorkArea, 0); + + /* Create the Window */ hMainWnd = CreateWindowEx( - WS_EX_TOPMOST, + WS_EX_TOPMOST | WS_EX_PALETTEWINDOW, szWindowClass, szTitle, WS_OVERLAPPEDWINDOW, CW_USEDEFAULT, CW_USEDEFAULT, - CW_USEDEFAULT, - CW_USEDEFAULT, + (rcWorkArea.right - rcWorkArea.left) * 2 / 3, + 200, NULL, NULL, hInstance,

11 years, 9 months

[akhaldi] 57869: [CALC]: Fix Japanese resource. Brought to you by Hirofumi Katayama. CORE-6800 #resolve #comment Committed in r57869. Thanks ; )

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Tue Dec 11 09:57:31 2012 New Revision: 57869 URL: http://svn.reactos.org/svn/reactos?rev=57869&view=rev Log: [CALC]: Fix Japanese resource. Brought to you by Hirofumi Katayama. CORE-6800 #resolve #comment Committed in r57869. Thanks ;) Modified: trunk/reactos/base/applications/calc/lang/ja-JP.rc Modified: trunk/reactos/base/applications/calc/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/lan… ============================================================================== --- trunk/reactos/base/applications/calc/lang/ja-JP.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/calc/lang/ja-JP.rc [iso-8859-1] Tue Dec 11 09:57:31 2012 @@ -341,29 +341,29 @@ IDR_MENU_SCIENTIFIC_1 MENU DISCARDABLE BEGIN - POPUP "ç·¨é" - BEGIN - MENUITEM "ã³ãã¼\tCtrl+C", IDM_EDIT_COPY - MENUITEM "è²¼ ãä»ãtCtrl+V", IDM_EDIT_PASTE - END - POPUP "è¡¨ ç¤º" - BEGIN - MENUITEM "æ¨æº", IDM_VIEW_STANDARD, CHECKED - MENUITEM "é¢æ°é»å", IDM_VIEW_SCIENTIFIC, CHECKED - MENUITEM "å¤æ", IDM_VIEW_CONVERSION - MENUITEM SEPARATOR - MENUITEM "16é²\tF5", IDM_VIEW_HEX, CHECKED - MENUITEM "10é²\tF6", IDM_VIEW_DEC, CHECKED - MENUITEM "8é²\tF7", IDM_VIEW_OCT, CHECKED - MENUITEM "2é²\tF8", IDM_VIEW_BIN, CHECKED - MENUITEM SEPARATOR - MENUITEM "Degrees\tF2", IDM_VIEW_DEG, CHECKED - MENUITEM "Radians\tF3", IDM_VIEW_RAD, CHECKED - MENUITEM "Gradians\tF4", IDM_VIEW_GRAD, CHECKED - MENUITEM SEPARATOR - MENUITEM "æ¡ãåºåã", IDM_VIEW_GROUP, CHECKED - END - POPUP "ãã«ã" + POPUP "ç·¨é(&E)" + BEGIN + MENUITEM "ã³ãã¼(&C)\tCtrl+C", IDM_EDIT_COPY + MENUITEM "è²¼ãä»ã(&P)\tCtrl+V", IDM_EDIT_PASTE + END + POPUP "è¡¨ç¤º(&V)" + BEGIN + MENUITEM "æ¨æº(&T)", IDM_VIEW_STANDARD, CHECKED + MENUITEM "é¢æ°é»å(&S)", IDM_VIEW_SCIENTIFIC, CHECKED + MENUITEM "å¤æ(&C)", IDM_VIEW_CONVERSION + MENUITEM SEPARATOR + MENUITEM "1&6é²\tF5", IDM_VIEW_HEX, CHECKED + MENUITEM "&10é²\tF6", IDM_VIEW_DEC, CHECKED + MENUITEM "&8é²\tF7", IDM_VIEW_OCT, CHECKED + MENUITEM "&2é²\tF8", IDM_VIEW_BIN, CHECKED + MENUITEM SEPARATOR + MENUITEM "&Degrees\tF2", IDM_VIEW_DEG, CHECKED + MENUITEM "&Radians\tF3", IDM_VIEW_RAD, CHECKED + MENUITEM "&Gradians\tF4", IDM_VIEW_GRAD, CHECKED + MENUITEM SEPARATOR + MENUITEM "æ¡ãåºåã(&I)", IDM_VIEW_GROUP, CHECKED + END + POPUP "ãã«ã(&H)" BEGIN MENUITEM "ãã«ã ãããã¯", IDM_HELP_HELP MENUITEM SEPARATOR @@ -373,30 +373,30 @@ IDR_MENU_SCIENTIFIC_2 MENU DISCARDABLE BEGIN - POPUP "ç·¨é" - BEGIN - MENUITEM "ã³ãã¼\tCtrl+C", IDM_EDIT_COPY - MENUITEM "è²¼ ãä»ã\tCtrl+V", IDM_EDIT_PASTE - END - POPUP "è¡¨ ç¤º" - BEGIN - MENUITEM "æ¨æº", IDM_VIEW_STANDARD, CHECKED - MENUITEM "é¢æ°é»å", IDM_VIEW_SCIENTIFIC, CHECKED - MENUITEM "å¤æ", IDM_VIEW_CONVERSION - MENUITEM SEPARATOR - MENUITEM "16é²\tF5", IDM_VIEW_HEX, CHECKED - MENUITEM "10é²\tF6", IDM_VIEW_DEC, CHECKED - MENUITEM "8é²\tF7", IDM_VIEW_OCT, CHECKED - MENUITEM "2é²\tF8", IDM_VIEW_BIN, CHECKED - MENUITEM SEPARATOR - MENUITEM "Qword\tF12", IDM_VIEW_QWORD, CHECKED - MENUITEM "Dword\tF2", IDM_VIEW_DWORD, CHECKED - MENUITEM "Word\tF3", IDM_VIEW_WORD, CHECKED - MENUITEM "Byte\tF4", IDM_VIEW_BYTE, CHECKED - MENUITEM SEPARATOR - MENUITEM "æ¡ãåºåã", IDM_VIEW_GROUP, CHECKED - END - POPUP "ãã«ã" + POPUP "ç·¨é(&E)" + BEGIN + MENUITEM "ã³ãã¼(&C)\tCtrl+C", IDM_EDIT_COPY + MENUITEM "è²¼ãä»ã(&P)\tCtrl+V", IDM_EDIT_PASTE + END + POPUP "è¡¨ç¤º(&V)" + BEGIN + MENUITEM "æ¨æº(&T)", IDM_VIEW_STANDARD, CHECKED + MENUITEM "é¢æ°é»å(&S)", IDM_VIEW_SCIENTIFIC, CHECKED + MENUITEM "å¤æ(&C)", IDM_VIEW_CONVERSION + MENUITEM SEPARATOR + MENUITEM "1&6é²\tF5", IDM_VIEW_HEX, CHECKED + MENUITEM "&10é²\tF6", IDM_VIEW_DEC, CHECKED + MENUITEM "&8é²\tF7", IDM_VIEW_OCT, CHECKED + MENUITEM "&2é²\tF8", IDM_VIEW_BIN, CHECKED + MENUITEM SEPARATOR + MENUITEM "&Qword\tF12", IDM_VIEW_QWORD, CHECKED + MENUITEM "&Dword\tF2", IDM_VIEW_DWORD, CHECKED + MENUITEM "&Word\tF3", IDM_VIEW_WORD, CHECKED + MENUITEM "&Byte\tF4", IDM_VIEW_BYTE, CHECKED + MENUITEM SEPARATOR + MENUITEM "æ¡ãåºåã(&I)", IDM_VIEW_GROUP, CHECKED + END + POPUP "ãã«ã(&H)" BEGIN MENUITEM "ãã«ã ãããã¯", IDM_HELP_HELP MENUITEM SEPARATOR @@ -406,20 +406,20 @@ IDR_MENU_STANDARD MENU DISCARDABLE BEGIN - POPUP "ç·¨é" - BEGIN - MENUITEM "ã³ãã¼\tCtrl+C", IDM_EDIT_COPY - MENUITEM "è²¼ ãä»ã\tCtrl+V", IDM_EDIT_PASTE - END - POPUP "è¡¨ ç¤º" - BEGIN - MENUITEM "æ¨æº", IDM_VIEW_STANDARD, CHECKED - MENUITEM "é¢æ°é»å", IDM_VIEW_SCIENTIFIC, CHECKED - MENUITEM "å¤æ", IDM_VIEW_CONVERSION - MENUITEM SEPARATOR - MENUITEM "æ¡ãåºåã", IDM_VIEW_GROUP, CHECKED - END - POPUP "ãã«ã" + POPUP "ç·¨é(&E)" + BEGIN + MENUITEM "ã³ãã¼(&C)\tCtrl+C", IDM_EDIT_COPY + MENUITEM "è²¼ãä»ã(&P)\tCtrl+V", IDM_EDIT_PASTE + END + POPUP "è¡¨ç¤º" + BEGIN + MENUITEM "æ¨æº(&T)", IDM_VIEW_STANDARD, CHECKED + MENUITEM "é¢æ°é»å(&S)", IDM_VIEW_SCIENTIFIC, CHECKED + MENUITEM "å¤æ(&C)", IDM_VIEW_CONVERSION + MENUITEM SEPARATOR + MENUITEM "æ¡ãåºåã(&I)", IDM_VIEW_GROUP, CHECKED + END + POPUP "ãã«ã(&H)" BEGIN MENUITEM "ãã«ã ãããã¯", IDM_HELP_HELP MENUITEM SEPARATOR @@ -431,7 +431,7 @@ STRINGTABLE DISCARDABLE BEGIN - IDS_STRING_LICENSE "ReactOS é»åã¯GNU GPLã©ã¤ã»ã³ã¹ã®åã§æä¾ãããããªã¼ã½ ããã¦ã§ã¢ã§ãã\r\n\r\nãã¡ãã§GNU GPLã©ã¤ã»ã³ã¹ã®ã³ãã¼ãå¾ããã¨ãã§ãã¾ã:\r\nhttp://www… GPLã©ã¤ã»ã³ã¹ã®ç¿»è¨³ãå¾ããã¨ãã§ãã¾ã:\r\nhttp://www.gn…" + IDS_STRING_LICENSE "ReactOS é»åã¯GNU GPLã©ã¤ã»ã³ã¹ã®åã§æä¾ãããããªã¼ã½ããã¦ã§ã¢ã§ãã\r\n\r\nãã¡ãã§GNU GPLã©ã¤ã»ã³ã¹ã®ã³ãã¼ãå¾ããã¨ãã§ãã¾ã:\r\nhttp://www… GPLã©ã¤ã»ã³ã¹ã®ç¿»è¨³ãå¾ããã¨ãã§ãã¾ã:\r\nhttp://www.gn…" IDS_MATH_ERROR "ã¨ã©ã¼" IDS_QUICKHELP "ã¯ã¤ãã¯ãã«ã" END

11 years, 9 months

[hbelusca] 57868: [FREELDR] Fix the height of the FreeLdr debugging options dialog.

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Tue Dec 11 02:34:10 2012 New Revision: 57868 URL: http://svn.reactos.org/svn/reactos?rev=57868&view=rev Log: [FREELDR] Fix the height of the FreeLdr debugging options dialog. Modified: trunk/reactos/boot/freeldr/freeldr/options.c Modified: trunk/reactos/boot/freeldr/freeldr/options.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/optio… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/options.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/options.c [iso-8859-1] Tue Dec 11 02:34:10 2012 @@ -20,7 +20,7 @@ #include <freeldr.h> #include <debug.h> -PCSTR OptionsMenuList[] = +PCSTR OptionsMenuList[] = { "Safe Mode", "Safe Mode with Networking", @@ -45,7 +45,7 @@ #endif }; -PCSTR FrldrDbgMsg = "Enable freeldr debug channels\n" +PCSTR FrldrDbgMsg = "Enable FreeLdr debug channels\n" "Acceptable syntax: [level1]#channel1[,[level2]#channel2]\n" "level can be one of: trace,warn,fixme,err\n" " if the level is ommited all levels\n" @@ -58,7 +58,7 @@ " trace+windows,trace+reactos\n" " +hwdetect,err-disk\n" " +peloader\n" - "NOTE: all letters must be lowercase, no spaces allowed\n"; + "NOTE: all letters must be lowercase, no spaces allowed."; enum OptionMenuItems { @@ -85,7 +85,7 @@ #endif }; -ULONG OptionsMenuItemCount = sizeof(OptionsMenuList) / sizeof(OptionsMenuList[0]); +ULONG OptionsMenuItemCount = sizeof(OptionsMenuList) / sizeof(OptionsMenuList[0]); BOOLEAN SafeMode = FALSE; BOOLEAN SafeModeWithNetworking = FALSE; @@ -98,8 +98,8 @@ VOID DoOptionsMenu(VOID) { - ULONG SelectedMenuItem; - CHAR DebugChannelString[100]; + ULONG SelectedMenuItem; + CHAR DebugChannelString[100]; if (!UiDisplayMenu("Select an option:", OptionsMenuList, @@ -149,7 +149,7 @@ break; case FREELDR_DEBUGGING: DebugChannelString[0]=0; - if(UiEditBox(FrldrDbgMsg, DebugChannelString, 100)) + if (UiEditBox(FrldrDbgMsg, DebugChannelString, 100)) DbgParseDebugChannels(DebugChannelString); break; //case SEPARATOR2:

11 years, 9 months

[hbelusca] 57867: [CONSRV] However here, we must keep the incrementation at the end of the loop, because of a possible corner case (a loop-break which takes place when we reach the last element of ...

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Tue Dec 11 01:45:49 2012 New Revision: 57867 URL: http://svn.reactos.org/svn/reactos?rev=57867&view=rev Log: [CONSRV] However here, we must keep the incrementation at the end of the loop, because of a possible corner case (a loop-break which takes place when we reach the last element of the list, but NextEntry already points to its head because of the cyclicity of the list) with the following 'if'-test made just after the loop. Modified: branches/ros-csrss/subsystems/win32/csrsrv/procsup.c branches/ros-csrss/subsystems/win32/csrsrv/thredsup.c Modified: branches/ros-csrss/subsystems/win32/csrsrv/procsup.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/subsystems/win32/csrs… ============================================================================== --- branches/ros-csrss/subsystems/win32/csrsrv/procsup.c [iso-8859-1] (original) +++ branches/ros-csrss/subsystems/win32/csrsrv/procsup.c [iso-8859-1] Tue Dec 11 01:45:49 2012 @@ -1118,7 +1118,7 @@ CsrLockedReferenceProcess(CurrentProcess); *CsrProcess = CurrentProcess; } - + /* Return the result */ return Status; } Modified: branches/ros-csrss/subsystems/win32/csrsrv/thredsup.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/subsystems/win32/csrs… ============================================================================== --- branches/ros-csrss/subsystems/win32/csrsrv/thredsup.c [iso-8859-1] (original) +++ branches/ros-csrss/subsystems/win32/csrsrv/thredsup.c [iso-8859-1] Tue Dec 11 01:45:49 2012 @@ -970,9 +970,6 @@ /* Get the Process */ CurrentThread = CONTAINING_RECORD(NextEntry, CSR_THREAD, HashLinks); - /* Move to the next entry */ - NextEntry = NextEntry->Flink; - /* Check for PID Match */ if ((CurrentThread->ClientId.UniqueThread == Tid) && !(CurrentThread->Flags & CsrThreadTerminated)) @@ -980,6 +977,9 @@ /* Get out of here */ break; } + + /* Move to the next entry */ + NextEntry = NextEntry->Flink; } /* Nothing found if we got back to the list */

11 years, 9 months

[hbelusca] 57866: [CONSRV] Put the "Move to the next entry" code just after retrieving list record, because it is less bug-prone. Indeed correct a bug in CsrDestroyProcess where we were doing an in...

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Tue Dec 11 01:25:57 2012 New Revision: 57866 URL: http://svn.reactos.org/svn/reactos?rev=57866&view=rev Log: [CONSRV] Put the "Move to the next entry" code just after retrieving list record, because it is less bug-prone. Indeed correct a bug in CsrDestroyProcess where we were doing an infinite loop when trying to notify existing CSR waits, because NextEntry was set to the CsrProcess->ThreadList.Flink element (head) of the list. Modified: branches/ros-csrss/subsystems/win32/csrsrv/procsup.c branches/ros-csrss/subsystems/win32/csrsrv/thredsup.c Modified: branches/ros-csrss/subsystems/win32/csrsrv/procsup.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/subsystems/win32/csrs… ============================================================================== --- branches/ros-csrss/subsystems/win32/csrsrv/procsup.c [iso-8859-1] (original) +++ branches/ros-csrss/subsystems/win32/csrsrv/procsup.c [iso-8859-1] Tue Dec 11 01:25:57 2012 @@ -854,10 +854,13 @@ /* Get the current thread entry */ CsrThread = CONTAINING_RECORD(NextEntry, CSR_THREAD, Link); + /* Move to the next entry */ + NextEntry = NextEntry->Flink; + /* Make sure the thread isn't already dead */ if (CsrThread->Flags & CsrThreadTerminated) { - NextEntry = NextEntry->Flink; + /* Go the the next thread */ continue; } @@ -884,7 +887,6 @@ /* Dereference the thread */ CsrLockedDereferenceThread(CsrThread); - NextEntry = CsrProcess->ThreadList.Flink; } /* Release the Process Lock and return success */ @@ -1100,7 +1102,7 @@ break; } - /* Next entry */ + /* Move to the next entry */ NextEntry = NextEntry->Flink; } while (NextEntry != &CsrRootProcess->ListLink); @@ -1279,12 +1281,12 @@ /* Get the Process */ CsrProcess = CONTAINING_RECORD(NextEntry, CSR_PROCESS, ListLink); - /* Remove the skip flag, set shutdown flags to 0*/ + /* Move to the next entry */ + NextEntry = NextEntry->Flink; + + /* Remove the skip flag, set shutdown flags to 0 */ CsrProcess->Flags &= ~CsrProcessSkipShutdown; CsrProcess->ShutdownFlags = 0; - - /* Move to the next */ - NextEntry = NextEntry->Flink; } /* Set shudown Priority */ @@ -1394,12 +1396,12 @@ /* Get the Process */ CsrProcess = CONTAINING_RECORD(NextEntry, CSR_PROCESS, ListLink); - /* Remove the skip flag, set shutdown flags to 0*/ + /* Move to the next entry */ + NextEntry = NextEntry->Flink; + + /* Remove the skip flag, set shutdown flags to 0 */ CsrProcess->Flags &= ~CsrProcessSkipShutdown; CsrProcess->ShutdownFlags = 0; - - /* Move to the next */ - NextEntry = NextEntry->Flink; } /* Set shudown Priority */ Modified: branches/ros-csrss/subsystems/win32/csrsrv/thredsup.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/subsystems/win32/csrs… ============================================================================== --- branches/ros-csrss/subsystems/win32/csrsrv/thredsup.c [iso-8859-1] (original) +++ branches/ros-csrss/subsystems/win32/csrsrv/thredsup.c [iso-8859-1] Tue Dec 11 01:25:57 2012 @@ -201,6 +201,9 @@ /* Get the thread */ FoundThread = CONTAINING_RECORD(NextEntry, CSR_THREAD, HashLinks); + /* Move to the next entry */ + NextEntry = NextEntry->Flink; + /* Compare the CID */ // FIXME: if (*(PULONGLONG)&FoundThread->ClientId == *(PULONGLONG)ClientId) if (FoundThread->ClientId.UniqueThread == ClientId->UniqueThread) @@ -212,9 +215,6 @@ // DPRINT1("Found: %p %p\n", FoundThread, FoundThread->Process); return FoundThread; } - - /* Next */ - NextEntry = NextEntry->Flink; } /* Nothing found */ @@ -267,7 +267,7 @@ /* Check for TID Match */ if (FoundThread->ClientId.UniqueThread == Cid->UniqueThread) break; - /* Next entry */ + /* Move to the next entry */ NextEntry = NextEntry->Flink; } @@ -970,6 +970,9 @@ /* Get the Process */ CurrentThread = CONTAINING_RECORD(NextEntry, CSR_THREAD, HashLinks); + /* Move to the next entry */ + NextEntry = NextEntry->Flink; + /* Check for PID Match */ if ((CurrentThread->ClientId.UniqueThread == Tid) && !(CurrentThread->Flags & CsrThreadTerminated)) @@ -977,9 +980,6 @@ /* Get out of here */ break; } - - /* Next entry */ - NextEntry = NextEntry->Flink; } /* Nothing found if we got back to the list */

11 years, 9 months

[hbelusca] 57865: - Synchronize up to trunk's revision r57864. - [CONSRV/WINSRV] Add langage definition support.

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Mon Dec 10 23:01:20 2012 New Revision: 57865 URL: http://svn.reactos.org/svn/reactos?rev=57865&view=rev Log: - Synchronize up to trunk's revision r57864. - [CONSRV/WINSRV] Add langage definition support. Added: branches/ros-csrss/include/reactos/wine/ddk/ntddcdvd.h - copied unchanged from r57864, trunk/reactos/include/reactos/wine/ddk/ntddcdvd.h branches/ros-csrss/lib/sdk/crt/include/internal/locale.h - copied unchanged from r57864, trunk/reactos/lib/sdk/crt/include/internal/locale.h branches/ros-csrss/lib/sdk/crt/mbstring/_setmbcp.c - copied unchanged from r57864, trunk/reactos/lib/sdk/crt/mbstring/_setmbcp.c Modified: branches/ros-csrss/ (props changed) branches/ros-csrss/base/applications/games/spider/spigame.cpp branches/ros-csrss/base/setup/usetup/lang/fr-FR.h branches/ros-csrss/base/setup/usetup/lang/it-IT.h branches/ros-csrss/boot/bootdata/bootcd.ini branches/ros-csrss/boot/bootdata/livecd.ini branches/ros-csrss/boot/freeldr/FREELDR.INI (props changed) branches/ros-csrss/boot/freeldr/bootsect/dosmbr.asm (props changed) branches/ros-csrss/boot/freeldr/bootsect/ext2.S (props changed) branches/ros-csrss/boot/freeldr/bootsect/ext2.asm (props changed) branches/ros-csrss/boot/freeldr/bootsect/fat.asm (props changed) branches/ros-csrss/boot/freeldr/bootsect/fat32.asm (props changed) branches/ros-csrss/boot/freeldr/bootsect/isoboot.asm (props changed) branches/ros-csrss/boot/freeldr/bootsect/win2k.asm (props changed) branches/ros-csrss/boot/freeldr/bootsect/wxpfat16.asm (props changed) branches/ros-csrss/boot/freeldr/fdebug/fdebug.c (props changed) branches/ros-csrss/boot/freeldr/fdebug/fdebug.rc (props changed) branches/ros-csrss/boot/freeldr/fdebug/lang/tr-TR.rc (props changed) branches/ros-csrss/boot/freeldr/fdebug/resource.h (props changed) branches/ros-csrss/boot/freeldr/fdebug/rs232.c (props changed) branches/ros-csrss/boot/freeldr/fdebug/rs232.h (props changed) branches/ros-csrss/boot/freeldr/freeldr/CHANGELOG (props changed) branches/ros-csrss/boot/freeldr/freeldr/arch/i386/archmach.c (contents, props changed) branches/ros-csrss/boot/freeldr/freeldr/arch/i386/custom.c (contents, props changed) branches/ros-csrss/boot/freeldr/freeldr/arch/i386/drivemap.c (props changed) branches/ros-csrss/boot/freeldr/freeldr/arch/i386/drvmap.S (props changed) branches/ros-csrss/boot/freeldr/freeldr/arch/i386/entry.S (props changed) branches/ros-csrss/boot/freeldr/freeldr/arch/i386/hardware.c (props changed) branches/ros-csrss/boot/freeldr/freeldr/arch/i386/hwacpi.c (props changed) branches/ros-csrss/boot/freeldr/freeldr/arch/i386/hwapm.c (props changed) branches/ros-csrss/boot/freeldr/freeldr/arch/i386/hwpci.c (props changed) branches/ros-csrss/boot/freeldr/freeldr/arch/i386/i386disk.c (props changed) branches/ros-csrss/boot/freeldr/freeldr/arch/i386/i386rtl.c (props changed) branches/ros-csrss/boot/freeldr/freeldr/arch/i386/i386trap.S (props changed) branches/ros-csrss/boot/freeldr/freeldr/arch/i386/i386vid.c (props changed) branches/ros-csrss/boot/freeldr/freeldr/arch/i386/machpc.c (contents, props changed) branches/ros-csrss/boot/freeldr/freeldr/arch/i386/machxbox.c (contents, props changed) branches/ros-csrss/boot/freeldr/freeldr/arch/i386/mb.S (props changed) branches/ros-csrss/boot/freeldr/freeldr/arch/i386/miscboot.c (props changed) branches/ros-csrss/boot/freeldr/freeldr/arch/i386/pccons.c (contents, props changed) branches/ros-csrss/boot/freeldr/freeldr/arch/i386/pcdisk.c (props changed) branches/ros-csrss/boot/freeldr/freeldr/arch/i386/pcmem.c (props changed) branches/ros-csrss/boot/freeldr/freeldr/arch/i386/pcrtc.c (contents, props changed) branches/ros-csrss/boot/freeldr/freeldr/arch/i386/pcvideo.c (contents, props changed) branches/ros-csrss/boot/freeldr/freeldr/arch/i386/xboxcons.c (contents, props changed) branches/ros-csrss/boot/freeldr/freeldr/arch/i386/xboxdisk.c (contents, props changed) branches/ros-csrss/boot/freeldr/freeldr/arch/i386/xboxfont.c (contents, props changed) branches/ros-csrss/boot/freeldr/freeldr/arch/i386/xboxhw.c (contents, props changed) branches/ros-csrss/boot/freeldr/freeldr/arch/i386/xboxi2c.c branches/ros-csrss/boot/freeldr/freeldr/arch/i386/xboxmem.c (contents, props changed) branches/ros-csrss/boot/freeldr/freeldr/arch/i386/xboxrtc.c (contents, props changed) branches/ros-csrss/boot/freeldr/freeldr/arch/i386/xboxvideo.c (contents, props changed) branches/ros-csrss/boot/freeldr/freeldr/bootmgr.c branches/ros-csrss/boot/freeldr/freeldr/cache/blocklist.c (props changed) branches/ros-csrss/boot/freeldr/freeldr/cache/cache.c (props changed) branches/ros-csrss/boot/freeldr/freeldr/cmdline.c (props changed) branches/ros-csrss/boot/freeldr/freeldr/comm/rs232.c (props changed) branches/ros-csrss/boot/freeldr/freeldr/debug.c (props changed) branches/ros-csrss/boot/freeldr/freeldr/disk/disk.c (props changed) branches/ros-csrss/boot/freeldr/freeldr/disk/partition.c (props changed) branches/ros-csrss/boot/freeldr/freeldr/fs/ext2.c (props changed) branches/ros-csrss/boot/freeldr/freeldr/fs/fat.c (props changed) branches/ros-csrss/boot/freeldr/freeldr/fs/fs.c (props changed) branches/ros-csrss/boot/freeldr/freeldr/fs/iso.c (props changed) branches/ros-csrss/boot/freeldr/freeldr/fs/ntfs.c (props changed) branches/ros-csrss/boot/freeldr/freeldr/include/arch/i386/custom.h (props changed) branches/ros-csrss/boot/freeldr/freeldr/include/arch/i386/drivemap.h (props changed) branches/ros-csrss/boot/freeldr/freeldr/include/arch/i386/i386.h (props changed) branches/ros-csrss/boot/freeldr/freeldr/include/arch/i386/machxbox.h (contents, props changed) branches/ros-csrss/boot/freeldr/freeldr/include/arch/i386/miscboot.h (props changed) branches/ros-csrss/boot/freeldr/freeldr/include/arch/pc/hardware.h (props changed) branches/ros-csrss/boot/freeldr/freeldr/include/arch/pc/machpc.h (contents, props changed) branches/ros-csrss/boot/freeldr/freeldr/include/cache.h (props changed) branches/ros-csrss/boot/freeldr/freeldr/include/cmdline.h (contents, props changed) branches/ros-csrss/boot/freeldr/freeldr/include/comm.h (props changed) branches/ros-csrss/boot/freeldr/freeldr/include/debug.h (props changed) branches/ros-csrss/boot/freeldr/freeldr/include/disk.h (props changed) branches/ros-csrss/boot/freeldr/freeldr/include/freeldr.h (props changed) branches/ros-csrss/boot/freeldr/freeldr/include/fs.h (props changed) branches/ros-csrss/boot/freeldr/freeldr/include/fs/ext2.h (props changed) branches/ros-csrss/boot/freeldr/freeldr/include/fs/fat.h (props changed) branches/ros-csrss/boot/freeldr/freeldr/include/fs/iso.h (props changed) branches/ros-csrss/boot/freeldr/freeldr/include/fs/ntfs.h (props changed) branches/ros-csrss/boot/freeldr/freeldr/include/inffile.h (contents, props changed) branches/ros-csrss/boot/freeldr/freeldr/include/inifile.h (props changed) branches/ros-csrss/boot/freeldr/freeldr/include/keycodes.h (props changed) branches/ros-csrss/boot/freeldr/freeldr/include/linux.h (props changed) branches/ros-csrss/boot/freeldr/freeldr/include/machine.h (props changed) branches/ros-csrss/boot/freeldr/freeldr/include/mm.h (props changed) branches/ros-csrss/boot/freeldr/freeldr/include/multiboot.h (props changed) branches/ros-csrss/boot/freeldr/freeldr/include/options.h (props changed) branches/ros-csrss/boot/freeldr/freeldr/include/oslist.h (props changed) branches/ros-csrss/boot/freeldr/freeldr/include/reactos.h (props changed) branches/ros-csrss/boot/freeldr/freeldr/include/registry.h (props changed) branches/ros-csrss/boot/freeldr/freeldr/include/ui.h (contents, props changed) branches/ros-csrss/boot/freeldr/freeldr/include/ui/noui.h branches/ros-csrss/boot/freeldr/freeldr/include/ui/tui.h branches/ros-csrss/boot/freeldr/freeldr/include/ver.h (props changed) branches/ros-csrss/boot/freeldr/freeldr/include/video.h (props changed) branches/ros-csrss/boot/freeldr/freeldr/inffile/inffile.c (contents, props changed) branches/ros-csrss/boot/freeldr/freeldr/inifile/ini_init.c (props changed) branches/ros-csrss/boot/freeldr/freeldr/inifile/inifile.c (props changed) branches/ros-csrss/boot/freeldr/freeldr/inifile/parse.c (props changed) branches/ros-csrss/boot/freeldr/freeldr/linuxboot.c (props changed) branches/ros-csrss/boot/freeldr/freeldr/machine.c (contents, props changed) branches/ros-csrss/boot/freeldr/freeldr/mm/meminit.c (props changed) branches/ros-csrss/boot/freeldr/freeldr/mm/mm.c (props changed) branches/ros-csrss/boot/freeldr/freeldr/options.c (contents, props changed) branches/ros-csrss/boot/freeldr/freeldr/oslist.c (props changed) branches/ros-csrss/boot/freeldr/freeldr/reactos/arcname.c (props changed) branches/ros-csrss/boot/freeldr/freeldr/reactos/binhive.c (props changed) branches/ros-csrss/boot/freeldr/freeldr/reactos/registry.c (props changed) branches/ros-csrss/boot/freeldr/freeldr/ui/directui.c branches/ros-csrss/boot/freeldr/freeldr/ui/gui.c (props changed) branches/ros-csrss/boot/freeldr/freeldr/ui/minitui.c branches/ros-csrss/boot/freeldr/freeldr/ui/noui.c branches/ros-csrss/boot/freeldr/freeldr/ui/tui.c (contents, props changed) branches/ros-csrss/boot/freeldr/freeldr/ui/tuimenu.c (contents, props changed) branches/ros-csrss/boot/freeldr/freeldr/ui/ui.c (contents, props changed) branches/ros-csrss/boot/freeldr/freeldr/version.c (props changed) branches/ros-csrss/boot/freeldr/freeldr/video/fade.c (props changed) branches/ros-csrss/boot/freeldr/freeldr/video/palette.c (props changed) branches/ros-csrss/boot/freeldr/freeldr/video/video.c (props changed) branches/ros-csrss/boot/freeldr/freeldr/windows/setupldr.c branches/ros-csrss/boot/freeldr/install/install.c (props changed) branches/ros-csrss/boot/freeldr/install/install.h (props changed) branches/ros-csrss/boot/freeldr/install/linux/finstext2.c (props changed) branches/ros-csrss/boot/freeldr/install/linux/finstext2.h (props changed) branches/ros-csrss/boot/freeldr/install/volume.c (props changed) branches/ros-csrss/boot/freeldr/install/volume.h (props changed) branches/ros-csrss/boot/freeldr/notes.txt (props changed) branches/ros-csrss/boot/freeldr/tools/deptool.c (props changed) branches/ros-csrss/boot/freeldr/tools/hosttype.c (props changed) branches/ros-csrss/boot/freeldr/tools/rcopy.c (props changed) branches/ros-csrss/boot/freeldr/tools/rdel.c (contents, props changed) branches/ros-csrss/boot/freeldr/tools/rmkdir.c (props changed) branches/ros-csrss/boot/freeldr/tools/rrmdir.c (contents, props changed) branches/ros-csrss/dll/cpl/main/CMakeLists.txt branches/ros-csrss/dll/cpl/main/main.h branches/ros-csrss/dll/win32/advpack/CMakeLists.txt branches/ros-csrss/dll/win32/advpack/advpack_private.h branches/ros-csrss/dll/win32/advpack/files.c branches/ros-csrss/dll/win32/kernel32/client/file/copy.c branches/ros-csrss/dll/win32/lsasrv/database.c branches/ros-csrss/dll/win32/lsasrv/lsarpc.c branches/ros-csrss/dll/win32/lsasrv/lsasrv.h branches/ros-csrss/dll/win32/lsasrv/policy.c branches/ros-csrss/dll/win32/msi/action.c branches/ros-csrss/dll/win32/msi/appsearch.c branches/ros-csrss/dll/win32/msi/automation.c branches/ros-csrss/dll/win32/msi/custom.c branches/ros-csrss/dll/win32/msi/database.c branches/ros-csrss/dll/win32/msi/dialog.c branches/ros-csrss/dll/win32/msi/events.c branches/ros-csrss/dll/win32/msi/files.c branches/ros-csrss/dll/win32/msi/format.c branches/ros-csrss/dll/win32/msi/install.c branches/ros-csrss/dll/win32/msi/msi.c branches/ros-csrss/dll/win32/msi/msi_main.c branches/ros-csrss/dll/win32/msi/msipriv.h branches/ros-csrss/dll/win32/msi/msiquery.c branches/ros-csrss/dll/win32/msi/package.c branches/ros-csrss/dll/win32/msi/patch.c branches/ros-csrss/dll/win32/msi/record.c branches/ros-csrss/dll/win32/msi/registry.c branches/ros-csrss/dll/win32/msi/script.c branches/ros-csrss/dll/win32/msi/select.c branches/ros-csrss/dll/win32/msi/source.c branches/ros-csrss/dll/win32/msi/storages.c branches/ros-csrss/dll/win32/msi/streams.c branches/ros-csrss/dll/win32/msi/string.c branches/ros-csrss/dll/win32/msi/table.c branches/ros-csrss/dll/win32/msi/tokenize.c branches/ros-csrss/dll/win32/msi/upgrade.c branches/ros-csrss/dll/win32/msi/where.c branches/ros-csrss/dll/win32/msvcrt/dllmain.c branches/ros-csrss/dll/win32/msvcrt/msvcrt.spec branches/ros-csrss/dll/win32/msvcrt/precomp.h branches/ros-csrss/dll/win32/msvcrt20/msvcrt20.c branches/ros-csrss/dll/win32/msvcrt40/msvcrt40.c branches/ros-csrss/dll/win32/shell32/control.cpp branches/ros-csrss/dll/win32/userenv/directory.c branches/ros-csrss/drivers/filesystems/cdfs/dirctl.c branches/ros-csrss/drivers/filesystems/fastfat/dir.c branches/ros-csrss/drivers/filesystems/fastfat/fcb.c branches/ros-csrss/drivers/hid/hidclass/fdo.c branches/ros-csrss/drivers/hid/hidusb/ (props changed) branches/ros-csrss/drivers/hid/hidusb/hidusb.c branches/ros-csrss/drivers/network/ndis/ndis/config.c branches/ros-csrss/drivers/network/ndis/ndis/misc.c branches/ros-csrss/drivers/usb/usbccgp/descriptor.c branches/ros-csrss/drivers/usb/usbccgp/usbccgp.h branches/ros-csrss/drivers/usb/usbd/usbd.spec branches/ros-csrss/drivers/usb/usbhub/ (props changed) branches/ros-csrss/drivers/usb/usbhub/fdo.c branches/ros-csrss/drivers/usb/usbuhci/usb_request.cpp branches/ros-csrss/include/crt/crtdefs.h branches/ros-csrss/include/crt/float.h branches/ros-csrss/include/psdk/shellapi.h branches/ros-csrss/include/psdk/shlguid.h branches/ros-csrss/include/psdk/winbase.h branches/ros-csrss/include/psdk/wincred.h branches/ros-csrss/include/psdk/winnt.h branches/ros-csrss/include/psdk/winsvc.h branches/ros-csrss/include/psdk/winternl.h branches/ros-csrss/include/reactos/idl/svcctl.idl branches/ros-csrss/lib/drivers/libusb/hub_controller.cpp (contents, props changed) branches/ros-csrss/lib/drivers/libusb/usb_device.cpp (contents, props changed) branches/ros-csrss/lib/sdk/crt/crt.cmake branches/ros-csrss/lib/sdk/crt/float/i386/cntrlfp.c branches/ros-csrss/lib/sdk/crt/include/internal/mbstring.h branches/ros-csrss/lib/sdk/crt/include/internal/tls.h branches/ros-csrss/lib/sdk/crt/locale/locale.c branches/ros-csrss/lib/sdk/crt/mbstring/iskana.c branches/ros-csrss/lib/sdk/crt/mbstring/ismbkaln.c branches/ros-csrss/lib/sdk/crt/mbstring/ismblead.c branches/ros-csrss/lib/sdk/crt/mbstring/ismbpun.c branches/ros-csrss/lib/sdk/crt/mbstring/ismbtrl.c branches/ros-csrss/lib/sdk/crt/mbstring/mbsncpy.c branches/ros-csrss/lib/sdk/crt/misc/environ.c branches/ros-csrss/lib/sdk/crt/misc/tls.c branches/ros-csrss/lib/sdk/crt/precomp.h branches/ros-csrss/lib/sdk/crt/string/ctype.c branches/ros-csrss/lib/sdk/crt/string/wcs.c branches/ros-csrss/lib/sdk/crt/time/strftime.c branches/ros-csrss/lib/sdk/uuid/shguids.c branches/ros-csrss/media/doc/README.WINE branches/ros-csrss/media/drivers/etc/services (props changed) branches/ros-csrss/ntoskrnl/fsrtl/dbcsname.c branches/ros-csrss/ntoskrnl/fsrtl/filelock.c branches/ros-csrss/ntoskrnl/fsrtl/name.c branches/ros-csrss/ntoskrnl/inbv/inbv.c branches/ros-csrss/ntoskrnl/kdbg/kdb.c branches/ros-csrss/win32ss/drivers/miniport/vga/initvga.c branches/ros-csrss/win32ss/drivers/miniport/vga_new/vbemodes.c branches/ros-csrss/win32ss/user/consrv/rsrc.rc branches/ros-csrss/win32ss/user/winsrv/rsrc.rc [This mail would be too long, it was shortened to contain the URLs only.] Modified: branches/ros-csrss/base/applications/games/spider/spigame.cpp URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/base/applications/gam… Modified: branches/ros-csrss/base/setup/usetup/lang/fr-FR.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/base/setup/usetup/lan… Modified: branches/ros-csrss/base/setup/usetup/lang/it-IT.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/base/setup/usetup/lan… Modified: branches/ros-csrss/boot/bootdata/bootcd.ini URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/boot/bootdata/bootcd.… Modified: branches/ros-csrss/boot/bootdata/livecd.ini URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/boot/bootdata/livecd.… Modified: branches/ros-csrss/boot/freeldr/freeldr/arch/i386/archmach.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/boot/freeldr/freeldr/… Modified: branches/ros-csrss/boot/freeldr/freeldr/arch/i386/custom.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/boot/freeldr/freeldr/… Modified: branches/ros-csrss/boot/freeldr/freeldr/arch/i386/machpc.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/boot/freeldr/freeldr/… Modified: branches/ros-csrss/boot/freeldr/freeldr/arch/i386/machxbox.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/boot/freeldr/freeldr/… Modified: branches/ros-csrss/boot/freeldr/freeldr/arch/i386/pccons.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/boot/freeldr/freeldr/… Modified: branches/ros-csrss/boot/freeldr/freeldr/arch/i386/pcrtc.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/boot/freeldr/freeldr/… Modified: branches/ros-csrss/boot/freeldr/freeldr/arch/i386/pcvideo.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/boot/freeldr/freeldr/… Modified: branches/ros-csrss/boot/freeldr/freeldr/arch/i386/xboxcons.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/boot/freeldr/freeldr/… Modified: branches/ros-csrss/boot/freeldr/freeldr/arch/i386/xboxdisk.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/boot/freeldr/freeldr/… Modified: branches/ros-csrss/boot/freeldr/freeldr/arch/i386/xboxfont.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/boot/freeldr/freeldr/… Modified: branches/ros-csrss/boot/freeldr/freeldr/arch/i386/xboxhw.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/boot/freeldr/freeldr/… Modified: branches/ros-csrss/boot/freeldr/freeldr/arch/i386/xboxi2c.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/boot/freeldr/freeldr/… Modified: branches/ros-csrss/boot/freeldr/freeldr/arch/i386/xboxmem.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/boot/freeldr/freeldr/… Modified: branches/ros-csrss/boot/freeldr/freeldr/arch/i386/xboxrtc.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/boot/freeldr/freeldr/… Modified: branches/ros-csrss/boot/freeldr/freeldr/arch/i386/xboxvideo.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/boot/freeldr/freeldr/… Modified: branches/ros-csrss/boot/freeldr/freeldr/bootmgr.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/boot/freeldr/freeldr/… Modified: branches/ros-csrss/boot/freeldr/freeldr/include/arch/i386/machxbox.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/boot/freeldr/freeldr/… Modified: branches/ros-csrss/boot/freeldr/freeldr/include/arch/pc/machpc.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/boot/freeldr/freeldr/… Modified: branches/ros-csrss/boot/freeldr/freeldr/include/cmdline.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/boot/freeldr/freeldr/… Modified: branches/ros-csrss/boot/freeldr/freeldr/include/inffile.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/boot/freeldr/freeldr/… Modified: branches/ros-csrss/boot/freeldr/freeldr/include/ui.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/boot/freeldr/freeldr/… Modified: branches/ros-csrss/boot/freeldr/freeldr/include/ui/noui.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/boot/freeldr/freeldr/… Modified: branches/ros-csrss/boot/freeldr/freeldr/include/ui/tui.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/boot/freeldr/freeldr/… Modified: branches/ros-csrss/boot/freeldr/freeldr/inffile/inffile.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/boot/freeldr/freeldr/… Modified: branches/ros-csrss/boot/freeldr/freeldr/machine.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/boot/freeldr/freeldr/… Modified: branches/ros-csrss/boot/freeldr/freeldr/options.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/boot/freeldr/freeldr/… Modified: branches/ros-csrss/boot/freeldr/freeldr/ui/directui.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/boot/freeldr/freeldr/… Modified: branches/ros-csrss/boot/freeldr/freeldr/ui/minitui.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/boot/freeldr/freeldr/… Modified: branches/ros-csrss/boot/freeldr/freeldr/ui/noui.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/boot/freeldr/freeldr/… Modified: branches/ros-csrss/boot/freeldr/freeldr/ui/tui.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/boot/freeldr/freeldr/… Modified: branches/ros-csrss/boot/freeldr/freeldr/ui/tuimenu.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/boot/freeldr/freeldr/… Modified: branches/ros-csrss/boot/freeldr/freeldr/ui/ui.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/boot/freeldr/freeldr/… Modified: branches/ros-csrss/boot/freeldr/freeldr/windows/setupldr.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/boot/freeldr/freeldr/… Modified: branches/ros-csrss/boot/freeldr/tools/rdel.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/boot/freeldr/tools/rd… Modified: branches/ros-csrss/boot/freeldr/tools/rrmdir.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/boot/freeldr/tools/rr… Modified: branches/ros-csrss/dll/cpl/main/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/cpl/main/CMakeLis… Modified: branches/ros-csrss/dll/cpl/main/main.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/cpl/main/main.h?r… Modified: branches/ros-csrss/dll/win32/advpack/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/advpack/CMa… Modified: branches/ros-csrss/dll/win32/advpack/advpack_private.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/advpack/adv… Modified: branches/ros-csrss/dll/win32/advpack/files.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/advpack/fil… Modified: branches/ros-csrss/dll/win32/kernel32/client/file/copy.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/kernel32/cl… Modified: branches/ros-csrss/dll/win32/lsasrv/database.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/lsasrv/data… Modified: branches/ros-csrss/dll/win32/lsasrv/lsarpc.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/lsasrv/lsar… Modified: branches/ros-csrss/dll/win32/lsasrv/lsasrv.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/lsasrv/lsas… Modified: branches/ros-csrss/dll/win32/lsasrv/policy.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/lsasrv/poli… Modified: branches/ros-csrss/dll/win32/msi/action.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/msi/action.… Modified: branches/ros-csrss/dll/win32/msi/appsearch.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/msi/appsear… Modified: branches/ros-csrss/dll/win32/msi/automation.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/msi/automat… Modified: branches/ros-csrss/dll/win32/msi/custom.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/msi/custom.… Modified: branches/ros-csrss/dll/win32/msi/database.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/msi/databas… Modified: branches/ros-csrss/dll/win32/msi/dialog.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/msi/dialog.… Modified: branches/ros-csrss/dll/win32/msi/events.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/msi/events.… Modified: branches/ros-csrss/dll/win32/msi/files.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/msi/files.c… Modified: branches/ros-csrss/dll/win32/msi/format.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/msi/format.… Modified: branches/ros-csrss/dll/win32/msi/install.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/msi/install… Modified: branches/ros-csrss/dll/win32/msi/msi.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/msi/msi.c?r… Modified: branches/ros-csrss/dll/win32/msi/msi_main.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/msi/msi_mai… Modified: branches/ros-csrss/dll/win32/msi/msipriv.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/msi/msipriv… Modified: branches/ros-csrss/dll/win32/msi/msiquery.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/msi/msiquer… Modified: branches/ros-csrss/dll/win32/msi/package.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/msi/package… Modified: branches/ros-csrss/dll/win32/msi/patch.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/msi/patch.c… Modified: branches/ros-csrss/dll/win32/msi/record.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/msi/record.… Modified: branches/ros-csrss/dll/win32/msi/registry.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/msi/registr… Modified: branches/ros-csrss/dll/win32/msi/script.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/msi/script.… Modified: branches/ros-csrss/dll/win32/msi/select.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/msi/select.… Modified: branches/ros-csrss/dll/win32/msi/source.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/msi/source.… Modified: branches/ros-csrss/dll/win32/msi/storages.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/msi/storage… Modified: branches/ros-csrss/dll/win32/msi/streams.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/msi/streams… Modified: branches/ros-csrss/dll/win32/msi/string.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/msi/string.… Modified: branches/ros-csrss/dll/win32/msi/table.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/msi/table.c… Modified: branches/ros-csrss/dll/win32/msi/tokenize.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/msi/tokeniz… Modified: branches/ros-csrss/dll/win32/msi/upgrade.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/msi/upgrade… Modified: branches/ros-csrss/dll/win32/msi/where.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/msi/where.c… Modified: branches/ros-csrss/dll/win32/msvcrt/dllmain.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/msvcrt/dllm… Modified: branches/ros-csrss/dll/win32/msvcrt/msvcrt.spec URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/msvcrt/msvc… Modified: branches/ros-csrss/dll/win32/msvcrt/precomp.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/msvcrt/prec… Modified: branches/ros-csrss/dll/win32/msvcrt20/msvcrt20.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/msvcrt20/ms… Modified: branches/ros-csrss/dll/win32/msvcrt40/msvcrt40.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/msvcrt40/ms… Modified: branches/ros-csrss/dll/win32/shell32/control.cpp URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/shell32/con… Modified: branches/ros-csrss/dll/win32/userenv/directory.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/userenv/dir… Modified: branches/ros-csrss/drivers/filesystems/cdfs/dirctl.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/drivers/filesystems/c… Modified: branches/ros-csrss/drivers/filesystems/fastfat/dir.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/drivers/filesystems/f… Modified: branches/ros-csrss/drivers/filesystems/fastfat/fcb.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/drivers/filesystems/f… Modified: branches/ros-csrss/drivers/hid/hidclass/fdo.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/drivers/hid/hidclass/… Modified: branches/ros-csrss/drivers/hid/hidusb/hidusb.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/drivers/hid/hidusb/hi… Modified: branches/ros-csrss/drivers/network/ndis/ndis/config.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/drivers/network/ndis/… Modified: branches/ros-csrss/drivers/network/ndis/ndis/misc.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/drivers/network/ndis/… Modified: branches/ros-csrss/drivers/usb/usbccgp/descriptor.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/drivers/usb/usbccgp/d… Modified: branches/ros-csrss/drivers/usb/usbccgp/usbccgp.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/drivers/usb/usbccgp/u… Modified: branches/ros-csrss/drivers/usb/usbd/usbd.spec URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/drivers/usb/usbd/usbd… Modified: branches/ros-csrss/drivers/usb/usbhub/fdo.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/drivers/usb/usbhub/fd… Modified: branches/ros-csrss/drivers/usb/usbuhci/usb_request.cpp URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/drivers/usb/usbuhci/u… Modified: branches/ros-csrss/include/crt/crtdefs.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/include/crt/crtdefs.h… Modified: branches/ros-csrss/include/crt/float.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/include/crt/float.h?r… Modified: branches/ros-csrss/include/psdk/shellapi.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/include/psdk/shellapi… Modified: branches/ros-csrss/include/psdk/shlguid.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/include/psdk/shlguid.… Modified: branches/ros-csrss/include/psdk/winbase.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/include/psdk/winbase.… Modified: branches/ros-csrss/include/psdk/wincred.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/include/psdk/wincred.… Modified: branches/ros-csrss/include/psdk/winnt.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/include/psdk/winnt.h?… Modified: branches/ros-csrss/include/psdk/winsvc.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/include/psdk/winsvc.h… Modified: branches/ros-csrss/include/psdk/winternl.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/include/psdk/winternl… Modified: branches/ros-csrss/include/reactos/idl/svcctl.idl URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/include/reactos/idl/s… Modified: branches/ros-csrss/lib/drivers/libusb/hub_controller.cpp URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/lib/drivers/libusb/hu… Modified: branches/ros-csrss/lib/drivers/libusb/usb_device.cpp URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/lib/drivers/libusb/us… Modified: branches/ros-csrss/lib/sdk/crt/crt.cmake URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/lib/sdk/crt/crt.cmake… Modified: branches/ros-csrss/lib/sdk/crt/float/i386/cntrlfp.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/lib/sdk/crt/float/i38… Modified: branches/ros-csrss/lib/sdk/crt/include/internal/mbstring.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/lib/sdk/crt/include/i… Modified: branches/ros-csrss/lib/sdk/crt/include/internal/tls.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/lib/sdk/crt/include/i… Modified: branches/ros-csrss/lib/sdk/crt/locale/locale.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/lib/sdk/crt/locale/lo… Modified: branches/ros-csrss/lib/sdk/crt/mbstring/iskana.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/lib/sdk/crt/mbstring/… Modified: branches/ros-csrss/lib/sdk/crt/mbstring/ismbkaln.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/lib/sdk/crt/mbstring/… Modified: branches/ros-csrss/lib/sdk/crt/mbstring/ismblead.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/lib/sdk/crt/mbstring/… Modified: branches/ros-csrss/lib/sdk/crt/mbstring/ismbpun.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/lib/sdk/crt/mbstring/… Modified: branches/ros-csrss/lib/sdk/crt/mbstring/ismbtrl.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/lib/sdk/crt/mbstring/… Modified: branches/ros-csrss/lib/sdk/crt/mbstring/mbsncpy.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/lib/sdk/crt/mbstring/… Modified: branches/ros-csrss/lib/sdk/crt/misc/environ.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/lib/sdk/crt/misc/envi… Modified: branches/ros-csrss/lib/sdk/crt/misc/tls.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/lib/sdk/crt/misc/tls.… Modified: branches/ros-csrss/lib/sdk/crt/precomp.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/lib/sdk/crt/precomp.h… Modified: branches/ros-csrss/lib/sdk/crt/string/ctype.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/lib/sdk/crt/string/ct… Modified: branches/ros-csrss/lib/sdk/crt/string/wcs.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/lib/sdk/crt/string/wc… Modified: branches/ros-csrss/lib/sdk/crt/time/strftime.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/lib/sdk/crt/time/strf… Modified: branches/ros-csrss/lib/sdk/uuid/shguids.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/lib/sdk/uuid/shguids.… Modified: branches/ros-csrss/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/media/doc/README.WINE… Modified: branches/ros-csrss/ntoskrnl/fsrtl/dbcsname.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/ntoskrnl/fsrtl/dbcsna… Modified: branches/ros-csrss/ntoskrnl/fsrtl/filelock.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/ntoskrnl/fsrtl/filelo… Modified: branches/ros-csrss/ntoskrnl/fsrtl/name.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/ntoskrnl/fsrtl/name.c… Modified: branches/ros-csrss/ntoskrnl/inbv/inbv.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/ntoskrnl/inbv/inbv.c?… Modified: branches/ros-csrss/ntoskrnl/kdbg/kdb.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/ntoskrnl/kdbg/kdb.c?r… Modified: branches/ros-csrss/win32ss/drivers/miniport/vga/initvga.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/drivers/minip… Modified: branches/ros-csrss/win32ss/drivers/miniport/vga_new/vbemodes.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/drivers/minip… Modified: branches/ros-csrss/win32ss/user/consrv/rsrc.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/consrv/r… Modified: branches/ros-csrss/win32ss/user/winsrv/rsrc.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/winsrv/r…

11 years, 9 months

[akhaldi] 57864: [ADVAPI32_WINETEST]: Sync with Wine 1.5.19.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Mon Dec 10 14:54:40 2012 New Revision: 57864 URL: http://svn.reactos.org/svn/reactos?rev=57864&view=rev Log: [ADVAPI32_WINETEST]: Sync with Wine 1.5.19. Modified: trunk/rostests/winetests/advapi32/cred.c trunk/rostests/winetests/advapi32/crypt.c trunk/rostests/winetests/advapi32/registry.c trunk/rostests/winetests/advapi32/security.c trunk/rostests/winetests/advapi32/service.c Modified: trunk/rostests/winetests/advapi32/cred.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/advapi32/cred.c… ============================================================================== --- trunk/rostests/winetests/advapi32/cred.c [iso-8859-1] (original) +++ trunk/rostests/winetests/advapi32/cred.c [iso-8859-1] Mon Dec 10 14:54:40 2012 @@ -35,7 +35,9 @@ static BOOL (WINAPI *pCredRenameA)(LPCSTR,LPCSTR,DWORD,DWORD); static BOOL (WINAPI *pCredWriteA)(PCREDENTIALA,DWORD); static BOOL (WINAPI *pCredReadDomainCredentialsA)(PCREDENTIAL_TARGET_INFORMATIONA,DWORD,DWORD*,PCREDENTIALA**); - +static BOOL (WINAPI *pCredMarshalCredentialA)(CRED_MARSHAL_TYPE,PVOID,LPSTR *); +static BOOL (WINAPI *pCredUnmarshalCredentialA)(LPCSTR,PCRED_MARSHAL_TYPE,PVOID); +static BOOL (WINAPI *pCredIsMarshaledCredentialA)(LPCSTR); #define TEST_TARGET_NAME "credtest.winehq.org" #define TEST_TARGET_NAME2 "credtest2.winehq.org" @@ -119,6 +121,47 @@ ok(!ret && GetLastError() == ERROR_BAD_USERNAME, "CredWriteA with NULL username should have failed with ERROR_BAD_USERNAME instead of %d\n", GetLastError()); + + new_cred.UserName = (char *)"winetest"; + new_cred.Persist = CRED_PERSIST_LOCAL_MACHINE; + SetLastError(0xdeadbeef); + ret = pCredWriteA(&new_cred, 0); + ok(ret || broken(!ret), "CredWriteA failed with error %u\n", GetLastError()); + if (ret) + { + ret = pCredDeleteA(TEST_TARGET_NAME, CRED_TYPE_DOMAIN_PASSWORD, 0); + ok(ret, "CredDeleteA failed with error %u\n", GetLastError()); + } + new_cred.Type = CRED_TYPE_GENERIC; + SetLastError(0xdeadbeef); + ret = pCredWriteA(&new_cred, 0); + ok(ret || broken(!ret), "CredWriteA failed with error %u\n", GetLastError()); + if (ret) + { + ret = pCredDeleteA(TEST_TARGET_NAME, CRED_TYPE_GENERIC, 0); + ok(ret, "CredDeleteA failed with error %u\n", GetLastError()); + } + new_cred.Persist = CRED_PERSIST_SESSION; + ret = pCredWriteA(&new_cred, 0); + ok(ret, "CredWriteA failed with error %u\n", GetLastError()); + + ret = pCredDeleteA(TEST_TARGET_NAME, CRED_TYPE_GENERIC, 0); + ok(ret, "CredDeleteA failed with error %u\n", GetLastError()); + + new_cred.Type = CRED_TYPE_DOMAIN_PASSWORD; + SetLastError(0xdeadbeef); + ret = pCredWriteA(&new_cred, 0); + ok(ret || broken(!ret), "CredWriteA failed with error %u\n", GetLastError()); + if (ret) + { + ret = pCredDeleteA(TEST_TARGET_NAME, CRED_TYPE_DOMAIN_PASSWORD, 0); + ok(ret, "CredDeleteA failed with error %u\n", GetLastError()); + } + new_cred.UserName = NULL; + SetLastError(0xdeadbeef); + ret = pCredWriteA(&new_cred, 0); + ok(!ret, "CredWriteA succeeded\n"); + ok(GetLastError() == ERROR_BAD_USERNAME, "got %u\n", GetLastError()); } static void test_CredDeleteA(void) @@ -336,6 +379,368 @@ ok(ret, "CredDeleteA failed with error %d\n", GetLastError()); } +static void test_CredMarshalCredentialA(void) +{ + static WCHAR emptyW[] = {0}; + static WCHAR tW[] = {'t',0}; + static WCHAR teW[] = {'t','e',0}; + static WCHAR tesW[] = {'t','e','s',0}; + static WCHAR testW[] = {'t','e','s','t',0}; + static WCHAR test1W[] = {'t','e','s','t','1',0}; + CERT_CREDENTIAL_INFO cert; + USERNAME_TARGET_CREDENTIAL_INFO username; + DWORD error; + char *str; + BOOL ret; + + SetLastError( 0xdeadbeef ); + ret = pCredMarshalCredentialA( 0, NULL, NULL ); + error = GetLastError(); + ok( !ret, "unexpected success\n" ); + ok( error == ERROR_INVALID_PARAMETER, "got %u\n", error ); + + memset( cert.rgbHashOfCert, 0, sizeof(cert.rgbHashOfCert) ); + cert.cbSize = sizeof(cert); + SetLastError( 0xdeadbeef ); + ret = pCredMarshalCredentialA( 0, &cert, NULL ); + error = GetLastError(); + ok( !ret, "unexpected success\n" ); + ok( error == ERROR_INVALID_PARAMETER, "got %u\n", error ); + + str = (char *)0xdeadbeef; + SetLastError( 0xdeadbeef ); + ret = pCredMarshalCredentialA( 0, &cert, &str ); + error = GetLastError(); + ok( !ret, "unexpected success\n" ); + ok( error == ERROR_INVALID_PARAMETER, "got %u\n", error ); + ok( str == (char *)0xdeadbeef, "got %p\n", str ); + + SetLastError( 0xdeadbeef ); + ret = pCredMarshalCredentialA( CertCredential, NULL, NULL ); + error = GetLastError(); + ok( !ret, "unexpected success\n" ); + ok( error == ERROR_INVALID_PARAMETER, "got %u\n", error ); + + if (0) { /* crash */ + SetLastError( 0xdeadbeef ); + ret = pCredMarshalCredentialA( CertCredential, &cert, NULL ); + error = GetLastError(); + ok( !ret, "unexpected success\n" ); + ok( error == ERROR_INVALID_PARAMETER, "got %u\n", error ); + } + + cert.cbSize = 0; + str = (char *)0xdeadbeef; + SetLastError( 0xdeadbeef ); + ret = pCredMarshalCredentialA( CertCredential, &cert, &str ); + error = GetLastError(); + ok( !ret, "unexpected success\n" ); + ok( error == ERROR_INVALID_PARAMETER, "got %u\n", error ); + ok( str == (char *)0xdeadbeef, "got %p\n", str ); + + cert.cbSize = sizeof(cert) + 4; + str = NULL; + ret = pCredMarshalCredentialA( CertCredential, &cert, &str ); + ok( ret, "unexpected failure %u\n", GetLastError() ); + ok( str != NULL, "str not set\n" ); + ok( !lstrcmpA( str, "@@BAAAAAAAAAAAAAAAAAAAAAAAAAAA" ), "got %s\n", str ); + pCredFree( str ); + + cert.cbSize = sizeof(cert); + cert.rgbHashOfCert[0] = 2; + str = NULL; + ret = pCredMarshalCredentialA( CertCredential, &cert, &str ); + ok( ret, "unexpected failure %u\n", GetLastError() ); + ok( str != NULL, "str not set\n" ); + ok( !lstrcmpA( str, "@@BCAAAAAAAAAAAAAAAAAAAAAAAAAA" ), "got %s\n", str ); + pCredFree( str ); + + cert.rgbHashOfCert[0] = 255; + str = NULL; + ret = pCredMarshalCredentialA( CertCredential, &cert, &str ); + ok( ret, "unexpected failure %u\n", GetLastError() ); + ok( str != NULL, "str not set\n" ); + ok( !lstrcmpA( str, "@@B-DAAAAAAAAAAAAAAAAAAAAAAAAA" ), "got %s\n", str ); + pCredFree( str ); + + cert.rgbHashOfCert[0] = 1; + cert.rgbHashOfCert[1] = 1; + str = NULL; + ret = pCredMarshalCredentialA( CertCredential, &cert, &str ); + ok( ret, "unexpected failure %u\n", GetLastError() ); + ok( str != NULL, "str not set\n" ); + ok( !lstrcmpA( str, "@@BBEAAAAAAAAAAAAAAAAAAAAAAAAA" ), "got %s\n", str ); + pCredFree( str ); + + cert.rgbHashOfCert[0] = 1; + cert.rgbHashOfCert[1] = 1; + cert.rgbHashOfCert[2] = 1; + str = NULL; + ret = pCredMarshalCredentialA( CertCredential, &cert, &str ); + ok( ret, "unexpected failure %u\n", GetLastError() ); + ok( str != NULL, "str not set\n" ); + ok( !lstrcmpA( str, "@@BBEQAAAAAAAAAAAAAAAAAAAAAAAA" ), "got %s\n", str ); + pCredFree( str ); + + memset( cert.rgbHashOfCert, 0, sizeof(cert.rgbHashOfCert) ); + cert.rgbHashOfCert[0] = 'W'; + cert.rgbHashOfCert[1] = 'i'; + cert.rgbHashOfCert[2] = 'n'; + cert.rgbHashOfCert[3] = 'e'; + str = NULL; + ret = pCredMarshalCredentialA( CertCredential, &cert, &str ); + ok( ret, "unexpected failure %u\n", GetLastError() ); + ok( str != NULL, "str not set\n" ); + ok( !lstrcmpA( str, "@@BXlmblBAAAAAAAAAAAAAAAAAAAAA" ), "got %s\n", str ); + pCredFree( str ); + + memset( cert.rgbHashOfCert, 0xff, sizeof(cert.rgbHashOfCert) ); + str = NULL; + ret = pCredMarshalCredentialA( CertCredential, &cert, &str ); + ok( ret, "unexpected failure %u\n", GetLastError() ); + ok( str != NULL, "str not set\n" ); + ok( !lstrcmpA( str, "@@B--------------------------P" ), "got %s\n", str ); + pCredFree( str ); + + username.UserName = NULL; + str = (char *)0xdeadbeef; + SetLastError( 0xdeadbeef ); + ret = pCredMarshalCredentialA( UsernameTargetCredential, &username, &str ); + error = GetLastError(); + ok( !ret, "unexpected success\n" ); + ok( error == ERROR_INVALID_PARAMETER, "got %u\n", error ); + ok( str == (char *)0xdeadbeef, "got %p\n", str ); + + username.UserName = emptyW; + str = (char *)0xdeadbeef; + SetLastError( 0xdeadbeef ); + ret = pCredMarshalCredentialA( UsernameTargetCredential, &username, &str ); + error = GetLastError(); + ok( !ret, "unexpected success\n" ); + ok( error == ERROR_INVALID_PARAMETER, "got %u\n", error ); + ok( str == (char *)0xdeadbeef, "got %p\n", str ); + + username.UserName = tW; + str = NULL; + ret = pCredMarshalCredentialA( UsernameTargetCredential, &username, &str ); + ok( ret, "unexpected failure %u\n", GetLastError() ); + ok( str != NULL, "str not set\n" ); + ok( !lstrcmpA( str, "@@CCAAAAA0BA" ), "got %s\n", str ); + pCredFree( str ); + + username.UserName = teW; + str = NULL; + ret = pCredMarshalCredentialA( UsernameTargetCredential, &username, &str ); + ok( ret, "unexpected failure %u\n", GetLastError() ); + ok( str != NULL, "str not set\n" ); + ok( !lstrcmpA( str, "@@CEAAAAA0BQZAA" ), "got %s\n", str ); + pCredFree( str ); + + username.UserName = tesW; + str = NULL; + ret = pCredMarshalCredentialA( UsernameTargetCredential, &username, &str ); + ok( ret, "unexpected failure %u\n", GetLastError() ); + ok( str != NULL, "str not set\n" ); + ok( !lstrcmpA( str, "@@CGAAAAA0BQZAMHA" ), "got %s\n", str ); + pCredFree( str ); + + username.UserName = testW; + str = NULL; + ret = pCredMarshalCredentialA( UsernameTargetCredential, &username, &str ); + ok( ret, "unexpected failure %u\n", GetLastError() ); + ok( str != NULL, "str not set\n" ); + ok( !lstrcmpA( str, "@@CIAAAAA0BQZAMHA0BA" ), "got %s\n", str ); + pCredFree( str ); + + username.UserName = test1W; + str = NULL; + ret = pCredMarshalCredentialA( UsernameTargetCredential, &username, &str ); + ok( ret, "unexpected failure %u\n", GetLastError() ); + ok( str != NULL, "str not set\n" ); + ok( !lstrcmpA( str, "@@CKAAAAA0BQZAMHA0BQMAA" ), "got %s\n", str ); + pCredFree( str ); +} + +static void test_CredUnmarshalCredentialA(void) +{ + static WCHAR tW[] = {'t',0}; + static WCHAR testW[] = {'t','e','s','t',0}; + CERT_CREDENTIAL_INFO *cert; + USERNAME_TARGET_CREDENTIAL_INFO *username; + CRED_MARSHAL_TYPE type; + unsigned int i; + DWORD error; + BOOL ret; + + SetLastError( 0xdeadbeef ); + ret = pCredUnmarshalCredentialA( NULL, NULL, NULL ); + error = GetLastError(); + ok( !ret, "unexpected success\n" ); + ok( error == ERROR_INVALID_PARAMETER, "got %u\n", error ); + + cert = NULL; + SetLastError( 0xdeadbeef ); + ret = pCredUnmarshalCredentialA( NULL, NULL, (void **)&cert ); + error = GetLastError(); + ok( !ret, "unexpected success\n" ); + ok( error == ERROR_INVALID_PARAMETER, "got %u\n", error ); + + type = 0; + cert = NULL; + SetLastError( 0xdeadbeef ); + ret = pCredUnmarshalCredentialA( NULL, &type, (void **)&cert ); + error = GetLastError(); + ok( !ret, "unexpected success\n" ); + ok( error == ERROR_INVALID_PARAMETER, "got %u\n", error ); + + type = 0; + cert = NULL; + SetLastError( 0xdeadbeef ); + ret = pCredUnmarshalCredentialA( "", &type, (void **)&cert ); + error = GetLastError(); + ok( !ret, "unexpected success\n" ); + ok( error == ERROR_INVALID_PARAMETER, "got %u\n", error ); + + if (0) { /* crash */ + SetLastError( 0xdeadbeef ); + ret = pCredUnmarshalCredentialA( "@@BAAAAAAAAAAAAAAAAAAAAAAAAAAA", &type, NULL ); + error = GetLastError(); + ok( !ret, "unexpected success\n" ); + ok( error == ERROR_INVALID_PARAMETER, "got %u\n", error ); + + SetLastError( 0xdeadbeef ); + ret = pCredUnmarshalCredentialA( "@@BAAAAAAAAAAAAAAAAAAAAAAAAAAA", NULL, (void **)&cert ); + error = GetLastError(); + ok( !ret, "unexpected success\n" ); + ok( error == ERROR_INVALID_PARAMETER, "got %u\n", error ); + } + + type = 0; + cert = NULL; + ret = pCredUnmarshalCredentialA( "@@BAAAAAAAAAAAAAAAAAAAAAAAAAAA", &type, (void **)&cert ); + ok( ret, "unexpected failure %u\n", GetLastError() ); + ok( type == CertCredential, "got %u\n", type ); + ok( cert != NULL, "cert is NULL\n" ); + ok( cert->cbSize == sizeof(*cert), "wrong size %u\n", cert->cbSize ); + for (i = 0; i < sizeof(cert->rgbHashOfCert); i++) ok( !cert->rgbHashOfCert[i], "wrong data\n" ); + pCredFree( cert ); + + type = 0; + cert = NULL; + ret = pCredUnmarshalCredentialA( "@@BXlmblBAAAAAAAAAAAAAAAAAAAAA", &type, (void **)&cert ); + ok( ret, "unexpected failure %u\n", GetLastError() ); + ok( type == CertCredential, "got %u\n", type ); + ok( cert != NULL, "cert is NULL\n" ); + ok( cert->cbSize == sizeof(*cert), "wrong size %u\n", cert->cbSize ); + ok( cert->rgbHashOfCert[0] == 'W', "wrong data)\n" ); + ok( cert->rgbHashOfCert[1] == 'i', "wrong data\n" ); + ok( cert->rgbHashOfCert[2] == 'n', "wrong data\n" ); + ok( cert->rgbHashOfCert[3] == 'e', "wrong data\n" ); + for (i = 4; i < sizeof(cert->rgbHashOfCert); i++) ok( !cert->rgbHashOfCert[i], "wrong data\n" ); + pCredFree( cert ); + + SetLastError( 0xdeadbeef ); + ret = pCredUnmarshalCredentialA( "@@CAAAAAA", &type, (void **)&username ); + error = GetLastError(); + ok( !ret, "unexpected success\n" ); + ok( error == ERROR_INVALID_PARAMETER, "got %u\n", error ); + + SetLastError( 0xdeadbeef ); + ret = pCredUnmarshalCredentialA( "@@CAAAAAA0BA", &type, (void **)&username ); + error = GetLastError(); + ok( !ret, "unexpected success\n" ); + ok( error == ERROR_INVALID_PARAMETER, "got %u\n", error ); + + type = 0; + username = NULL; + ret = pCredUnmarshalCredentialA( "@@CCAAAAA0BA", &type, (void **)&username ); + ok( ret, "unexpected failure %u\n", GetLastError() ); + ok( type == UsernameTargetCredential, "got %u\n", type ); + ok( username != NULL, "username is NULL\n" ); + ok( username->UserName != NULL, "UserName is NULL\n" ); + ok( !lstrcmpW( username->UserName, tW ), "got %s\n", wine_dbgstr_w(username->UserName) ); + pCredFree( username ); + + type = 0; + username = NULL; + ret = pCredUnmarshalCredentialA( "@@CIAAAAA0BQZAMHA0BA", &type, (void **)&username ); + ok( ret, "unexpected failure %u\n", GetLastError() ); + ok( type == UsernameTargetCredential, "got %u\n", type ); + ok( username != NULL, "username is NULL\n" ); + ok( username->UserName != NULL, "UserName is NULL\n" ); + ok( !lstrcmpW( username->UserName, testW ), "got %s\n", wine_dbgstr_w(username->UserName) ); + pCredFree( username ); + + type = 0; + username = NULL; + SetLastError( 0xdeadbeef ); + ret = pCredUnmarshalCredentialA( "@@CA-----0BQZAMHA0BA", &type, (void **)&username ); + error = GetLastError(); + ok( !ret, "unexpected success\n" ); + ok( error == ERROR_INVALID_PARAMETER, "got %u\n", error ); +} + +static void test_CredIsMarshaledCredentialA(void) +{ + int i; + BOOL res; + BOOL expected = TRUE; + + const char * ptr[] = { + /* CertCredential */ + "@@BXlmblBAAAAAAAAAAAAAAAAAAAAA", /* hash for 'W','i','n','e' */ + "@@BAAAAAAAAAAAAAAAAAAAAAAAAAAA", /* hash for all 0 */ + + /* UsernameTargetCredential */ + "@@CCAAAAA0BA", /* "t" */ + "@@CIAAAAA0BQZAMHA0BA", /* "test" */ + + /* todo: BinaryBlobCredential */ + + /* not marshaled names return always FALSE */ + "winetest", + "", + "@@", + "@@A", + "@@AA", + "@@AAA", + "@@B", + "@@BB", + "@@BBB", + + /* CertCredential */ + "@@BAAAAAAAAAAAAAAAAAAAAAAAAAAAA", /* to long */ + "@@BAAAAAAAAAAAAAAAAAAAAAAAAAA", /* to short */ + "@@BAAAAAAAAAAAAAAAAAAAAAAAAAA+", /* bad char */ + "@@BAAAAAAAAAAAAAAAAAAAAAAAAAA:", + "@@BAAAAAAAAAAAAAAAAAAAAAAAAAA>", + "@@BAAAAAAAAAAAAAAAAAAAAAAAAAA<", + + "@@C", + "@@CC", + "@@CCC", + "@@D", + "@@DD", + "@@DDD", + NULL}; + + for (i = 0; ptr[i]; i++) + { + if (*ptr[i] != '@') + expected = FALSE; + + SetLastError(0xdeadbeef); + res = pCredIsMarshaledCredentialA(ptr[i]); + if (expected) + ok(res != FALSE, "%d: got %d and %u for %s (expected TRUE)\n", i, res, GetLastError(), ptr[i]); + else + { + /* Windows returns ERROR_INVALID_PARAMETER here, but that's not documented */ + ok(!res, "%d: got %d and %u for %s (expected FALSE)\n", i, res, GetLastError(), ptr[i]); + } + } +} + START_TEST(cred) { DWORD persists[CRED_TYPE_MAXIMUM]; @@ -348,9 +753,11 @@ pCredReadA = (void *)GetProcAddress(GetModuleHandle("advapi32.dll"), "CredReadA"); pCredRenameA = (void *)GetProcAddress(GetModuleHandle("advapi32.dll"), "CredRenameA"); pCredReadDomainCredentialsA = (void *)GetProcAddress(GetModuleHandle("advapi32.dll"), "CredReadDomainCredentialsA"); - - if (!pCredEnumerateA || !pCredFree || !pCredWriteA || !pCredDeleteA || - !pCredReadA) + pCredMarshalCredentialA = (void *)GetProcAddress(GetModuleHandle("advapi32.dll"), "CredMarshalCredentialA"); + pCredUnmarshalCredentialA = (void *)GetProcAddress(GetModuleHandle("advapi32.dll"), "CredUnmarshalCredentialA"); + pCredIsMarshaledCredentialA = (void *)GetProcAddress(GetModuleHandle("advapi32.dll"), "CredIsMarshaledCredentialA"); + + if (!pCredEnumerateA || !pCredFree || !pCredWriteA || !pCredDeleteA || !pCredReadA) { win_skip("credentials functions not present in advapi32.dll\n"); return; @@ -392,4 +799,8 @@ skip("CRED_TYPE_DOMAIN_VISIBLE_PASSWORD credentials are not supported or are disabled. Skipping\n"); else test_domain_password(CRED_TYPE_DOMAIN_VISIBLE_PASSWORD); -} + + test_CredMarshalCredentialA(); + test_CredUnmarshalCredentialA(); + test_CredIsMarshaledCredentialA(); +} Modified: trunk/rostests/winetests/advapi32/crypt.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/advapi32/crypt.… ============================================================================== --- trunk/rostests/winetests/advapi32/crypt.c [iso-8859-1] (original) +++ trunk/rostests/winetests/advapi32/crypt.c [iso-8859-1] Mon Dec 10 14:54:40 2012 @@ -237,6 +237,9 @@ ok (result, "%d\n", GetLastError()); if (!result) return; pCryptDestroyHash(hHash); + + result = pCryptCreateHash(0, CALG_SHA, 0, 0, &hHash); + ok (!result && GetLastError() == ERROR_INVALID_PARAMETER, "%d\n", GetLastError()); result = pCryptGenKey(0, CALG_RC4, 0, &hKey); ok (!result && GetLastError() == ERROR_INVALID_PARAMETER, "%d\n", GetLastError()); @@ -448,7 +451,9 @@ "Expected NTE_BAD_SIGNATURE, got %08x\n", GetLastError()); SetLastError(0xdeadbeef); ret = pCryptVerifySignatureW(hash, bogus, sizeof(bogus), key, NULL, 0); - ok(!ret && GetLastError() == NTE_BAD_SIGNATURE, + ok(!ret && + (GetLastError() == NTE_BAD_SIGNATURE || + broken(GetLastError() == NTE_BAD_HASH_STATE /* older NT4 */)), "Expected NTE_BAD_SIGNATURE, got %08x\n", GetLastError()); pCryptDestroyKey(key); pCryptDestroyHash(hash); @@ -619,9 +624,6 @@ (*pdwIndex)++; } - - if (!ret) - LocalFree(*pszTypeName); RegCloseKey(hSubKey); LocalFree(szName); Modified: trunk/rostests/winetests/advapi32/registry.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/advapi32/regist… ============================================================================== --- trunk/rostests/winetests/advapi32/registry.c [iso-8859-1] (original) +++ trunk/rostests/winetests/advapi32/registry.c [iso-8859-1] Mon Dec 10 14:54:40 2012 @@ -346,6 +346,9 @@ /* Crashes on NT4, Windows 2000 and XP SP1 */ ret = RegSetValueW(hkey_main, NULL, REG_SZ, NULL, 0); ok(ret == ERROR_INVALID_PARAMETER, "RegSetValueW should have failed with ERROR_INVALID_PARAMETER instead of %d\n", ret); + + RegSetValueExA(hkey_main, name2A, 0, REG_SZ, (const BYTE *)1, 1); + RegSetValueExA(hkey_main, name2A, 0, REG_DWORD, (const BYTE *)1, 1); } ret = RegSetValueW(hkey_main, NULL, REG_SZ, string1W, sizeof(string1W)); @@ -353,7 +356,12 @@ test_hkey_main_Value_A(NULL, string1A, sizeof(string1A)); test_hkey_main_Value_W(NULL, string1W, sizeof(string1W)); - /* RegSetValueA ignores the size passed in */ + ret = RegSetValueW(hkey_main, name1W, REG_SZ, string1W, sizeof(string1W)); + ok(ret == ERROR_SUCCESS, "RegSetValueW failed: %d, GLE=%d\n", ret, GetLastError()); + test_hkey_main_Value_A(name1A, string1A, sizeof(string1A)); + test_hkey_main_Value_W(name1W, string1W, sizeof(string1W)); + + /* RegSetValueW ignores the size passed in */ ret = RegSetValueW(hkey_main, NULL, REG_SZ, string1W, 4 * sizeof(string1W[0])); ok(ret == ERROR_SUCCESS, "RegSetValueW failed: %d, GLE=%d\n", ret, GetLastError()); test_hkey_main_Value_A(NULL, string1A, sizeof(string1A)); @@ -390,6 +398,12 @@ ok(ret == ERROR_SUCCESS, "RegSetValueExW failed: %d, GLE=%d\n", ret, GetLastError()); test_hkey_main_Value_A(name2A, string2A, sizeof(string2A)); test_hkey_main_Value_W(name2W, string2W, sizeof(string2W)); + + /* test RegSetValueExW with data = 1 */ + ret = RegSetValueExW(hkey_main, name2W, 0, REG_SZ, (const BYTE *)1, 1); + ok(ret == ERROR_NOACCESS, "RegSetValueExW should have failed with ERROR_NOACCESS: %d, GLE=%d\n", ret, GetLastError()); + ret = RegSetValueExW(hkey_main, name2W, 0, REG_DWORD, (const BYTE *)1, 1); + ok(ret == ERROR_NOACCESS, "RegSetValueExW should have failed with ERROR_NOACCESS: %d, GLE=%d\n", ret, GetLastError()); } static void create_test_entries(void) Modified: trunk/rostests/winetests/advapi32/security.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/advapi32/securi… ============================================================================== --- trunk/rostests/winetests/advapi32/security.c [iso-8859-1] (original) +++ trunk/rostests/winetests/advapi32/security.c [iso-8859-1] Mon Dec 10 14:54:40 2012 @@ -33,7 +33,16 @@ #include "ntsecapi.h" #include "lmcons.h" +#include <winsvc.h> + #include "wine/test.h" + +/* PROCESS_ALL_ACCESS in Vista+ PSDKs is incompatible with older Windows versions */ +#define PROCESS_ALL_ACCESS_NT4 (PROCESS_ALL_ACCESS & ~0xf000) + +#ifndef EVENT_QUERY_STATE +#define EVENT_QUERY_STATE 0x0001 +#endif /* copied from Wine winternl.h - not included in the Windows SDK */ typedef enum _OBJECT_INFORMATION_CLASS { @@ -58,7 +67,7 @@ LARGE_INTEGER CreateTime; } OBJECT_BASIC_INFORMATION, *POBJECT_BASIC_INFORMATION; -#define expect_eq(expr, value, type, format) { type ret = expr; ok((value) == ret, #expr " expected " format " got " format "\n", (value), (ret)); } +#define expect_eq(expr, value, type, format) { type ret_ = expr; ok((value) == ret_, #expr " expected " format " got " format "\n", (value), (ret_)); } static BOOL (WINAPI *pAddAccessAllowedAceEx)(PACL, DWORD, DWORD, DWORD, PSID); static BOOL (WINAPI *pAddAccessDeniedAceEx)(PACL, DWORD, DWORD, DWORD, PSID); @@ -94,6 +103,8 @@ static DWORD (WINAPI *pGetNamedSecurityInfoA)(LPSTR, SE_OBJECT_TYPE, SECURITY_INFORMATION, PSID*, PSID*, PACL*, PACL*, PSECURITY_DESCRIPTOR*); +static DWORD (WINAPI *pSetNamedSecurityInfoA)(LPTSTR, SE_OBJECT_TYPE, SECURITY_INFORMATION, + PSID, PSID, PACL, PACL); static PDWORD (WINAPI *pGetSidSubAuthority)(PSID, DWORD); static PUCHAR (WINAPI *pGetSidSubAuthorityCount)(PSID); static BOOL (WINAPI *pIsValidSid)(PSID); @@ -113,14 +124,26 @@ SECURITY_DESCRIPTOR_CONTROL); static DWORD (WINAPI *pGetSecurityInfo)(HANDLE, SE_OBJECT_TYPE, SECURITY_INFORMATION, PSID*, PSID*, PACL*, PACL*, PSECURITY_DESCRIPTOR*); +static DWORD (WINAPI *pSetSecurityInfo)(HANDLE, SE_OBJECT_TYPE, SECURITY_INFORMATION, + PSID, PSID, PACL, PACL); static NTSTATUS (WINAPI *pNtAccessCheck)(PSECURITY_DESCRIPTOR, HANDLE, ACCESS_MASK, PGENERIC_MAPPING, PPRIVILEGE_SET, PULONG, PULONG, NTSTATUS*); static BOOL (WINAPI *pCreateRestrictedToken)(HANDLE, DWORD, DWORD, PSID_AND_ATTRIBUTES, DWORD, PLUID_AND_ATTRIBUTES, DWORD, PSID_AND_ATTRIBUTES, PHANDLE); +static BOOL (WINAPI *pGetAclInformation)(PACL,LPVOID,DWORD,ACL_INFORMATION_CLASS); +static BOOL (WINAPI *pGetAce)(PACL,DWORD,LPVOID*); static HMODULE hmod; static int myARGC; static char** myARGV; + +struct strsid_entry +{ + const char *str; + DWORD flags; +}; +#define STRSID_OK 0 +#define STRSID_OPT 1 struct sidRef { @@ -151,6 +174,7 @@ pSetFileSecurityA = (void *)GetProcAddress(hmod, "SetFileSecurityA" ); pCreateWellKnownSid = (void *)GetProcAddress( hmod, "CreateWellKnownSid" ); pGetNamedSecurityInfoA = (void *)GetProcAddress(hmod, "GetNamedSecurityInfoA"); + pSetNamedSecurityInfoA = (void *)GetProcAddress(hmod, "SetNamedSecurityInfoA"); pGetSidSubAuthority = (void *)GetProcAddress(hmod, "GetSidSubAuthority"); pGetSidSubAuthorityCount = (void *)GetProcAddress(hmod, "GetSidSubAuthorityCount"); pIsValidSid = (void *)GetProcAddress(hmod, "IsValidSid"); @@ -159,32 +183,14 @@ pSetEntriesInAclA = (void *)GetProcAddress(hmod, "SetEntriesInAclA"); pSetSecurityDescriptorControl = (void *)GetProcAddress(hmod, "SetSecurityDescriptorControl"); pGetSecurityInfo = (void *)GetProcAddress(hmod, "GetSecurityInfo"); + pSetSecurityInfo = (void *)GetProcAddress(hmod, "SetSecurityInfo"); pCreateRestrictedToken = (void *)GetProcAddress(hmod, "CreateRestrictedToken"); + pConvertSidToStringSidA = (void *)GetProcAddress(hmod, "ConvertSidToStringSidA"); + pConvertStringSidToSidA = (void *)GetProcAddress(hmod, "ConvertStringSidToSidA"); + pGetAclInformation = (void *)GetProcAddress(hmod, "GetAclInformation"); + pGetAce = (void *)GetProcAddress(hmod, "GetAce"); myARGC = winetest_get_mainargs( &myARGV ); -} - -static void test_str_sid(const char *str_sid) -{ - PSID psid; - char *temp; - - if (pConvertStringSidToSidA(str_sid, &psid)) - { - if (pConvertSidToStringSidA(psid, &temp)) - { - trace(" %s: %s\n", str_sid, temp); - LocalFree(temp); - } - LocalFree(psid); - } - else - { - if (GetLastError() != ERROR_INVALID_SID) - trace(" %s: couldn't be converted, returned %d\n", str_sid, GetLastError()); - else - trace(" %s: couldn't be converted\n", str_sid); - } } static void test_sid(void) @@ -197,6 +203,18 @@ { { {0x00,0x00,0x00,0x00,0x00,0x02} }, "S-1-2-1" }, { { {0x00,0x00,0x00,0x00,0x00,0x0c} }, "S-1-12-1" }, }; + struct strsid_entry strsid_table[] = { + {"AO", STRSID_OK}, {"RU", STRSID_OK}, {"AN", STRSID_OK}, {"AU", STRSID_OK}, + {"BA", STRSID_OK}, {"BG", STRSID_OK}, {"BO", STRSID_OK}, {"BU", STRSID_OK}, + {"CA", STRSID_OPT}, {"CG", STRSID_OK}, {"CO", STRSID_OK}, {"DA", STRSID_OPT}, + {"DC", STRSID_OPT}, {"DD", STRSID_OPT}, {"DG", STRSID_OPT}, {"DU", STRSID_OPT}, + {"EA", STRSID_OPT}, {"ED", STRSID_OK}, {"WD", STRSID_OK}, {"PA", STRSID_OPT}, + {"IU", STRSID_OK}, {"LA", STRSID_OK}, {"LG", STRSID_OK}, {"LS", STRSID_OK}, + {"SY", STRSID_OK}, {"NU", STRSID_OK}, {"NO", STRSID_OK}, {"NS", STRSID_OK}, + {"PO", STRSID_OK}, {"PS", STRSID_OK}, {"PU", STRSID_OK}, {"RS", STRSID_OPT}, + {"RD", STRSID_OK}, {"RE", STRSID_OK}, {"RC", STRSID_OK}, {"SA", STRSID_OPT}, + {"SO", STRSID_OK}, {"SU", STRSID_OK}}; + const char noSubAuthStr[] = "S-1-5"; unsigned int i; PSID psid = NULL; @@ -204,12 +222,11 @@ BOOL r; LPSTR str = NULL; - pConvertSidToStringSidA = (void *)GetProcAddress( hmod, "ConvertSidToStringSidA" ); - if( !pConvertSidToStringSidA ) - return; - pConvertStringSidToSidA = (void *)GetProcAddress( hmod, "ConvertStringSidToSidA" ); - if( !pConvertStringSidToSidA ) - return; + if( !pConvertSidToStringSidA || !pConvertStringSidToSidA ) + { + win_skip("ConvertSidToStringSidA or ConvertStringSidToSidA not available\n"); + return; + } r = pConvertStringSidToSidA( NULL, NULL ); ok( !r, "expected failure with NULL parameters\n" ); @@ -246,8 +263,6 @@ for( i = 0; i < sizeof(refs) / sizeof(refs[0]); i++ ) { - PISID pisid; - r = AllocateAndInitializeSid( &refs[i].auth, 1,1,0,0,0,0,0,0,0, &psid ); ok( r, "failed to allocate sid\n" ); @@ -284,45 +299,44 @@ LocalFree( psid ); } - trace("String SIDs:\n"); - test_str_sid("AO"); - test_str_sid("RU"); - test_str_sid("AN"); - test_str_sid("AU"); - test_str_sid("BA"); - test_str_sid("BG"); - test_str_sid("BO"); - test_str_sid("BU"); - test_str_sid("CA"); - test_str_sid("CG"); - test_str_sid("CO"); - test_str_sid("DA"); - test_str_sid("DC"); - test_str_sid("DD"); - test_str_sid("DG"); - test_str_sid("DU"); - test_str_sid("EA"); - test_str_sid("ED"); - test_str_sid("WD"); - test_str_sid("PA"); - test_str_sid("IU"); - test_str_sid("LA"); - test_str_sid("LG"); - test_str_sid("LS"); - test_str_sid("SY"); - test_str_sid("NU"); - test_str_sid("NO"); - test_str_sid("NS"); - test_str_sid("PO"); - test_str_sid("PS"); - test_str_sid("PU"); - test_str_sid("RS"); - test_str_sid("RD"); - test_str_sid("RE"); - test_str_sid("RC"); - test_str_sid("SA"); - test_str_sid("SO"); - test_str_sid("SU"); + /* string constant format not supported before XP */ + r = pConvertStringSidToSidA(strsid_table[0].str, &psid); + if(!r) + { + win_skip("String constant format not supported\n"); + return; + } + LocalFree(psid); + + for(i = 0; i < sizeof(strsid_table) / sizeof(strsid_table[0]); i++) + { + char *temp; + + SetLastError(0xdeadbeef); + r = pConvertStringSidToSidA(strsid_table[i].str, &psid); + + if (!(strsid_table[i].flags & STRSID_OPT)) + { + ok(r, "%s: got %u\n", strsid_table[i].str, GetLastError()); + } + + if (r) + { + if ((winetest_debug > 1) && (pConvertSidToStringSidA(psid, &temp))) + { + trace(" %s: %s\n", strsid_table[i].str, temp); + LocalFree(temp); + } + LocalFree(psid); + } + else + { + if (GetLastError() != ERROR_INVALID_SID) + trace(" %s: couldn't be converted, returned %d\n", strsid_table[i].str, GetLastError()); + else + trace(" %s: couldn't be converted\n", strsid_table[i].str); + } + } } static void test_trustee(void) @@ -1455,9 +1469,11 @@ Size = 0; ret = GetTokenInformation(Token, TokenGroups, Groups, Size2, &Size); ok(Size > 1, "got %d\n", Size); - ok(!ret && GetLastError() == ERROR_INSUFFICIENT_BUFFER, + ok((!ret && GetLastError() == ERROR_INSUFFICIENT_BUFFER) || broken(ret) /* wow64 */, "%d with error %d\n", ret, GetLastError()); - ok(*((BYTE*)Groups) == 0xcc, "buffer altered\n"); + if(!ret) + ok(*((BYTE*)Groups) == 0xcc, "buffer altered\n"); + HeapFree(GetProcessHeap(), 0, Groups); SetLastError(0xdeadbeef); @@ -1646,7 +1662,8 @@ /* 66 */ {TRUE, "S-1-16-4096"}, {TRUE, "S-1-16-8192"}, {TRUE, "S-1-16-12288"}, /* 69 */ {TRUE, "S-1-16-16384"}, {TRUE, "S-1-5-33"}, {TRUE, "S-1-3-4"}, /* 72 */ {FALSE, "S-1-5-21-12-23-34-45-56-571"}, {FALSE, "S-1-5-21-12-23-34-45-56-572"}, -/* 74 */ {TRUE, "S-1-5-22"}, {FALSE, "S-1-5-21-12-23-34-45-56-521"}, {TRUE, "S-1-5-32-573"} +/* 74 */ {TRUE, "S-1-5-22"}, {FALSE, "S-1-5-21-12-23-34-45-56-521"}, {TRUE, "S-1-5-32-573"}, +/* 77 */ {FALSE, "S-1-5-21-12-23-34-45-56-498"}, {TRUE, "S-1-5-32-574"}, {TRUE, "S-1-16-8448"} }; static void test_CreateWellKnownSid(void) @@ -1711,7 +1728,7 @@ expect_eq(GetSidLengthRequired(*GetSidSubAuthorityCount(sid_buffer)), cb, DWORD, "%d"); ok(IsValidSid(sid_buffer), "The sid is not valid\n"); ok(pConvertSidToStringSidA(sid_buffer, &str), "Couldn't convert SID to string\n"); - ok(strcmp(str, value->sid_string) == 0, "SID mismatch - expected %s, got %s\n", + ok(strcmp(str, value->sid_string) == 0, "%d: SID mismatch - expected %s, got %s\n", i, value->sid_string, str); LocalFree(str); @@ -2420,15 +2437,15 @@ #define CHECK_SET_SECURITY(o,i,e) \ do{ \ - BOOL res; \ + BOOL res_; \ DWORD err; \ SetLastError( 0xdeadbeef ); \ - res = SetKernelObjectSecurity( o, i, SecurityDescriptor ); \ + res_ = SetKernelObjectSecurity( o, i, SecurityDescriptor ); \ err = GetLastError(); \ if (e == ERROR_SUCCESS) \ - ok(res, "SetKernelObjectSecurity failed with %d\n", err); \ + ok(res_, "SetKernelObjectSecurity failed with %d\n", err); \ else \ - ok(!res && err == e, "SetKernelObjectSecurity should have failed " \ + ok(!res_ && err == e, "SetKernelObjectSecurity should have failed " \ "with %s, instead of %d\n", #e, err); \ }while(0) @@ -2543,7 +2560,7 @@ /* Doesn't matter what ACL say we should get full access for ourselves */ res = CreateProcessA( NULL, buffer, &psa, NULL, FALSE, 0, NULL, NULL, &startup, &info ); ok(res, "CreateProcess with err:%d\n", GetLastError()); - TEST_GRANTED_ACCESS2( info.hProcess, PROCESS_ALL_ACCESS, + TEST_GRANTED_ACCESS2( info.hProcess, PROCESS_ALL_ACCESS_NT4, STANDARD_RIGHTS_ALL | SPECIFIC_RIGHTS_ALL ); winetest_wait_child_process( info.hProcess ); @@ -2595,7 +2612,7 @@ ret = DuplicateHandle( GetCurrentProcess(), GetCurrentProcess(), GetCurrentProcess(), &handle, 0, TRUE, DUPLICATE_SAME_ACCESS ); ok(ret, "duplicating handle err:%d\n", GetLastError()); - TEST_GRANTED_ACCESS2( handle, PROCESS_ALL_ACCESS, + TEST_GRANTED_ACCESS2( handle, PROCESS_ALL_ACCESS_NT4, STANDARD_RIGHTS_ALL | SPECIFIC_RIGHTS_ALL ); CloseHandle( handle ); @@ -2604,7 +2621,7 @@ ret = DuplicateHandle( GetCurrentProcess(), GetCurrentProcess(), GetCurrentProcess(), &handle, PROCESS_ALL_ACCESS, TRUE, 0 ); ok(ret, "duplicating handle err:%d\n", GetLastError()); - TEST_GRANTED_ACCESS2( handle, PROCESS_ALL_ACCESS, + TEST_GRANTED_ACCESS2( handle, PROCESS_ALL_ACCESS_NT4, PROCESS_ALL_ACCESS | PROCESS_QUERY_LIMITED_INFORMATION ); ret = DuplicateHandle( GetCurrentProcess(), handle, GetCurrentProcess(), &handle1, PROCESS_VM_READ, TRUE, 0 ); @@ -2990,40 +3007,67 @@ static void test_GetNamedSecurityInfoA(void) { - PSECURITY_DESCRIPTOR pSecDesc; - DWORD revision; + char admin_ptr[sizeof(SID)+sizeof(ULONG)*SID_MAX_SUB_AUTHORITIES], dacl[100], *user; + DWORD sid_size = sizeof(admin_ptr), user_size; + char invalid_path[] = "/an invalid file path"; + PSID admin_sid = (PSID) admin_ptr, user_sid; + char sd[SECURITY_DESCRIPTOR_MIN_LENGTH]; SECURITY_DESCRIPTOR_CONTROL control; - PSID owner; - PSID group; - PACL dacl; + ACL_SIZE_INFORMATION acl_size; + CHAR windows_dir[MAX_PATH]; + PSECURITY_DESCRIPTOR pSD; + ACCESS_ALLOWED_ACE *ace; + BOOL bret = TRUE, isNT4; + char tmpfile[MAX_PATH]; + DWORD error, revision; BOOL owner_defaulted; BOOL group_defaulted; - DWORD error; - BOOL ret, isNT4; - CHAR windows_dir[MAX_PATH]; - - if (!pGetNamedSecurityInfoA) - { - win_skip("GetNamedSecurityInfoA is not available\n"); - return; - } - - ret = GetWindowsDirectoryA(windows_dir, MAX_PATH); - ok(ret, "GetWindowsDirectory failed with error %d\n", GetLastError()); + HANDLE token, hTemp; + PSID owner, group; + PACL pDacl; + + if (!pSetNamedSecurityInfoA || !pGetNamedSecurityInfoA || !pCreateWellKnownSid) + { + win_skip("Required functions are not available\n"); + return; + } + + if (!OpenThreadToken(GetCurrentThread(), TOKEN_READ, TRUE, &token)) + { + if (GetLastError() != ERROR_NO_TOKEN) bret = FALSE; + else if (!OpenProcessToken(GetCurrentProcess(), TOKEN_READ, &token)) bret = FALSE; + } + if (!bret) + { + win_skip("Failed to get current user token\n"); + return; + } + bret = GetTokenInformation(token, TokenUser, NULL, 0, &user_size); + ok(!bret && (GetLastError() == ERROR_INSUFFICIENT_BUFFER), + "GetTokenInformation(TokenUser) failed with error %d\n", GetLastError()); + user = HeapAlloc(GetProcessHeap(), 0, user_size); + bret = GetTokenInformation(token, TokenUser, user, user_size, &user_size); + ok(bret, "GetTokenInformation(TokenUser) failed with error %d\n", GetLastError()); + CloseHandle( token ); + user_sid = ((TOKEN_USER *)user)->User.Sid; + + bret = GetWindowsDirectoryA(windows_dir, MAX_PATH); + ok(bret, "GetWindowsDirectory failed with error %d\n", GetLastError()); SetLastError(0xdeadbeef); error = pGetNamedSecurityInfoA(windows_dir, SE_FILE_OBJECT, OWNER_SECURITY_INFORMATION|GROUP_SECURITY_INFORMATION|DACL_SECURITY_INFORMATION, - NULL, NULL, NULL, NULL, &pSecDesc); + NULL, NULL, NULL, NULL, &pSD); if (error != ERROR_SUCCESS && (GetLastError() == ERROR_CALL_NOT_IMPLEMENTED)) { win_skip("GetNamedSecurityInfoA is not implemented\n"); + HeapFree(GetProcessHeap(), 0, user); return; } ok(!error, "GetNamedSecurityInfo failed with error %d\n", error); - ret = GetSecurityDescriptorControl(pSecDesc, &control, &revision); - ok(ret, "GetSecurityDescriptorControl failed with error %d\n", GetLastError()); + bret = GetSecurityDescriptorControl(pSD, &control, &revision); + ok(bret, "GetSecurityDescriptorControl failed with error %d\n", GetLastError()); ok((control & (SE_SELF_RELATIVE|SE_DACL_PRESENT)) == (SE_SELF_RELATIVE|SE_DACL_PRESENT) || broken((control & (SE_SELF_RELATIVE|SE_DACL_PRESENT)) == SE_DACL_PRESENT), /* NT4 */ "control (0x%x) doesn't have (SE_SELF_RELATIVE|SE_DACL_PRESENT) flags set\n", control); @@ -3031,20 +3075,21 @@ isNT4 = (control & (SE_SELF_RELATIVE|SE_DACL_PRESENT)) == SE_DACL_PRESENT; - ret = GetSecurityDescriptorOwner(pSecDesc, &owner, &owner_defaulted); - ok(ret, "GetSecurityDescriptorOwner failed with error %d\n", GetLastError()); + bret = GetSecurityDescriptorOwner(pSD, &owner, &owner_defaulted); + ok(bret, "GetSecurityDescriptorOwner failed with error %d\n", GetLastError()); ok(owner != NULL, "owner should not be NULL\n"); - ret = GetSecurityDescriptorGroup(pSecDesc, &group, &group_defaulted); - ok(ret, "GetSecurityDescriptorGroup failed with error %d\n", GetLastError()); + bret = GetSecurityDescriptorGroup(pSD, &group, &group_defaulted); + ok(bret, "GetSecurityDescriptorGroup failed with error %d\n", GetLastError()); ok(group != NULL, "group should not be NULL\n"); - LocalFree(pSecDesc); + LocalFree(pSD); /* NULL descriptor tests */ if(isNT4) { win_skip("NT4 does not support GetNamedSecutityInfo with a NULL descriptor\n"); + HeapFree(GetProcessHeap(), 0, user); return; } @@ -3053,13 +3098,85 @@ ok(error==ERROR_INVALID_PARAMETER, "GetNamedSecurityInfo failed with error %d\n", error); error = pGetNamedSecurityInfoA(windows_dir, SE_FILE_OBJECT,DACL_SECURITY_INFORMATION, - NULL, NULL, &dacl, NULL, NULL); + NULL, NULL, &pDacl, NULL, NULL); ok(!error, "GetNamedSecurityInfo failed with error %d\n", error); - ok(dacl != NULL, "dacl should not be NULL\n"); + ok(pDacl != NULL, "DACL should not be NULL\n"); error = pGetNamedSecurityInfoA(windows_dir, SE_FILE_OBJECT,OWNER_SECURITY_INFORMATION, - NULL, NULL, &dacl, NULL, NULL); + NULL, NULL, &pDacl, NULL, NULL); ok(error==ERROR_INVALID_PARAMETER, "GetNamedSecurityInfo failed with error %d\n", error); + + /* Test behavior of SetNamedSecurityInfo with an invalid path */ + SetLastError(0xdeadbeef); + error = pSetNamedSecurityInfoA(invalid_path, SE_FILE_OBJECT, DACL_SECURITY_INFORMATION, NULL, + NULL, NULL, NULL); + ok(error == ERROR_FILE_NOT_FOUND, "Unexpected error returned: 0x%x\n", error); + ok(GetLastError() == 0xdeadbeef, "Expected last error to remain unchanged.\n"); + + /* Create security descriptor information and test that it comes back the same */ + pSD = &sd; + pDacl = (PACL)&dacl; + InitializeSecurityDescriptor(pSD, SECURITY_DESCRIPTOR_REVISION); + pCreateWellKnownSid(WinBuiltinAdministratorsSid, NULL, admin_sid, &sid_size); + bret = InitializeAcl(pDacl, sizeof(dacl), ACL_REVISION); + ok(bret, "Failed to initialize ACL.\n"); + bret = pAddAccessAllowedAceEx(pDacl, ACL_REVISION, 0, GENERIC_ALL, user_sid); + HeapFree(GetProcessHeap(), 0, user); + ok(bret, "Failed to add Current User to ACL.\n"); + bret = pAddAccessAllowedAceEx(pDacl, ACL_REVISION, 0, GENERIC_ALL, admin_sid); + ok(bret, "Failed to add Administrator Group to ACL.\n"); + bret = SetSecurityDescriptorDacl(pSD, TRUE, pDacl, FALSE); + ok(bret, "Failed to add ACL to security desciptor.\n"); + GetTempFileNameA(".", "foo", 0, tmpfile); + hTemp = CreateFileA(tmpfile, GENERIC_WRITE, FILE_SHARE_READ, NULL, OPEN_EXISTING, + FILE_FLAG_DELETE_ON_CLOSE, NULL); + SetLastError(0xdeadbeef); + error = pSetNamedSecurityInfoA(tmpfile, SE_FILE_OBJECT, DACL_SECURITY_INFORMATION, NULL, + NULL, pDacl, NULL); + if (error != ERROR_SUCCESS && (GetLastError() == ERROR_CALL_NOT_IMPLEMENTED)) + { + win_skip("SetNamedSecurityInfoA is not implemented\n"); + CloseHandle(hTemp); + return; + } + ok(!error, "SetNamedSecurityInfoA failed with error %d\n", error); + SetLastError(0xdeadbeef); + error = pGetNamedSecurityInfoA(tmpfile, SE_FILE_OBJECT, DACL_SECURITY_INFORMATION, + NULL, NULL, &pDacl, NULL, &pSD); + if (error != ERROR_SUCCESS && (GetLastError() == ERROR_CALL_NOT_IMPLEMENTED)) + { + win_skip("GetNamedSecurityInfoA is not implemented\n"); + return; + } + ok(!error, "GetNamedSecurityInfo failed with error %d\n", error); + + bret = pGetAclInformation(pDacl, &acl_size, sizeof(acl_size), AclSizeInformation); + ok(bret, "GetAclInformation failed\n"); + if (acl_size.AceCount > 0) + { + bret = pGetAce(pDacl, 0, (VOID **)&ace); + ok(bret, "Failed to get Current User ACE.\n"); + bret = EqualSid(&ace->SidStart, user_sid); + todo_wine ok(bret, "Current User ACE != Current User SID.\n"); + ok(((ACE_HEADER *)ace)->AceFlags == 0, + "Current User ACE has unexpected flags (0x%x != 0x0)\n", ((ACE_HEADER *)ace)->AceFlags); + ok(ace->Mask == 0x1f01ff, "Current User ACE has unexpected mask (0x%x != 0x1f01ff)\n", + ace->Mask); + } + if (acl_size.AceCount > 1) + { + bret = pGetAce(pDacl, 1, (VOID **)&ace); + ok(bret, "Failed to get Administators Group ACE.\n"); + bret = EqualSid(&ace->SidStart, admin_sid); + todo_wine ok(bret || broken(!bret) /* win2k */, + "Administators Group ACE != Administators Group SID.\n"); + ok(((ACE_HEADER *)ace)->AceFlags == 0, + "Administators Group ACE has unexpected flags (0x%x != 0x0)\n", ((ACE_HEADER *)ace)->AceFlags); + ok(ace->Mask == 0x1f01ff || broken(ace->Mask == GENERIC_ALL) /* win2k */, + "Administators Group ACE has unexpected mask (0x%x != 0x1f01ff)\n", ace->Mask); + } + LocalFree(pSD); + CloseHandle(hTemp); } static void test_ConvertStringSecurityDescriptor(void) @@ -3523,20 +3640,42 @@ static void test_GetSecurityInfo(void) { - HANDLE obj; - PSECURITY_DESCRIPTOR sd; + char b[sizeof(TOKEN_USER) + sizeof(SID) + sizeof(DWORD)*SID_MAX_SUB_AUTHORITIES]; + char admin_ptr[sizeof(SID)+sizeof(ULONG)*SID_MAX_SUB_AUTHORITIES], dacl[100]; + DWORD sid_size = sizeof(admin_ptr), l = sizeof(b); + PSID admin_sid = (PSID) admin_ptr, user_sid; + char sd[SECURITY_DESCRIPTOR_MIN_LENGTH]; + ACL_SIZE_INFORMATION acl_size; + PSECURITY_DESCRIPTOR pSD; + ACCESS_ALLOWED_ACE *ace; + HANDLE token, obj; PSID owner, group; - PACL dacl; + BOOL bret = TRUE; + PACL pDacl; DWORD ret; - if (!pGetSecurityInfo) - { - win_skip("GetSecurityInfo is not available\n"); - return; - } + if (!pGetSecurityInfo || !pSetSecurityInfo) + { + win_skip("[Get|Set]SecurityInfo is not available\n"); + return; + } + + if (!OpenThreadToken(GetCurrentThread(), TOKEN_READ, TRUE, &token)) + { + if (GetLastError() != ERROR_NO_TOKEN) bret = FALSE; + else if (!OpenProcessToken(GetCurrentProcess(), TOKEN_READ, &token)) bret = FALSE; + } + if (!bret) + { + win_skip("Failed to get current user token\n"); + return; + } + GetTokenInformation(token, TokenUser, b, l, &l); + CloseHandle( token ); + user_sid = ((TOKEN_USER *)b)->User.Sid; /* Create something. Files have lots of associated security info. */ - obj = CreateFile(myARGV[0], GENERIC_READ, FILE_SHARE_READ, NULL, + obj = CreateFile(myARGV[0], GENERIC_READ|WRITE_DAC, FILE_SHARE_READ, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); if (obj == INVALID_HANDLE_VALUE) { @@ -3546,7 +3685,7 @@ ret = pGetSecurityInfo(obj, SE_FILE_OBJECT, OWNER_SECURITY_INFORMATION | GROUP_SECURITY_INFORMATION | DACL_SECURITY_INFORMATION, - &owner, &group, &dacl, NULL, &sd); + &owner, &group, &pDacl, NULL, &pSD); if (ret == ERROR_CALL_NOT_IMPLEMENTED) { win_skip("GetSecurityInfo is not implemented\n"); @@ -3554,15 +3693,15 @@ return; } ok(ret == ERROR_SUCCESS, "GetSecurityInfo returned %d\n", ret); - ok(sd != NULL, "GetSecurityInfo\n"); + ok(pSD != NULL, "GetSecurityInfo\n"); ok(owner != NULL, "GetSecurityInfo\n"); ok(group != NULL, "GetSecurityInfo\n"); - if (dacl != NULL) - ok(IsValidAcl(dacl), "GetSecurityInfo\n"); + if (pDacl != NULL) + ok(IsValidAcl(pDacl), "GetSecurityInfo\n"); else win_skip("No ACL information returned\n"); - LocalFree(sd); + LocalFree(pSD); if (!pCreateWellKnownSid) { @@ -3575,15 +3714,59 @@ the other stuff, leaving us no way to free it. */ ret = pGetSecurityInfo(obj, SE_FILE_OBJECT, OWNER_SECURITY_INFORMATION | GROUP_SECURITY_INFORMATION | DACL_SECURITY_INFORMATION, - &owner, &group, &dacl, NULL, NULL); + &owner, &group, &pDacl, NULL, NULL); ok(ret == ERROR_SUCCESS, "GetSecurityInfo returned %d\n", ret); ok(owner != NULL, "GetSecurityInfo\n"); ok(group != NULL, "GetSecurityInfo\n"); - if (dacl != NULL) - ok(IsValidAcl(dacl), "GetSecurityInfo\n"); + if (pDacl != NULL) + ok(IsValidAcl(pDacl), "GetSecurityInfo\n"); else win_skip("No ACL information returned\n"); + /* Create security descriptor information and test that it comes back the same */ + pSD = &sd; + pDacl = (PACL)&dacl; + InitializeSecurityDescriptor(pSD, SECURITY_DESCRIPTOR_REVISION); + pCreateWellKnownSid(WinBuiltinAdministratorsSid, NULL, admin_sid, &sid_size); + bret = InitializeAcl(pDacl, sizeof(dacl), ACL_REVISION); + ok(bret, "Failed to initialize ACL.\n"); + bret = pAddAccessAllowedAceEx(pDacl, ACL_REVISION, 0, GENERIC_ALL, user_sid); + ok(bret, "Failed to add Current User to ACL.\n"); + bret = pAddAccessAllowedAceEx(pDacl, ACL_REVISION, 0, GENERIC_ALL, admin_sid); + ok(bret, "Failed to add Administrator Group to ACL.\n"); + bret = SetSecurityDescriptorDacl(pSD, TRUE, pDacl, FALSE); + ok(bret, "Failed to add ACL to security desciptor.\n"); + ret = pSetSecurityInfo(obj, SE_FILE_OBJECT, DACL_SECURITY_INFORMATION, + NULL, NULL, pDacl, NULL); + ok(ret == ERROR_SUCCESS, "SetSecurityInfo returned %d\n", ret); + ret = pGetSecurityInfo(obj, SE_FILE_OBJECT, DACL_SECURITY_INFORMATION, + NULL, NULL, &pDacl, NULL, NULL); + ok(ret == ERROR_SUCCESS, "GetSecurityInfo returned %d\n", ret); + ok(pDacl && IsValidAcl(pDacl), "GetSecurityInfo returned invalid DACL.\n"); + bret = pGetAclInformation(pDacl, &acl_size, sizeof(acl_size), AclSizeInformation); + ok(bret, "GetAclInformation failed\n"); + if (acl_size.AceCount > 0) + { + bret = pGetAce(pDacl, 0, (VOID **)&ace); + ok(bret, "Failed to get Current User ACE.\n"); + bret = EqualSid(&ace->SidStart, user_sid); + todo_wine ok(bret, "Current User ACE != Current User SID.\n"); + ok(((ACE_HEADER *)ace)->AceFlags == 0, + "Current User ACE has unexpected flags (0x%x != 0x0)\n", ((ACE_HEADER *)ace)->AceFlags); + ok(ace->Mask == 0x1f01ff, "Current User ACE has unexpected mask (0x%x != 0x1f01ff)\n", + ace->Mask); + } + if (acl_size.AceCount > 1) + { + bret = pGetAce(pDacl, 1, (VOID **)&ace); + ok(bret, "Failed to get Administators Group ACE.\n"); + bret = EqualSid(&ace->SidStart, admin_sid); + todo_wine ok(bret, "Administators Group ACE != Administators Group SID.\n"); + ok(((ACE_HEADER *)ace)->AceFlags == 0, + "Administators Group ACE has unexpected flags (0x%x != 0x0)\n", ((ACE_HEADER *)ace)->AceFlags); + ok(ace->Mask == 0x1f01ff, "Administators Group ACE has unexpected mask (0x%x != 0x1f01ff)\n", + ace->Mask); + } CloseHandle(obj); } @@ -3981,6 +4164,339 @@ CloseHandle(process_token); } +static void validate_default_security_descriptor(SECURITY_DESCRIPTOR *sd) +{ + BOOL ret, present, defaulted; + ACL *acl; + void *sid; + + ret = IsValidSecurityDescriptor(sd); + ok(ret, "security descriptor is not valid\n"); + + present = -1; + defaulted = -1; + acl = (void *)0xdeadbeef; + SetLastError(0xdeadbeef); + ret = GetSecurityDescriptorDacl(sd, &present, &acl, &defaulted); + ok(ret, "GetSecurityDescriptorDacl error %d\n", GetLastError()); +todo_wine + ok(present == 1, "acl is not present\n"); +todo_wine + ok(acl != (void *)0xdeadbeef && acl != NULL, "acl pointer is not set\n"); + ok(defaulted == 0, "defaulted is set to TRUE\n"); + + defaulted = -1; + sid = (void *)0xdeadbeef; + SetLastError(0xdeadbeef); + ret = GetSecurityDescriptorOwner(sd, &sid, &defaulted); + ok(ret, "GetSecurityDescriptorOwner error %d\n", GetLastError()); +todo_wine + ok(sid != (void *)0xdeadbeef && sid != NULL, "sid pointer is not set\n"); + ok(defaulted == 0, "defaulted is set to TRUE\n"); + + defaulted = -1; + sid = (void *)0xdeadbeef; + SetLastError(0xdeadbeef); + ret = GetSecurityDescriptorGroup(sd, &sid, &defaulted); + ok(ret, "GetSecurityDescriptorGroup error %d\n", GetLastError()); +todo_wine + ok(sid != (void *)0xdeadbeef && sid != NULL, "sid pointer is not set\n"); + ok(defaulted == 0, "defaulted is set to TRUE\n"); +} + +static void test_default_handle_security(HANDLE token, HANDLE handle, GENERIC_MAPPING *mapping) +{ + DWORD ret, length, needed, granted, priv_set_len; + BOOL status; + PRIVILEGE_SET priv_set; + SECURITY_DESCRIPTOR *sd; + + needed = 0xdeadbeef; + SetLastError(0xdeadbeef); + ret = GetKernelObjectSecurity(handle, OWNER_SECURITY_INFORMATION | GROUP_SECURITY_INFORMATION | DACL_SECURITY_INFORMATION, + NULL, 0, &needed); + ok(!ret, "GetKernelObjectSecurity should fail\n"); + ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, "expected ERROR_INSUFFICIENT_BUFFER, got %d\n", GetLastError()); + ok(needed != 0xdeadbeef, "GetKernelObjectSecurity should return required buffer length\n"); + + length = needed; + sd = HeapAlloc(GetProcessHeap(), 0, length); + + needed = 0xdeadbeef; + SetLastError(0xdeadbeef); + ret = GetKernelObjectSecurity(handle, OWNER_SECURITY_INFORMATION | GROUP_SECURITY_INFORMATION | DACL_SECURITY_INFORMATION, + sd, length, &needed); + ok(ret, "GetKernelObjectSecurity error %d\n", GetLastError()); + ok(needed == length || needed == 0 /* file, pipe */, "GetKernelObjectSecurity should return %u instead of %u\n", length, needed); + + validate_default_security_descriptor(sd); + + priv_set_len = sizeof(priv_set); + granted = 0xdeadbeef; + status = 0xdeadbeef; + SetLastError(0xdeadbeef); + ret = AccessCheck(sd, token, MAXIMUM_ALLOWED, mapping, &priv_set, &priv_set_len, &granted, &status); +todo_wine { + ok(ret, "AccessCheck error %d\n", GetLastError()); + ok(status == 1, "expected 1, got %d\n", status); + ok(granted == mapping->GenericAll, "expected all access %#x, got %#x\n", mapping->GenericAll, granted); +} + priv_set_len = sizeof(priv_set); + granted = 0xdeadbeef; + status = 0xdeadbeef; + SetLastError(0xdeadbeef); + ret = AccessCheck(sd, token, 0, mapping, &priv_set, &priv_set_len, &granted, &status); +todo_wine { + ok(ret, "AccessCheck error %d\n", GetLastError()); + ok(status == 0 || broken(status == 1) /* NT4 */, "expected 0, got %d\n", status); + ok(granted == 0 || broken(granted == mapping->GenericRead) /* NT4 */, "expected 0, got %#x\n", granted); +} + priv_set_len = sizeof(priv_set); + granted = 0xdeadbeef; + status = 0xdeadbeef; + SetLastError(0xdeadbeef); + ret = AccessCheck(sd, token, ACCESS_SYSTEM_SECURITY, mapping, &priv_set, &priv_set_len, &granted, &status); +todo_wine { + ok(ret, "AccessCheck error %d\n", GetLastError()); + ok(status == 0, "expected 0, got %d\n", status); + ok(granted == 0, "expected 0, got %#x\n", granted); +} + priv_set_len = sizeof(priv_set); + granted = 0xdeadbeef; + status = 0xdeadbeef; + SetLastError(0xdeadbeef); + ret = AccessCheck(sd, token, mapping->GenericRead, mapping, &priv_set, &priv_set_len, &granted, &status); +todo_wine { + ok(ret, "AccessCheck error %d\n", GetLastError()); + ok(status == 1, "expected 1, got %d\n", status); + ok(granted == mapping->GenericRead, "expected read access %#x, got %#x\n", mapping->GenericRead, granted); +} + priv_set_len = sizeof(priv_set); + granted = 0xdeadbeef; + status = 0xdeadbeef; + SetLastError(0xdeadbeef); + ret = AccessCheck(sd, token, mapping->GenericWrite, mapping, &priv_set, &priv_set_len, &granted, &status); +todo_wine { + ok(ret, "AccessCheck error %d\n", GetLastError()); + ok(status == 1, "expected 1, got %d\n", status); + ok(granted == mapping->GenericWrite, "expected write access %#x, got %#x\n", mapping->GenericWrite, granted); +} + priv_set_len = sizeof(priv_set); + granted = 0xdeadbeef; + status = 0xdeadbeef; + SetLastError(0xdeadbeef); + ret = AccessCheck(sd, token, mapping->GenericExecute, mapping, &priv_set, &priv_set_len, &granted, &status); +todo_wine { + ok(ret, "AccessCheck error %d\n", GetLastError()); + ok(status == 1, "expected 1, got %d\n", status); + ok(granted == mapping->GenericExecute, "expected execute access %#x, got %#x\n", mapping->GenericExecute, granted); +} + HeapFree(GetProcessHeap(), 0, sd); +} + +static void test_mutex_security(HANDLE token) +{ + HANDLE mutex; + GENERIC_MAPPING mapping = { STANDARD_RIGHTS_READ | MUTANT_QUERY_STATE | SYNCHRONIZE, + STANDARD_RIGHTS_WRITE | MUTEX_MODIFY_STATE | SYNCHRONIZE, + STANDARD_RIGHTS_EXECUTE | SYNCHRONIZE, + STANDARD_RIGHTS_ALL | MUTEX_ALL_ACCESS }; + + SetLastError(0xdeadbeef); + mutex = OpenMutex(0, FALSE, "WineTestMutex"); + ok(!mutex, "mutex should not exist\n"); + ok(GetLastError() == ERROR_FILE_NOT_FOUND, "wrong error %u\n", GetLastError()); + + SetLastError(0xdeadbeef); + mutex = CreateMutex(NULL, FALSE, "WineTestMutex"); + ok(mutex != 0, "CreateMutex error %d\n", GetLastError()); + + test_default_handle_security(token, mutex, &mapping); + + CloseHandle (mutex); +} + +static void test_event_security(HANDLE token) +{ + HANDLE event; + GENERIC_MAPPING mapping = { STANDARD_RIGHTS_READ | EVENT_QUERY_STATE | SYNCHRONIZE, + STANDARD_RIGHTS_WRITE | EVENT_MODIFY_STATE | SYNCHRONIZE, + STANDARD_RIGHTS_EXECUTE | SYNCHRONIZE, + STANDARD_RIGHTS_ALL | EVENT_ALL_ACCESS }; + + SetLastError(0xdeadbeef); + event = OpenEvent(0, FALSE, "WineTestEvent"); + ok(!event, "event should not exist\n"); + ok(GetLastError() == ERROR_FILE_NOT_FOUND, "wrong error %u\n", GetLastError()); + + SetLastError(0xdeadbeef); + event = CreateEvent(NULL, FALSE, FALSE, "WineTestEvent"); + ok(event != 0, "CreateEvent error %d\n", GetLastError()); + + test_default_handle_security(token, event, &mapping); + + CloseHandle(event); +} + +#define WINE_TEST_PIPE "\\\\.\\pipe\\WineTestPipe" +static void test_named_pipe_security(HANDLE token) +{ + HANDLE pipe, file; + GENERIC_MAPPING mapping = { FILE_GENERIC_READ, + FILE_GENERIC_WRITE, + FILE_GENERIC_EXECUTE, + STANDARD_RIGHTS_ALL | FILE_ALL_ACCESS }; + + SetLastError(0xdeadbeef); + pipe = CreateNamedPipe(WINE_TEST_PIPE, PIPE_ACCESS_DUPLEX | FILE_FLAG_FIRST_PIPE_INSTANCE, + PIPE_TYPE_BYTE | PIPE_NOWAIT, PIPE_UNLIMITED_INSTANCES, + 0, 0, NMPWAIT_USE_DEFAULT_WAIT, NULL); + ok(pipe != INVALID_HANDLE_VALUE, "CreateNamedPipe error %d\n", GetLastError()); + + test_default_handle_security(token, pipe, &mapping); + + SetLastError(0xdeadbeef); + file = CreateFile(WINE_TEST_PIPE, FILE_ALL_ACCESS, 0, NULL, OPEN_EXISTING, 0, 0); + ok(file != INVALID_HANDLE_VALUE, "CreateFile error %d\n", GetLastError()); + CloseHandle(file); + + CloseHandle(pipe); + + SetLastError(0xdeadbeef); + file = CreateFile("\\\\.\\pipe\\", FILE_ALL_ACCESS, FILE_SHARE_READ | FILE_SHARE_WRITE, NULL, OPEN_EXISTING, 0, 0); + ok(file != INVALID_HANDLE_VALUE || broken(file == INVALID_HANDLE_VALUE) /* before Vista */, "CreateFile error %d\n", GetLastError()); + CloseHandle(file); +} + +static BOOL validate_impersonation_token(HANDLE token, DWORD *token_type) +{ + DWORD ret, needed; + TOKEN_TYPE type; + SECURITY_IMPERSONATION_LEVEL sil; + + type = 0xdeadbeef; + needed = 0; + SetLastError(0xdeadbeef); + ret = GetTokenInformation(token, TokenType, &type, sizeof(type), &needed); + ok(ret, "GetTokenInformation error %d\n", GetLastError()); + ok(needed == sizeof(type), "GetTokenInformation should return required buffer length\n"); + ok(type == TokenPrimary || type == TokenImpersonation, "expected TokenPrimary or TokenImpersonation, got %d\n", type); + + *token_type = type; + if (type != TokenImpersonation) return FALSE; + + needed = 0; + SetLastError(0xdeadbeef); + ret = GetTokenInformation(token, TokenImpersonationLevel, &sil, sizeof(sil), &needed); + ok(ret, "GetTokenInformation error %d\n", GetLastError()); + ok(needed == sizeof(sil), "GetTokenInformation should return required buffer length\n"); + ok(sil == SecurityImpersonation, "expected SecurityImpersonation, got %d\n", sil); + + needed = 0xdeadbeef; + SetLastError(0xdeadbeef); + ret = GetTokenInformation(token, TokenDefaultDacl, NULL, 0, &needed); + ok(!ret, "GetTokenInformation should fail\n"); + ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, "expected ERROR_INSUFFICIENT_BUFFER, got %d\n", GetLastError()); + ok(needed != 0xdeadbeef, "GetTokenInformation should return required buffer length\n"); + ok(needed > sizeof(TOKEN_DEFAULT_DACL), "GetTokenInformation returned empty default DACL\n"); + + needed = 0xdeadbeef; + SetLastError(0xdeadbeef); + ret = GetTokenInformation(token, TokenOwner, NULL, 0, &needed); + ok(!ret, "GetTokenInformation should fail\n"); + ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, "expected ERROR_INSUFFICIENT_BUFFER, got %d\n", GetLastError()); + ok(needed != 0xdeadbeef, "GetTokenInformation should return required buffer length\n"); + ok(needed > sizeof(TOKEN_OWNER), "GetTokenInformation returned empty token owner\n"); + + needed = 0xdeadbeef; + SetLastError(0xdeadbeef); + ret = GetTokenInformation(token, TokenPrimaryGroup, NULL, 0, &needed); + ok(!ret, "GetTokenInformation should fail\n"); + ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, "expected ERROR_INSUFFICIENT_BUFFER, got %d\n", GetLastError()); + ok(needed != 0xdeadbeef, "GetTokenInformation should return required buffer length\n"); + ok(needed > sizeof(TOKEN_PRIMARY_GROUP), "GetTokenInformation returned empty token primary group\n"); + + return TRUE; +} + +static void test_kernel_objects_security(void) +{ + HANDLE token, process_token; + DWORD ret, token_type; + + ret = OpenProcessToken(GetCurrentProcess(), TOKEN_DUPLICATE | TOKEN_QUERY, &process_token); + ok(ret, "OpenProcessToken error %d\n", GetLastError()); + + ret = validate_impersonation_token(process_token, &token_type); + ok(token_type == TokenPrimary, "expected TokenPrimary, got %d\n", token_type); + ok(!ret, "access token should not be an impersonation token\n"); + + ret = DuplicateToken(process_token, SecurityImpersonation, &token); + ok(ret, "DuplicateToken error %d\n", GetLastError()); + + ret = validate_impersonation_token(token, &token_type); + ok(ret, "access token should be a valid impersonation token\n"); + ok(token_type == TokenImpersonation, "expected TokenImpersonation, got %d\n", token_type); + + test_mutex_security(token); + test_event_security(token); + test_named_pipe_security(token); + /* FIXME: test other kernel object types */ + + CloseHandle(process_token); + CloseHandle(token); +} + +static void test_TokenIntegrityLevel(void) +{ + TOKEN_MANDATORY_LABEL *tml; + BYTE buffer[64]; /* using max. 28 byte in win7 x64 */ + HANDLE token; + DWORD size; + DWORD res; + char *sidname = NULL; + static SID medium_level = {SID_REVISION, 1, {SECURITY_MANDATORY_LABEL_AUTHORITY}, + {SECURITY_MANDATORY_HIGH_RID}}; + static SID high_level = {SID_REVISION, 1, {SECURITY_MANDATORY_LABEL_AUTHORITY}, + {SECURITY_MANDATORY_MEDIUM_RID}}; + + SetLastError(0xdeadbeef); + res = OpenProcessToken(GetCurrentProcess(), TOKEN_QUERY, &token); + ok(res, "got %d with %d (expected TRUE)\n", res, GetLastError()); + + SetLastError(0xdeadbeef); + res = GetTokenInformation(token, TokenIntegrityLevel, buffer, sizeof(buffer), &size); + + /* not supported before Vista */ + if (!res && ((GetLastError() == ERROR_INVALID_PARAMETER) || GetLastError() == ERROR_INVALID_FUNCTION)) + { + win_skip("TokenIntegrityLevel not supported\n"); + CloseHandle(token); + return; + } + + ok(res, "got %u with %u (expected TRUE)\n", res, GetLastError()); + if (!res) + { + CloseHandle(token); + return; + } + + tml = (TOKEN_MANDATORY_LABEL*) buffer; + ok(tml->Label.Attributes == (SE_GROUP_INTEGRITY | SE_GROUP_INTEGRITY_ENABLED), + "got 0x%x (expected 0x%x)\n", tml->Label.Attributes, (SE_GROUP_INTEGRITY | SE_GROUP_INTEGRITY_ENABLED)); + + SetLastError(0xdeadbeef); + res = pConvertSidToStringSidA(tml->Label.Sid, &sidname); + ok(res, "got %u and %u\n", res, GetLastError()); + + ok(EqualSid(tml->Label.Sid, &medium_level) || EqualSid(tml->Label.Sid, &high_level), + "got %s (expected 'S-1-16-8192' or 'S-1-16-12288')\n", sidname); + + LocalFree(sidname); + CloseHandle(token); +} + START_TEST(security) { init(); @@ -3991,6 +4507,7 @@ test_process_security_child(); return; } + test_kernel_objects_security(); test_sid(); test_trustee(); test_luid(); @@ -4017,4 +4534,5 @@ test_GetUserNameA(); test_GetUserNameW(); test_CreateRestrictedToken(); -} + test_TokenIntegrityLevel(); +} Modified: trunk/rostests/winetests/advapi32/service.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/advapi32/servic… ============================================================================== --- trunk/rostests/winetests/advapi32/service.c [iso-8859-1] (original) +++ trunk/rostests/winetests/advapi32/service.c [iso-8859-1] Mon Dec 10 14:54:40 2012 @@ -1896,6 +1896,7 @@ DWORD expected, needed; BYTE buffer[MAX_PATH]; LPSERVICE_DESCRIPTIONA pConfig = (LPSERVICE_DESCRIPTIONA)buffer; + SERVICE_PRESHUTDOWN_INFO preshutdown_info; static const CHAR servicename [] = "Winetest"; static const CHAR displayname [] = "Winetest dummy service"; static const CHAR pathname [] = "we_dont_care.exe"; @@ -2062,6 +2063,33 @@ ret = pQueryServiceConfig2W(svc_handle, SERVICE_CONFIG_DESCRIPTION,buffer, needed,&needed); ok(ret, "expected QueryServiceConfig2W to succeed\n"); + SetLastError(0xdeadbeef); + ret = pQueryServiceConfig2W(svc_handle, SERVICE_CONFIG_PRESHUTDOWN_INFO, + (LPBYTE)&preshutdown_info, sizeof(preshutdown_info), &needed); + if(!ret && GetLastError()==ERROR_INVALID_LEVEL) + { + /* Win2k3 and older */ + win_skip("SERVICE_CONFIG_PRESHUTDOWN_INFO not supported\n"); + goto cleanup; + } + ok(ret, "expected QueryServiceConfig2W to succeed (%d)\n", GetLastError()); + ok(needed == sizeof(preshutdown_info), "needed = %d\n", needed); + ok(preshutdown_info.dwPreshutdownTimeout == 180000, "Default PreshutdownTimeout = %d\n", + preshutdown_info.dwPreshutdownTimeout); + + SetLastError(0xdeadbeef); + preshutdown_info.dwPreshutdownTimeout = -1; + ret = pChangeServiceConfig2A(svc_handle, SERVICE_CONFIG_PRESHUTDOWN_INFO, + (LPVOID)&preshutdown_info); + ok(ret, "expected ChangeServiceConfig2A to succeed (%d)\n", GetLastError()); + + ret = pQueryServiceConfig2W(svc_handle, SERVICE_CONFIG_PRESHUTDOWN_INFO, + (LPBYTE)&preshutdown_info, sizeof(preshutdown_info), &needed); + ok(ret, "expected QueryServiceConfig2W to succeed (%d)\n", GetLastError()); + ok(needed == sizeof(preshutdown_info), "needed = %d\n", needed); + ok(preshutdown_info.dwPreshutdownTimeout == -1, "New PreshutdownTimeout = %d\n", + preshutdown_info.dwPreshutdownTimeout); + cleanup: DeleteService(svc_handle); @@ -2178,7 +2206,7 @@ if (!winetest_interactive) { - skip("reactos bug 6646: Skipping service start timeout tests!\n"); + skip("ROSTESTS-56: Skipping service start timeout tests!\n"); goto cleanup; }

11 years, 9 months

[akhaldi] 57863: [PSDK] * Update some headers.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Mon Dec 10 14:54:25 2012 New Revision: 57863 URL: http://svn.reactos.org/svn/reactos?rev=57863&view=rev Log: [PSDK] * Update some headers. Modified: trunk/reactos/include/psdk/wincred.h trunk/reactos/include/psdk/winnt.h trunk/reactos/include/psdk/winsvc.h trunk/reactos/include/reactos/idl/svcctl.idl Modified: trunk/reactos/include/psdk/wincred.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/wincred.h?rev… ============================================================================== --- trunk/reactos/include/psdk/wincred.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/wincred.h [iso-8859-1] Mon Dec 10 14:54:25 2012 @@ -23,6 +23,12 @@ extern "C" { #endif +#ifdef _ADVAPI32_ +#define WINADVAPI +#else +#define WINADVAPI DECLSPEC_IMPORT +#endif + #ifndef __SECHANDLE_DEFINED__ #define __SECHANDLE_DEFINED__ typedef struct _SecHandle @@ -32,8 +38,11 @@ } SecHandle, *PSecHandle; #endif +#ifndef __WINE_CTXTHANDLE_DEFINED__ +#define __WINE_CTXTHANDLE_DEFINED__ typedef SecHandle CtxtHandle; typedef PSecHandle PCtxtHandle; +#endif typedef struct _CREDENTIAL_ATTRIBUTEA { @@ -89,30 +98,8 @@ DECL_WINELIB_TYPE_AW(CREDENTIAL) DECL_WINELIB_TYPE_AW(PCREDENTIAL) -typedef struct _CREDUI_INFOA -{ - DWORD cbSize; - HWND hwndParent; - PCSTR pszMessageText; - PCSTR pszCaptionText; - HBITMAP hbmBanner; -} CREDUI_INFOA, *PCREDUI_INFOA; - -typedef struct _CREDUI_INFOW -{ - DWORD cbSize; - HWND hwndParent; - PCWSTR pszMessageText; - PCWSTR pszCaptionText; - HBITMAP hbmBanner; -} CREDUI_INFOW, *PCREDUI_INFOW; - -typedef enum _CRED_MARSHAL_TYPE { - CertCredential = 1, - UsernameTargetCredential -} CRED_MARSHAL_TYPE, *PCRED_MARSHAL_TYPE; - -typedef struct _CREDENTIAL_TARGET_INFORMATIONA { +typedef struct _CREDENTIAL_TARGET_INFORMATIONA +{ LPSTR TargetName; LPSTR NetbiosServerName; LPSTR DnsServerName; @@ -120,12 +107,13 @@ LPSTR DnsDomainName; LPSTR DnsTreeName; LPSTR PackageName; - ULONG Flags; + DWORD Flags; DWORD CredTypeCount; LPDWORD CredTypes; } CREDENTIAL_TARGET_INFORMATIONA, *PCREDENTIAL_TARGET_INFORMATIONA; -typedef struct _CREDENTIAL_TARGET_INFORMATIONW { +typedef struct _CREDENTIAL_TARGET_INFORMATIONW +{ LPWSTR TargetName; LPWSTR NetbiosServerName; LPWSTR DnsServerName; @@ -133,21 +121,60 @@ LPWSTR DnsDomainName; LPWSTR DnsTreeName; LPWSTR PackageName; - ULONG Flags; + DWORD Flags; DWORD CredTypeCount; LPDWORD CredTypes; } CREDENTIAL_TARGET_INFORMATIONW, *PCREDENTIAL_TARGET_INFORMATIONW; -#ifdef UNICODE -typedef CREDENTIAL_TARGET_INFORMATIONW CREDENTIAL_TARGET_INFORMATION; -typedef PCREDENTIAL_TARGET_INFORMATIONW PCREDENTIAL_TARGET_INFORMATION; -#else -typedef CREDENTIAL_TARGET_INFORMATIONA CREDENTIAL_TARGET_INFORMATION; -typedef PCREDENTIAL_TARGET_INFORMATIONA PCREDENTIAL_TARGET_INFORMATION; -#endif /* UNICODE */ +DECL_WINELIB_TYPE_AW(CREDENTIAL_TARGET_INFORMATION) +DECL_WINELIB_TYPE_AW(PCREDENTIAL_TARGET_INFORMATION) + +typedef struct _CREDUI_INFOA +{ + DWORD cbSize; + HWND hwndParent; + PCSTR pszMessageText; + PCSTR pszCaptionText; + HBITMAP hbmBanner; +} CREDUI_INFOA, *PCREDUI_INFOA; + +typedef struct _CREDUI_INFOW +{ + DWORD cbSize; + HWND hwndParent; + PCWSTR pszMessageText; + PCWSTR pszCaptionText; + HBITMAP hbmBanner; +} CREDUI_INFOW, *PCREDUI_INFOW; DECL_WINELIB_TYPE_AW(CREDUI_INFO) DECL_WINELIB_TYPE_AW(PCREDUI_INFO) + +typedef enum _CRED_MARSHAL_TYPE +{ + CertCredential = 1, + UsernameTargetCredential, + BinaryBlobCredential +} CRED_MARSHAL_TYPE, *PCRED_MARSHAL_TYPE; + +#define CERT_HASH_LENGTH 20 + +typedef struct _CERT_CREDENTIAL_INFO +{ + ULONG cbSize; + UCHAR rgbHashOfCert[CERT_HASH_LENGTH]; +} CERT_CREDENTIAL_INFO, *PCERT_CREDENTIAL_INFO; + +typedef struct _USERNAME_TARGET_CREDENTIAL_INFO +{ + LPWSTR UserName; +} USERNAME_TARGET_CREDENTIAL_INFO; + +typedef struct _BINARY_BLOB_CREDENTIAL_INFO +{ + ULONG cbBlob; + LPBYTE pbBlob; +} BINARY_BLOB_CREDENTIAL_INFO, *PBINARY_BLOB_CREDENTIAL_INFO; #define CRED_MAX_STRING_LENGTH 256 #define CRED_MAX_USERNAME_LENGTH 513 @@ -177,13 +204,20 @@ #define CRED_TYPE_DOMAIN_PASSWORD 2 #define CRED_TYPE_DOMAIN_CERTIFICATE 3 #define CRED_TYPE_DOMAIN_VISIBLE_PASSWORD 4 -#define CRED_TYPE_MAXIMUM 5 +#define CRED_TYPE_GENERIC_CERTIFICATE 5 +#define CRED_TYPE_MAXIMUM 6 +#define CRED_TYPE_MAXIMUM_EX (CRED_TYPE_MAXIMUM+1000) /* values for CREDENTIAL::Persist */ #define CRED_PERSIST_NONE 0 #define CRED_PERSIST_SESSION 1 #define CRED_PERSIST_LOCAL_MACHINE 2 #define CRED_PERSIST_ENTERPRISE 3 + +/* values for CREDENTIAL_TARGET_INFORMATION::Flags */ +#define CRED_TI_SERVER_FORMAT_UNKNOWN 1 +#define CRED_TI_DOMAIN_FORMAT_UNKNOWN 2 +#define CRED_TI_ONLY_PASSWORD_REQUIRED 4 #define CREDUI_FLAGS_INCORRECT_PASSWORD 0x00000001 #define CREDUI_FLAGS_DO_NOT_PERSIST 0x00000002 @@ -206,22 +240,35 @@ /* flags for CredWrite and CredWriteDomainCredentials */ #define CRED_PRESERVE_CREDENTIAL_BLOB 0x00000001 -BOOL WINAPI CredDeleteA(LPCSTR,DWORD,DWORD); -BOOL WINAPI CredDeleteW(LPCWSTR,DWORD,DWORD); -#define CredDelete WINELIB_NAME_AW(CredDelete) -BOOL WINAPI CredEnumerateA(LPCSTR,DWORD,DWORD *,PCREDENTIALA **); -BOOL WINAPI CredEnumerateW(LPCWSTR,DWORD,DWORD *,PCREDENTIALW **); -#define CredEnumerate WINELIB_NAME_AW(CredEnumerate) -VOID WINAPI CredFree(PVOID); -BOOL WINAPI CredReadA(LPCSTR,DWORD,DWORD,PCREDENTIALA *); -BOOL WINAPI CredReadW(LPCWSTR,DWORD,DWORD,PCREDENTIALW *); -#define CredRead WINELIB_NAME_AW(CredRead) -BOOL WINAPI CredRenameA(LPCSTR,LPCSTR,DWORD,DWORD); -BOOL WINAPI CredRenameW(LPCWSTR,LPCWSTR,DWORD,DWORD); -#define CredRename WINELIB_NAME_AW(CredRename) -BOOL WINAPI CredWriteA(PCREDENTIALA,DWORD); -BOOL WINAPI CredWriteW(PCREDENTIALW,DWORD); -#define CredWrite WINELIB_NAME_AW(CredWrite) +WINADVAPI BOOL WINAPI CredDeleteA(LPCSTR,DWORD,DWORD); +WINADVAPI BOOL WINAPI CredDeleteW(LPCWSTR,DWORD,DWORD); +#define CredDelete WINELIB_NAME_AW(CredDelete) +WINADVAPI BOOL WINAPI CredEnumerateA(LPCSTR,DWORD,DWORD *,PCREDENTIALA **); +WINADVAPI BOOL WINAPI CredEnumerateW(LPCWSTR,DWORD,DWORD *,PCREDENTIALW **); +#define CredEnumerate WINELIB_NAME_AW(CredEnumerate) +WINADVAPI VOID WINAPI CredFree(PVOID); +WINADVAPI BOOL WINAPI CredGetSessionTypes(DWORD,LPDWORD); +WINADVAPI BOOL WINAPI CredIsMarshaledCredentialA(LPCSTR); +WINADVAPI BOOL WINAPI CredIsMarshaledCredentialW(LPCWSTR); +#define CredIsMarshaledCredential WINELIB_NAME_AW(CredIsMarshaledCredential) +WINADVAPI BOOL WINAPI CredMarshalCredentialA(CRED_MARSHAL_TYPE,PVOID,LPSTR *); +WINADVAPI BOOL WINAPI CredMarshalCredentialW(CRED_MARSHAL_TYPE,PVOID,LPWSTR *); +#define CredMarshalCredential WINELIB_NAME_AW(CredMarshalCredential) +WINADVAPI BOOL WINAPI CredReadA(LPCSTR,DWORD,DWORD,PCREDENTIALA *); +WINADVAPI BOOL WINAPI CredReadW(LPCWSTR,DWORD,DWORD,PCREDENTIALW *); +#define CredRead WINELIB_NAME_AW(CredRead) +WINADVAPI BOOL WINAPI CredReadDomainCredentialsA(PCREDENTIAL_TARGET_INFORMATIONA,DWORD,DWORD *,PCREDENTIALA **); +WINADVAPI BOOL WINAPI CredReadDomainCredentialsW(PCREDENTIAL_TARGET_INFORMATIONW,DWORD,DWORD *,PCREDENTIALW **); +#define CredReadDomainCredentials WINELIB_NAME_AW(CredReadDomainCredentials) +WINADVAPI BOOL WINAPI CredRenameA(LPCSTR,LPCSTR,DWORD,DWORD); +WINADVAPI BOOL WINAPI CredRenameW(LPCWSTR,LPCWSTR,DWORD,DWORD); +#define CredRename WINELIB_NAME_AW(CredRename) +WINADVAPI BOOL WINAPI CredUnmarshalCredentialA(LPCSTR,PCRED_MARSHAL_TYPE,PVOID *); +WINADVAPI BOOL WINAPI CredUnmarshalCredentialW(LPCWSTR,PCRED_MARSHAL_TYPE,PVOID *); +#define CredUnmarshalCredential WINELIB_NAME_AW(CredUnmarshalCredential) +WINADVAPI BOOL WINAPI CredWriteA(PCREDENTIALA,DWORD); +WINADVAPI BOOL WINAPI CredWriteW(PCREDENTIALW,DWORD); +#define CredWrite WINELIB_NAME_AW(CredWrite) DWORD WINAPI CredUICmdLinePromptForCredentialsW(PCWSTR,PCtxtHandle,DWORD,PWSTR,ULONG,PWSTR,ULONG,PBOOL,DWORD); DWORD WINAPI CredUICmdLinePromptForCredentialsA(PCSTR,PCtxtHandle,DWORD,PSTR,ULONG,PSTR,ULONG,PBOOL,DWORD); @@ -240,23 +287,6 @@ DWORD WINAPI CredUIReadSSOCredW(PCWSTR,PWSTR*); /* Note: no CredUIReadSSOCredA in PSDK header */ -BOOL WINAPI CredReadDomainCredentialsW(PCREDENTIAL_TARGET_INFORMATIONW TargetInfo, DWORD Flags, DWORD *Count, PCREDENTIALW **Credential); -BOOL WINAPI CredReadDomainCredentialsA(PCREDENTIAL_TARGET_INFORMATIONA TargetInfo, DWORD Flags, DWORD *Count, PCREDENTIALA **Credential); -BOOL WINAPI CredWriteDomainCredentialsW(PCREDENTIAL_TARGET_INFORMATIONW TargetInfo, PCREDENTIALW Credential, DWORD Flags); -BOOL WINAPI CredWriteDomainCredentialsA(PCREDENTIAL_TARGET_INFORMATIONA TargetInfo, PCREDENTIALA Credential, DWORD Flags); -BOOL WINAPI CredUnmarshalCredentialW(LPCWSTR MarshaledCredential, PCRED_MARSHAL_TYPE CredType, PVOID *Credential); -BOOL WINAPI CredUnmarshalCredentialA(LPCSTR MarshaledCredential, PCRED_MARSHAL_TYPE CredType, PVOID *Credential); - -#ifdef UNICODE -#define CredReadDomainCredentials CredReadDomainCredentialsW -#define CredWriteDomainCredentials CredWriteDomainCredentialsW -#define CredUnmarshalCredential CredUnmarshalCredentialW -#else -#define CredReadDomainCredentials CredReadDomainCredentialsA -#define CredWriteDomainCredentials CredWriteDomainCredentialsA -#define CredUnmarshalCredential CredUnmarshalCredentialA -#endif /* UNICODE */ - #ifdef __cplusplus } #endif Modified: trunk/reactos/include/psdk/winnt.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winnt.h?rev=5… ============================================================================== --- trunk/reactos/include/psdk/winnt.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/winnt.h [iso-8859-1] Mon Dec 10 14:54:25 2012 @@ -931,13 +931,17 @@ #define SE_MANAGE_VOLUME_NAME TEXT("SeManageVolumePrivilege") #define SE_IMPERSONATE_NAME TEXT("SeImpersonatePrivilege") #define SE_CREATE_GLOBAL_NAME TEXT("SeCreateGlobalPrivilege") -#define SE_GROUP_MANDATORY 1 -#define SE_GROUP_ENABLED_BY_DEFAULT 2 -#define SE_GROUP_ENABLED 4 -#define SE_GROUP_OWNER 8 -#define SE_GROUP_USE_FOR_DENY_ONLY 16 -#define SE_GROUP_LOGON_ID 3221225472U -#define SE_GROUP_RESOURCE 536870912 + +#define SE_GROUP_MANDATORY 0x00000001 +#define SE_GROUP_ENABLED_BY_DEFAULT 0x00000002 +#define SE_GROUP_ENABLED 0x00000004 +#define SE_GROUP_OWNER 0x00000008 +#define SE_GROUP_USE_FOR_DENY_ONLY 0x00000010 +#define SE_GROUP_INTEGRITY 0x00000020 +#define SE_GROUP_INTEGRITY_ENABLED 0x00000040 +#define SE_GROUP_LOGON_ID 0xC0000000 +#define SE_GROUP_RESOURCE 0x20000000 +#define SE_GROUP_VALID_ATTRIBUTES 0xE000007F /* * Product types @@ -3481,6 +3485,10 @@ TokenElevationTypeLimited, } TOKEN_ELEVATION_TYPE, *PTOKEN_ELEVATION_TYPE; +typedef struct _TOKEN_MANDATORY_LABEL { + SID_AND_ATTRIBUTES Label; +} TOKEN_MANDATORY_LABEL, * PTOKEN_MANDATORY_LABEL; + #include <pshpack4.h> typedef struct _TOKEN_STATISTICS { LUID TokenId; Modified: trunk/reactos/include/psdk/winsvc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winsvc.h?rev=… ============================================================================== --- trunk/reactos/include/psdk/winsvc.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/winsvc.h [iso-8859-1] Mon Dec 10 14:54:25 2012 @@ -61,8 +61,24 @@ #define SERVICE_USER_DEFINED_CONTROL 256 #define SERVICE_ALL_ACCESS (STANDARD_RIGHTS_REQUIRED|SERVICE_QUERY_CONFIG|SERVICE_CHANGE_CONFIG|SERVICE_QUERY_STATUS|SERVICE_ENUMERATE_DEPENDENTS|SERVICE_START|SERVICE_STOP|SERVICE_PAUSE_CONTINUE|SERVICE_INTERROGATE|SERVICE_USER_DEFINED_CONTROL) #define SERVICE_RUNS_IN_SYSTEM_PROCESS 1 -#define SERVICE_CONFIG_DESCRIPTION 1 -#define SERVICE_CONFIG_FAILURE_ACTIONS 2 + +#define SERVICE_CONFIG_DESCRIPTION 1 +#define SERVICE_CONFIG_FAILURE_ACTIONS 2 +#define SERVICE_CONFIG_DELAYED_AUTO_START_INFO 3 +#define SERVICE_CONFIG_FAILURE_ACTIONS_FLAG 4 +#define SERVICE_CONFIG_SERVICE_SID_INFO 5 +#define SERVICE_CONFIG_REQUIRED_PRIVILEGES_INFO 6 +#define SERVICE_CONFIG_PRESHUTDOWN_INFO 7 +#define SERVICE_CONFIG_TRIGGER_INFO 8 +#define SERVICE_CONFIG_PREFERRED_NODE 9 +#define SERVICE_CONFIG_RUNLEVEL_INFO 10 + +#ifndef _SERVICE_PRESHUTDOWN_INFO_DEFINED_ +#define _SERVICE_PRESHUTDOWN_INFO_DEFINED_ +typedef struct _SERVICE_PRESHUTDOWN_INFO { + DWORD dwPreshutdownTimeout; +} SERVICE_PRESHUTDOWN_INFO, *LPSERVICE_PRESHUTDOWN_INFO; +#endif typedef struct _SERVICE_STATUS { DWORD dwServiceType; Modified: trunk/reactos/include/reactos/idl/svcctl.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/idl/svcctl… ============================================================================== --- trunk/reactos/include/reactos/idl/svcctl.idl [iso-8859-1] (original) +++ trunk/reactos/include/reactos/idl/svcctl.idl [iso-8859-1] Mon Dec 10 14:54:25 2012 @@ -174,9 +174,12 @@ [size_is(cbRequiredPrivileges)] PBYTE pRequiredPrivileges; } SERVICE_RPC_REQUIRED_PRIVILEGES_INFO, *LPSERVICE_RPC_REQUIRED_PRIVILEGES_INFO; +cpp_quote("#ifndef _SERVICE_PRESHUTDOWN_INFO_DEFINED_") +cpp_quote("#define _SERVICE_PRESHUTDOWN_INFO_DEFINED_") typedef struct _SERVICE_PRESHUTDOWN_INFO { DWORD dwPreshutdownTimeout; } SERVICE_PRESHUTDOWN_INFO, *LPSERVICE_PRESHUTDOWN_INFO; +cpp_quote("#endif") typedef struct _SC_RPC_CONFIG_INFOA { DWORD dwInfoLevel;

11 years, 9 months

← Newer
1
...
18
19
20
21
22
23
24
...
29
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 December 2012