Ros-diffs December 2019

ros-diffs@reactos.org

18 participants
225 discussions

[reactos] 01/01: [XMLLITE] Sync with Wine Staging 4.18. CORE-16441

by Amine Khaldi

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=fba7694887e3fc7695eab… commit fba7694887e3fc7695eabd118e2810a82d443dbc Author: Amine Khaldi <amine.khaldi(a)reactos.org> AuthorDate: Mon Dec 23 00:56:19 2019 +0100 Commit: Amine Khaldi <amine.khaldi(a)reactos.org> CommitDate: Mon Dec 23 00:56:19 2019 +0100 [XMLLITE] Sync with Wine Staging 4.18. CORE-16441 --- dll/win32/xmllite/reader.c | 34 +- dll/win32/xmllite/writer.c | 694 ++++++++++++++++++++++++++++++------ dll/win32/xmllite/xmllite_private.h | 5 + media/doc/README.WINE | 2 +- 4 files changed, 602 insertions(+), 133 deletions(-) diff --git a/dll/win32/xmllite/reader.c b/dll/win32/xmllite/reader.c index 9cb7f3bd776..ba09556adfa 100644 --- a/dll/win32/xmllite/reader.c +++ b/dll/win32/xmllite/reader.c @@ -29,10 +29,12 @@ #include "objbase.h" #include "xmllite.h" #include "xmllite_private.h" +#ifdef __REACTOS__ +#include <winnls.h> +#endif #include "wine/debug.h" #include "wine/list.h" -#include "wine/unicode.h" WINE_DEFAULT_DEBUG_CHANNEL(xmllite); @@ -95,7 +97,7 @@ static const WCHAR gtW[] = {'>',0}; static const WCHAR commentW[] = {'<','!','-','-',0}; static const WCHAR piW[] = {'<','?',0}; -static BOOL is_namestartchar(WCHAR ch); +BOOL is_namestartchar(WCHAR ch); static const char *debugstr_nodetype(XmlNodeType nodetype) { @@ -387,7 +389,7 @@ static inline WCHAR *readerinput_strdupW(xmlreaderinput *input, const WCHAR *str if(str) { DWORD size; - size = (strlenW(str)+1)*sizeof(WCHAR); + size = (lstrlenW(str)+1)*sizeof(WCHAR); ret = readerinput_alloc(input, size); if (ret) memcpy(ret, str, size); } @@ -756,9 +758,9 @@ xml_encoding parse_encoding_name(const WCHAR *name, int len) n = (min+max)/2; if (len != -1) - c = strncmpiW(xml_encoding_map[n].name, name, len); + c = _wcsnicmp(xml_encoding_map[n].name, name, len); else - c = strcmpiW(xml_encoding_map[n].name, name); + c = wcsicmp(xml_encoding_map[n].name, name); if (!c) return xml_encoding_map[n].enc; @@ -1019,9 +1021,9 @@ static void readerinput_switchencoding(xmlreaderinput *readerinput, xml_encoding encoded_buffer *src = &readerinput->buffer->encoded; encoded_buffer *dest = &readerinput->buffer->utf16; int len, dest_len; + UINT cp = ~0u; HRESULT hr; WCHAR *ptr; - UINT cp; hr = get_code_page(enc, &cp); if (FAILED(hr)) return; @@ -1491,7 +1493,7 @@ static inline BOOL is_char(WCHAR ch) } /* [13] PubidChar ::= #x20 | #xD | #xA | [a-zA-Z0-9] | [-'()+,./:=?;!*#@$_%] */ -static inline BOOL is_pubchar(WCHAR ch) +BOOL is_pubchar(WCHAR ch) { return (ch == ' ') || (ch >= 'a' && ch <= 'z') || @@ -1504,7 +1506,7 @@ static inline BOOL is_pubchar(WCHAR ch) (ch == '_') || (ch == '\r') || (ch == '\n'); } -static inline BOOL is_namestartchar(WCHAR ch) +BOOL is_namestartchar(WCHAR ch) { return (ch == ':') || (ch >= 'A' && ch <= 'Z') || (ch == '_') || (ch >= 'a' && ch <= 'z') || @@ -1524,7 +1526,7 @@ static inline BOOL is_namestartchar(WCHAR ch) } /* [4 NS] NCName ::= Name - (Char* ':' Char*) */ -static inline BOOL is_ncnamechar(WCHAR ch) +BOOL is_ncnamechar(WCHAR ch) { return (ch >= 'A' && ch <= 'Z') || (ch == '_') || (ch >= 'a' && ch <= 'z') || @@ -1548,7 +1550,7 @@ static inline BOOL is_ncnamechar(WCHAR ch) (ch >= 0xfdf0 && ch <= 0xfffd); } -static inline BOOL is_namechar(WCHAR ch) +BOOL is_namechar(WCHAR ch) { return (ch == ':') || is_ncnamechar(ch); } @@ -1848,7 +1850,7 @@ static HRESULT reader_parse_externalid(xmlreader *reader) hr = reader_parse_pub_literal(reader, &pub); if (FAILED(hr)) return hr; - reader_init_cstrvalue(publicW, strlenW(publicW), &name); + reader_init_cstrvalue(publicW, lstrlenW(publicW), &name); hr = reader_add_attr(reader, NULL, &name, NULL, &pub, &position, 0); if (FAILED(hr)) return hr; @@ -1859,7 +1861,7 @@ static HRESULT reader_parse_externalid(xmlreader *reader) hr = reader_parse_sys_literal(reader, &sys); if (FAILED(hr)) return S_OK; - reader_init_cstrvalue(systemW, strlenW(systemW), &name); + reader_init_cstrvalue(systemW, lstrlenW(systemW), &name); hr = reader_add_attr(reader, NULL, &name, NULL, &sys, &position, 0); if (FAILED(hr)) return hr; @@ -1873,7 +1875,7 @@ static HRESULT reader_parse_externalid(xmlreader *reader) hr = reader_parse_sys_literal(reader, &sys); if (FAILED(hr)) return hr; - reader_init_cstrvalue(systemW, strlenW(systemW), &name); + reader_init_cstrvalue(systemW, lstrlenW(systemW), &name); return reader_add_attr(reader, NULL, &name, NULL, &sys, &position, 0); } @@ -3081,8 +3083,8 @@ static HRESULT WINAPI xmlreader_MoveToAttributeByName(IXmlReader* iface, if (!namespace_uri) namespace_uri = emptyW; - target_name_len = strlenW(local_name); - target_uri_len = strlenW(namespace_uri); + target_name_len = lstrlenW(local_name); + target_uri_len = lstrlenW(namespace_uri); LIST_FOR_EACH_ENTRY(attr, &This->attrs, struct attribute, entry) { @@ -3093,7 +3095,7 @@ static HRESULT WINAPI xmlreader_MoveToAttributeByName(IXmlReader* iface, reader_get_attribute_ns_uri(This, attr, &uri, &uri_len); if (name_len == target_name_len && uri_len == target_uri_len && - !strcmpW(name, local_name) && !strcmpW(uri, namespace_uri)) + !wcscmp(name, local_name) && !wcscmp(uri, namespace_uri)) { reader_set_current_attribute(This, attr); return S_OK; diff --git a/dll/win32/xmllite/writer.c b/dll/win32/xmllite/writer.c index 88f75b6e202..eb72436b5fc 100644 --- a/dll/win32/xmllite/writer.c +++ b/dll/win32/xmllite/writer.c @@ -2,7 +2,7 @@ * IXmlWriter implementation * * Copyright 2011 Alistair Leslie-Hughes - * Copyright 2014, 2016 Nikolay Sivov for CodeWeavers + * Copyright 2014-2018 Nikolay Sivov for CodeWeavers * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -20,17 +20,22 @@ */ #define COBJMACROS +#include <assert.h> #include <stdarg.h> + #include "windef.h" #include "winbase.h" #include "objbase.h" #include "xmllite.h" #include "xmllite_private.h" +#ifdef __REACTOS__ +#include <wchar.h> +#include <winnls.h> +#endif #include "initguid.h" #include "wine/debug.h" #include "wine/list.h" -#include "wine/unicode.h" WINE_DEFAULT_DEBUG_CHANNEL(xmllite); @@ -40,10 +45,8 @@ DEFINE_GUID(IID_IXmlWriterOutput, 0xc1131708, 0x0f59, 0x477f, 0x93, 0x59, 0x7d, static const WCHAR closeelementW[] = {'<','/'}; static const WCHAR closetagW[] = {' ','/','>'}; static const WCHAR closepiW[] = {'?','>'}; -static const WCHAR ltW[] = {'<'}; -static const WCHAR gtW[] = {'>'}; -static const WCHAR spaceW[] = {' '}; -static const WCHAR quoteW[] = {'"'}; +static const WCHAR xmlnsW[] = {' ','x','m','l','n','s'}; +static const WCHAR xmlnsuriW[] = {'h','t','t','p',':','/','/','w','w','w','.','w','3','.','o','r','g','/','2','0','0','0','/','x','m','l','n','s','/',0}; struct output_buffer { @@ -75,6 +78,7 @@ typedef struct xml_encoding encoding; WCHAR *encoding_name; /* exactly as specified on output creation */ struct output_buffer buffer; + DWORD written : 1; } xmlwriteroutput; static const struct IUnknownVtbl xmlwriteroutputvtbl; @@ -84,6 +88,17 @@ struct element struct list entry; WCHAR *qname; unsigned int len; /* qname length in chars */ + struct list ns; +}; + +struct ns +{ + struct list entry; + WCHAR *prefix; + int prefix_len; + WCHAR *uri; + BOOL emitted; + struct element *element; }; typedef struct _xmlwriter @@ -98,9 +113,10 @@ typedef struct _xmlwriter BOOL omitxmldecl; XmlConformanceLevel conformance; XmlWriterState state; - BOOL bomwritten; - BOOL starttagopen; struct list elements; + DWORD bomwritten : 1; + DWORD starttagopen : 1; + DWORD textnode : 1; } xmlwriter; static inline xmlwriter *impl_from_IXmlWriter(IXmlWriter *iface) @@ -130,6 +146,9 @@ static const char *debugstr_writer_prop(XmlWriterProperty prop) return prop_names[prop]; } +static HRESULT create_writer_output(IUnknown *stream, IMalloc *imalloc, xml_encoding encoding, + const WCHAR *encoding_name, xmlwriteroutput **out); + /* writer output memory allocation functions */ static inline void *writeroutput_alloc(xmlwriteroutput *output, size_t len) { @@ -147,12 +166,12 @@ static inline void *writeroutput_realloc(xmlwriteroutput *output, void *mem, siz } /* writer memory allocation functions */ -static inline void *writer_alloc(xmlwriter *writer, size_t len) +static inline void *writer_alloc(const xmlwriter *writer, size_t len) { return m_alloc(writer->imalloc, len); } -static inline void writer_free(xmlwriter *writer, void *mem) +static inline void writer_free(const xmlwriter *writer, void *mem) { m_free(writer->imalloc, mem); } @@ -165,30 +184,52 @@ static struct element *alloc_element(xmlwriter *writer, const WCHAR *prefix, con ret = writer_alloc(writer, sizeof(*ret)); if (!ret) return ret; - len = prefix ? strlenW(prefix) + 1 /* ':' */ : 0; - len += strlenW(local); + len = prefix ? lstrlenW(prefix) + 1 /* ':' */ : 0; + len += lstrlenW(local); ret->qname = writer_alloc(writer, (len + 1)*sizeof(WCHAR)); ret->len = len; if (prefix) { static const WCHAR colonW[] = {':',0}; - strcpyW(ret->qname, prefix); - strcatW(ret->qname, colonW); + lstrcpyW(ret->qname, prefix); + lstrcatW(ret->qname, colonW); } else ret->qname[0] = 0; - strcatW(ret->qname, local); + lstrcatW(ret->qname, local); + list_init(&ret->ns); return ret; } -static void free_element(xmlwriter *writer, struct element *element) +static void writer_free_element(xmlwriter *writer, struct element *element) { + struct ns *ns, *ns2; + + LIST_FOR_EACH_ENTRY_SAFE(ns, ns2, &element->ns, struct ns, entry) + { + list_remove(&ns->entry); + writer_free(writer, ns->prefix); + writer_free(writer, ns->uri); + writer_free(writer, ns); + } + writer_free(writer, element->qname); writer_free(writer, element); } -static void push_element(xmlwriter *writer, struct element *element) +static void writer_free_element_stack(xmlwriter *writer) +{ + struct element *element, *element2; + + LIST_FOR_EACH_ENTRY_SAFE(element, element2, &writer->elements, struct element, entry) + { + list_remove(&element->entry); + writer_free_element(writer, element); + } +} + +static void writer_push_element(xmlwriter *writer, struct element *element) { list_add_head(&writer->elements, &element->entry); } @@ -203,6 +244,170 @@ static struct element *pop_element(xmlwriter *writer) return element; } +static WCHAR *writer_strndupW(const xmlwriter *writer, const WCHAR *str, int len) +{ + size_t size; + WCHAR *ret; + + if (!str) + return NULL; + + if (len == -1) + len = lstrlenW(str); + + size = (len + 1) * sizeof(WCHAR); + ret = writer_alloc(writer, size); + memcpy(ret, str, size); + return ret; +} + +static WCHAR *writer_strdupW(const xmlwriter *writer, const WCHAR *str) +{ + return writer_strndupW(writer, str, -1); +} + +static struct ns *writer_push_ns(xmlwriter *writer, const WCHAR *prefix, int prefix_len, const WCHAR *uri) +{ + struct element *element; + struct ns *ns; + + element = LIST_ENTRY(list_head(&writer->elements), struct element, entry); + if (!element) + return NULL; + + if ((ns = writer_alloc(writer, sizeof(*ns)))) + { + ns->prefix = writer_strndupW(writer, prefix, prefix_len); + ns->prefix_len = prefix_len; + ns->uri = writer_strdupW(writer, uri); + ns->emitted = FALSE; + ns->element = element; + list_add_tail(&element->ns, &ns->entry); + } + + return ns; +} + +static BOOL is_empty_string(const WCHAR *str) +{ + return !str || !*str; +} + +static struct ns *writer_find_ns_current(const xmlwriter *writer, const WCHAR *prefix, const WCHAR *uri) +{ + struct element *element; + struct ns *ns; + + if (is_empty_string(prefix) || is_empty_string(uri)) + return NULL; + + element = LIST_ENTRY(list_head(&writer->elements), struct element, entry); + + LIST_FOR_EACH_ENTRY(ns, &element->ns, struct ns, entry) + { + if (!wcscmp(uri, ns->uri) && !wcscmp(prefix, ns->prefix)) + return ns; + } + + return NULL; +} + +static struct ns *writer_find_ns(const xmlwriter *writer, const WCHAR *prefix, const WCHAR *uri) +{ + struct element *element; + struct ns *ns; + + if (is_empty_string(prefix) && is_empty_string(uri)) + return NULL; + + LIST_FOR_EACH_ENTRY(element, &writer->elements, struct element, entry) + { + LIST_FOR_EACH_ENTRY(ns, &element->ns, struct ns, entry) + { + if (!uri) + { + if (!ns->prefix) continue; + if (!wcscmp(ns->prefix, prefix)) + return ns; + } + else if (!wcscmp(uri, ns->uri)) + { + if (prefix && !*prefix) + return NULL; + if (!prefix || !wcscmp(prefix, ns->prefix)) + return ns; + } + } + } + + return NULL; +} + +static HRESULT is_valid_ncname(const WCHAR *str, int *out) +{ + int len = 0; + + *out = 0; + + if (!str || !*str) + return S_OK; + + while (*str) + { + if (!is_ncnamechar(*str)) + return WC_E_NAMECHARACTER; + len++; + str++; + } + + *out = len; + return S_OK; +} + +static HRESULT is_valid_name(const WCHAR *str, unsigned int *out) +{ + unsigned int len = 1; + + *out = 0; + + if (!str || !*str) + return S_OK; + + if (!is_namestartchar(*str++)) + return WC_E_NAMECHARACTER; + + while (*str++) + { + if (!is_namechar(*str)) + return WC_E_NAMECHARACTER; + len++; + } + + *out = len; + return S_OK; +} + +static HRESULT is_valid_pubid(const WCHAR *str, unsigned int *out) +{ + unsigned int len = 0; + + *out = 0; + + if (!str || !*str) + return S_OK; + + while (*str) + { + if (!is_pubchar(*str++)) + return WC_E_PUBLICID; + len++; + } + + *out = len; + + return S_OK; +} + static HRESULT init_output_buffer(xmlwriteroutput *output) { struct output_buffer *buffer = &output->buffer; @@ -257,7 +462,7 @@ static HRESULT write_output_buffer(xmlwriteroutput *output, const WCHAR *data, i if (buffer->codepage == 1200) { /* For UTF-16 encoding just copy. */ - length = len == -1 ? strlenW(data) : len; + length = len == -1 ? lstrlenW(data) : len; if (length) { length *= sizeof(WCHAR); @@ -280,28 +485,38 @@ static HRESULT write_output_buffer(xmlwriteroutput *output, const WCHAR *data, i length = WideCharToMultiByte(buffer->codepage, 0, data, len, ptr, length, NULL, NULL); buffer->written += len == -1 ? length-1 : length; } + output->written = length != 0; return S_OK; } +static HRESULT write_output_buffer_char(xmlwriteroutput *output, WCHAR ch) +{ + return write_output_buffer(output, &ch, 1); +} + static HRESULT write_output_buffer_quoted(xmlwriteroutput *output, const WCHAR *data, int len) { - write_output_buffer(output, quoteW, ARRAY_SIZE(quoteW)); - write_output_buffer(output, data, len); - write_output_buffer(output, quoteW, ARRAY_SIZE(quoteW)); + write_output_buffer_char(output, '"'); + if (!is_empty_string(data)) + write_output_buffer(output, data, len); + write_output_buffer_char(output, '"'); return S_OK; } /* TODO: test if we need to validate char range */ -static HRESULT write_output_qname(xmlwriteroutput *output, const WCHAR *prefix, const WCHAR *local_name) +static HRESULT write_output_qname(xmlwriteroutput *output, const WCHAR *prefix, int prefix_len, + const WCHAR *local_name, int local_len) { - if (prefix) { - static const WCHAR colW[] = {':'}; - write_output_buffer(output, prefix, -1); - write_output_buffer(output, colW, ARRAY_SIZE(colW)); - } + assert(prefix_len >= 0 && local_len >= 0); + + if (prefix_len) + write_output_buffer(output, prefix, prefix_len); + + if (prefix_len && local_len) + write_output_buffer_char(output, ':'); - write_output_buffer(output, local_name, -1); + write_output_buffer(output, local_name, local_len); return S_OK; } @@ -416,13 +631,30 @@ static HRESULT write_xmldecl(xmlwriter *writer, XmlStandalone standalone) return S_OK; } +static void writer_output_ns(xmlwriter *writer, struct element *element) +{ + struct ns *ns; + + LIST_FOR_EACH_ENTRY(ns, &element->ns, struct ns, entry) + { + if (ns->emitted) + continue; + + write_output_qname(writer->output, xmlnsW, ARRAY_SIZE(xmlnsW), ns->prefix, ns->prefix_len); + write_output_buffer_char(writer->output, '='); + write_output_buffer_quoted(writer->output, ns->uri, -1); + } +} + static HRESULT writer_close_starttag(xmlwriter *writer) { HRESULT hr; if (!writer->starttagopen) return S_OK; - hr = write_output_buffer(writer->output, gtW, ARRAY_SIZE(gtW)); - writer->starttagopen = FALSE; + + writer_output_ns(writer, LIST_ENTRY(list_head(&writer->elements), struct element, entry)); + hr = write_output_buffer_char(writer->output, '>'); + writer->starttagopen = 0; return hr; } @@ -443,15 +675,20 @@ static void write_node_indent(xmlwriter *writer) static const WCHAR crlfW[] = {'\r','\n'}; unsigned int indent_level = writer->indent_level; - if (!writer->indent) + if (!writer->indent || writer->textnode) + { + writer->textnode = 0; return; + } /* Do state check to prevent newline inserted after BOM. It is assumed that state does not change between writing BOM and inserting indentation. */ - if (writer->output->buffer.written && writer->state != XmlWriterState_Ready) + if (writer->output->written && writer->state != XmlWriterState_Ready) write_output_buffer(writer->output, crlfW, ARRAY_SIZE(crlfW)); while (indent_level--) write_output_buffer(writer->output, dblspaceW, ARRAY_SIZE(dblspaceW)); + + writer->textnode = 0; } static HRESULT WINAPI xmlwriter_QueryInterface(IXmlWriter *iface, REFIID riid, void **ppvObject) @@ -493,17 +730,12 @@ static ULONG WINAPI xmlwriter_Release(IXmlWriter *iface) TRACE("(%p)->(%u)\n", This, ref); if (ref == 0) { - struct element *element, *element2; IMalloc *imalloc = This->imalloc; writeroutput_flush_stream(This->output); if (This->output) IUnknown_Release(&This->output->IXmlWriterOutput_iface); - /* element stack */ - LIST_FOR_EACH_ENTRY_SAFE(element, element2, &This->elements, struct element, entry) { - list_remove(&element->entry); - free_element(This, element); - } + writer_free_element_stack(This); writer_free(This, This); if (imalloc) IMalloc_Release(imalloc); @@ -525,8 +757,10 @@ static HRESULT WINAPI xmlwriter_SetOutput(IXmlWriter *iface, IUnknown *output) writeroutput_release_stream(This->output); IUnknown_Release(&This->output->IXmlWriterOutput_iface); This->output = NULL; - This->bomwritten = FALSE; + This->bomwritten = 0; + This->textnode = 0; This->indent_level = 0; + writer_free_element_stack(This); } /* just reset current output */ @@ -549,10 +783,10 @@ static HRESULT WINAPI xmlwriter_SetOutput(IXmlWriter *iface, IUnknown *output) } if (hr != S_OK || !writeroutput) { - /* create IXmlWriterOutput basing on supplied interface */ - hr = CreateXmlWriterOutputWithEncodingName(output, This->imalloc, NULL, &writeroutput); - if (hr != S_OK) return hr; - This->output = impl_from_IXmlWriterOutput(writeroutput); + /* Create output for given stream. */ + hr = create_writer_output(output, This->imalloc, XmlEncoding_UTF8, NULL, &This->output); + if (hr != S_OK) + return hr; } if (This->output->encoding == XmlEncoding_Unknown) @@ -627,14 +861,39 @@ static HRESULT WINAPI xmlwriter_WriteAttributes(IXmlWriter *iface, IXmlReader *p return E_NOTIMPL; } -static HRESULT WINAPI xmlwriter_WriteAttributeString(IXmlWriter *iface, LPCWSTR ns_prefix, - LPCWSTR local_name, LPCWSTR ns_uri, LPCWSTR value) +static void write_output_attribute(xmlwriter *writer, const WCHAR *prefix, int prefix_len, + const WCHAR *local, int local_len, const WCHAR *value) +{ + write_output_buffer_char(writer->output, ' '); + write_output_qname(writer->output, prefix, prefix_len, local, local_len); + write_output_buffer_char(writer->output, '='); + write_output_buffer_quoted(writer->output, value, -1); +} + +static BOOL is_valid_xml_space_value(const WCHAR *value) { - static const WCHAR eqW[] = {'=','"'}; + static const WCHAR preserveW[] = {'p','r','e','s','e','r','v','e',0}; + static const WCHAR defaultW[] = {'d','e','f','a','u','l','t',0}; + + if (!value) + return FALSE; + + return !wcscmp(value, preserveW) || !wcscmp(value, defaultW); +} + +static HRESULT WINAPI xmlwriter_WriteAttributeString(IXmlWriter *iface, LPCWSTR prefix, + LPCWSTR local, LPCWSTR uri, LPCWSTR value) +{ + static const WCHAR spaceattrW[] = {'s','p','a','c','e',0}; + static const WCHAR xmlnsW[] = {'x','m','l','n','s',0}; + static const WCHAR xmlW[] = {'x','m','l',0}; xmlwriter *This = impl_from_IXmlWriter(iface); + BOOL is_xmlns_prefix, is_xmlns_local; + int prefix_len, local_len; + struct ns *ns; + HRESULT hr; - TRACE("%p %s %s %s %s\n", This, debugstr_w(ns_prefix), debugstr_w(local_name), - debugstr_w(ns_uri), debugstr_w(value)); + TRACE("%p %s %s %s %s\n", This, debugstr_w(prefix), debugstr_w(local), debugstr_w(uri), debugstr_w(value)); switch (This->state) { @@ -650,17 +909,83 @@ static HRESULT WINAPI xmlwriter_WriteAttributeString(IXmlWriter *iface, LPCWSTR ; } - if (ns_prefix || ns_uri) + /* Prefix "xmlns" */ + is_xmlns_prefix = prefix && !wcscmp(prefix, xmlnsW); + if (is_xmlns_prefix && is_empty_string(uri) && is_empty_string(local)) + return WR_E_NSPREFIXDECLARED; + + if (!local) + return E_INVALIDARG; + + /* Validate prefix and local name */ + if (FAILED(hr = is_valid_ncname(prefix, &prefix_len))) + return hr; + + if (FAILED(hr = is_valid_ncname(local, &local_len))) + return hr; + + is_xmlns_local = !wcscmp(local, xmlnsW); + + /* Trivial case, no prefix. */ + if (prefix_len == 0 && is_empty_string(uri)) + { + write_output_attribute(This, prefix, prefix_len, local, local_len, value); + return S_OK; + } + + /* Predefined "xml" prefix. */ + if (prefix_len && !wcscmp(prefix, xmlW)) { - FIXME("namespaces are not supported.\n"); - return E_NOTIMPL; + /* Valid "space" value is enforced. */ + if (!wcscmp(local, spaceattrW) && !is_valid_xml_space_value(value)) + return WR_E_INVALIDXMLSPACE; + + /* Redefinition is not allowed. */ + if (!is_empty_string(uri)) + return WR_E_XMLPREFIXDECLARATION; + + write_output_attribute(This, prefix, prefix_len, local, local_len, value); + + return S_OK; + } + + if (is_xmlns_prefix || (prefix_len == 0 && uri && !wcscmp(uri, xmlnsuriW))) + { + if (prefix_len && !is_empty_string(uri)) + return WR_E_XMLNSPREFIXDECLARATION; + + /* Look for exact match defined in current element, and write it out. */ + if (!(ns = writer_find_ns_current(This, prefix, value))) + ns = writer_push_ns(This, local, local_len, value); + ns->emitted = TRUE; + + write_output_attribute(This, xmlnsW, ARRAY_SIZE(xmlnsW) - 1, local, local_len, value); + + return S_OK; } - write_output_buffer(This->output, spaceW, ARRAY_SIZE(spaceW)); - write_output_buffer(This->output, local_name, -1); - write_output_buffer(This->output, eqW, ARRAY_SIZE(eqW)); - write_output_buffer(This->output, value, -1); - write_output_buffer(This->output, quoteW, ARRAY_SIZE(quoteW)); + /* Ignore prefix is URI wasn't specified. */ + if (is_xmlns_local && is_empty_string(uri)) + { + write_output_attribute(This, NULL, 0, xmlnsW, ARRAY_SIZE(xmlnsW) - 1, value); + return S_OK; + } + + if (!(ns = writer_find_ns(This, prefix, uri))) + { + if (is_empty_string(prefix) && !is_empty_string(uri)) + { + FIXME("Prefix autogeneration is not implemented.\n"); + return E_NOTIMPL; + } + if (!is_empty_string(uri)) + ns = writer_push_ns(This, prefix, prefix_len, uri); + } + + if (ns) + write_output_attribute(This, ns->prefix, ns->prefix_len, local, local_len, value); + else + write_output_attribute(This, prefix, prefix_len, local, local_len, value); return S_OK; } @@ -699,7 +1024,7 @@ static HRESULT WINAPI xmlwriter_WriteCData(IXmlWriter *iface, LPCWSTR data) ; } - len = data ? strlenW(data) : 0; + len = data ? lstrlenW(data) : 0; write_node_indent(This); if (!len) @@ -707,7 +1032,7 @@ static HRESULT WINAPI xmlwriter_WriteCData(IXmlWriter *iface, LPCWSTR data) else { static const WCHAR cdatacloseW[] = {']',']','>',0}; while (len) { - const WCHAR *str = strstrW(data, cdatacloseW); + const WCHAR *str = wcsstr(data, cdatacloseW); if (str) { str += 2; write_cdata_section(This->output, data, str - data); @@ -747,7 +1072,7 @@ static HRESULT WINAPI xmlwriter_WriteCharEntity(IXmlWriter *iface, WCHAR ch) ; } - sprintfW(bufW, fmtW, ch); + swprintf(bufW, fmtW, ch); write_output_buffer(This->output, bufW, -1); return S_OK; @@ -801,7 +1126,7 @@ static HRESULT WINAPI xmlwriter_WriteComment(IXmlWriter *iface, LPCWSTR comment) write_node_indent(This); write_output_buffer(This->output, copenW, ARRAY_SIZE(copenW)); if (comment) { - int len = strlenW(comment), i; + int len = lstrlenW(comment), i; /* Make sure there's no two hyphen sequences in a string, space is used as a separator to produce compliant comment string */ @@ -809,35 +1134,92 @@ static HRESULT WINAPI xmlwriter_WriteComment(IXmlWriter *iface, LPCWSTR comment) for (i = 0; i < len; i++) { write_output_buffer(This->output, comment + i, 1); if (comment[i] == '-' && (i + 1 < len) && comment[i+1] == '-') - write_output_buffer(This->output, spaceW, ARRAY_SIZE(spaceW)); + write_output_buffer_char(This->output, ' '); } } else write_output_buffer(This->output, comment, len); if (len && comment[len-1] == '-') - write_output_buffer(This->output, spaceW, ARRAY_SIZE(spaceW)); + write_output_buffer_char(This->output, ' '); } write_output_buffer(This->output, ccloseW, ARRAY_SIZE(ccloseW)); return S_OK; } -static HRESULT WINAPI xmlwriter_WriteDocType(IXmlWriter *iface, LPCWSTR pwszName, LPCWSTR pwszPublicId, - LPCWSTR pwszSystemId, LPCWSTR pwszSubset) +static HRESULT WINAPI xmlwriter_WriteDocType(IXmlWriter *iface, LPCWSTR name, LPCWSTR pubid, + LPCWSTR sysid, LPCWSTR subset) { + static const WCHAR doctypeW[] = {'<','!','D','O','C','T','Y','P','E',' '}; + static const WCHAR publicW[] = {' ','P','U','B','L','I','C',' '}; + static const WCHAR systemW[] = {' ','S','Y','S','T','E','M',' '}; xmlwriter *This = impl_from_IXmlWriter(iface); + unsigned int name_len, pubid_len; + HRESULT hr; - FIXME("%p %s %s %s %s\n", This, wine_dbgstr_w(pwszName), wine_dbgstr_w(pwszPublicId), - wine_dbgstr_w(pwszSystemId), wine_dbgstr_w(pwszSubset)); + TRACE("(%p)->(%s %s %s %s)\n", This, wine_dbgstr_w(name), wine_dbgstr_w(pubid), wine_dbgstr_w(sysid), + wine_dbgstr_w(subset)); - return E_NOTIMPL; + switch (This->state) + { + case XmlWriterState_Initial: + return E_UNEXPECTED; + case XmlWriterState_InvalidEncoding: + return MX_E_ENCODING; + case XmlWriterState_Content: + case XmlWriterState_DocClosed: + return WR_E_INVALIDACTION; + default: + ; + } + + if (is_empty_string(name)) + return E_INVALIDARG; + + if (FAILED(hr = is_valid_name(name, &name_len))) + return hr; + + if (FAILED(hr = is_valid_pubid(pubid, &pubid_len))) + return hr; + + write_output_buffer(This->output, doctypeW, ARRAY_SIZE(doctypeW)); + write_output_buffer(This->output, name, name_len); + + if (pubid) + { + write_output_buffer(This->output, publicW, ARRAY_SIZE(publicW)); + write_output_buffer_quoted(This->output, pubid, pubid_len); + write_output_buffer_char(This->output, ' '); + write_output_buffer_quoted(This->output, sysid, -1); + } + else if (sysid) + { + write_output_buffer(This->output, systemW, ARRAY_SIZE(systemW)); + write_output_buffer_quoted(This->output, sysid, -1); + } + + if (subset) + { + write_output_buffer_char(This->output, ' '); + write_output_buffer_char(This->output, '['); + write_output_buffer(This->output, subset, -1); + write_output_buffer_char(This->output, ']'); + } + write_output_buffer_char(This->output, '>'); + + This->state = XmlWriterState_Content; + + return S_OK; } static HRESULT WINAPI xmlwriter_WriteElementString(IXmlWriter *iface, LPCWSTR prefix, LPCWSTR local_name, LPCWSTR uri, LPCWSTR value) { xmlwriter *This = impl_from_IXmlWriter(iface); + int prefix_len, local_len; + struct ns *ns; + HRESULT hr; TRACE("(%p)->(%s %s %s %s)\n", This, wine_dbgstr_w(prefix), wine_dbgstr_w(local_name), wine_dbgstr_w(uri), wine_dbgstr_w(value)); @@ -857,18 +1239,52 @@ static HRESULT WINAPI xmlwriter_WriteElementString(IXmlWriter *iface, LPCWSTR pr ; } + if (!local_name) + return E_INVALIDARG; + + /* Validate prefix and local name */ + if (FAILED(hr = is_valid_ncname(prefix, &prefix_len))) + return hr; + + if (FAILED(hr = is_valid_ncname(local_name, &local_len))) + return hr; + + ns = writer_find_ns(This, prefix, uri); + if (!ns && !is_empty_string(prefix) && is_empty_string(uri)) + return WR_E_NSPREFIXWITHEMPTYNSURI; + + if (uri && !wcscmp(uri, xmlnsuriW)) + { + if (!prefix) + return WR_E_XMLNSPREFIXDECLARATION; + + if (!is_empty_string(prefix)) + return WR_E_XMLNSURIDECLARATION; + } + write_encoding_bom(This); write_node_indent(This); - write_output_buffer(This->output, ltW, ARRAY_SIZE(ltW)); - write_output_qname(This->output, prefix, local_name); + + write_output_buffer_char(This->output, '<'); + if (ns) + write_output_qname(This->output, ns->prefix, ns->prefix_len, local_name, local_len); + else + write_output_qname(This->output, prefix, prefix_len, local_name, local_len); + + if (!ns && (prefix_len || !is_empty_string(uri))) + { + write_output_qname(This->output, xmlnsW, ARRAY_SIZE(xmlnsW), prefix, prefix_len); + write_output_buffer_char(This->output, '='); + write_output_buffer_quoted(This->output, uri, -1); + } if (value) { - write_output_buffer(This->output, gtW, ARRAY_SIZE(gtW)); + write_output_buffer_char(This->output, '>'); write_output_buffer(This->output, value, -1); write_output_buffer(This->output, closeelementW, ARRAY_SIZE(closeelementW)); - write_output_qname(This->output, prefix, local_name); - write_output_buffer(This->output, gtW, ARRAY_SIZE(gtW)); + write_output_qname(This->output, prefix, prefix_len, local_name, local_len); + write_output_buffer_char(This->output, '>'); } else write_output_buffer(This->output, closetagW, ARRAY_SIZE(closetagW)); @@ -935,16 +1351,19 @@ static HRESULT WINAPI xmlwriter_WriteEndElement(IXmlWriter *iface) if (This->starttagopen) { + writer_output_ns(This, element); write_output_buffer(This->output, closetagW, ARRAY_SIZE(closetagW)); - This->starttagopen = FALSE; + This->starttagopen = 0; } - else { - /* write full end tag */ + else + { + /* Write full end tag. */ write_node_indent(This); write_output_buffer(This->output, closeelementW, ARRAY_SIZE(closeelementW)); write_output_buffer(This->output, element->qname, element->len); - write_output_buffer(This->output, gtW, ARRAY_SIZE(gtW)); + write_output_buffer_char(This->output, '>'); } + writer_free_element(This, element); return S_OK; } @@ -987,6 +1406,9 @@ static HRESULT WINAPI xmlwriter_WriteFullEndElement(IXmlWriter *iface) return WR_E_INVALIDACTION; case XmlWriterState_InvalidEncoding: return MX_E_ENCODING; + case XmlWriterState_ElemStarted: + writer_close_starttag(This); + break; default: ; } @@ -995,19 +1417,23 @@ static HRESULT WINAPI xmlwriter_WriteFullEndElement(IXmlWriter *iface) if (!element) return WR_E_INVALIDACTION; - writer_close_starttag(This); writer_dec_indent(This); /* don't force full end tag to the next line */ if (This->state == XmlWriterState_ElemStarted) + { This->state = XmlWriterState_Content; + This->textnode = 0; + } else write_node_indent(This); /* write full end tag */ write_output_buffer(This->output, closeelementW, ARRAY_SIZE(closeelementW)); write_output_buffer(This->output, element->qname, element->len); - write_output_buffer(This->output, gtW, ARRAY_SIZE(gtW)); + write_output_buffer_char(This->output, '>'); + + writer_free_element(This, element); return S_OK; } @@ -1094,7 +1520,7 @@ static HRESULT WINAPI xmlwriter_WriteProcessingInstruction(IXmlWriter *iface, LP case XmlWriterState_InvalidEncoding: return MX_E_ENCODING; case XmlWriterState_DocStarted: - if (!strcmpW(name, xmlW)) + if (!wcscmp(name, xmlW)) return WR_E_INVALIDACTION; break; case XmlWriterState_ElemStarted: @@ -1108,11 +1534,11 @@ static HRESULT WINAPI xmlwriter_WriteProcessingInstruction(IXmlWriter *iface, LP write_node_indent(This); write_output_buffer(This->output, openpiW, ARRAY_SIZE(openpiW)); write_output_buffer(This->output, name, -1); - write_output_buffer(This->output, spaceW, ARRAY_SIZE(spaceW)); + write_output_buffer_char(This->output, ' '); write_output_buffer(This->output, text, -1); write_output_buffer(This->output, closepiW, ARRAY_SIZE(closepiW)); - if (!strcmpW(name, xmlW)) + if (!wcscmp(name, xmlW)) This->state = XmlWriterState_PIDocStarted; return S_OK; @@ -1219,7 +1645,10 @@ static HRESULT WINAPI xmlwriter_WriteStartDocument(IXmlWriter *iface, XmlStandal static HRESULT WINAPI xmlwriter_WriteStartElement(IXmlWriter *iface, LPCWSTR prefix, LPCWSTR local_name, LPCWSTR uri) { xmlwriter *This = impl_from_IXmlWriter(iface); + int prefix_len, local_len; struct element *element; + struct ns *ns; + HRESULT hr; TRACE("(%p)->(%s %s %s)\n", This, wine_dbgstr_w(prefix), wine_dbgstr_w(local_name), wine_dbgstr_w(uri)); @@ -1234,13 +1663,30 @@ static HRESULT WINAPI xmlwriter_WriteStartElement(IXmlWriter *iface, LPCWSTR pre return MX_E_ENCODING; case XmlWriterState_DocClosed: return WR_E_INVALIDACTION; + case XmlWriterState_ElemStarted: + writer_close_starttag(This); + break; default: ; } - /* close pending element */ - if (This->starttagopen) - write_output_buffer(This->output, gtW, ARRAY_SIZE(gtW)); + /* Validate prefix and local name */ + if (FAILED(hr = is_valid_ncname(prefix, &prefix_len))) + return hr; + + if (FAILED(hr = is_valid_ncname(local_name, &local_len))) + return hr; + + if (uri && !wcscmp(uri, xmlnsuriW)) + { + if (!prefix) + return WR_E_XMLNSPREFIXDECLARATION; + + if (!is_empty_string(prefix)) + return WR_E_XMLNSURIDECLARATION; + } + + ns = writer_find_ns(This, prefix, uri); element = alloc_element(This, prefix, local_name); if (!element) @@ -1250,12 +1696,18 @@ static HRESULT WINAPI xmlwriter_WriteStartElement(IXmlWriter *iface, LPCWSTR pre write_node_indent(This); This->state = XmlWriterState_ElemStarted; - This->starttagopen = TRUE; + This->starttagopen = 1; + + writer_push_element(This, element); - push_element(This, element); + if (!ns && uri) + writer_push_ns(This, prefix, prefix_len, uri); - write_output_buffer(This->output, ltW, ARRAY_SIZE(ltW)); - write_output_qname(This->output, prefix, local_name); + write_output_buffer_char(This->output, '<'); + if (ns) + write_output_qname(This->output, ns->prefix, ns->prefix_len, local_name, local_len); + else + write_output_qname(This->output, prefix, prefix_len, local_name, local_len); writer_inc_indent(This); return S_OK; @@ -1314,6 +1766,7 @@ static HRESULT WINAPI xmlwriter_WriteString(IXmlWriter *iface, const WCHAR *stri ; } + This->textnode = 1; write_escaped_string(This, string); return S_OK; } @@ -1452,21 +1905,18 @@ HRESULT WINAPI CreateXmlWriter(REFIID riid, void **obj, IMalloc *imalloc) writer = IMalloc_Alloc(imalloc, sizeof(*writer)); else writer = heap_alloc(sizeof(*writer)); - if(!writer) return E_OUTOFMEMORY; + if (!writer) + return E_OUTOFMEMORY; + + memset(writer, 0, sizeof(*writer)); writer->IXmlWriter_iface.lpVtbl = &xmlwriter_vtbl; writer->ref = 1; writer->imalloc = imalloc; if (imalloc) IMalloc_AddRef(imalloc); - writer->output = NULL; - writer->indent_level = 0; - writer->indent = FALSE; writer->bom = TRUE; - writer->omitxmldecl = FALSE; writer->conformance = XmlConformanceLevel_Document; writer->state = XmlWriterState_Initial; - writer->bomwritten = FALSE; - writer->starttagopen = FALSE; list_init(&writer->elements); hr = IXmlWriter_QueryInterface(&writer->IXmlWriter_iface, riid, obj); @@ -1478,12 +1928,12 @@ HRESULT WINAPI CreateXmlWriter(REFIID riid, void **obj, IMalloc *imalloc) } static HRESULT create_writer_output(IUnknown *stream, IMalloc *imalloc, xml_encoding encoding, - const WCHAR *encoding_name, IXmlWriterOutput **output) + const WCHAR *encoding_name, xmlwriteroutput **out) { xmlwriteroutput *writeroutput; HRESULT hr; - *output = NULL; + *out = NULL; if (imalloc) writeroutput = IMalloc_Alloc(imalloc, sizeof(*writeroutput)); @@ -1506,49 +1956,61 @@ static HRESULT create_writer_output(IUnknown *stream, IMalloc *imalloc, xml_enco } if (encoding_name) { - unsigned int size = (strlenW(encoding_name) + 1) * sizeof(WCHAR); + unsigned int size = (lstrlenW(encoding_name) + 1) * sizeof(WCHAR); writeroutput->encoding_name = writeroutput_alloc(writeroutput, size); memcpy(writeroutput->encoding_name, encoding_name, size); } else writeroutput->encoding_name = NULL; + writeroutput->written = 0; IUnknown_QueryInterface(stream, &IID_IUnknown, (void**)&writeroutput->output); - *output = &writeroutput->IXmlWriterOutput_iface; + *out = writeroutput; - TRACE("returning iface %p\n", *output); + TRACE("Created writer output %p\n", *out); return S_OK; } -HRESULT WINAPI CreateXmlWriterOutputWithEncodingName(IUnknown *stream, - IMalloc *imalloc, - LPCWSTR encoding, - IXmlWriterOutput **output) +HRESULT WINAPI CreateXmlWriterOutputWithEncodingName(IUnknown *stream, IMalloc *imalloc, const WCHAR *encoding, + IXmlWriterOutput **out) { - static const WCHAR utf8W[] = {'U','T','F','-','8',0}; + xmlwriteroutput *output; xml_encoding xml_enc; + HRESULT hr; + + TRACE("%p %p %s %p\n", stream, imalloc, debugstr_w(encoding), out); + + if (!stream || !out) + return E_INVALIDARG; - TRACE("%p %p %s %p\n", stream, imalloc, debugstr_w(encoding), output); + *out = NULL; - if (!stream || !output) return E_INVALIDARG; + xml_enc = encoding ? parse_encoding_name(encoding, -1) : XmlEncoding_UTF8; + if (SUCCEEDED(hr = create_writer_output(stream, imalloc, xml_enc, encoding, &output))) + *out = &output->IXmlWriterOutput_iface; - xml_enc = parse_encoding_name(encoding ? encoding : utf8W, -1); - return create_writer_output(stream, imalloc, xml_enc, encoding, output); + return hr; } -HRESULT WINAPI CreateXmlWriterOutputWithEncodingCodePage(IUnknown *stream, - IMalloc *imalloc, - UINT codepage, - IXmlWriterOutput **output) +HRESULT WINAPI CreateXmlWriterOutputWithEncodingCodePage(IUnknown *stream, IMalloc *imalloc, UINT codepage, + IXmlWriterOutput **out) { + xmlwriteroutput *output; xml_encoding xml_enc; + HRESULT hr; - TRACE("%p %p %u %p\n", stream, imalloc, codepage, output); + TRACE("%p %p %u %p\n", stream, imalloc, codepage, out); - if (!stream || !output) return E_INVALIDARG; + if (!stream || !out) + return E_INVALIDARG; + + *out = NULL; xml_enc = get_encoding_from_codepage(codepage); - return create_writer_output(stream, imalloc, xml_enc, NULL, output); + if (SUCCEEDED(hr = create_writer_output(stream, imalloc, xml_enc, NULL, &output))) + *out = &output->IXmlWriterOutput_iface; + + return hr; } diff --git a/dll/win32/xmllite/xmllite_private.h b/dll/win32/xmllite/xmllite_private.h index 7884e27453d..10f43760b41 100644 --- a/dll/win32/xmllite/xmllite_private.h +++ b/dll/win32/xmllite/xmllite_private.h @@ -60,4 +60,9 @@ HRESULT get_code_page(xml_encoding,UINT*) DECLSPEC_HIDDEN; const WCHAR *get_encoding_name(xml_encoding) DECLSPEC_HIDDEN; xml_encoding get_encoding_from_codepage(UINT) DECLSPEC_HIDDEN; +BOOL is_ncnamechar(WCHAR ch) DECLSPEC_HIDDEN; +BOOL is_pubchar(WCHAR ch) DECLSPEC_HIDDEN; +BOOL is_namestartchar(WCHAR ch) DECLSPEC_HIDDEN; +BOOL is_namechar(WCHAR ch) DECLSPEC_HIDDEN; + #endif /* __XMLLITE_PRIVATE__ */ diff --git a/media/doc/README.WINE b/media/doc/README.WINE index bbdab7f171d..64ee6000989 100644 --- a/media/doc/README.WINE +++ b/media/doc/README.WINE @@ -219,7 +219,7 @@ dll/win32/xinput1_1 # Synced to WineStaging-2.9 dll/win32/xinput1_2 # Synced to WineStaging-2.9 dll/win32/xinput1_3 # Synced to WineStaging-2.9 dll/win32/xinput9_1_0 # Synced to WineStaging-2.9 -dll/win32/xmllite # Synced to WineStaging-3.3 +dll/win32/xmllite # Synced to WineStaging-4.18 dll/win32/xolehlp # Synced to WineStaging-3.21 dll/cpl/inetcpl # Synced to WineStaging-3.17

5 years

[reactos] 01/01: [XINPUT1_3_WINETEST] Sync with Wine Staging 4.18. CORE-16441

by Amine Khaldi

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=b05ac020b45c61f3d8aa2… commit b05ac020b45c61f3d8aa2d787350125655bb088e Author: Amine Khaldi <amine.khaldi(a)reactos.org> AuthorDate: Mon Dec 23 00:55:56 2019 +0100 Commit: Amine Khaldi <amine.khaldi(a)reactos.org> CommitDate: Mon Dec 23 00:55:56 2019 +0100 [XINPUT1_3_WINETEST] Sync with Wine Staging 4.18. CORE-16441 --- modules/rostests/winetests/xinput1_3/xinput.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/modules/rostests/winetests/xinput1_3/xinput.c b/modules/rostests/winetests/xinput1_3/xinput.c index f26fda90ebb..a6e2107446c 100644 --- a/modules/rostests/winetests/xinput1_3/xinput.c +++ b/modules/rostests/winetests/xinput1_3/xinput.c @@ -126,6 +126,9 @@ static void test_get_state(void) } } + result = pXInputGetState(0, NULL); + ok(result == ERROR_BAD_ARGUMENTS, "XInputGetState returned (%d)\n", result); + result = pXInputGetState(XUSER_MAX_COUNT, &state); ok(result == ERROR_BAD_ARGUMENTS, "XInputGetState returned (%d)\n", result); @@ -292,7 +295,7 @@ START_TEST(xinput) void *pXInputGetStateEx_Ordinal; int i; - for (i = 0; i < sizeof(libs) / sizeof(libs[0]); i++) + for (i = 0; i < ARRAY_SIZE(libs); i++) { hXinput = LoadLibraryA( libs[i].name );

5 years

[reactos] 01/01: [WUAPI] Sync with Wine Staging 4.18. CORE-16441

by Amine Khaldi

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=a80c5a56e35ef13411e2b… commit a80c5a56e35ef13411e2b498d1778099115578b1 Author: Amine Khaldi <amine.khaldi(a)reactos.org> AuthorDate: Mon Dec 23 00:55:33 2019 +0100 Commit: Amine Khaldi <amine.khaldi(a)reactos.org> CommitDate: Mon Dec 23 00:55:33 2019 +0100 [WUAPI] Sync with Wine Staging 4.18. CORE-16441 --- dll/win32/wuapi/downloader.c | 1 - dll/win32/wuapi/installer.c | 1 - dll/win32/wuapi/main.c | 1 - dll/win32/wuapi/precomp.h | 2 -- dll/win32/wuapi/searcher.c | 1 - dll/win32/wuapi/session.c | 1 - dll/win32/wuapi/systeminfo.c | 1 - dll/win32/wuapi/updates.c | 1 - media/doc/README.WINE | 2 +- 9 files changed, 1 insertion(+), 10 deletions(-) diff --git a/dll/win32/wuapi/downloader.c b/dll/win32/wuapi/downloader.c index e17e1554f87..ff66dd18699 100644 --- a/dll/win32/wuapi/downloader.c +++ b/dll/win32/wuapi/downloader.c @@ -20,7 +20,6 @@ #define COBJMACROS -#include "config.h" #include <stdarg.h> #include "windef.h" diff --git a/dll/win32/wuapi/installer.c b/dll/win32/wuapi/installer.c index 46c8699fbee..376148244d3 100644 --- a/dll/win32/wuapi/installer.c +++ b/dll/win32/wuapi/installer.c @@ -20,7 +20,6 @@ #define COBJMACROS -#include "config.h" #include <stdarg.h> #include "windef.h" diff --git a/dll/win32/wuapi/main.c b/dll/win32/wuapi/main.c index 0527ee53ba9..c2ed95ed42b 100644 --- a/dll/win32/wuapi/main.c +++ b/dll/win32/wuapi/main.c @@ -20,7 +20,6 @@ #define COBJMACROS -#include "config.h" #include <stdarg.h> #include "windef.h" diff --git a/dll/win32/wuapi/precomp.h b/dll/win32/wuapi/precomp.h index a52e44b9bf9..e41796f063b 100644 --- a/dll/win32/wuapi/precomp.h +++ b/dll/win32/wuapi/precomp.h @@ -2,8 +2,6 @@ #ifndef _WUAPI_PRECOMP_H_ #define _WUAPI_PRECOMP_H_ -#include <wine/config.h> - #include <stdarg.h> #define WIN32_NO_STATUS diff --git a/dll/win32/wuapi/searcher.c b/dll/win32/wuapi/searcher.c index 1ca8020a09d..697536bd592 100644 --- a/dll/win32/wuapi/searcher.c +++ b/dll/win32/wuapi/searcher.c @@ -20,7 +20,6 @@ #define COBJMACROS -#include "config.h" #include <stdarg.h> #include "windef.h" diff --git a/dll/win32/wuapi/session.c b/dll/win32/wuapi/session.c index acc7cb0a351..29365dd86c8 100644 --- a/dll/win32/wuapi/session.c +++ b/dll/win32/wuapi/session.c @@ -20,7 +20,6 @@ #define COBJMACROS -#include "config.h" #include <stdarg.h> #include "windef.h" diff --git a/dll/win32/wuapi/systeminfo.c b/dll/win32/wuapi/systeminfo.c index 7c62bed5296..6424e1b48df 100644 --- a/dll/win32/wuapi/systeminfo.c +++ b/dll/win32/wuapi/systeminfo.c @@ -21,7 +21,6 @@ #define COBJMACROS -#include "config.h" #include <stdarg.h> #include "windef.h" diff --git a/dll/win32/wuapi/updates.c b/dll/win32/wuapi/updates.c index 4f6648c5af0..249f07ae96f 100644 --- a/dll/win32/wuapi/updates.c +++ b/dll/win32/wuapi/updates.c @@ -20,7 +20,6 @@ #define COBJMACROS -#include "config.h" #include <stdarg.h> #include "windef.h" diff --git a/media/doc/README.WINE b/media/doc/README.WINE index 84e2af867cb..bbdab7f171d 100644 --- a/media/doc/README.WINE +++ b/media/doc/README.WINE @@ -214,7 +214,7 @@ dll/win32/wmiutils # Synced to WineStaging-4.18 dll/win32/wmvcore # Synced to WineStaging-4.18 dll/win32/wshom.ocx # Synced to WineStaging-4.18 dll/win32/wtsapi32 # Synced to WineStaging-4.18 -dll/win32/wuapi # Synced to WineStaging-3.3 +dll/win32/wuapi # Synced to WineStaging-4.18 dll/win32/xinput1_1 # Synced to WineStaging-2.9 dll/win32/xinput1_2 # Synced to WineStaging-2.9 dll/win32/xinput1_3 # Synced to WineStaging-2.9

5 years

[reactos] 01/01: [WTSAPI32_WINETEST] Sync with Wine Staging 4.18. CORE-16441

by Amine Khaldi

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=eea75d46e7a37ddb03ea5… commit eea75d46e7a37ddb03ea5c8f1f9a52cb6a3d41ca Author: Amine Khaldi <amine.khaldi(a)reactos.org> AuthorDate: Mon Dec 23 00:55:08 2019 +0100 Commit: Amine Khaldi <amine.khaldi(a)reactos.org> CommitDate: Mon Dec 23 00:55:08 2019 +0100 [WTSAPI32_WINETEST] Sync with Wine Staging 4.18. CORE-16441 --- modules/rostests/winetests/wtsapi32/wtsapi.c | 37 ++++++++++++++++++++++++---- 1 file changed, 32 insertions(+), 5 deletions(-) diff --git a/modules/rostests/winetests/wtsapi32/wtsapi.c b/modules/rostests/winetests/wtsapi32/wtsapi.c index dd5c8e86376..d993c6ff15e 100644 --- a/modules/rostests/winetests/wtsapi32/wtsapi.c +++ b/modules/rostests/winetests/wtsapi32/wtsapi.c @@ -47,21 +47,21 @@ static void test_WTSEnumerateProcessesW(void) ret = WTSEnumerateProcessesW(WTS_CURRENT_SERVER_HANDLE, 1, 1, &info, &count); ok(!ret, "expected WTSEnumerateProcessesW to fail\n"); ok(GetLastError()== ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER got: %d\n", GetLastError()); - if (info) WTSFreeMemory(info); + WTSFreeMemory(info); info = NULL; SetLastError(0xdeadbeef); ret = WTSEnumerateProcessesW(WTS_CURRENT_SERVER_HANDLE, 0, 0, &info, &count); ok(!ret, "expected WTSEnumerateProcessesW to fail\n"); ok(GetLastError()== ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER got: %d\n", GetLastError()); - if (info) WTSFreeMemory(info); + WTSFreeMemory(info); info = NULL; SetLastError(0xdeadbeef); ret = WTSEnumerateProcessesW(WTS_CURRENT_SERVER_HANDLE, 0, 2, &info, &count); ok(!ret, "expected WTSEnumerateProcessesW to fail\n"); ok(GetLastError()== ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER got: %d\n", GetLastError()); - if (info) WTSFreeMemory(info); + WTSFreeMemory(info); SetLastError(0xdeadbeef); ret = WTSEnumerateProcessesW(WTS_CURRENT_SERVER_HANDLE, 0, 1, NULL, &count); @@ -73,7 +73,7 @@ static void test_WTSEnumerateProcessesW(void) ret = WTSEnumerateProcessesW(WTS_CURRENT_SERVER_HANDLE, 0, 1, &info, NULL); ok(!ret, "expected WTSEnumerateProcessesW to fail\n"); ok(GetLastError()== ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER got: %d\n", GetLastError()); - if (info) WTSFreeMemory(info); + WTSFreeMemory(info); count = 0; info = NULL; @@ -86,10 +86,37 @@ static void test_WTSEnumerateProcessesW(void) found = found || !lstrcmpW(pname, info[i].pProcessName); } ok(found || broken(!ret), "process name %s not found\n", wine_dbgstr_w(pname)); - if (info) WTSFreeMemory(info); + WTSFreeMemory(info); +} + +static void test_WTSQuerySessionInformationW(void) +{ + BOOL ret; + WCHAR *buf; + DWORD count; + + count = 0; + buf = NULL; + ret = WTSQuerySessionInformationW(WTS_CURRENT_SERVER_HANDLE, WTS_CURRENT_SESSION, WTSUserName, &buf, &count); + ok(ret, "got %u\n", GetLastError()); + ok(buf != NULL, "buf not set\n"); + ok(count == (lstrlenW(buf) + 1) * sizeof(WCHAR), "got %u\n", count); + WTSFreeMemory(buf); +} + +static void test_WTSQueryUserToken(void) +{ + BOOL ret; + + SetLastError(0xdeadbeef); + ret = WTSQueryUserToken(WTS_CURRENT_SESSION, NULL); + ok(!ret, "expected WTSQueryUserToken to fail\n"); + ok(GetLastError()==ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER got: %d\n", GetLastError()); } START_TEST (wtsapi) { test_WTSEnumerateProcessesW(); + test_WTSQuerySessionInformationW(); + test_WTSQueryUserToken(); }

5 years

[reactos] 01/01: [WTSAPI32] Sync with Wine Staging 4.18. CORE-16441

by Amine Khaldi

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=667d3934240600b11684e… commit 667d3934240600b11684e7564f96764e8fa887d4 Author: Amine Khaldi <amine.khaldi(a)reactos.org> AuthorDate: Mon Dec 23 00:54:46 2019 +0100 Commit: Amine Khaldi <amine.khaldi(a)reactos.org> CommitDate: Mon Dec 23 00:54:46 2019 +0100 [WTSAPI32] Sync with Wine Staging 4.18. CORE-16441 --- dll/win32/wtsapi32/wtsapi32.c | 86 +++++++++++++++++++++++++++++++++++++++- dll/win32/wtsapi32/wtsapi32.spec | 12 +++++- media/doc/README.WINE | 2 +- 3 files changed, 95 insertions(+), 5 deletions(-) diff --git a/dll/win32/wtsapi32/wtsapi32.c b/dll/win32/wtsapi32/wtsapi32.c index 60658fd29c3..dc2da98d9bd 100644 --- a/dll/win32/wtsapi32/wtsapi32.c +++ b/dll/win32/wtsapi32/wtsapi32.c @@ -15,7 +15,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" #include <stdarg.h> #include <stdlib.h> #include "ntstatus.h" @@ -77,6 +76,27 @@ BOOL WINAPI WTSEnableChildSessions(BOOL enable) return TRUE; } + +/************************************************************ + * WTSEnumerateProcessesExW (WTSAPI32.@) + */ +BOOL WINAPI WTSEnumerateProcessesExW(HANDLE server, DWORD *level, DWORD session_id, WCHAR **info, DWORD *count) +{ + FIXME("Stub %p %p %d %p %p\n", server, level, session_id, info, count); + if (count) *count = 0; + return FALSE; +} + +/************************************************************ + * WTSEnumerateProcessesExA (WTSAPI32.@) + */ +BOOL WINAPI WTSEnumerateProcessesExA(HANDLE server, DWORD *level, DWORD session_id, char **info, DWORD *count) +{ + FIXME("Stub %p %p %d %p %p\n", server, level, session_id, info, count); + if (count) *count = 0; + return FALSE; +} + /************************************************************ * WTSEnumerateProcessesA (WTSAPI32.@) */ @@ -201,6 +221,26 @@ BOOL WINAPI WTSEnumerateServersW(LPWSTR pDomainName, DWORD Reserved, DWORD Versi } +/************************************************************ + * WTSEnumerateEnumerateSessionsExW (WTSAPI32.@) + */ +BOOL WINAPI WTSEnumerateSessionsExW(HANDLE server, DWORD *level, DWORD filter, WTS_SESSION_INFO_1W* info, DWORD *count) +{ + FIXME("Stub %p %p %d %p %p\n", server, level, filter, info, count); + if (count) *count = 0; + return FALSE; +} + +/************************************************************ + * WTSEnumerateEnumerateSessionsExA (WTSAPI32.@) + */ +BOOL WINAPI WTSEnumerateSessionsExA(HANDLE server, DWORD *level, DWORD filter, WTS_SESSION_INFO_1A* info, DWORD *count) +{ + FIXME("Stub %p %p %d %p %p\n", server, level, filter, info, count); + if (count) *count = 0; + return FALSE; +} + /************************************************************ * WTSEnumerateEnumerateSessionsA (WTSAPI32.@) */ @@ -245,6 +285,27 @@ void WINAPI WTSFreeMemory(PVOID pMemory) heap_free(pMemory); } +/************************************************************ + * WTSFreeMemoryExA (WTSAPI32.@) + */ +BOOL WINAPI WTSFreeMemoryExA(WTS_TYPE_CLASS type, void *ptr, ULONG nmemb) +{ + TRACE("%d %p %d\n", type, ptr, nmemb); + heap_free(ptr); + return TRUE; +} + +/************************************************************ + * WTSFreeMemoryExW (WTSAPI32.@) + */ +BOOL WINAPI WTSFreeMemoryExW(WTS_TYPE_CLASS type, void *ptr, ULONG nmemb) +{ + TRACE("%d %p %d\n", type, ptr, nmemb); + heap_free(ptr); + return TRUE; +} + + /************************************************************ * WTSLogoffSession (WTSAPI32.@) */ @@ -255,6 +316,27 @@ BOOL WINAPI WTSLogoffSession(HANDLE hserver, DWORD session_id, BOOL bwait) return FALSE; } + +/************************************************************ + * WTSOpenServerExW (WTSAPI32.@) + */ +HANDLE WINAPI WTSOpenServerExW(WCHAR *server_name) +{ + FIXME("(%s) stub\n", debugstr_w(server_name)); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return NULL; +} + +/************************************************************ + * WTSOpenServerExA (WTSAPI32.@) + */ +HANDLE WINAPI WTSOpenServerExA(char *server_name) +{ + FIXME("(%s) stub\n", debugstr_a(server_name)); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return NULL; +} + /************************************************************ * WTSOpenServerA (WTSAPI32.@) */ @@ -505,7 +587,7 @@ BOOL WINAPI WTSQuerySessionInformationW( */ BOOL WINAPI WTSQueryUserToken(ULONG session_id, PHANDLE token) { - FIXME("%u %p\n", session_id, token); + FIXME("%u %p semi-stub!\n", session_id, token); if (!token) { diff --git a/dll/win32/wtsapi32/wtsapi32.spec b/dll/win32/wtsapi32/wtsapi32.spec index 2b0174177ac..37838d5e07a 100644 --- a/dll/win32/wtsapi32/wtsapi32.spec +++ b/dll/win32/wtsapi32/wtsapi32.spec @@ -4,15 +4,23 @@ @ stdcall WTSDisconnectSession(long long long) @ stdcall WTSEnableChildSessions(long) @ stdcall WTSEnumerateProcessesA(long long long ptr ptr) +@ stdcall WTSEnumerateProcessesExA(ptr ptr long ptr ptr) +@ stdcall WTSEnumerateProcessesExW(ptr ptr long ptr ptr) @ stdcall WTSEnumerateProcessesW(long long long ptr ptr) @ stdcall WTSEnumerateServersA(ptr long long ptr ptr) @ stdcall WTSEnumerateServersW(ptr long long ptr ptr) @ stdcall WTSEnumerateSessionsA(long long long ptr ptr) +@ stdcall WTSEnumerateSessionsExA(ptr ptr long ptr ptr) +@ stdcall WTSEnumerateSessionsExW(ptr ptr long ptr ptr) @ stdcall WTSEnumerateSessionsW(long long long ptr ptr) @ stdcall WTSFreeMemory(ptr) +@ stdcall WTSFreeMemoryExA(long ptr long) +@ stdcall WTSFreeMemoryExW(long ptr long) @ stdcall WTSLogoffSession(long long long) -@ stdcall WTSOpenServerA(ptr) -@ stdcall WTSOpenServerW(ptr) +@ stdcall WTSOpenServerA(str) +@ stdcall WTSOpenServerExA(str) +@ stdcall WTSOpenServerExW(wstr) +@ stdcall WTSOpenServerW(wstr) @ stdcall WTSQuerySessionInformationA(long long long ptr ptr) @ stdcall WTSQuerySessionInformationW(long long long ptr ptr) @ stdcall WTSQueryUserConfigA(ptr ptr long ptr ptr) diff --git a/media/doc/README.WINE b/media/doc/README.WINE index 87a6b8c92ff..84e2af867cb 100644 --- a/media/doc/README.WINE +++ b/media/doc/README.WINE @@ -213,7 +213,7 @@ dll/win32/wmi # Synced to WineStaging-2.9 dll/win32/wmiutils # Synced to WineStaging-4.18 dll/win32/wmvcore # Synced to WineStaging-4.18 dll/win32/wshom.ocx # Synced to WineStaging-4.18 -dll/win32/wtsapi32 # Synced to WineStaging-3.9 +dll/win32/wtsapi32 # Synced to WineStaging-4.18 dll/win32/wuapi # Synced to WineStaging-3.3 dll/win32/xinput1_1 # Synced to WineStaging-2.9 dll/win32/xinput1_2 # Synced to WineStaging-2.9

5 years

[reactos] 01/01: [PSDK] Update wtsapi32.h. CORE-16441

by Amine Khaldi

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=c376b5acea67a34bcffd7… commit c376b5acea67a34bcffd77812afa4fbb28656726 Author: Amine Khaldi <amine.khaldi(a)reactos.org> AuthorDate: Mon Dec 23 00:54:23 2019 +0100 Commit: Amine Khaldi <amine.khaldi(a)reactos.org> CommitDate: Mon Dec 23 00:54:23 2019 +0100 [PSDK] Update wtsapi32.h. CORE-16441 --- sdk/include/psdk/wtsapi32.h | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) diff --git a/sdk/include/psdk/wtsapi32.h b/sdk/include/psdk/wtsapi32.h index 5fc98e5fb67..119fcc6ac86 100644 --- a/sdk/include/psdk/wtsapi32.h +++ b/sdk/include/psdk/wtsapi32.h @@ -111,6 +111,13 @@ typedef enum _WTS_CONFIG_CLASS WTSUserConfigfTerminalServerRemoteHomeDir } WTS_CONFIG_CLASS; +typedef enum _WTS_TYPE_CLASS +{ + WTSTypeProcessInfoLevel0, + WTSTypeProcessInfoLevel1, + WTSTypeSessionInfoLevel1 +} WTS_TYPE_CLASS; + typedef struct _WTS_PROCESS_INFOA { DWORD SessionId; @@ -147,6 +154,33 @@ typedef struct _WTS_SESSION_INFOW DECL_WINELIB_TYPE_AW(WTS_SESSION_INFO) DECL_WINELIB_TYPE_AW(PWTS_SESSION_INFO) +typedef struct _WTS_SESSION_INFO_1A +{ + DWORD ExecEnvId; + WTS_CONNECTSTATE_CLASS State; + DWORD SessionId; + char *pSessionName; + char *pHostName; + char *pUserName; + char *pDomainName; + char *pFarmName; +} WTS_SESSION_INFO_1A, *PWTS_SESSION_INFO_1A; + +typedef struct _WTS_SESSION_INFO_1W +{ + DWORD ExecEnvId; + WTS_CONNECTSTATE_CLASS State; + DWORD SessionId; + WCHAR *pSessionName; + WCHAR *pHostName; + WCHAR *pUserName; + WCHAR *pDomainName; + WCHAR *pFarmName; +} WTS_SESSION_INFO_1W, *PWTS_SESSION_INFO_1W; + +DECL_WINELIB_TYPE_AW(WTS_SESSION_INFO_1) +DECL_WINELIB_TYPE_AW(PWTS_SESSION_INFO_1) + typedef struct _WTS_SERVER_INFOA { LPSTR pServerName; @@ -161,12 +195,14 @@ DECL_WINELIB_TYPE_AW(WTS_SERVER_INFO) DECL_WINELIB_TYPE_AW(PWTS_SERVER_INFO) #define WTS_CURRENT_SERVER_HANDLE ((HANDLE)NULL) +#define WTS_CURRENT_SESSION (~0u) void WINAPI WTSCloseServer(HANDLE); BOOL WINAPI WTSConnectSessionA(ULONG, ULONG, PSTR, BOOL); BOOL WINAPI WTSConnectSessionW(ULONG, ULONG, PWSTR, BOOL); #define WTSConnectSession WINELIB_NAME_AW(WTSConnectSession) BOOL WINAPI WTSDisconnectSession(HANDLE, DWORD, BOOL); +BOOL WINAPI WTSEnableChildSessions(BOOL); BOOL WINAPI WTSEnumerateProcessesA(HANDLE, DWORD, DWORD, PWTS_PROCESS_INFOA *, DWORD *); BOOL WINAPI WTSEnumerateProcessesW(HANDLE, DWORD, DWORD, PWTS_PROCESS_INFOW *, DWORD *); #define WTSEnumerateProcesses WINELIB_NAME_AW(WTSEnumerateProcesses)

5 years

[reactos] 03/03: [CMAKE] Update baseaddresses

by Mark Jansen

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=0bd9535d4db475c119087… commit 0bd9535d4db475c11908757ae14d021a44ed7582 Author: Mark Jansen <mark.jansen(a)reactos.org> AuthorDate: Sat Sep 21 22:06:12 2019 +0200 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Sun Dec 22 15:38:36 2019 +0100 [CMAKE] Update baseaddresses --- sdk/cmake/baseaddress.cmake | 755 ++++++++++++++++++------------------- sdk/cmake/baseaddress_dwarf.cmake | 713 +++++++++++++++++------------------ sdk/cmake/baseaddress_msvc.cmake | 757 +++++++++++++++++++------------------- 3 files changed, 1132 insertions(+), 1093 deletions(-) diff --git a/sdk/cmake/baseaddress.cmake b/sdk/cmake/baseaddress.cmake index 3ab2ff2c8b9..528e0b91108 100644 --- a/sdk/cmake/baseaddress.cmake +++ b/sdk/cmake/baseaddress.cmake @@ -1,372 +1,389 @@ -# Generated from E:\build-gcc-x86 +# Generated from R:\build\master\gcc # Generated by sdk/tools/gen_baseaddress.py + set(baseaddress_ntdll 0x7c920000) # should be above 0x7c920000 -set(baseaddress_kernel32 0x7c5b0000) -set(baseaddress_msvcrt 0x7c4d0000) -set(baseaddress_advapi32 0x7c400000) -set(baseaddress_gdi32 0x7c340000) +set(baseaddress_kernel32 0x7c5d0000) +set(baseaddress_msvcrt 0x7c520000) +set(baseaddress_advapi32 0x7c470000) +set(baseaddress_gdi32 0x7c3c0000) set(baseaddress_user32 0x77a20000) # reserved -set(baseaddress_dhcpcsvc 0x7c2e0000) -set(baseaddress_dnsapi 0x7c280000) -set(baseaddress_icmp 0x7c250000) -set(baseaddress_iphlpapi 0x7c1f0000) -set(baseaddress_ws2_32 0x7c1a0000) -set(baseaddress_ws2help 0x7c170000) -set(baseaddress_shlwapi 0x7c0b0000) -set(baseaddress_rpcrt4 0x7bfc0000) -set(baseaddress_comctl32 0x7bda0000) -set(baseaddress_ole32 0x7bb40000) -set(baseaddress_winspool 0x7bae0000) -set(baseaddress_winmm 0x7ba20000) -set(baseaddress_comdlg32 0x7b900000) -set(baseaddress_shell32 0x7afe0000) -set(baseaddress_lz32 0x7afc0000) -set(baseaddress_version 0x7af80000) -set(baseaddress_oleaut32 0x7ad60000) -set(baseaddress_setupapi 0x7abd0000) -set(baseaddress_mpr 0x7ab80000) -set(baseaddress_crypt32 0x7aa50000) -set(baseaddress_wininet 0x7a970000) -set(baseaddress_urlmon 0x7a840000) -set(baseaddress_psapi 0x7a810000) -set(baseaddress_imm32 0x7a7d0000) -set(baseaddress_msvfw32 0x7a780000) -set(baseaddress_dbghelp 0x7a6b0000) -set(baseaddress_devmgr 0x7a5c0000) -set(baseaddress_msacm32 0x7a570000) -set(baseaddress_netapi32 0x7a4d0000) -set(baseaddress_powrprof 0x7a4a0000) -set(baseaddress_secur32 0x7a440000) -set(baseaddress_wintrust 0x7a3e0000) -set(baseaddress_avicap32 0x7a3b0000) -set(baseaddress_cabinet 0x7a350000) -set(baseaddress_dsound 0x7a2c0000) -set(baseaddress_glu32 0x7a190000) -set(baseaddress_opengl32 0x7a040000) -set(baseaddress_riched20 0x79f60000) -set(baseaddress_smdll 0x79f40000) -set(baseaddress_userenv 0x79ee0000) -set(baseaddress_uxtheme 0x79e70000) -set(baseaddress_cryptui 0x79db0000) -set(baseaddress_csrsrv 0x79d70000) -set(baseaddress_basesrv 0x79d40000) -set(baseaddress_winsrv 0x79c80000) -set(baseaddress_dplayx 0x79c00000) -set(baseaddress_gdiplus 0x79af0000) -set(baseaddress_msimg32 0x79ac0000) -set(baseaddress_mswsock 0x79a90000) -set(baseaddress_oledlg 0x79a40000) -set(baseaddress_rasapi32 0x79a00000) -set(baseaddress_rsaenh 0x79980000) -set(baseaddress_samlib 0x79940000) -set(baseaddress_sensapi 0x79910000) -set(baseaddress_sfc_os 0x798e0000) -set(baseaddress_snmpapi 0x798b0000) -set(baseaddress_spoolss 0x79870000) -set(baseaddress_usp10 0x797e0000) -set(baseaddress_access 0x79750000) -set(baseaddress_acgenral 0x79730000) -set(baseaddress_aclayers 0x79700000) -set(baseaddress_acledit 0x796d0000) -set(baseaddress_aclui 0x79690000) -set(baseaddress_acppage 0x79610000) -set(baseaddress_activeds 0x795e0000) -set(baseaddress_actxprxy 0x79300000) -set(baseaddress_advapi32_vista 0x792d0000) -set(baseaddress_advpack 0x79290000) -set(baseaddress_amstream 0x79230000) -set(baseaddress_apphelp 0x791e0000) -set(baseaddress_appwiz 0x79160000) -set(baseaddress_atl 0x79110000) -set(baseaddress_atl100 0x790c0000) -set(baseaddress_atl80 0x79070000) -set(baseaddress_authz 0x79040000) -set(baseaddress_avifil32 0x78fb0000) -set(baseaddress_batt 0x78f80000) -set(baseaddress_bcrypt 0x78f50000) -set(baseaddress_beepmidi 0x78f20000) -set(baseaddress_browseui 0x78d70000) -set(baseaddress_bthci 0x78d40000) -set(baseaddress_cards 0x78c80000) -set(baseaddress_cfgmgr32 0x78c50000) -set(baseaddress_clusapi 0x78c10000) -set(baseaddress_cmicpl 0x78bd0000) -set(baseaddress_comcat 0x78ba0000) -set(baseaddress_compstui 0x78b70000) -set(baseaddress_console 0x78b10000) -set(baseaddress_credui 0x78ac0000) -set(baseaddress_crtdll 0x78a50000) -set(baseaddress_cryptdlg 0x78a10000) -set(baseaddress_cryptdll 0x789e0000) -set(baseaddress_cryptext 0x789b0000) -set(baseaddress_cryptnet 0x78970000) -set(baseaddress_d3d8 0x78900000) -set(baseaddress_d3d8thk 0x788e0000) -set(baseaddress_d3d9 0x78860000) -set(baseaddress_d3dcompiler_43 0x78790000) -set(baseaddress_d3drm 0x786e0000) -set(baseaddress_d3dwine 0x78490000) -set(baseaddress_d3dx9_24 0x78460000) -set(baseaddress_d3dx9_25 0x78420000) -set(baseaddress_d3dx9_26 0x783f0000) -set(baseaddress_d3dx9_27 0x783c0000) -set(baseaddress_d3dx9_28 0x78390000) -set(baseaddress_d3dx9_29 0x78360000) -set(baseaddress_d3dx9_30 0x78330000) -set(baseaddress_d3dx9_31 0x78300000) -set(baseaddress_d3dx9_32 0x782d0000) -set(baseaddress_d3dx9_33 0x782a0000) -set(baseaddress_d3dx9_34 0x78270000) -set(baseaddress_d3dx9_35 0x78240000) -set(baseaddress_d3dx9_36 0x78110000) -set(baseaddress_d3dx9_37 0x780e0000) -set(baseaddress_d3dx9_38 0x780b0000) -set(baseaddress_d3dx9_39 0x78080000) -set(baseaddress_d3dx9_40 0x78050000) -set(baseaddress_d3dx9_41 0x78020000) -set(baseaddress_d3dx9_42 0x77ff0000) -set(baseaddress_d3dx9_43 0x77fc0000) -set(baseaddress_d3dxof 0x77f70000) -set(baseaddress_dciman32 0x77f40000) -set(baseaddress_dcomlaunch 0x77f10000) -set(baseaddress_ddraw 0x77e40000) -set(baseaddress_desk 0x77d90000) -set(baseaddress_deskadp 0x77d50000) -set(baseaddress_deskmon 0x77d20000) -set(baseaddress_devcpux 0x77cf0000) -set(baseaddress_devenum 0x77ca0000) -set(baseaddress_dinput 0x77c30000) -set(baseaddress_dinput8 0x77bf0000) -set(baseaddress_dmusic 0x779c0000) -set(baseaddress_dplay 0x77990000) -set(baseaddress_dpnhpast 0x77960000) -set(baseaddress_dxdiagn 0x77910000) -set(baseaddress_dxtn 0x778e0000) -set(baseaddress_esent 0x778a0000) -set(baseaddress_faultrep 0x77870000) -set(baseaddress_fltlib 0x77840000) -set(baseaddress_fmifs 0x77820000) -set(baseaddress_fontext 0x777f0000) -set(baseaddress_fontsub 0x777c0000) -set(baseaddress_framebuf 0x777a0000) -set(baseaddress_framebuf_new 0x77780000) -set(baseaddress_framedyn 0x77730000) -set(baseaddress_genincdata 0x77700000) -set(baseaddress_getuname 0x76c90000) -set(baseaddress_hdwwiz 0x76c10000) -set(baseaddress_hhctrl 0x76bb0000) -set(baseaddress_hid 0x76b80000) -set(baseaddress_hlink 0x76b40000) -set(baseaddress_hnetcfg 0x76af0000) -set(baseaddress_httpapi 0x76ac0000) -set(baseaddress_iccvid 0x76a90000) -set(baseaddress_ieframe 0x769b0000) -set(baseaddress_iernonce 0x76980000) -set(baseaddress_imaadp32.acm 0x76950000) -set(baseaddress_imagehlp 0x76910000) -set(baseaddress_inetcomm 0x768a0000) -set(baseaddress_inetcpl 0x76840000) -set(baseaddress_inetmib1 0x76810000) -set(baseaddress_initpki 0x767e0000) -set(baseaddress_input 0x76770000) -set(baseaddress_inseng 0x76730000) -set(baseaddress_intl 0x766c0000) -set(baseaddress_iologmsg 0x766a0000) -set(baseaddress_itircl 0x76670000) -set(baseaddress_itss 0x76620000) -set(baseaddress_joy 0x765e0000) -set(baseaddress_jscript 0x76460000) -set(baseaddress_jsproxy 0x76430000) -set(baseaddress_kbdeo 0x76410000) -set(baseaddress_kbdrost 0x763f0000) -set(baseaddress_kbsdll 0x763c0000) -set(baseaddress_kernel32_vista 0x763a0000) -set(baseaddress_ksuser 0x76370000) -set(baseaddress_libjpeg 0x762c0000) -set(baseaddress_libpng 0x76210000) -set(baseaddress_libtiff 0x76120000) -set(baseaddress_libtirpc 0x760b0000) -set(baseaddress_libxslt 0x75d70000) -set(baseaddress_loadperf 0x75d40000) -set(baseaddress_localmon 0x75d10000) -set(baseaddress_localspl 0x75cc0000) -set(baseaddress_localui 0x75c90000) -set(baseaddress_lpk 0x75c50000) -set(baseaddress_lsasrv 0x75bd0000) -set(baseaddress_main 0x75b30000) -set(baseaddress_mapi32 0x75ae0000) -set(baseaddress_mbedtls 0x75a20000) -set(baseaddress_mciavi32 0x759e0000) -set(baseaddress_mcicda 0x759b0000) -set(baseaddress_mciqtz32 0x75970000) -set(baseaddress_mciseq 0x75930000) -set(baseaddress_mciwave 0x758f0000) -set(baseaddress_mgmtapi 0x758c0000) -set(baseaddress_midimap 0x75890000) -set(baseaddress_mlang 0x75840000) -set(baseaddress_mmdrv 0x75810000) -set(baseaddress_mmsys 0x75730000) -set(baseaddress_modemui 0x756b0000) -set(baseaddress_mprapi 0x75670000) -set(baseaddress_msacm32.drv 0x75640000) -set(baseaddress_msadp32.acm 0x75610000) -set(baseaddress_msafd 0x755c0000) -set(baseaddress_mscat32 0x75590000) -set(baseaddress_mscms 0x75550000) -set(baseaddress_mscoree 0x754f0000) -set(baseaddress_msctf 0x75490000) -set(baseaddress_msdmo 0x75460000) -set(baseaddress_msftedit 0x75430000) -set(baseaddress_msg711.acm 0x75400000) -set(baseaddress_msgina 0x75350000) -set(baseaddress_msgsm32.acm 0x75320000) -set(baseaddress_mshtml 0x75050000) -set(baseaddress_msi 0x74e70000) -set(baseaddress_msimtf 0x74e40000) -set(baseaddress_msisip 0x74e10000) -set(baseaddress_msisys 0x74de0000) -set(baseaddress_mspatcha 0x74db0000) -set(baseaddress_msports 0x74d70000) -set(baseaddress_msrle32 0x74d30000) -set(baseaddress_mssign32 0x74d00000) -set(baseaddress_mssip32 0x74cd0000) -set(baseaddress_mstask 0x74c90000) -set(baseaddress_msv1_0 0x74c60000) -set(baseaddress_msvcrt20 0x74b60000) -set(baseaddress_msvcrt40 0x74a60000) -set(baseaddress_msvidc32 0x74a30000) -set(baseaddress_msxml 0x74a00000) -set(baseaddress_msxml2 0x749d0000) -set(baseaddress_msxml3 0x74590000) -set(baseaddress_msxml4 0x74550000) -set(baseaddress_msxml6 0x74510000) -set(baseaddress_mycomput 0x744f0000) -set(baseaddress_ncpa 0x744c0000) -set(baseaddress_nddeapi 0x74490000) -set(baseaddress_netcfgx 0x743e0000) -set(baseaddress_netevent 0x743b0000) -set(baseaddress_netid 0x74360000) -set(baseaddress_netmsg 0x741e0000) -set(baseaddress_netplwiz 0x741b0000) -set(baseaddress_netshell 0x740e0000) -set(baseaddress_newdev 0x74080000) -set(baseaddress_nfs41_np 0x74050000) -set(baseaddress_normaliz 0x74020000) -set(baseaddress_npptools 0x73ff0000) -set(baseaddress_ntdll_vista 0x73fd0000) -set(baseaddress_ntdsapi 0x73f90000) -set(baseaddress_ntlanman 0x73f60000) -set(baseaddress_ntmarta 0x73f30000) -set(baseaddress_ntobjshex 0x73e80000) -set(baseaddress_objsel 0x73e50000) -set(baseaddress_odbc32 0x73e00000) -set(baseaddress_odbccp32 0x73dc0000) -set(baseaddress_odbccp32i 0x73d90000) -set(baseaddress_oleacc 0x73cf0000) -set(baseaddress_olecli32 0x73cc0000) -set(baseaddress_olepro32 0x73c90000) -set(baseaddress_olesvr32 0x73c60000) -set(baseaddress_olethk32 0x73c30000) -set(baseaddress_openglcfg 0x73c00000) -set(baseaddress_pdh 0x73bc0000) -set(baseaddress_pidgen 0x73b90000) -set(baseaddress_pifmgr 0x73b20000) -set(baseaddress_powercfg 0x73ac0000) -set(baseaddress_printui 0x73a90000) -set(baseaddress_propsys 0x73a40000) -set(baseaddress_pstorec 0x73a10000) -set(baseaddress_qedit 0x739b0000) -set(baseaddress_qmgr 0x73970000) -set(baseaddress_qmgrprxy 0x738f0000) -set(baseaddress_quartz 0x73720000) -set(baseaddress_query 0x736f0000) -set(baseaddress_rasadhlp 0x736c0000) -set(baseaddress_rasdlg 0x734f0000) -set(baseaddress_rasman 0x734b0000) -set(baseaddress_resutils 0x73480000) -set(baseaddress_riched32 0x73450000) -set(baseaddress_rsabase 0x73430000) -set(baseaddress_samsrv 0x733b0000) -set(baseaddress_sccbase 0x73380000) -set(baseaddress_schannel 0x73340000) -set(baseaddress_schedsvc 0x73310000) -set(baseaddress_scrrun 0x732b0000) -set(baseaddress_security 0x73290000) -set(baseaddress_serialui 0x73260000) -set(baseaddress_sfc 0x73230000) -set(baseaddress_shdoclc 0x731f0000) -set(baseaddress_shdocvw 0x731a0000) -set(baseaddress_shellbtrfs 0x72f60000) -set(baseaddress_shfolder 0x72f40000) -set(baseaddress_shimgvw 0x72ef0000) -set(baseaddress_shsvcs 0x72ec0000) -set(baseaddress_slbcsp 0x72e90000) -set(baseaddress_sndblst 0x72e50000) -set(baseaddress_softpub 0x72e30000) -set(baseaddress_srclient 0x72e00000) -set(baseaddress_srvsvc 0x72dd0000) -set(baseaddress_sti 0x72d90000) -set(baseaddress_stobject 0x72cf0000) -set(baseaddress_streamci 0x72cc0000) -set(baseaddress_sxs 0x72c80000) -set(baseaddress_sysdm 0x72b80000) -set(baseaddress_syssetup 0x72a50000) -set(baseaddress_t2embed 0x72a20000) -set(baseaddress_tapi32 0x729e0000) -set(baseaddress_tapiui 0x72960000) -set(baseaddress_telephon 0x72930000) -set(baseaddress_themeui 0x72910000) -set(baseaddress_timedate 0x72890000) -set(baseaddress_traffic 0x72860000) -set(baseaddress_twain_32 0x72830000) -set(baseaddress_ubtrfs 0x72800000) -set(baseaddress_ucdfs 0x727e0000) -set(baseaddress_uext2 0x727a0000) -set(baseaddress_ufat 0x72760000) -set(baseaddress_ufatx 0x72740000) -set(baseaddress_uffs 0x72720000) -set(baseaddress_umpnpmgr 0x726e0000) -set(baseaddress_untfs 0x726c0000) -set(baseaddress_updspapi 0x72690000) -set(baseaddress_ureiserfs 0x72670000) -set(baseaddress_url 0x72640000) -set(baseaddress_usrmgr 0x725e0000) -set(baseaddress_vbscript 0x72540000) -set(baseaddress_vdmdbg 0x72510000) -set(baseaddress_verifier 0x724f0000) -set(baseaddress_vssapi 0x724b0000) -set(baseaddress_wbemdisp 0x72460000) -set(baseaddress_wbemprox 0x723f0000) -set(baseaddress_wdmaud.drv 0x72220000) -set(baseaddress_windowscodecs 0x720a0000) -set(baseaddress_windowscodecsext 0x72070000) -set(baseaddress_wined3dcfg 0x72040000) -set(baseaddress_winemp3.acm 0x71fa0000) -set(baseaddress_winfax 0x71f70000) -set(baseaddress_wing32 0x71f40000) -set(baseaddress_winhttp 0x71ed0000) -set(baseaddress_winprint 0x71ea0000) -set(baseaddress_winscard 0x71e70000) -set(baseaddress_winsta 0x71e40000) -set(baseaddress_wkssvc 0x71e10000) -set(baseaddress_wlanapi 0x71de0000) -set(baseaddress_wldap32 0x71da0000) -set(baseaddress_wlnotify 0x71d70000) -set(baseaddress_wmi 0x71d50000) -set(baseaddress_wmisvc 0x71d20000) -set(baseaddress_wmiutils 0x71ce0000) -set(baseaddress_wmvcore 0x71c90000) -set(baseaddress_wshirda 0x71c60000) -set(baseaddress_wshom 0x71c10000) -set(baseaddress_wshtcpip 0x71be0000) -set(baseaddress_wsock32 0x71bb0000) -set(baseaddress_wtsapi32 0x71b80000) -set(baseaddress_wuapi 0x71b40000) -set(baseaddress_wuauserv 0x71b10000) -set(baseaddress_xinput1_1 0x71ae0000) -set(baseaddress_xinput1_2 0x71ab0000) -set(baseaddress_xinput1_3 0x71a80000) -set(baseaddress_xinput9_1_0 0x71a50000) -set(baseaddress_xmllite 0x71a00000) -set(baseaddress_xolehlp 0x719d0000) -set(baseaddress_zipfldr 0x71910000) \ No newline at end of file +set(baseaddress_dhcpcsvc 0x7c370000) +set(baseaddress_dnsapi 0x7c320000) +set(baseaddress_icmp 0x7c2f0000) +set(baseaddress_iphlpapi 0x7c2a0000) +set(baseaddress_ws2_32 0x7c250000) +set(baseaddress_ws2help 0x7c220000) +set(baseaddress_shlwapi 0x7c170000) +set(baseaddress_rpcrt4 0x7c0a0000) +set(baseaddress_comctl32 0x7bec0000) +set(baseaddress_ole32 0x7bcd0000) +set(baseaddress_winspool 0x7bc80000) +set(baseaddress_winmm 0x7bbc0000) +set(baseaddress_comdlg32 0x7bab0000) +set(baseaddress_shell32 0x7b1b0000) +set(baseaddress_lz32 0x7b190000) +set(baseaddress_version 0x7b160000) +set(baseaddress_oleaut32 0x7af90000) +set(baseaddress_setupapi 0x7ae10000) +set(baseaddress_mpr 0x7add0000) +set(baseaddress_crypt32 0x7acc0000) +set(baseaddress_wininet 0x7ac00000) +set(baseaddress_urlmon 0x7ab00000) +set(baseaddress_psapi 0x7aad0000) +set(baseaddress_imm32 0x7aa90000) +set(baseaddress_msvfw32 0x7aa40000) +set(baseaddress_dbghelp 0x7a990000) +set(baseaddress_devmgr 0x7a8a0000) +set(baseaddress_msacm32 0x7a860000) +set(baseaddress_netapi32 0x7a7d0000) +set(baseaddress_powrprof 0x7a7a0000) +set(baseaddress_secur32 0x7a750000) +set(baseaddress_wintrust 0x7a6f0000) +set(baseaddress_avicap32 0x7a6c0000) +set(baseaddress_cabinet 0x7a670000) +set(baseaddress_dsound 0x7a5f0000) +set(baseaddress_glu32 0x7a500000) +set(baseaddress_opengl32 0x7a3e0000) +set(baseaddress_riched20 0x7a320000) +set(baseaddress_smdll 0x7a300000) +set(baseaddress_userenv 0x7a2b0000) +set(baseaddress_uxtheme 0x7a250000) +set(baseaddress_cryptui 0x7a1a0000) +set(baseaddress_csrsrv 0x7a170000) +set(baseaddress_basesrv 0x7a140000) +set(baseaddress_winsrv 0x7a090000) +set(baseaddress_dplayx 0x7a020000) +set(baseaddress_gdiplus 0x79f40000) +set(baseaddress_msimg32 0x79f10000) +set(baseaddress_mswsock 0x79ee0000) +set(baseaddress_oledlg 0x79e90000) +set(baseaddress_rasapi32 0x79e60000) +set(baseaddress_rsaenh 0x79df0000) +set(baseaddress_samlib 0x79db0000) +set(baseaddress_sensapi 0x79d80000) +set(baseaddress_sfc_os 0x79d50000) +set(baseaddress_snmpapi 0x79d20000) +set(baseaddress_spoolss 0x79ce0000) +set(baseaddress_usp10 0x79c70000) +set(baseaddress_access 0x79be0000) +set(baseaddress_acgenral 0x79bc0000) +set(baseaddress_aclayers 0x79b90000) +set(baseaddress_acledit 0x79b60000) +set(baseaddress_aclui 0x79b20000) +set(baseaddress_acppage 0x79ab0000) +set(baseaddress_activeds 0x79a80000) +set(baseaddress_actxprxy 0x79840000) +set(baseaddress_advapi32_vista 0x79820000) +set(baseaddress_advpack 0x797e0000) +set(baseaddress_amstream 0x79790000) +set(baseaddress_apphelp 0x79740000) +set(baseaddress_appwiz 0x796c0000) +set(baseaddress_atl 0x79680000) +set(baseaddress_atl100 0x79640000) +set(baseaddress_atl80 0x79600000) +set(baseaddress_authz 0x795d0000) +set(baseaddress_avifil32 0x79550000) +set(baseaddress_batt 0x79520000) +set(baseaddress_bcrypt 0x794f0000) +set(baseaddress_beepmidi 0x794c0000) +set(baseaddress_browseui 0x79310000) +set(baseaddress_bthci 0x792e0000) +set(baseaddress_cards 0x79220000) +set(baseaddress_cfgmgr32 0x791f0000) +set(baseaddress_clusapi 0x791c0000) +set(baseaddress_cmicpl 0x79180000) +set(baseaddress_comcat 0x79150000) +set(baseaddress_compstui 0x79120000) +set(baseaddress_console 0x790c0000) +set(baseaddress_credui 0x79080000) +set(baseaddress_crtdll 0x79010000) +set(baseaddress_cryptdlg 0x78fe0000) +set(baseaddress_cryptdll 0x78fb0000) +set(baseaddress_cryptext 0x78f80000) +set(baseaddress_cryptnet 0x78f50000) +set(baseaddress_custom 0x78f20000) +set(baseaddress_d3d8 0x78ec0000) +set(baseaddress_d3d8thk 0x78ea0000) +set(baseaddress_d3d9 0x78e30000) +set(baseaddress_d3dcompiler_43 0x78d80000) +set(baseaddress_d3drm 0x78ce0000) +set(baseaddress_d3dwine 0x78ae0000) +set(baseaddress_d3dx9_24 0x78ab0000) +set(baseaddress_d3dx9_25 0x78a70000) +set(baseaddress_d3dx9_26 0x78a40000) +set(baseaddress_d3dx9_27 0x78a10000) +set(baseaddress_d3dx9_28 0x789e0000) +set(baseaddress_d3dx9_29 0x789b0000) +set(baseaddress_d3dx9_30 0x78980000) +set(baseaddress_d3dx9_31 0x78950000) +set(baseaddress_d3dx9_32 0x78920000) +set(baseaddress_d3dx9_33 0x788f0000) +set(baseaddress_d3dx9_34 0x788c0000) +set(baseaddress_d3dx9_35 0x78890000) +set(baseaddress_d3dx9_36 0x78790000) +set(baseaddress_d3dx9_37 0x78760000) +set(baseaddress_d3dx9_38 0x78730000) +set(baseaddress_d3dx9_39 0x78700000) +set(baseaddress_d3dx9_40 0x786d0000) +set(baseaddress_d3dx9_41 0x786a0000) +set(baseaddress_d3dx9_42 0x78670000) +set(baseaddress_d3dx9_43 0x78640000) +set(baseaddress_d3dxof 0x78600000) +set(baseaddress_dciman32 0x785d0000) +set(baseaddress_dcomlaunch 0x785a0000) +set(baseaddress_ddraw 0x784e0000) +set(baseaddress_desk 0x78440000) +set(baseaddress_deskadp 0x78410000) +set(baseaddress_deskmon 0x783e0000) +set(baseaddress_devcpux 0x783b0000) +set(baseaddress_devenum 0x78360000) +set(baseaddress_dinput 0x78300000) +set(baseaddress_dinput8 0x782a0000) +set(baseaddress_dmusic 0x78250000) +set(baseaddress_dnsrslvr 0x78220000) +set(baseaddress_dplay 0x781f0000) +set(baseaddress_dpnhpast 0x781c0000) +set(baseaddress_dxdiagn 0x78170000) +set(baseaddress_dxtn 0x78150000) +set(baseaddress_esent 0x78120000) +set(baseaddress_faultrep 0x780f0000) +set(baseaddress_fltlib 0x780c0000) +set(baseaddress_fmifs 0x780a0000) +set(baseaddress_fontext 0x78030000) +set(baseaddress_fontsub 0x78000000) +set(baseaddress_framedyn 0x77fc0000) +set(baseaddress_getuname 0x76b00000) +set(baseaddress_halxbox 0x76970000) +set(baseaddress_hdwwiz 0x768f0000) +set(baseaddress_hhctrl 0x768a0000) +set(baseaddress_hid 0x76870000) +set(baseaddress_hlink 0x76830000) +set(baseaddress_hnetcfg 0x767f0000) +set(baseaddress_httpapi 0x767c0000) +set(baseaddress_iccvid 0x76790000) +set(baseaddress_ieframe 0x76690000) +set(baseaddress_iernonce 0x76660000) +set(baseaddress_imaadp32.acm 0x76630000) +set(baseaddress_imagehlp 0x76600000) +set(baseaddress_inetcomm 0x765a0000) +set(baseaddress_inetcpl 0x76540000) +set(baseaddress_inetmib1 0x76510000) +set(baseaddress_initpki 0x764e0000) +set(baseaddress_input 0x76480000) +set(baseaddress_inseng 0x76440000) +set(baseaddress_intl 0x763d0000) +set(baseaddress_iologmsg 0x763b0000) +set(baseaddress_itircl 0x76380000) +set(baseaddress_itss 0x76340000) +set(baseaddress_joy 0x76300000) +set(baseaddress_jscript 0x761e0000) +set(baseaddress_jsproxy 0x761b0000) +set(baseaddress_kbdeo 0x76190000) +set(baseaddress_kbdrost 0x76170000) +set(baseaddress_kbsdll 0x76140000) +set(baseaddress_kernel32_vista 0x76120000) +set(baseaddress_ksuser 0x760f0000) +set(baseaddress_libjpeg 0x76060000) +set(baseaddress_libpng 0x75fd0000) +set(baseaddress_libtiff 0x75f00000) +set(baseaddress_libtirpc 0x75ea0000) +set(baseaddress_libxslt 0x75be0000) +set(baseaddress_load_notifications 0x75bc0000) +set(baseaddress_loadperf 0x75b90000) +set(baseaddress_localmon 0x75b60000) +set(baseaddress_localspl 0x75b20000) +set(baseaddress_localspl_apitest 0x75af0000) +set(baseaddress_localui 0x75ac0000) +set(baseaddress_lpk 0x75a90000) +set(baseaddress_lsasrv 0x75a10000) +set(baseaddress_main 0x75970000) +set(baseaddress_mapi32 0x75930000) +set(baseaddress_mbedtls 0x75890000) +set(baseaddress_mciavi32 0x75850000) +set(baseaddress_mcicda 0x75820000) +set(baseaddress_mciqtz32 0x757e0000) +set(baseaddress_mciseq 0x757b0000) +set(baseaddress_mciwave 0x75780000) +set(baseaddress_mgmtapi 0x75750000) +set(baseaddress_midimap 0x75720000) +set(baseaddress_mlang 0x756e0000) +set(baseaddress_mmdrv 0x756b0000) +set(baseaddress_mmsys 0x755d0000) +set(baseaddress_modemui 0x75560000) +set(baseaddress_mprapi 0x75530000) +set(baseaddress_msacm32.drv 0x75500000) +set(baseaddress_msadp32.acm 0x754d0000) +set(baseaddress_msafd 0x75490000) +set(baseaddress_mscat32 0x75460000) +set(baseaddress_mscms 0x75430000) +set(baseaddress_mscoree 0x753e0000) +set(baseaddress_msctf 0x75380000) +set(baseaddress_msdmo 0x75350000) +set(baseaddress_msftedit 0x75320000) +set(baseaddress_msg711.acm 0x752f0000) +set(baseaddress_msgina 0x75240000) +set(baseaddress_msgsm32.acm 0x75210000) +set(baseaddress_mshtml 0x74f00000) +set(baseaddress_msi 0x74d50000) +set(baseaddress_msimtf 0x74d20000) +set(baseaddress_msisip 0x74cf0000) +set(baseaddress_msisys 0x74cc0000) +set(baseaddress_mspatcha 0x74c90000) +set(baseaddress_msports 0x74c50000) +set(baseaddress_msrle32 0x74c20000) +set(baseaddress_mssign32 0x74bf0000) +set(baseaddress_mssip32 0x74bc0000) +set(baseaddress_mstask 0x74b80000) +set(baseaddress_msv1_0 0x74b50000) +set(baseaddress_msvcrt20 0x74a80000) +set(baseaddress_msvcrt40 0x749b0000) +set(baseaddress_msvcrt_crt_dll_startup 0x74980000) +set(baseaddress_msvidc32 0x74950000) +set(baseaddress_msxml 0x74920000) +set(baseaddress_msxml2 0x748f0000) +set(baseaddress_msxml3 0x74510000) +set(baseaddress_msxml3r 0x744f0000) +set(baseaddress_msxml4 0x744b0000) +set(baseaddress_msxml6 0x74470000) +set(baseaddress_mycomput 0x74450000) +set(baseaddress_ncpa 0x74420000) +set(baseaddress_nddeapi 0x743f0000) +set(baseaddress_netcfgx 0x74340000) +set(baseaddress_netevent 0x74310000) +set(baseaddress_netid 0x742c0000) +set(baseaddress_netlogon 0x74290000) +set(baseaddress_netmsg 0x74110000) +set(baseaddress_netplwiz 0x740e0000) +set(baseaddress_netshell 0x74010000) +set(baseaddress_newdev 0x73fb0000) +set(baseaddress_nfs41_np 0x73f80000) +set(baseaddress_normaliz 0x73f50000) +set(baseaddress_notifyhook 0x73f20000) +set(baseaddress_npptools 0x73ef0000) +set(baseaddress_ntdll_vista 0x73ed0000) +set(baseaddress_ntdsapi 0x73ea0000) +set(baseaddress_ntlanman 0x73e70000) +set(baseaddress_ntmarta 0x73e40000) +set(baseaddress_ntobjshex 0x73da0000) +set(baseaddress_objsel 0x73d70000) +set(baseaddress_odbc32 0x73d20000) +set(baseaddress_odbccp32 0x73cf0000) +set(baseaddress_odbccp32i 0x73cc0000) +set(baseaddress_oleacc 0x73c20000) +set(baseaddress_olecli32 0x73bf0000) +set(baseaddress_olepro32 0x73bc0000) +set(baseaddress_olesvr32 0x73b90000) +set(baseaddress_olethk32 0x73b60000) +set(baseaddress_openglcfg 0x73b30000) +set(baseaddress_pdh 0x73af0000) +set(baseaddress_pidgen 0x73ac0000) +set(baseaddress_pifmgr 0x73a50000) +set(baseaddress_powercfg 0x739e0000) +set(baseaddress_printui 0x739b0000) +set(baseaddress_propsys 0x73970000) +set(baseaddress_pstorec 0x73940000) +set(baseaddress_qedit 0x738f0000) +set(baseaddress_qmgr 0x738b0000) +set(baseaddress_qmgrprxy 0x73840000) +set(baseaddress_quartz 0x736b0000) +set(baseaddress_query 0x73680000) +set(baseaddress_rasadhlp 0x73650000) +set(baseaddress_rasdlg 0x73480000) +set(baseaddress_rasman 0x73450000) +set(baseaddress_redirtest1 0x73420000) +set(baseaddress_redirtest2 0x733f0000) +set(baseaddress_resutils 0x733c0000) +set(baseaddress_riched32 0x73390000) +set(baseaddress_rsabase 0x73370000) +set(baseaddress_rshell 0x732c0000) +set(baseaddress_samsrv 0x73250000) +set(baseaddress_sccbase 0x73220000) +set(baseaddress_schannel 0x731e0000) +set(baseaddress_schedsvc 0x731b0000) +set(baseaddress_scrrun 0x73150000) +set(baseaddress_security 0x73130000) +set(baseaddress_sendmail 0x730d0000) +set(baseaddress_serialui 0x730a0000) +set(baseaddress_sfc 0x73070000) +set(baseaddress_shdoclc 0x73030000) +set(baseaddress_shdocvw 0x72fe0000) +set(baseaddress_shellbtrfs 0x72e30000) +set(baseaddress_shfolder 0x72e10000) +set(baseaddress_shimgvw 0x72dc0000) +set(baseaddress_shsvcs 0x72d90000) +set(baseaddress_slbcsp 0x72d60000) +set(baseaddress_sndblst 0x72d30000) +set(baseaddress_softpub 0x72d10000) +set(baseaddress_srclient 0x72ce0000) +set(baseaddress_srvsvc 0x72cb0000) +set(baseaddress_sti 0x72c70000) +set(baseaddress_stobject 0x72bd0000) +set(baseaddress_streamci 0x72ba0000) +set(baseaddress_sxs 0x72b70000) +set(baseaddress_sysdm 0x72a70000) +set(baseaddress_syssetup 0x72940000) +set(baseaddress_t2embed 0x72910000) +set(baseaddress_tapi32 0x728d0000) +set(baseaddress_tapiui 0x72850000) +set(baseaddress_telephon 0x72820000) +set(baseaddress_testvdd 0x727f0000) +set(baseaddress_themeui 0x727d0000) +set(baseaddress_timedate 0x72760000) +set(baseaddress_traffic 0x72730000) +set(baseaddress_twain_32 0x72700000) +set(baseaddress_ubtrfs 0x726d0000) +set(baseaddress_ucdfs 0x726b0000) +set(baseaddress_uext2 0x72670000) +set(baseaddress_ufat 0x72630000) +set(baseaddress_ufatx 0x72610000) +set(baseaddress_uffs 0x725f0000) +set(baseaddress_umpnpmgr 0x725b0000) +set(baseaddress_untfs 0x72590000) +set(baseaddress_updspapi 0x72560000) +set(baseaddress_ureiserfs 0x72540000) +set(baseaddress_url 0x72510000) +set(baseaddress_usrmgr 0x724c0000) +set(baseaddress_vbscript 0x72410000) +set(baseaddress_vdmdbg 0x723e0000) +set(baseaddress_verifier 0x723c0000) +set(baseaddress_vfd 0x72360000) +set(baseaddress_vssapi 0x72330000) +set(baseaddress_w32time 0x72300000) +set(baseaddress_wbemdisp 0x722b0000) +set(baseaddress_wbemprox 0x72240000) +set(baseaddress_wdmaud.drv 0x72080000) +set(baseaddress_win32u 0x72050000) +set(baseaddress_win32u_2k3sp2 0x72020000) +set(baseaddress_win32u_xpsp2 0x71ff0000) +set(baseaddress_windowscodecs 0x71ea0000) +set(baseaddress_windowscodecsext 0x71e70000) +set(baseaddress_wined3dcfg 0x71e40000) +set(baseaddress_winemp3.acm 0x71dc0000) +set(baseaddress_winfax 0x71d90000) +set(baseaddress_wing32 0x71d60000) +set(baseaddress_winhttp 0x71cf0000) +set(baseaddress_winprint 0x71cc0000) +set(baseaddress_winscard 0x71c90000) +set(baseaddress_winsta 0x71c60000) +set(baseaddress_wkssvc 0x71c30000) +set(baseaddress_wlanapi 0x71c00000) +set(baseaddress_wldap32 0x71bc0000) +set(baseaddress_wlnotify 0x71b90000) +set(baseaddress_wmi 0x71b70000) +set(baseaddress_wmisvc 0x71b40000) +set(baseaddress_wmiutils 0x71b10000) +set(baseaddress_wmvcore 0x71ac0000) +set(baseaddress_wshirda 0x71a90000) +set(baseaddress_wshom 0x71a40000) +set(baseaddress_wshtcpip 0x71a10000) +set(baseaddress_wsock32 0x719e0000) +set(baseaddress_wtsapi32 0x719b0000) +set(baseaddress_wuapi 0x71970000) +set(baseaddress_wuauserv 0x71940000) +set(baseaddress_xinput1_1 0x71910000) +set(baseaddress_xinput1_2 0x718e0000) +set(baseaddress_xinput1_3 0x718b0000) +set(baseaddress_xinput9_1_0 0x71880000) +set(baseaddress_xmllite 0x71840000) +set(baseaddress_xolehlp 0x71810000) +set(baseaddress_zipfldr 0x71730000) diff --git a/sdk/cmake/baseaddress_dwarf.cmake b/sdk/cmake/baseaddress_dwarf.cmake index 25b86ab5fcf..251837579e0 100644 --- a/sdk/cmake/baseaddress_dwarf.cmake +++ b/sdk/cmake/baseaddress_dwarf.cmake @@ -1,110 +1,112 @@ # Generated from R:\build\master\gcc_dwarf # Generated by sdk/tools/gen_baseaddress.py + set(baseaddress_ntdll 0x7c920000) # should be above 0x7c920000 -set(baseaddress_kernel32 0x7c570000) -set(baseaddress_msvcrt 0x7c450000) -set(baseaddress_advapi32 0x7c350000) -set(baseaddress_gdi32 0x7c270000) +set(baseaddress_kernel32 0x7c560000) +set(baseaddress_msvcrt 0x7c440000) +set(baseaddress_advapi32 0x7c340000) +set(baseaddress_gdi32 0x7c260000) set(baseaddress_user32 0x77a20000) # reserved -set(baseaddress_dhcpcsvc 0x7c210000) -set(baseaddress_dnsapi 0x7c1a0000) -set(baseaddress_icmp 0x7c170000) -set(baseaddress_iphlpapi 0x7c110000) -set(baseaddress_ws2_32 0x7c0a0000) -set(baseaddress_ws2help 0x7c070000) -set(baseaddress_shlwapi 0x7bf90000) -set(baseaddress_rpcrt4 0x7be80000) -set(baseaddress_comctl32 0x7bc40000) -set(baseaddress_ole32 0x7b970000) -set(baseaddress_winspool 0x7b900000) -set(baseaddress_winmm 0x7b830000) -set(baseaddress_comdlg32 0x7b710000) -set(baseaddress_shell32 0x7acc0000) -set(baseaddress_lz32 0x7aca0000) -set(baseaddress_version 0x7ac60000) -set(baseaddress_oleaut32 0x7a9f0000) -set(baseaddress_setupapi 0x7a840000) -set(baseaddress_mpr 0x7a7f0000) -set(baseaddress_crypt32 0x7a680000) -set(baseaddress_wininet 0x7a580000) -set(baseaddress_urlmon 0x7a410000) -set(baseaddress_psapi 0x7a3d0000) -set(baseaddress_imm32 0x7a380000) -set(baseaddress_msvfw32 0x7a330000) -set(baseaddress_dbghelp 0x7a230000) -set(baseaddress_devmgr 0x7a120000) -set(baseaddress_msacm32 0x7a0d0000) -set(baseaddress_netapi32 0x7a010000) -set(baseaddress_powrprof 0x79fd0000) -set(baseaddress_secur32 0x79f60000) -set(baseaddress_wintrust 0x79ef0000) -set(baseaddress_avicap32 0x79ec0000) -set(baseaddress_cabinet 0x79e60000) -set(baseaddress_dsound 0x79dc0000) -set(baseaddress_glu32 0x79c60000) -set(baseaddress_opengl32 0x79950000) -set(baseaddress_riched20 0x79860000) -set(baseaddress_smdll 0x79840000) -set(baseaddress_userenv 0x797e0000) -set(baseaddress_uxtheme 0x79760000) -set(baseaddress_cryptui 0x796a0000) -set(baseaddress_csrsrv 0x79660000) -set(baseaddress_basesrv 0x79620000) -set(baseaddress_winsrv 0x79550000) -set(baseaddress_dplayx 0x794c0000) -set(baseaddress_gdiplus 0x79390000) -set(baseaddress_msimg32 0x79360000) -set(baseaddress_mswsock 0x79320000) -set(baseaddress_oledlg 0x792c0000) -set(baseaddress_rasapi32 0x79280000) -set(baseaddress_rsaenh 0x79200000) -set(baseaddress_samlib 0x791b0000) -set(baseaddress_sensapi 0x79180000) -set(baseaddress_sfc_os 0x79150000) -set(baseaddress_snmpapi 0x79110000) -set(baseaddress_spoolss 0x790c0000) -set(baseaddress_usp10 0x79020000) -set(baseaddress_access 0x78f90000) -set(baseaddress_acgenral 0x78f60000) -set(baseaddress_aclayers 0x78f20000) -set(baseaddress_acledit 0x78ef0000) -set(baseaddress_aclui 0x78ea0000) -set(baseaddress_acppage 0x78e10000) -set(baseaddress_activeds 0x78de0000) -set(baseaddress_actxprxy 0x78af0000) -set(baseaddress_advapi32_vista 0x78ac0000) -set(baseaddress_advpack 0x78a70000) -set(baseaddress_amstream 0x78a00000) -set(baseaddress_apphelp 0x789a0000) -set(baseaddress_appwiz 0x78910000) -set(baseaddress_atl 0x788b0000) -set(baseaddress_atl100 0x78860000) -set(baseaddress_atl80 0x78800000) -set(baseaddress_authz 0x787d0000) -set(baseaddress_avifil32 0x78740000) -set(baseaddress_batt 0x78710000) -set(baseaddress_bcrypt 0x786d0000) -set(baseaddress_beepmidi 0x786a0000) -set(baseaddress_browseui 0x78460000) -set(baseaddress_bthci 0x78430000) -set(baseaddress_cards 0x78360000) -set(baseaddress_cfgmgr32 0x78330000) -set(baseaddress_clusapi 0x782f0000) -set(baseaddress_cmicpl 0x782b0000) -set(baseaddress_comcat 0x78280000) -set(baseaddress_compstui 0x78250000) -set(baseaddress_console 0x781f0000) -set(baseaddress_credui 0x781a0000) -set(baseaddress_crtdll 0x78120000) -set(baseaddress_cryptdlg 0x780e0000) -set(baseaddress_cryptdll 0x780b0000) -set(baseaddress_cryptnet 0x78070000) -set(baseaddress_custom 0x78040000) -set(baseaddress_d3d8 0x77fc0000) -set(baseaddress_d3d8thk 0x77fa0000) -set(baseaddress_d3d9 0x77f00000) -set(baseaddress_d3dcompiler_43 0x77e20000) -set(baseaddress_d3drm 0x77d40000) +set(baseaddress_dhcpcsvc 0x7c200000) +set(baseaddress_dnsapi 0x7c190000) +set(baseaddress_icmp 0x7c160000) +set(baseaddress_iphlpapi 0x7c100000) +set(baseaddress_ws2_32 0x7c090000) +set(baseaddress_ws2help 0x7c060000) +set(baseaddress_shlwapi 0x7bf80000) +set(baseaddress_rpcrt4 0x7be60000) +set(baseaddress_comctl32 0x7bc20000) +set(baseaddress_ole32 0x7b950000) +set(baseaddress_winspool 0x7b8e0000) +set(baseaddress_winmm 0x7b810000) +set(baseaddress_comdlg32 0x7b6e0000) +set(baseaddress_shell32 0x7ac10000) +set(baseaddress_lz32 0x7abf0000) +set(baseaddress_version 0x7abb0000) +set(baseaddress_oleaut32 0x7a960000) +set(baseaddress_setupapi 0x7a7b0000) +set(baseaddress_mpr 0x7a760000) +set(baseaddress_crypt32 0x7a5f0000) +set(baseaddress_wininet 0x7a4f0000) +set(baseaddress_urlmon 0x7a380000) +set(baseaddress_psapi 0x7a340000) +set(baseaddress_imm32 0x7a2f0000) +set(baseaddress_msvfw32 0x7a2a0000) +set(baseaddress_dbghelp 0x7a1a0000) +set(baseaddress_devmgr 0x7a080000) +set(baseaddress_msacm32 0x7a030000) +set(baseaddress_netapi32 0x79f60000) +set(baseaddress_powrprof 0x79f20000) +set(baseaddress_secur32 0x79eb0000) +set(baseaddress_wintrust 0x79e40000) +set(baseaddress_avicap32 0x79e10000) +set(baseaddress_cabinet 0x79db0000) +set(baseaddress_dsound 0x79d10000) +set(baseaddress_glu32 0x79bc0000) +set(baseaddress_opengl32 0x79a80000) +set(baseaddress_riched20 0x79990000) +set(baseaddress_smdll 0x79970000) +set(baseaddress_userenv 0x79910000) +set(baseaddress_uxtheme 0x79890000) +set(baseaddress_cryptui 0x797d0000) +set(baseaddress_csrsrv 0x79790000) +set(baseaddress_basesrv 0x79750000) +set(baseaddress_winsrv 0x79680000) +set(baseaddress_dplayx 0x795f0000) +set(baseaddress_gdiplus 0x794b0000) +set(baseaddress_msimg32 0x79480000) +set(baseaddress_mswsock 0x79440000) +set(baseaddress_oledlg 0x793e0000) +set(baseaddress_rasapi32 0x793a0000) +set(baseaddress_rsaenh 0x79320000) +set(baseaddress_samlib 0x792d0000) +set(baseaddress_sensapi 0x792a0000) +set(baseaddress_sfc_os 0x79270000) +set(baseaddress_snmpapi 0x79230000) +set(baseaddress_spoolss 0x791e0000) +set(baseaddress_usp10 0x79140000) +set(baseaddress_access 0x790b0000) +set(baseaddress_acgenral 0x79080000) +set(baseaddress_aclayers 0x79040000) +set(baseaddress_acledit 0x79010000) +set(baseaddress_aclui 0x78fc0000) +set(baseaddress_acppage 0x78f20000) +set(baseaddress_activeds 0x78ef0000) +set(baseaddress_actxprxy 0x78c00000) +set(baseaddress_advapi32_vista 0x78bd0000) +set(baseaddress_advpack 0x78b80000) +set(baseaddress_amstream 0x78b10000) +set(baseaddress_apphelp 0x78ab0000) +set(baseaddress_appwiz 0x78a20000) +set(baseaddress_atl 0x789c0000) +set(baseaddress_atl100 0x78970000) +set(baseaddress_atl80 0x78910000) +set(baseaddress_authz 0x788e0000) +set(baseaddress_avifil32 0x78850000) +set(baseaddress_batt 0x78820000) +set(baseaddress_bcrypt 0x787e0000) +set(baseaddress_beepmidi 0x787b0000) +set(baseaddress_browseui 0x78510000) +set(baseaddress_bthci 0x784e0000) +set(baseaddress_cards 0x78410000) +set(baseaddress_cfgmgr32 0x783e0000) +set(baseaddress_clusapi 0x783a0000) +set(baseaddress_cmicpl 0x78360000) +set(baseaddress_comcat 0x78330000) +set(baseaddress_compstui 0x78300000) +set(baseaddress_console 0x78290000) +set(baseaddress_credui 0x78240000) +set(baseaddress_crtdll 0x781c0000) +set(baseaddress_cryptdlg 0x78180000) +set(baseaddress_cryptdll 0x78150000) +set(baseaddress_cryptext 0x78120000) +set(baseaddress_cryptnet 0x780e0000) +set(baseaddress_custom 0x780b0000) +set(baseaddress_d3d8 0x78030000) +set(baseaddress_d3d8thk 0x78010000) +set(baseaddress_d3d9 0x77f70000) +set(baseaddress_d3dcompiler_43 0x77e80000) +set(baseaddress_d3drm 0x77db0000) set(baseaddress_d3dwine 0x77740000) set(baseaddress_d3dx9_24 0x77710000) set(baseaddress_d3dx9_25 0x776c0000) @@ -128,251 +130,260 @@ set(baseaddress_d3dx9_42 0x77250000) set(baseaddress_d3dx9_43 0x77220000) set(baseaddress_d3dxof 0x771d0000) set(baseaddress_dciman32 0x771a0000) -set(baseaddress_ddraw 0x770a0000) -set(baseaddress_desk 0x76ff0000) -set(baseaddress_deskadp 0x76fb0000) -set(baseaddress_deskmon 0x76f70000) -set(baseaddress_devcpux 0x76f40000) -set(baseaddress_devenum 0x76ee0000) -set(baseaddress_dinput 0x76e60000) -set(baseaddress_dinput8 0x76e20000) -set(baseaddress_dmusic 0x76db0000) -set(baseaddress_dplay 0x76d80000) -set(baseaddress_dxdiagn 0x76d20000) -set(baseaddress_dxtn 0x76cf0000) -set(baseaddress_esent 0x76cb0000) -set(baseaddress_faultrep 0x76c80000) -set(baseaddress_fltlib 0x76c50000) -set(baseaddress_fmifs 0x76c20000) -set(baseaddress_fontext 0x76bf0000) -set(baseaddress_fontsub 0x76bc0000) -set(baseaddress_framebuf 0x76b90000) -set(baseaddress_framebuf_new 0x76b60000) -set(baseaddress_framedyn 0x76b10000) -set(baseaddress_genincdata 0x76ae0000) -set(baseaddress_getuname 0x761d0000) -set(baseaddress_hdwwiz 0x76150000) -set(baseaddress_hhctrl 0x760e0000) -set(baseaddress_hid 0x760b0000) -set(baseaddress_hlink 0x76060000) -set(baseaddress_hnetcfg 0x76000000) -set(baseaddress_httpapi 0x75fc0000) -set(baseaddress_iccvid 0x75f80000) -set(baseaddress_ieframe 0x75e40000) -set(baseaddress_iernonce 0x75e00000) -set(baseaddress_imaadp32.acm 0x75dc0000) -set(baseaddress_imagehlp 0x75d80000) -set(baseaddress_inetcomm 0x75cf0000) -set(baseaddress_inetcpl 0x75c80000) -set(baseaddress_inetmib1 0x75c40000) -set(baseaddress_initpki 0x75c10000) -set(baseaddress_input 0x75ba0000) -set(baseaddress_inseng 0x75b50000) -set(baseaddress_intl 0x75ad0000) -set(baseaddress_iologmsg 0x75ab0000) -set(baseaddress_itircl 0x75a80000) -set(baseaddress_itss 0x75a20000) -set(baseaddress_joy 0x759e0000) -set(baseaddress_jscript 0x75850000) -set(baseaddress_jsproxy 0x75810000) -set(baseaddress_kbdeo 0x757f0000) -set(baseaddress_kbsdll 0x757c0000) -set(baseaddress_kernel32_vista 0x75790000) -set(baseaddress_ksuser 0x75760000) -set(baseaddress_libjpeg 0x756a0000) -set(baseaddress_libpng 0x755f0000) -set(baseaddress_libtiff 0x75500000) -set(baseaddress_libtirpc 0x75480000) -set(baseaddress_libxslt 0x75100000) -set(baseaddress_load_notifications 0x750d0000) -set(baseaddress_loadperf 0x750a0000) -set(baseaddress_localmon 0x75060000) -set(baseaddress_localspl 0x75000000) -set(baseaddress_localspl_apitest 0x74fd0000) -set(baseaddress_localui 0x74f90000) -set(baseaddress_lpk 0x74f50000) -set(baseaddress_lsasrv 0x74ec0000) -set(baseaddress_main 0x74e20000) -set(baseaddress_mapi32 0x74dc0000) -set(baseaddress_mbedtls 0x74cf0000) -set(baseaddress_mciavi32 0x74ca0000) -set(baseaddress_mcicda 0x74c60000) -set(baseaddress_mciqtz32 0x74c10000) -set(baseaddress_mciseq 0x74bd0000) -set(baseaddress_mciwave 0x74b90000) -set(baseaddress_mgmtapi 0x74b60000) -set(baseaddress_midimap 0x74b20000) -set(baseaddress_mlang 0x74ad0000) -set(baseaddress_mmdrv 0x74aa0000) -set(baseaddress_mmsys 0x749c0000) -set(baseaddress_modemui 0x74940000) -set(baseaddress_mprapi 0x74900000) -set(baseaddress_msacm32.drv 0x748c0000) -set(baseaddress_msadp32.acm 0x74890000) -set(baseaddress_msafd 0x74840000) -set(baseaddress_mscat32 0x74810000) -set(baseaddress_mscms 0x747d0000) -set(baseaddress_mscoree 0x74760000) -set(baseaddress_msctf 0x746e0000) -set(baseaddress_msdmo 0x746a0000) -set(baseaddress_msftedit 0x74670000) -set(baseaddress_msg711.acm 0x74640000) -set(baseaddress_msgina 0x74590000) -set(baseaddress_msgsm32.acm 0x74560000) -set(baseaddress_mshtml 0x740b0000) -set(baseaddress_msi 0x73e30000) -set(baseaddress_msimtf 0x73df0000) -set(baseaddress_msisip 0x73dc0000) -set(baseaddress_msisys 0x73d90000) -set(baseaddress_mspatcha 0x73d60000) -set(baseaddress_msports 0x73d20000) -set(baseaddress_msrle32 0x73ce0000) -set(baseaddress_mssign32 0x73cb0000) -set(baseaddress_mssip32 0x73c80000) -set(baseaddress_mstask 0x73c30000) -set(baseaddress_msv1_0 0x73c00000) -set(baseaddress_msvcrt20 0x73ac0000) -set(baseaddress_msvcrt40 0x73980000) -set(baseaddress_msvcrt_crt_dll_startup 0x73950000) -set(baseaddress_msvidc32 0x73910000) -set(baseaddress_msxml 0x738d0000) -set(baseaddress_msxml2 0x73890000) -set(baseaddress_msxml3 0x73370000) -set(baseaddress_msxml4 0x73320000) -set(baseaddress_msxml6 0x732d0000) -set(baseaddress_mycomput 0x732b0000) -set(baseaddress_ncpa 0x73280000) -set(baseaddress_nddeapi 0x73240000) -set(baseaddress_netcfgx 0x73190000) -set(baseaddress_netevent 0x73160000) -set(baseaddress_netid 0x73110000) -set(baseaddress_netshell 0x73050000) -set(baseaddress_newdev 0x72fe0000) -set(baseaddress_nfs41_np 0x72fb0000) -set(baseaddress_normaliz 0x72f80000) -set(baseaddress_notifyhook 0x72f50000) -set(baseaddress_npptools 0x72f20000) -set(baseaddress_ntdll_vista 0x72ef0000) -set(baseaddress_ntdsapi 0x72eb0000) -set(baseaddress_ntlanman 0x72e80000) -set(baseaddress_ntmarta 0x72e50000) -set(baseaddress_ntobjshex 0x72d70000) -set(baseaddress_objsel 0x72d30000) -set(baseaddress_odbc32 0x72ce0000) -set(baseaddress_odbccp32 0x72ca0000) -set(baseaddress_odbccp32i 0x72c70000) -set(baseaddress_oleacc 0x72bc0000) -set(baseaddress_olecli32 0x72b80000) -set(baseaddress_olepro32 0x72b50000) -set(baseaddress_olesvr32 0x72b20000) -set(baseaddress_olethk32 0x72af0000) -set(baseaddress_openglcfg 0x72ab0000) -set(baseaddress_pdh 0x72a60000) -set(baseaddress_pidgen 0x72a30000) -set(baseaddress_pifmgr 0x729c0000) -set(baseaddress_powercfg 0x72950000) -set(baseaddress_printui 0x72910000) -set(baseaddress_propsys 0x728c0000) -set(baseaddress_pstorec 0x72880000) -set(baseaddress_qedit 0x72810000) -set(baseaddress_qmgr 0x727c0000) -set(baseaddress_qmgrprxy 0x72740000) -set(baseaddress_quartz 0x72520000) -set(baseaddress_query 0x724e0000) -set(baseaddress_rasadhlp 0x724b0000) -set(baseaddress_rasdlg 0x722d0000) -set(baseaddress_rasman 0x72290000) -set(baseaddress_redirtest1 0x72260000) -set(baseaddress_redirtest2 0x72230000) -set(baseaddress_resutils 0x721f0000) -set(baseaddress_riched32 0x721c0000) -set(baseaddress_rsabase 0x721a0000) -set(baseaddress_rshell 0x720b0000) -set(baseaddress_samsrv 0x72020000) -set(baseaddress_sccbase 0x71ff0000) -set(baseaddress_schannel 0x71fa0000) -set(baseaddress_schedsvc 0x71f60000) -set(baseaddress_scrrun 0x71ef0000) -set(baseaddress_security 0x71ed0000) -set(baseaddress_serialui 0x71ea0000) -set(baseaddress_sfc 0x71e70000) -set(baseaddress_shdoclc 0x71e30000) -set(baseaddress_shdocvw 0x71dd0000) -set(baseaddress_shellbtrfs 0x71c40000) -set(baseaddress_shfolder 0x71c20000) -set(baseaddress_shimgvw 0x71bd0000) -set(baseaddress_shsvcs 0x71b90000) -set(baseaddress_slbcsp 0x71b60000) -set(baseaddress_sndblst 0x71b20000) -set(baseaddress_softpub 0x71b00000) -set(baseaddress_srclient 0x71ad0000) -set(baseaddress_srvsvc 0x71a90000) -set(baseaddress_sti 0x71a40000) -set(baseaddress_stobject 0x71990000) -set(baseaddress_streamci 0x71960000) -set(baseaddress_sxs 0x71920000) -set(baseaddress_sysdm 0x71820000) -set(baseaddress_syssetup 0x71720000) -set(baseaddress_t2embed 0x716f0000) -set(baseaddress_tapi32 0x716a0000) -set(baseaddress_tapiui 0x71620000) -set(baseaddress_telephon 0x715f0000) -set(baseaddress_testvdd 0x715c0000) -set(baseaddress_themeui 0x715a0000) -set(baseaddress_timedate 0x71520000) -set(baseaddress_traffic 0x714f0000) -set(baseaddress_twain_32 0x714b0000) -set(baseaddress_ubtrfs 0x71480000) -set(baseaddress_ucdfs 0x71460000) -set(baseaddress_uext2 0x71420000) -set(baseaddress_ufat 0x713e0000) -set(baseaddress_ufatx 0x713b0000) -set(baseaddress_uffs 0x71390000) -set(baseaddress_umpnpmgr 0x71350000) -set(baseaddress_untfs 0x71330000) -set(baseaddress_updspapi 0x71300000) -set(baseaddress_ureiserfs 0x712e0000) -set(baseaddress_url 0x712b0000) -set(baseaddress_usrmgr 0x71250000) -set(baseaddress_vbscript 0x71170000) -set(baseaddress_vdmdbg 0x71140000) -set(baseaddress_verifier 0x71110000) -set(baseaddress_vfd 0x710a0000) -set(baseaddress_vssapi 0x71060000) -set(baseaddress_wbemdisp 0x71000000) -set(baseaddress_wbemprox 0x70f70000) -set(baseaddress_wdmaud.drv 0x70da0000) -set(baseaddress_win32u 0x70d70000) -set(baseaddress_win32u_2k3sp2 0x70d40000) -set(baseaddress_win32u_xpsp2 0x70d10000) -set(baseaddress_windowscodecs 0x70b40000) -set(baseaddress_windowscodecsext 0x70b00000) -set(baseaddress_wined3dcfg 0x70ac0000) -set(baseaddress_winemp3.acm 0x70a20000) -set(baseaddress_winfax 0x709f0000) -set(baseaddress_wing32 0x709c0000) -set(baseaddress_winhttp 0x70940000) -set(baseaddress_winprint 0x70910000) -set(baseaddress_winscard 0x708d0000) -set(baseaddress_winsta 0x70890000) -set(baseaddress_wkssvc 0x70850000) -set(baseaddress_wlanapi 0x70810000) -set(baseaddress_wldap32 0x707b0000) -set(baseaddress_wlnotify 0x70780000) -set(baseaddress_wmi 0x70760000) -set(baseaddress_wmisvc 0x70730000) -set(baseaddress_wmiutils 0x706e0000) -set(baseaddress_wmvcore 0x70680000) -set(baseaddress_wshirda 0x70650000) -set(baseaddress_wshom 0x705f0000) -set(baseaddress_wshtcpip 0x705c0000) -set(baseaddress_wsock32 0x70590000) -set(baseaddress_wtsapi32 0x70550000) -set(baseaddress_wuapi 0x70500000) -set(baseaddress_wuauserv 0x704d0000) -set(baseaddress_xinput1_1 0x704a0000) -set(baseaddress_xinput1_2 0x70470000) -set(baseaddress_xinput1_3 0x70440000) -set(baseaddress_xinput9_1_0 0x70410000) -set(baseaddress_xmllite 0x703b0000) -set(baseaddress_zipfldr 0x702b0000) +set(baseaddress_dcomlaunch 0x77170000) +set(baseaddress_ddraw 0x77070000) +set(baseaddress_desk 0x76fb0000) +set(baseaddress_deskadp 0x76f70000) +set(baseaddress_deskmon 0x76f30000) +set(baseaddress_devcpux 0x76f00000) +set(baseaddress_devenum 0x76ea0000) +set(baseaddress_dinput 0x76e20000) +set(baseaddress_dinput8 0x76da0000) +set(baseaddress_dmusic 0x76d30000) +set(baseaddress_dnsrslvr 0x76d00000) +set(baseaddress_dplay 0x76cd0000) +set(baseaddress_dpnhpast 0x76ca0000) +set(baseaddress_dxdiagn 0x76c40000) +set(baseaddress_dxtn 0x76c10000) +set(baseaddress_esent 0x76bd0000) +set(baseaddress_faultrep 0x76ba0000) +set(baseaddress_fltlib 0x76b70000) +set(baseaddress_fmifs 0x76b40000) +set(baseaddress_fontext 0x76aa0000) +set(baseaddress_fontsub 0x76a70000) +set(baseaddress_framedyn 0x76a20000) +set(baseaddress_getuname 0x75fb0000) +set(baseaddress_halxbox 0x75e00000) +set(baseaddress_hdwwiz 0x75d80000) +set(baseaddress_hhctrl 0x75d10000) +set(baseaddress_hid 0x75cd0000) +set(baseaddress_hlink 0x75c80000) +set(baseaddress_hnetcfg 0x75c20000) +set(baseaddress_httpapi 0x75be0000) +set(baseaddress_iccvid 0x75ba0000) +set(baseaddress_ieframe 0x75a60000) +set(baseaddress_iernonce 0x75a20000) +set(baseaddress_imaadp32.acm 0x759e0000) +set(baseaddress_imagehlp 0x759a0000) +set(baseaddress_inetcomm 0x75910000) +set(baseaddress_inetcpl 0x758a0000) +set(baseaddress_inetmib1 0x75860000) +set(baseaddress_initpki 0x75830000) +set(baseaddress_input 0x757c0000) +set(baseaddress_inseng 0x75770000) +set(baseaddress_intl 0x756f0000) +set(baseaddress_iologmsg 0x756d0000) +set(baseaddress_itircl 0x756a0000) +set(baseaddress_itss 0x75640000) +set(baseaddress_joy 0x755f0000) +set(baseaddress_jscript 0x75450000) +set(baseaddress_jsproxy 0x75410000) +set(baseaddress_kbdeo 0x753f0000) +set(baseaddress_kbdrost 0x753d0000) +set(baseaddress_kbsdll 0x753a0000) +set(baseaddress_kernel32_vista 0x75370000) +set(baseaddress_ksuser 0x75340000) +set(baseaddress_libjpeg 0x75280000) +set(baseaddress_libpng 0x751d0000) +set(baseaddress_libtiff 0x750d0000) +set(baseaddress_libtirpc 0x75050000) +set(baseaddress_libxslt 0x74cd0000) +set(baseaddress_load_notifications 0x74ca0000) +set(baseaddress_loadperf 0x74c70000) +set(baseaddress_localmon 0x74c30000) +set(baseaddress_localspl 0x74bd0000) +set(baseaddress_localspl_apitest 0x74ba0000) +set(baseaddress_localui 0x74b60000) +set(baseaddress_lpk 0x74b20000) +set(baseaddress_lsasrv 0x74a80000) +set(baseaddress_main 0x749e0000) +set(baseaddress_mapi32 0x74980000) +set(baseaddress_mbedtls 0x748b0000) +set(baseaddress_mciavi32 0x74860000) +set(baseaddress_mcicda 0x74820000) +set(baseaddress_mciqtz32 0x747d0000) +set(baseaddress_mciseq 0x74790000) +set(baseaddress_mciwave 0x74750000) +set(baseaddress_mgmtapi 0x74720000) +set(baseaddress_midimap 0x746e0000) +set(baseaddress_mlang 0x74690000) +set(baseaddress_mmdrv 0x74660000) +set(baseaddress_mmsys 0x74570000) +set(baseaddress_modemui 0x744f0000) +set(baseaddress_mprapi 0x744b0000) +set(baseaddress_msacm32.drv 0x74470000) +set(baseaddress_msadp32.acm 0x74440000) +set(baseaddress_msafd 0x743f0000) +set(baseaddress_mscat32 0x743c0000) +set(baseaddress_mscms 0x74380000) +set(baseaddress_mscoree 0x74310000) +set(baseaddress_msctf 0x74290000) +set(baseaddress_msdmo 0x74250000) +set(baseaddress_msftedit 0x74220000) +set(baseaddress_msg711.acm 0x741f0000) +set(baseaddress_msgina 0x74130000) +set(baseaddress_msgsm32.acm 0x74100000) +set(baseaddress_mshtml 0x73c50000) +set(baseaddress_msi 0x739d0000) +set(baseaddress_msimtf 0x73990000) +set(baseaddress_msisip 0x73960000) +set(baseaddress_msisys 0x73930000) +set(baseaddress_mspatcha 0x738f0000) +set(baseaddress_msports 0x738b0000) +set(baseaddress_msrle32 0x73870000) +set(baseaddress_mssign32 0x73840000) +set(baseaddress_mssip32 0x73810000) +set(baseaddress_mstask 0x737c0000) +set(baseaddress_msv1_0 0x73790000) +set(baseaddress_msvcrt20 0x73660000) +set(baseaddress_msvcrt40 0x73520000) +set(baseaddress_msvcrt_crt_dll_startup 0x734f0000) +set(baseaddress_msvidc32 0x734b0000) +set(baseaddress_msxml 0x73470000) +set(baseaddress_msxml2 0x73430000) +set(baseaddress_msxml3 0x72f10000) +set(baseaddress_msxml3r 0x72ef0000) +set(baseaddress_msxml4 0x72ea0000) +set(baseaddress_msxml6 0x72e50000) +set(baseaddress_mycomput 0x72e30000) +set(baseaddress_ncpa 0x72e00000) +set(baseaddress_nddeapi 0x72dc0000) +set(baseaddress_netcfgx 0x72d00000) +set(baseaddress_netevent 0x72cd0000) +set(baseaddress_netid 0x72c80000) +set(baseaddress_netlogon 0x72c40000) +set(baseaddress_netmsg 0x72ac0000) +set(baseaddress_netplwiz 0x72a90000) +set(baseaddress_netshell 0x729a0000) +set(baseaddress_newdev 0x72930000) +set(baseaddress_nfs41_np 0x72900000) +set(baseaddress_normaliz 0x728d0000) +set(baseaddress_notifyhook 0x728a0000) +set(baseaddress_npptools 0x72870000) +set(baseaddress_ntdll_vista 0x72840000) +set(baseaddress_ntdsapi 0x72800000) +set(baseaddress_ntlanman 0x727d0000) +set(baseaddress_ntmarta 0x727a0000) +set(baseaddress_ntobjshex 0x726c0000) +set(baseaddress_objsel 0x72680000) +set(baseaddress_odbc32 0x72620000) +set(baseaddress_odbccp32 0x725e0000) +set(baseaddress_odbccp32i 0x725b0000) +set(baseaddress_oleacc 0x72500000) +set(baseaddress_olecli32 0x724c0000) +set(baseaddress_olepro32 0x72490000) +set(baseaddress_olesvr32 0x72460000) +set(baseaddress_olethk32 0x72430000) +set(baseaddress_openglcfg 0x723f0000) +set(baseaddress_pdh 0x723a0000) +set(baseaddress_pidgen 0x72370000) +set(baseaddress_pifmgr 0x72300000) +set(baseaddress_powercfg 0x72290000) +set(baseaddress_printui 0x72250000) +set(baseaddress_propsys 0x72200000) +set(baseaddress_pstorec 0x721c0000) +set(baseaddress_qedit 0x72150000) +set(baseaddress_qmgr 0x72100000) +set(baseaddress_qmgrprxy 0x72080000) +set(baseaddress_quartz 0x71e60000) +set(baseaddress_query 0x71e30000) +set(baseaddress_rasadhlp 0x71e00000) +set(baseaddress_rasdlg 0x71c20000) +set(baseaddress_rasman 0x71be0000) +set(baseaddress_redirtest1 0x71bb0000) +set(baseaddress_redirtest2 0x71b80000) +set(baseaddress_resutils 0x71b40000) +set(baseaddress_riched32 0x71b10000) +set(baseaddress_rsabase 0x71af0000) +set(baseaddress_rshell 0x719f0000) +set(baseaddress_samsrv 0x71960000) +set(baseaddress_sccbase 0x71930000) +set(baseaddress_schannel 0x718e0000) +set(baseaddress_schedsvc 0x718a0000) +set(baseaddress_scrrun 0x71830000) +set(baseaddress_security 0x71810000) +set(baseaddress_sendmail 0x717a0000) +set(baseaddress_serialui 0x71770000) +set(baseaddress_sfc 0x71740000) +set(baseaddress_shdoclc 0x71700000) +set(baseaddress_shdocvw 0x716a0000) +set(baseaddress_shellbtrfs 0x71490000) +set(baseaddress_shfolder 0x71470000) +set(baseaddress_shimgvw 0x71420000) +set(baseaddress_shsvcs 0x713e0000) +set(baseaddress_slbcsp 0x713b0000) +set(baseaddress_sndblst 0x71370000) +set(baseaddress_softpub 0x71350000) +set(baseaddress_srclient 0x71320000) +set(baseaddress_srvsvc 0x712e0000) +set(baseaddress_sti 0x71290000) +set(baseaddress_stobject 0x711d0000) +set(baseaddress_streamci 0x711a0000) +set(baseaddress_sxs 0x71160000) +set(baseaddress_sysdm 0x71050000) +set(baseaddress_syssetup 0x70f10000) +set(baseaddress_t2embed 0x70ee0000) +set(baseaddress_tapi32 0x70e90000) +set(baseaddress_tapiui 0x70e10000) +set(baseaddress_telephon 0x70de0000) +set(baseaddress_testvdd 0x70db0000) +set(baseaddress_themeui 0x70d90000) +set(baseaddress_timedate 0x70d10000) +set(baseaddress_traffic 0x70ce0000) +set(baseaddress_twain_32 0x70ca0000) +set(baseaddress_ubtrfs 0x70c70000) +set(baseaddress_ucdfs 0x70c50000) +set(baseaddress_uext2 0x70c10000) +set(baseaddress_ufat 0x70bd0000) +set(baseaddress_ufatx 0x70ba0000) +set(baseaddress_uffs 0x70b80000) +set(baseaddress_umpnpmgr 0x70b40000) +set(baseaddress_untfs 0x70b20000) +set(baseaddress_updspapi 0x70af0000) +set(baseaddress_ureiserfs 0x70ad0000) +set(baseaddress_url 0x70aa0000) +set(baseaddress_usrmgr 0x70a40000) +set(baseaddress_vbscript 0x70960000) +set(baseaddress_vdmdbg 0x70930000) +set(baseaddress_verifier 0x70900000) +set(baseaddress_vfd 0x70890000) +set(baseaddress_vssapi 0x70850000) +set(baseaddress_w32time 0x70820000) +set(baseaddress_wbemdisp 0x707c0000) +set(baseaddress_wbemprox 0x70720000) +set(baseaddress_wdmaud.drv 0x70550000) +set(baseaddress_win32u 0x70520000) +set(baseaddress_win32u_2k3sp2 0x704f0000) +set(baseaddress_win32u_xpsp2 0x704c0000) +set(baseaddress_windowscodecs 0x702e0000) +set(baseaddress_windowscodecsext 0x702a0000) +set(baseaddress_wined3dcfg 0x70260000) +set(baseaddress_winemp3.acm 0x701c0000) +set(baseaddress_winfax 0x70190000) +set(baseaddress_wing32 0x70160000) +set(baseaddress_winhttp 0x700e0000) +set(baseaddress_winprint 0x700b0000) +set(baseaddress_winscard 0x70070000) +set(baseaddress_winsta 0x70030000) +set(baseaddress_wkssvc 0x6fff0000) +set(baseaddress_wlanapi 0x6ffb0000) +set(baseaddress_wldap32 0x6ff50000) +set(baseaddress_wlnotify 0x6ff20000) +set(baseaddress_wmi 0x6ff00000) +set(baseaddress_wmisvc 0x6fed0000) +set(baseaddress_wmiutils 0x6fe80000) +set(baseaddress_wmvcore 0x6fe20000) +set(baseaddress_wshirda 0x6fdf0000) +set(baseaddress_wshom 0x6fd90000) +set(baseaddress_wshtcpip 0x6fd60000) +set(baseaddress_wsock32 0x6fd30000) +set(baseaddress_wtsapi32 0x6fcf0000) +set(baseaddress_wuapi 0x6fca0000) +set(baseaddress_wuauserv 0x6fc70000) +set(baseaddress_xinput1_1 0x6fc40000) +set(baseaddress_xinput1_2 0x6fc10000) +set(baseaddress_xinput1_3 0x6fbe0000) +set(baseaddress_xinput9_1_0 0x6fbb0000) +set(baseaddress_xmllite 0x6fb50000) +set(baseaddress_xolehlp 0x6fb10000) +set(baseaddress_zipfldr 0x6f9b0000) diff --git a/sdk/cmake/baseaddress_msvc.cmake b/sdk/cmake/baseaddress_msvc.cmake index 219203c33c0..66e69f53a0b 100644 --- a/sdk/cmake/baseaddress_msvc.cmake +++ b/sdk/cmake/baseaddress_msvc.cmake @@ -1,378 +1,389 @@ # Generated from R:\build\master\msvc # Generated by sdk/tools/gen_baseaddress.py + set(baseaddress_ntdll 0x7c920000) # should be above 0x7c920000 set(baseaddress_kernel32 0x7c620000) -set(baseaddress_msvcrt 0x7c5a0000) -set(baseaddress_advapi32 0x7c510000) -set(baseaddress_gdi32 0x7c4b0000) +set(baseaddress_msvcrt 0x7c5b0000) +set(baseaddress_advapi32 0x7c520000) +set(baseaddress_gdi32 0x7c4c0000) set(baseaddress_user32 0x77a20000) # reserved -set(baseaddress_dhcpcsvc 0x7c470000) -set(baseaddress_dnsapi 0x7c430000) -set(baseaddress_icmp 0x7c410000) -set(baseaddress_iphlpapi 0x7c3d0000) -set(baseaddress_ws2_32 0x7c3a0000) -set(baseaddress_ws2help 0x7c380000) -set(baseaddress_shlwapi 0x7c300000) -set(baseaddress_rpcrt4 0x7c260000) -set(baseaddress_comctl32 0x7c100000) -set(baseaddress_ole32 0x7bfb0000) -set(baseaddress_winspool 0x7bf70000) -set(baseaddress_winmm 0x7bed0000) -set(baseaddress_comdlg32 0x7bdf0000) -set(baseaddress_shell32 0x7b610000) -set(baseaddress_lz32 0x7b5f0000) -set(baseaddress_version 0x7b5c0000) -set(baseaddress_oleaut32 0x7b470000) -set(baseaddress_setupapi 0x7b330000) -set(baseaddress_mpr 0x7b300000) -set(baseaddress_crypt32 0x7b220000) -set(baseaddress_wininet 0x7b190000) -set(baseaddress_urlmon 0x7b0d0000) -set(baseaddress_psapi 0x7b0b0000) -set(baseaddress_imm32 0x7b080000) -set(baseaddress_msvfw32 0x7b040000) -set(baseaddress_dbghelp 0x7afc0000) -set(baseaddress_devmgr 0x7af10000) -set(baseaddress_msacm32 0x7aed0000) -set(baseaddress_netapi32 0x7ae60000) -set(baseaddress_powrprof 0x7ae40000) -set(baseaddress_secur32 0x7ae00000) -set(baseaddress_wintrust 0x7adb0000) -set(baseaddress_avicap32 0x7ad90000) -set(baseaddress_cabinet 0x7ad50000) -set(baseaddress_dsound 0x7acf0000) -set(baseaddress_glu32 0x7ac70000) -set(baseaddress_opengl32 0x7aac0000) -set(baseaddress_riched20 0x7aa30000) -set(baseaddress_smdll 0x7aa10000) -set(baseaddress_userenv 0x7a9d0000) -set(baseaddress_uxtheme 0x7a980000) -set(baseaddress_cryptui 0x7a8f0000) -set(baseaddress_csrsrv 0x7a8c0000) -set(baseaddress_basesrv 0x7a890000) -set(baseaddress_winsrv 0x7a820000) -set(baseaddress_dplayx 0x7a7d0000) -set(baseaddress_gdiplus 0x7a730000) -set(baseaddress_msimg32 0x7a710000) -set(baseaddress_mswsock 0x7a6f0000) -set(baseaddress_oledlg 0x7a6b0000) -set(baseaddress_rasapi32 0x7a680000) -set(baseaddress_rsaenh 0x7a630000) -set(baseaddress_samlib 0x7a600000) -set(baseaddress_sensapi 0x7a5e0000) -set(baseaddress_sfc_os 0x7a5c0000) -set(baseaddress_snmpapi 0x7a5a0000) -set(baseaddress_spoolss 0x7a570000) -set(baseaddress_usp10 0x7a510000) -set(baseaddress_access 0x7a490000) -set(baseaddress_acgenral 0x7a470000) -set(baseaddress_aclayers 0x7a450000) -set(baseaddress_acledit 0x7a430000) -set(baseaddress_aclui 0x7a400000) -set(baseaddress_acppage 0x7a3c0000) -set(baseaddress_activeds 0x7a3a0000) -set(baseaddress_actxprxy 0x7a220000) -set(baseaddress_advapi32_vista 0x7a200000) -set(baseaddress_advpack 0x7a1d0000) -set(baseaddress_amstream 0x7a190000) -set(baseaddress_apphelp 0x7a150000) -set(baseaddress_appwiz 0x7a0e0000) -set(baseaddress_atl 0x7a0b0000) -set(baseaddress_atl100 0x7a080000) -set(baseaddress_atl80 0x7a050000) -set(baseaddress_authz 0x7a030000) -set(baseaddress_avifil32 0x79fd0000) -set(baseaddress_batt 0x79fb0000) -set(baseaddress_bcrypt 0x79f80000) -set(baseaddress_beepmidi 0x79f60000) -set(baseaddress_browseui 0x79e60000) -set(baseaddress_bthci 0x79e40000) -set(baseaddress_cards 0x79d80000) -set(baseaddress_cfgmgr32 0x79d60000) -set(baseaddress_clusapi 0x79d30000) -set(baseaddress_cmicpl 0x79d00000) -set(baseaddress_comcat 0x79ce0000) -set(baseaddress_compstui 0x79cc0000) -set(baseaddress_console 0x79c70000) -set(baseaddress_credui 0x79c30000) -set(baseaddress_crtdll 0x79bf0000) -set(baseaddress_cryptdlg 0x79bc0000) -set(baseaddress_cryptdll 0x79ba0000) -set(baseaddress_cryptnet 0x79b70000) -set(baseaddress_custom 0x79b50000) -set(baseaddress_d3d8 0x79b00000) -set(baseaddress_d3d8thk 0x79ae0000) -set(baseaddress_d3d9 0x79a90000) -set(baseaddress_d3dcompiler_43 0x799f0000) -set(baseaddress_d3drm 0x79970000) -set(baseaddress_d3dwine 0x797b0000) -set(baseaddress_d3dx9_24 0x79790000) -set(baseaddress_d3dx9_25 0x79760000) -set(baseaddress_d3dx9_26 0x79740000) -set(baseaddress_d3dx9_27 0x79720000) -set(baseaddress_d3dx9_28 0x79700000) -set(baseaddress_d3dx9_29 0x796e0000) -set(baseaddress_d3dx9_30 0x796b0000) -set(baseaddress_d3dx9_31 0x79690000) -set(baseaddress_d3dx9_32 0x79670000) -set(baseaddress_d3dx9_33 0x79650000) -set(baseaddress_d3dx9_34 0x79630000) -set(baseaddress_d3dx9_35 0x79610000) -set(baseaddress_d3dx9_36 0x79540000) -set(baseaddress_d3dx9_37 0x79520000) -set(baseaddress_d3dx9_38 0x79500000) -set(baseaddress_d3dx9_39 0x794e0000) -set(baseaddress_d3dx9_40 0x794c0000) -set(baseaddress_d3dx9_41 0x794a0000) -set(baseaddress_d3dx9_42 0x79480000) -set(baseaddress_d3dx9_43 0x79460000) -set(baseaddress_d3dxof 0x79430000) -set(baseaddress_dciman32 0x79410000) -set(baseaddress_ddraw 0x79380000) -set(baseaddress_desk 0x79300000) -set(baseaddress_deskadp 0x792d0000) -set(baseaddress_deskmon 0x792b0000) -set(baseaddress_devcpux 0x79290000) -set(baseaddress_devenum 0x79260000) -set(baseaddress_dinput 0x79220000) -set(baseaddress_dinput8 0x79200000) -set(baseaddress_dmusic 0x791c0000) -set(baseaddress_dplay 0x791a0000) -set(baseaddress_dxdiagn 0x79170000) -set(baseaddress_dxtn 0x79150000) -set(baseaddress_esent 0x79120000) -set(baseaddress_faultrep 0x79100000) -set(baseaddress_fltlib 0x790e0000) -set(baseaddress_fmifs 0x790c0000) -set(baseaddress_fontext 0x790a0000) -set(baseaddress_fontsub 0x79080000) -set(baseaddress_framebuf 0x79060000) -set(baseaddress_framebuf_new 0x79040000) -set(baseaddress_framedyn 0x79020000) -set(baseaddress_genincdata 0x78ff0000) -set(baseaddress_getuname 0x786f0000) -set(baseaddress_hdwwiz 0x78680000) -set(baseaddress_hhctrl 0x78640000) -set(baseaddress_hid 0x78620000) -set(baseaddress_hlink 0x785f0000) -set(baseaddress_hnetcfg 0x785c0000) -set(baseaddress_httpapi 0x785a0000) -set(baseaddress_iccvid 0x78580000) -set(baseaddress_ieframe 0x784f0000) -set(baseaddress_iernonce 0x784c0000) -set(baseaddress_imaadp32.acm 0x784a0000) -set(baseaddress_imagehlp 0x78470000) -set(baseaddress_inetcomm 0x78420000) -set(baseaddress_inetcpl 0x783d0000) -set(baseaddress_inetmib1 0x783b0000) -set(baseaddress_initpki 0x78390000) -set(baseaddress_input 0x78330000) -set(baseaddress_inseng 0x78300000) -set(baseaddress_intl 0x782a0000) -set(baseaddress_iologmsg 0x78280000) -set(baseaddress_itircl 0x78260000) -set(baseaddress_itss 0x78230000) -set(baseaddress_joy 0x781f0000) -set(baseaddress_jscript 0x78140000) -set(baseaddress_jsproxy 0x78120000) -set(baseaddress_kbdeo 0x78100000) -set(baseaddress_kbsdll 0x780e0000) -set(baseaddress_kernel32_vista 0x780c0000) -set(baseaddress_ksuser 0x780a0000) -set(baseaddress_libjpeg 0x78040000) -set(baseaddress_libpng 0x77fe0000) -set(baseaddress_libtiff 0x77f40000) -set(baseaddress_libtirpc 0x77f00000) -set(baseaddress_libxslt 0x77dc0000) -set(baseaddress_load_notifications 0x77da0000) -set(baseaddress_loadperf 0x77d80000) -set(baseaddress_localmon 0x77d50000) -set(baseaddress_localspl 0x77d10000) -set(baseaddress_localspl_apitest 0x77cf0000) -set(baseaddress_localui 0x77cc0000) -set(baseaddress_lpk 0x77c90000) -set(baseaddress_lsasrv 0x77c30000) -set(baseaddress_main 0x77bb0000) -set(baseaddress_mapi32 0x77b80000) -set(baseaddress_mbedtls 0x779b0000) -set(baseaddress_mciavi32 0x77980000) -set(baseaddress_mcicda 0x77950000) -set(baseaddress_mciqtz32 0x77920000) -set(baseaddress_mciseq 0x778f0000) -set(baseaddress_mciwave 0x778c0000) -set(baseaddress_mgmtapi 0x778a0000) -set(baseaddress_midimap 0x77880000) -set(baseaddress_mlang 0x77850000) -set(baseaddress_mmdrv 0x77830000) -set(baseaddress_mmsys 0x77760000) -set(baseaddress_modemui 0x776f0000) -set(baseaddress_mprapi 0x776c0000) -set(baseaddress_msacm32.drv 0x77690000) -set(baseaddress_msadp32.acm 0x77670000) -set(baseaddress_msafd 0x77640000) -set(baseaddress_mscat32 0x77620000) -set(baseaddress_mscms 0x775f0000) -set(baseaddress_mscoree 0x775b0000) -set(baseaddress_msctf 0x77570000) -set(baseaddress_msdmo 0x77550000) -set(baseaddress_msftedit 0x77530000) -set(baseaddress_msg711.acm 0x77510000) -set(baseaddress_msgina 0x77490000) -set(baseaddress_msgsm32.acm 0x77470000) -set(baseaddress_mshtml 0x772b0000) -set(baseaddress_msi 0x77170000) -set(baseaddress_msimtf 0x77150000) -set(baseaddress_msisip 0x77130000) -set(baseaddress_msisys 0x77110000) -set(baseaddress_mspatcha 0x770f0000) -set(baseaddress_msports 0x770c0000) -set(baseaddress_msrle32 0x77090000) -set(baseaddress_mssign32 0x77070000) -set(baseaddress_mssip32 0x77050000) -set(baseaddress_mstask 0x77020000) -set(baseaddress_msv1_0 0x77000000) -set(baseaddress_msvcrt20 0x76f60000) -set(baseaddress_msvcrt40 0x76ec0000) -set(baseaddress_msvcrt_crt_dll_startup 0x76ea0000) -set(baseaddress_msvidc32 0x76e80000) -set(baseaddress_msxml 0x76e50000) -set(baseaddress_msxml2 0x76e20000) -set(baseaddress_msxml3 0x76c20000) -set(baseaddress_msxml4 0x76be0000) -set(baseaddress_msxml6 0x76ba0000) -set(baseaddress_mycomput 0x76b80000) -set(baseaddress_ncpa 0x76b60000) -set(baseaddress_nddeapi 0x76b40000) -set(baseaddress_netcfgx 0x76ac0000) -set(baseaddress_netevent 0x76a90000) -set(baseaddress_netid 0x76a50000) -set(baseaddress_netshell 0x769d0000) -set(baseaddress_newdev 0x76980000) -set(baseaddress_nfs41_np 0x76960000) -set(baseaddress_normaliz 0x76940000) -set(baseaddress_notifyhook 0x76920000) -set(baseaddress_npptools 0x76900000) -set(baseaddress_ntdll_vista 0x768e0000) -set(baseaddress_ntdsapi 0x768b0000) -set(baseaddress_ntlanman 0x76890000) -set(baseaddress_ntmarta 0x76870000) -set(baseaddress_ntobjshex 0x76810000) -set(baseaddress_objsel 0x767f0000) -set(baseaddress_odbc32 0x767b0000) -set(baseaddress_odbccp32 0x76780000) -set(baseaddress_odbccp32i 0x76760000) -set(baseaddress_oleacc 0x76710000) -set(baseaddress_olecli32 0x766f0000) -set(baseaddress_olepro32 0x766d0000) -set(baseaddress_olesvr32 0x766b0000) -set(baseaddress_olethk32 0x76690000) -set(baseaddress_openglcfg 0x76660000) -set(baseaddress_pdh 0x76630000) -set(baseaddress_pidgen 0x76610000) -set(baseaddress_pifmgr 0x765a0000) -set(baseaddress_powercfg 0x76540000) -set(baseaddress_printui 0x76520000) -set(baseaddress_propsys 0x764e0000) -set(baseaddress_pstorec 0x764c0000) -set(baseaddress_qedit 0x76490000) -set(baseaddress_qmgr 0x76460000) -set(baseaddress_qmgrprxy 0x76410000) -set(baseaddress_quartz 0x762f0000) -set(baseaddress_query 0x762d0000) -set(baseaddress_rasadhlp 0x762b0000) -set(baseaddress_rasdlg 0x760f0000) -set(baseaddress_rasman 0x760c0000) -set(baseaddress_redirtest1 0x760a0000) -set(baseaddress_redirtest2 0x76080000) -set(baseaddress_resutils 0x76050000) -set(baseaddress_riched32 0x76030000) -set(baseaddress_rsabase 0x76010000) -set(baseaddress_rshell 0x75fb0000) -set(baseaddress_samsrv 0x75f50000) -set(baseaddress_sccbase 0x75f30000) -set(baseaddress_schannel 0x75f00000) -set(baseaddress_schedsvc 0x75ee0000) -set(baseaddress_scrrun 0x75ea0000) -set(baseaddress_security 0x75e80000) -set(baseaddress_serialui 0x75e60000) -set(baseaddress_sfc 0x75e40000) -set(baseaddress_shdoclc 0x75e00000) -set(baseaddress_shdocvw 0x75dc0000) -set(baseaddress_shellbtrfs 0x75d10000) -set(baseaddress_shfolder 0x75cf0000) -set(baseaddress_shimgvw 0x75cb0000) -set(baseaddress_shsvcs 0x75c90000) -set(baseaddress_slbcsp 0x75c70000) -set(baseaddress_sndblst 0x75c40000) -set(baseaddress_softpub 0x75c20000) -set(baseaddress_srclient 0x75c00000) -set(baseaddress_srvsvc 0x75bd0000) -set(baseaddress_sti 0x75ba0000) -set(baseaddress_stobject 0x75b40000) -set(baseaddress_streamci 0x75b20000) -set(baseaddress_sxs 0x75b00000) -set(baseaddress_sysdm 0x75a20000) -set(baseaddress_syssetup 0x75930000) -set(baseaddress_t2embed 0x75910000) -set(baseaddress_tapi32 0x758e0000) -set(baseaddress_tapiui 0x75860000) -set(baseaddress_telephon 0x75840000) -set(baseaddress_testvdd 0x75820000) -set(baseaddress_themeui 0x75800000) -set(baseaddress_timedate 0x75790000) -set(baseaddress_traffic 0x75770000) -set(baseaddress_twain_32 0x75750000) -set(baseaddress_ubtrfs 0x75730000) -set(baseaddress_ucdfs 0x75710000) -set(baseaddress_uext2 0x756e0000) -set(baseaddress_ufat 0x756b0000) -set(baseaddress_ufatx 0x75690000) -set(baseaddress_uffs 0x75670000) -set(baseaddress_umpnpmgr 0x75640000) -set(baseaddress_untfs 0x75620000) -set(baseaddress_updspapi 0x75600000) -set(baseaddress_ureiserfs 0x755e0000) -set(baseaddress_url 0x755c0000) -set(baseaddress_usrmgr 0x75570000) -set(baseaddress_vbscript 0x75500000) -set(baseaddress_vdmdbg 0x754e0000) -set(baseaddress_verifier 0x754c0000) -set(baseaddress_vfd 0x75480000) -set(baseaddress_vssapi 0x75450000) -set(baseaddress_wbemdisp 0x75410000) -set(baseaddress_wbemprox 0x753d0000) -set(baseaddress_wdmaud.drv 0x75240000) -set(baseaddress_win32u 0x75220000) -set(baseaddress_win32u_2k3sp2 0x75200000) -set(baseaddress_win32u_xpsp2 0x751e0000) -set(baseaddress_windowscodecs 0x75100000) -set(baseaddress_windowscodecsext 0x750e0000) -set(baseaddress_wined3dcfg 0x750b0000) -set(baseaddress_winemp3.acm 0x75040000) -set(baseaddress_winfax 0x75020000) -set(baseaddress_wing32 0x75000000) -set(baseaddress_winhttp 0x74fb0000) -set(baseaddress_winprint 0x74f90000) -set(baseaddress_winscard 0x74f70000) -set(baseaddress_winsta 0x74f40000) -set(baseaddress_wkssvc 0x74f20000) -set(baseaddress_wlanapi 0x74f00000) -set(baseaddress_wldap32 0x74ed0000) -set(baseaddress_wlnotify 0x74ea0000) -set(baseaddress_wmi 0x74e80000) -set(baseaddress_wmisvc 0x74e60000) -set(baseaddress_wmiutils 0x74e30000) -set(baseaddress_wmvcore 0x74e00000) -set(baseaddress_wshirda 0x74de0000) -set(baseaddress_wshom 0x74db0000) -set(baseaddress_wshtcpip 0x74d90000) -set(baseaddress_wsock32 0x74d70000) -set(baseaddress_wtsapi32 0x74d50000) -set(baseaddress_wuapi 0x74d20000) -set(baseaddress_wuauserv 0x74d00000) -set(baseaddress_xinput1_1 0x74ce0000) -set(baseaddress_xinput1_2 0x74cc0000) -set(baseaddress_xinput1_3 0x74ca0000) -set(baseaddress_xinput9_1_0 0x74c80000) -set(baseaddress_xmllite 0x74c50000) -set(baseaddress_zipfldr 0x74c00000) +set(baseaddress_dhcpcsvc 0x7c480000) +set(baseaddress_dnsapi 0x7c440000) +set(baseaddress_icmp 0x7c420000) +set(baseaddress_iphlpapi 0x7c3e0000) +set(baseaddress_ws2_32 0x7c3b0000) +set(baseaddress_ws2help 0x7c390000) +set(baseaddress_shlwapi 0x7c320000) +set(baseaddress_rpcrt4 0x7c280000) +set(baseaddress_comctl32 0x7c130000) +set(baseaddress_ole32 0x7bfe0000) +set(baseaddress_winspool 0x7bfa0000) +set(baseaddress_winmm 0x7bf00000) +set(baseaddress_comdlg32 0x7be20000) +set(baseaddress_shell32 0x7b640000) +set(baseaddress_lz32 0x7b620000) +set(baseaddress_version 0x7b5f0000) +set(baseaddress_oleaut32 0x7b4c0000) +set(baseaddress_setupapi 0x7b390000) +set(baseaddress_mpr 0x7b360000) +set(baseaddress_crypt32 0x7b290000) +set(baseaddress_wininet 0x7b200000) +set(baseaddress_urlmon 0x7b150000) +set(baseaddress_psapi 0x7b130000) +set(baseaddress_imm32 0x7b100000) +set(baseaddress_msvfw32 0x7b0c0000) +set(baseaddress_dbghelp 0x7b040000) +set(baseaddress_devmgr 0x7af90000) +set(baseaddress_msacm32 0x7af50000) +set(baseaddress_netapi32 0x7aee0000) +set(baseaddress_powrprof 0x7aec0000) +set(baseaddress_secur32 0x7ae80000) +set(baseaddress_wintrust 0x7ae40000) +set(baseaddress_avicap32 0x7ae20000) +set(baseaddress_cabinet 0x7ade0000) +set(baseaddress_dsound 0x7ad80000) +set(baseaddress_glu32 0x7ad00000) +set(baseaddress_opengl32 0x7ac20000) +set(baseaddress_riched20 0x7ab90000) +set(baseaddress_smdll 0x7ab70000) +set(baseaddress_userenv 0x7ab30000) +set(baseaddress_uxtheme 0x7aae0000) +set(baseaddress_cryptui 0x7aa40000) +set(baseaddress_csrsrv 0x7aa10000) +set(baseaddress_basesrv 0x7a9e0000) +set(baseaddress_winsrv 0x7a970000) +set(baseaddress_dplayx 0x7a920000) +set(baseaddress_gdiplus 0x7a880000) +set(baseaddress_msimg32 0x7a860000) +set(baseaddress_mswsock 0x7a840000) +set(baseaddress_oledlg 0x7a800000) +set(baseaddress_rasapi32 0x7a7d0000) +set(baseaddress_rsaenh 0x7a780000) +set(baseaddress_samlib 0x7a750000) +set(baseaddress_sensapi 0x7a730000) +set(baseaddress_sfc_os 0x7a710000) +set(baseaddress_snmpapi 0x7a6f0000) +set(baseaddress_spoolss 0x7a6c0000) +set(baseaddress_usp10 0x7a660000) +set(baseaddress_access 0x7a5e0000) +set(baseaddress_acgenral 0x7a5c0000) +set(baseaddress_aclayers 0x7a5a0000) +set(baseaddress_acledit 0x7a580000) +set(baseaddress_aclui 0x7a550000) +set(baseaddress_acppage 0x7a510000) +set(baseaddress_activeds 0x7a4f0000) +set(baseaddress_actxprxy 0x7a370000) +set(baseaddress_advapi32_vista 0x7a350000) +set(baseaddress_advpack 0x7a320000) +set(baseaddress_amstream 0x7a2f0000) +set(baseaddress_apphelp 0x7a2b0000) +set(baseaddress_appwiz 0x7a240000) +set(baseaddress_atl 0x7a210000) +set(baseaddress_atl100 0x7a1e0000) +set(baseaddress_atl80 0x7a1b0000) +set(baseaddress_authz 0x7a190000) +set(baseaddress_avifil32 0x7a140000) +set(baseaddress_batt 0x7a120000) +set(baseaddress_bcrypt 0x7a0f0000) +set(baseaddress_beepmidi 0x7a0d0000) +set(baseaddress_browseui 0x79fc0000) +set(baseaddress_bthci 0x79fa0000) +set(baseaddress_cards 0x79ee0000) +set(baseaddress_cfgmgr32 0x79ec0000) +set(baseaddress_clusapi 0x79e90000) +set(baseaddress_cmicpl 0x79e60000) +set(baseaddress_comcat 0x79e40000) +set(baseaddress_compstui 0x79e20000) +set(baseaddress_console 0x79dd0000) +set(baseaddress_credui 0x79d90000) +set(baseaddress_crtdll 0x79d50000) +set(baseaddress_cryptdlg 0x79d20000) +set(baseaddress_cryptdll 0x79d00000) +set(baseaddress_cryptext 0x79ce0000) +set(baseaddress_cryptnet 0x79cb0000) +set(baseaddress_custom 0x79c90000) +set(baseaddress_d3d8 0x79c50000) +set(baseaddress_d3d8thk 0x79c30000) +set(baseaddress_d3d9 0x79be0000) +set(baseaddress_d3dcompiler_43 0x79b50000) +set(baseaddress_d3drm 0x79ae0000) +set(baseaddress_d3dwine 0x79950000) +set(baseaddress_d3dx9_24 0x79930000) +set(baseaddress_d3dx9_25 0x79900000) +set(baseaddress_d3dx9_26 0x798e0000) +set(baseaddress_d3dx9_27 0x798c0000) +set(baseaddress_d3dx9_28 0x798a0000) +set(baseaddress_d3dx9_29 0x79880000) +set(baseaddress_d3dx9_30 0x79850000) +set(baseaddress_d3dx9_31 0x79830000) +set(baseaddress_d3dx9_32 0x79810000) +set(baseaddress_d3dx9_33 0x797f0000) +set(baseaddress_d3dx9_34 0x797d0000) +set(baseaddress_d3dx9_35 0x797b0000) +set(baseaddress_d3dx9_36 0x796f0000) +set(baseaddress_d3dx9_37 0x796d0000) +set(baseaddress_d3dx9_38 0x796b0000) +set(baseaddress_d3dx9_39 0x79690000) +set(baseaddress_d3dx9_40 0x79670000) +set(baseaddress_d3dx9_41 0x79650000) +set(baseaddress_d3dx9_42 0x79630000) +set(baseaddress_d3dx9_43 0x79610000) +set(baseaddress_d3dxof 0x795e0000) +set(baseaddress_dciman32 0x795c0000) +set(baseaddress_dcomlaunch 0x795a0000) +set(baseaddress_ddraw 0x79510000) +set(baseaddress_desk 0x79480000) +set(baseaddress_deskadp 0x79450000) +set(baseaddress_deskmon 0x79420000) +set(baseaddress_devcpux 0x79400000) +set(baseaddress_devenum 0x793d0000) +set(baseaddress_dinput 0x79390000) +set(baseaddress_dinput8 0x79350000) +set(baseaddress_dmusic 0x79310000) +set(baseaddress_dnsrslvr 0x792f0000) +set(baseaddress_dplay 0x792d0000) +set(baseaddress_dpnhpast 0x792b0000) +set(baseaddress_dxdiagn 0x79280000) +set(baseaddress_dxtn 0x79260000) +set(baseaddress_esent 0x79230000) +set(baseaddress_faultrep 0x79210000) +set(baseaddress_fltlib 0x791f0000) +set(baseaddress_fmifs 0x791d0000) +set(baseaddress_fontext 0x791a0000) +set(baseaddress_fontsub 0x79180000) +set(baseaddress_framedyn 0x79160000) +set(baseaddress_getuname 0x78700000) +set(baseaddress_halxbox 0x78590000) +set(baseaddress_hdwwiz 0x78520000) +set(baseaddress_hhctrl 0x784e0000) +set(baseaddress_hid 0x784c0000) +set(baseaddress_hlink 0x78490000) +set(baseaddress_hnetcfg 0x78460000) +set(baseaddress_httpapi 0x78430000) +set(baseaddress_iccvid 0x78410000) +set(baseaddress_ieframe 0x78380000) +set(baseaddress_iernonce 0x78350000) +set(baseaddress_imaadp32.acm 0x78330000) +set(baseaddress_imagehlp 0x78300000) +set(baseaddress_inetcomm 0x782b0000) +set(baseaddress_inetcpl 0x78260000) +set(baseaddress_inetmib1 0x78240000) +set(baseaddress_initpki 0x78220000) +set(baseaddress_input 0x781c0000) +set(baseaddress_inseng 0x78190000) +set(baseaddress_intl 0x78130000) +set(baseaddress_iologmsg 0x78110000) +set(baseaddress_itircl 0x780f0000) +set(baseaddress_itss 0x780c0000) +set(baseaddress_joy 0x78080000) +set(baseaddress_jscript 0x77fd0000) +set(baseaddress_jsproxy 0x77fb0000) +set(baseaddress_kbdeo 0x77f90000) +set(baseaddress_kbdrost 0x77f70000) +set(baseaddress_kbsdll 0x77f50000) +set(baseaddress_kernel32_vista 0x77f30000) +set(baseaddress_ksuser 0x77f10000) +set(baseaddress_libjpeg 0x77eb0000) +set(baseaddress_libpng 0x77e50000) +set(baseaddress_libtiff 0x77db0000) +set(baseaddress_libtirpc 0x77d70000) +set(baseaddress_libxslt 0x77c50000) +set(baseaddress_load_notifications 0x77c30000) +set(baseaddress_loadperf 0x77c10000) +set(baseaddress_localmon 0x77bf0000) +set(baseaddress_localspl 0x77bc0000) +set(baseaddress_localspl_apitest 0x77ba0000) +set(baseaddress_localui 0x77b70000) +set(baseaddress_lpk 0x77b40000) +set(baseaddress_lsasrv 0x779c0000) +set(baseaddress_main 0x77940000) +set(baseaddress_mapi32 0x77910000) +set(baseaddress_mbedtls 0x778a0000) +set(baseaddress_mciavi32 0x77870000) +set(baseaddress_mcicda 0x77840000) +set(baseaddress_mciqtz32 0x77810000) +set(baseaddress_mciseq 0x777e0000) +set(baseaddress_mciwave 0x777b0000) +set(baseaddress_mgmtapi 0x77790000) +set(baseaddress_midimap 0x77770000) +set(baseaddress_mlang 0x77740000) +set(baseaddress_mmdrv 0x77720000) +set(baseaddress_mmsys 0x77650000) +set(baseaddress_modemui 0x775e0000) +set(baseaddress_mprapi 0x775b0000) +set(baseaddress_msacm32.drv 0x77580000) +set(baseaddress_msadp32.acm 0x77560000) +set(baseaddress_msafd 0x77530000) +set(baseaddress_mscat32 0x77510000) +set(baseaddress_mscms 0x774e0000) +set(baseaddress_mscoree 0x774a0000) +set(baseaddress_msctf 0x77460000) +set(baseaddress_msdmo 0x77440000) +set(baseaddress_msftedit 0x77420000) +set(baseaddress_msg711.acm 0x77400000) +set(baseaddress_msgina 0x77370000) +set(baseaddress_msgsm32.acm 0x77350000) +set(baseaddress_mshtml 0x771c0000) +set(baseaddress_msi 0x77080000) +set(baseaddress_msimtf 0x77060000) +set(baseaddress_msisip 0x77040000) +set(baseaddress_msisys 0x77020000) +set(baseaddress_mspatcha 0x77000000) +set(baseaddress_msports 0x76fd0000) +set(baseaddress_msrle32 0x76fa0000) +set(baseaddress_mssign32 0x76f80000) +set(baseaddress_mssip32 0x76f60000) +set(baseaddress_mstask 0x76f30000) +set(baseaddress_msv1_0 0x76f00000) +set(baseaddress_msvcrt20 0x76e70000) +set(baseaddress_msvcrt40 0x76de0000) +set(baseaddress_msvcrt_crt_dll_startup 0x76dc0000) +set(baseaddress_msvidc32 0x76da0000) +set(baseaddress_msxml 0x76d70000) +set(baseaddress_msxml2 0x76d40000) +set(baseaddress_msxml3 0x76b60000) +set(baseaddress_msxml3r 0x76b40000) +set(baseaddress_msxml4 0x76b00000) +set(baseaddress_msxml6 0x76ac0000) +set(baseaddress_mycomput 0x76aa0000) +set(baseaddress_ncpa 0x76a80000) +set(baseaddress_nddeapi 0x76a60000) +set(baseaddress_netcfgx 0x769d0000) +set(baseaddress_netevent 0x769a0000) +set(baseaddress_netid 0x76960000) +set(baseaddress_netlogon 0x76930000) +set(baseaddress_netmsg 0x767b0000) +set(baseaddress_netplwiz 0x76790000) +set(baseaddress_netshell 0x76710000) +set(baseaddress_newdev 0x766c0000) +set(baseaddress_nfs41_np 0x766a0000) +set(baseaddress_normaliz 0x76680000) +set(baseaddress_notifyhook 0x76660000) +set(baseaddress_npptools 0x76640000) +set(baseaddress_ntdll_vista 0x76620000) +set(baseaddress_ntdsapi 0x765f0000) +set(baseaddress_ntlanman 0x765d0000) +set(baseaddress_ntmarta 0x765b0000) +set(baseaddress_ntobjshex 0x76550000) +set(baseaddress_objsel 0x76530000) +set(baseaddress_odbc32 0x764f0000) +set(baseaddress_odbccp32 0x764c0000) +set(baseaddress_odbccp32i 0x764a0000) +set(baseaddress_oleacc 0x76450000) +set(baseaddress_olecli32 0x76430000) +set(baseaddress_olepro32 0x76410000) +set(baseaddress_olesvr32 0x763f0000) +set(baseaddress_olethk32 0x763d0000) +set(baseaddress_openglcfg 0x763a0000) +set(baseaddress_pdh 0x76370000) +set(baseaddress_pidgen 0x76350000) +set(baseaddress_pifmgr 0x762e0000) +set(baseaddress_powercfg 0x76280000) +set(baseaddress_printui 0x76260000) +set(baseaddress_propsys 0x76220000) +set(baseaddress_pstorec 0x76200000) +set(baseaddress_qedit 0x761d0000) +set(baseaddress_qmgr 0x761a0000) +set(baseaddress_qmgrprxy 0x76150000) +set(baseaddress_quartz 0x76040000) +set(baseaddress_query 0x76020000) +set(baseaddress_rasadhlp 0x76000000) +set(baseaddress_rasdlg 0x75e40000) +set(baseaddress_rasman 0x75e10000) +set(baseaddress_redirtest1 0x75df0000) +set(baseaddress_redirtest2 0x75dd0000) +set(baseaddress_resutils 0x75db0000) +set(baseaddress_riched32 0x75d90000) +set(baseaddress_rsabase 0x75d70000) +set(baseaddress_rshell 0x75d20000) +set(baseaddress_samsrv 0x75cc0000) +set(baseaddress_sccbase 0x75ca0000) +set(baseaddress_schannel 0x75c70000) +set(baseaddress_schedsvc 0x75c50000) +set(baseaddress_scrrun 0x75c10000) +set(baseaddress_security 0x75bf0000) +set(baseaddress_sendmail 0x75bc0000) +set(baseaddress_serialui 0x75ba0000) +set(baseaddress_sfc 0x75b80000) +set(baseaddress_shdoclc 0x75b40000) +set(baseaddress_shdocvw 0x75b00000) +set(baseaddress_shellbtrfs 0x75a30000) +set(baseaddress_shfolder 0x75a10000) +set(baseaddress_shimgvw 0x759d0000) +set(baseaddress_shsvcs 0x759b0000) +set(baseaddress_slbcsp 0x75990000) +set(baseaddress_sndblst 0x75970000) +set(baseaddress_softpub 0x75950000) +set(baseaddress_srclient 0x75930000) +set(baseaddress_srvsvc 0x75900000) +set(baseaddress_sti 0x758d0000) +set(baseaddress_stobject 0x75870000) +set(baseaddress_streamci 0x75850000) +set(baseaddress_sxs 0x75830000) +set(baseaddress_sysdm 0x75740000) +set(baseaddress_syssetup 0x75620000) +set(baseaddress_t2embed 0x75600000) +set(baseaddress_tapi32 0x755d0000) +set(baseaddress_tapiui 0x75550000) +set(baseaddress_telephon 0x75530000) +set(baseaddress_testvdd 0x75510000) +set(baseaddress_themeui 0x754f0000) +set(baseaddress_timedate 0x75480000) +set(baseaddress_traffic 0x75460000) +set(baseaddress_twain_32 0x75440000) +set(baseaddress_ubtrfs 0x75420000) +set(baseaddress_ucdfs 0x75400000) +set(baseaddress_uext2 0x753d0000) +set(baseaddress_ufat 0x753a0000) +set(baseaddress_ufatx 0x75380000) +set(baseaddress_uffs 0x75360000) +set(baseaddress_umpnpmgr 0x75330000) +set(baseaddress_untfs 0x75310000) +set(baseaddress_updspapi 0x752f0000) +set(baseaddress_ureiserfs 0x752d0000) +set(baseaddress_url 0x752b0000) +set(baseaddress_usrmgr 0x75260000) +set(baseaddress_vbscript 0x751f0000) +set(baseaddress_vdmdbg 0x751d0000) +set(baseaddress_verifier 0x751b0000) +set(baseaddress_vfd 0x75180000) +set(baseaddress_vssapi 0x75150000) +set(baseaddress_w32time 0x75130000) +set(baseaddress_wbemdisp 0x750f0000) +set(baseaddress_wbemprox 0x750a0000) +set(baseaddress_wdmaud.drv 0x74f10000) +set(baseaddress_win32u 0x74ef0000) +set(baseaddress_win32u_2k3sp2 0x74ed0000) +set(baseaddress_win32u_xpsp2 0x74eb0000) +set(baseaddress_windowscodecs 0x74dd0000) +set(baseaddress_windowscodecsext 0x74db0000) +set(baseaddress_wined3dcfg 0x74d80000) +set(baseaddress_winemp3.acm 0x74d10000) +set(baseaddress_winfax 0x74cf0000) +set(baseaddress_wing32 0x74cd0000) +set(baseaddress_winhttp 0x74c90000) +set(baseaddress_winprint 0x74c70000) +set(baseaddress_winscard 0x74c50000) +set(baseaddress_winsta 0x74c20000) +set(baseaddress_wkssvc 0x74c00000) +set(baseaddress_wlanapi 0x74be0000) +set(baseaddress_wldap32 0x74bb0000) +set(baseaddress_wlnotify 0x74b80000) +set(baseaddress_wmi 0x74b60000) +set(baseaddress_wmisvc 0x74b40000) +set(baseaddress_wmiutils 0x74b10000) +set(baseaddress_wmvcore 0x74ae0000) +set(baseaddress_wshirda 0x74ac0000) +set(baseaddress_wshom 0x74a90000) +set(baseaddress_wshtcpip 0x74a70000) +set(baseaddress_wsock32 0x74a50000) +set(baseaddress_wtsapi32 0x74a30000) +set(baseaddress_wuapi 0x74a00000) +set(baseaddress_wuauserv 0x749e0000) +set(baseaddress_xinput1_1 0x749c0000) +set(baseaddress_xinput1_2 0x749a0000) +set(baseaddress_xinput1_3 0x74980000) +set(baseaddress_xinput9_1_0 0x74960000) +set(baseaddress_xmllite 0x74930000) +set(baseaddress_xolehlp 0x74910000) +set(baseaddress_zipfldr 0x748b0000)

5 years

[reactos] 02/03: [SDK] Update the gen_baseaddress script - Remove some debug leftovers - Automatically write the correct file

by Mark Jansen

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=c519650009ba9a3e425e8… commit c519650009ba9a3e425e8663bbb8714212b2c64a Author: Mark Jansen <mark.jansen(a)reactos.org> AuthorDate: Sat Dec 14 18:28:03 2019 +0100 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Sun Dec 22 15:38:36 2019 +0100 [SDK] Update the gen_baseaddress script - Remove some debug leftovers - Automatically write the correct file --- sdk/tools/gen_baseaddress.py | 62 ++++++++++++++++++++------------------------ 1 file changed, 28 insertions(+), 34 deletions(-) diff --git a/sdk/tools/gen_baseaddress.py b/sdk/tools/gen_baseaddress.py index 2c53c6c1202..f214012a982 100644 --- a/sdk/tools/gen_baseaddress.py +++ b/sdk/tools/gen_baseaddress.py @@ -13,8 +13,7 @@ try: import pefile except ImportError: print('# Please install pefile from pip or https://github.com/erocarrera/pefile') - print('# Using fallback') - print() + sys.exit(-1) ALL_EXTENSIONS = ( '.dll', '.acm', '.ax', '.cpl', '.drv', '.ocx' @@ -202,7 +201,7 @@ IMAGE_TYPES = { def is_x64(): return IMAGE_TYPES[IMAGE_NT_OPTIONAL_HDR64_MAGIC] > IMAGE_TYPES[IMAGE_NT_OPTIONAL_HDR32_MAGIC] -def size_of_image_fallback(filename): +def size_of_image(filename): with open(filename, 'rb') as fin: if fin.read(2) != b'MZ': print(filename, 'No dos header found!') @@ -224,14 +223,6 @@ def size_of_image_fallback(filename): return 0 -def size_of_image_verify(filename): - pefile_size = pefile.PE(filename, fast_load=True).OPTIONAL_HEADER.SizeOfImage - custom_size = size_of_image_fallback(filename) - assert custom_size == pefile_size, filename - return custom_size - -SIZE_OF_IMAGE_FN = size_of_image_fallback - class Module(object): def __init__(self, name, address, size, filename): self._name = name @@ -240,7 +231,7 @@ class Module(object): self._reserved = address != 0 self.filename = filename - def gen_baseaddress(self): + def gen_baseaddress(self, output_file): name, ext = os.path.splitext(self._name) postfix = '' if ext in('.acm', '.drv') and self._name != 'winspool.drv': @@ -249,7 +240,7 @@ class Module(object): postfix = ' # should be above 0x%08x' % self.address elif self._reserved: postfix = ' # reserved' - print('set(baseaddress_%-30s 0x%08x)%s' % (name, self.address, postfix)) + output_file.write('set(baseaddress_%-30s 0x%08x)%s\n' % (name, self.address, postfix)) def end(self): return self.address + self.size @@ -270,7 +261,7 @@ class MemoryLayout(object): self.reserved[name] = (address, 0) def add(self, filename, name): - size = SIZE_OF_IMAGE_FN(filename) + size = size_of_image(filename) addr = 0 if name in self.found: return # Assume duplicate files (rshell, ...) are 1:1 copies @@ -326,39 +317,49 @@ class MemoryLayout(object): obj.address = self.next_address(obj.size) self.addresses.append(obj) - def gen_baseaddress(self): + def gen_baseaddress(self, output_file): for obj in self.addresses: - obj.gen_baseaddress() + obj.gen_baseaddress(output_file) -def guess_version(ntdll_path): +def get_target_file(ntdll_path): if 'pefile' in globals(): ntdll_pe = pefile.PE(ntdll_path, fast_load=True) names = [sect.Name.strip(b'\0') for sect in ntdll_pe.sections] count = b'|'.join(names).count(b'/') if b'.rossym' in names: - print('# This should probably go in sdk/cmake/baseaddress.cmake') + return 'baseaddress.cmake' elif is_x64(): - print('# This should probably go in sdk/cmake/baseaddress_msvc_x64.cmake') + return 'baseaddress_msvc_x64.cmake' elif count == 0: - print('# This should probably go in sdk/cmake/baseaddress_msvc.cmake') + return 'baseaddress_msvc.cmake' elif count > 3: - print('# This should probably go in sdk/cmake/baseaddress_dwarf.cmake') + return 'baseaddress_dwarf.cmake' else: - print('# No clue where to put this') + assert False, "Unknown" + return None def run_dir(target): - print('# Generated from', target) - print('# Generated by sdk/tools/gen_baseaddress.py') layout = MemoryLayout(0x7c920000) layout.add_reserved('user32.dll', 0x77a20000) + IMAGE_TYPES[IMAGE_NT_OPTIONAL_HDR64_MAGIC] = 0 + IMAGE_TYPES[IMAGE_NT_OPTIONAL_HDR32_MAGIC] = 0 for root, _, files in os.walk(target): for dll in [filename for filename in files if filename.endswith(ALL_EXTENSIONS)]: if not dll in EXCLUDE and not dll.startswith('api-ms-win-'): layout.add(os.path.join(root, dll), dll) ntdll_path = layout.found['ntdll.dll'].filename - guess_version(ntdll_path) - layout.update(PRIORITIES) - layout.gen_baseaddress() + target_file = get_target_file(ntdll_path) + if target_file: + target_dir = os.path.realpath(os.path.dirname(os.path.dirname(__file__))) + target_path = os.path.join(target_dir, 'cmake', target_file) + output_file = open(target_path, "w") + else: + output_file = sys.stdout + with output_file: + output_file.write('# Generated from {}\n'.format(target)) + output_file.write('# Generated by sdk/tools/gen_baseaddress.py\n\n') + layout.update(PRIORITIES) + layout.gen_baseaddress(output_file) def main(): dirs = sys.argv[1:] @@ -370,12 +371,5 @@ def main(): run_dir(onedir) -def profile(): - import cProfile - # pyprof2calltree -k -i test.cprof - cProfile.run('main()', filename='test.cprof') - if __name__ == '__main__': - #profile() - #SIZE_OF_IMAGE_FN = size_of_image_verify main()

5 years

[reactos] 01/03: [GEN_BASEADDRESS] Fix the script for python 3 and update *_pe.dll entries, as hinted by hermes

by Mark Jansen

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=0e7ab518756d365780b2b… commit 0e7ab518756d365780b2b1783e701f3459b7d567 Author: Mark Jansen <mark.jansen(a)reactos.org> AuthorDate: Sat Sep 21 22:03:49 2019 +0200 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Sun Dec 22 15:38:30 2019 +0100 [GEN_BASEADDRESS] Fix the script for python 3 and update *_pe.dll entries, as hinted by hermes --- sdk/tools/gen_baseaddress.py | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/sdk/tools/gen_baseaddress.py b/sdk/tools/gen_baseaddress.py index 66cf4a6479f..2c53c6c1202 100644 --- a/sdk/tools/gen_baseaddress.py +++ b/sdk/tools/gen_baseaddress.py @@ -92,7 +92,6 @@ EXCLUDE = ( 'bootvid.dll', 'framebuf.dll', 'framebuf_new.dll', - 'freeldr_pe.dll', 'ftfd.dll', 'fusion.dll', 'genincdata.dll', @@ -182,7 +181,6 @@ EXCLUDE = ( 'kbdycl.dll', 'kdcom.dll', 'kdvbox.dll', - 'setupldr_pe.dll', 'vgaddi.dll', 'dllexport_test_dll1.dll', 'dllexport_test_dll2.dll', @@ -337,14 +335,14 @@ def guess_version(ntdll_path): ntdll_pe = pefile.PE(ntdll_path, fast_load=True) names = [sect.Name.strip(b'\0') for sect in ntdll_pe.sections] count = b'|'.join(names).count(b'/') - if '.rossym' in names: - print('# This should probably go in baseaddress.cmake') + if b'.rossym' in names: + print('# This should probably go in sdk/cmake/baseaddress.cmake') elif is_x64(): - print('# This should probably go in baseaddress_msvc_x64.cmake') + print('# This should probably go in sdk/cmake/baseaddress_msvc_x64.cmake') elif count == 0: - print('# This should probably go in baseaddress_msvc.cmake') + print('# This should probably go in sdk/cmake/baseaddress_msvc.cmake') elif count > 3: - print('# This should probably go in baseaddress_dwarf.cmake') + print('# This should probably go in sdk/cmake/baseaddress_dwarf.cmake') else: print('# No clue where to put this')

5 years

[reactos] 01/01: [GDI32_APITEST] Fix GetGlyphOutline testcase (#2163)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=5fbf239348789b027e230… commit 5fbf239348789b027e23035409a326ed481b4568 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sun Dec 22 22:59:22 2019 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Sun Dec 22 22:59:22 2019 +0900 [GDI32_APITEST] Fix GetGlyphOutline testcase (#2163) ROSTESTS-340 --- modules/rostests/apitests/gdi32/GetGlyphOutline.c | 34 ----------------------- 1 file changed, 34 deletions(-) diff --git a/modules/rostests/apitests/gdi32/GetGlyphOutline.c b/modules/rostests/apitests/gdi32/GetGlyphOutline.c index 22859c26e7d..c2d16f5a70e 100644 --- a/modules/rostests/apitests/gdi32/GetGlyphOutline.c +++ b/modules/rostests/apitests/gdi32/GetGlyphOutline.c @@ -109,74 +109,52 @@ static const TEST_ENTRY s_entries[] = { __LINE__, L"Tahoma", -14, GDI_ERROR, 0xDEADBEEF, WCH4, GGO_BITMAP, FALSE, { 0 }, 512, s_ab }, { __LINE__, L"Tahoma", -14, GDI_ERROR, 0xDEADBEEF, WCH5, GGO_BITMAP, FALSE, { 0 }, 512, s_ab }, - { __LINE__, L"Tahoma", -12, 20, 0xDEADBEEF, WCH0, GGO_METRICS, TRUE, { 1, 1, { 0, 0 }, 4, 0 }, }, { __LINE__, L"Tahoma", -12, 36, 0xDEADBEEF, WCH1, GGO_METRICS, TRUE, { 9, 9, { 2, 9 }, 12, 0 }, }, { __LINE__, L"Tahoma", -12, 28, 0xDEADBEEF, WCH2, GGO_METRICS, TRUE, { 7, 9, { 0, 9 }, 8, 0 }, }, { __LINE__, L"Tahoma", -12, 28, 0xDEADBEEF, WCH3, GGO_METRICS, TRUE, { 7, 9, { 0, 9 }, 8, 0 }, }, { __LINE__, L"Tahoma", -12, 28, 0xDEADBEEF, WCH4, GGO_METRICS, TRUE, { 6, 9, { 0, 7 }, 7, 0 }, }, { __LINE__, L"Tahoma", -12, 20, 0xDEADBEEF, WCH5, GGO_METRICS, TRUE, { 1, 2, { 1, 2 }, 4, 0 }, }, - { __LINE__, L"Tahoma", -12, 20, 0xDEADBEEF, WCH0, GGO_METRICS, TRUE, { 1, 1, { 0, 0 }, 4, 0 }, 1, s_ab }, { __LINE__, L"Tahoma", -12, 36, 0xDEADBEEF, WCH1, GGO_METRICS, TRUE, { 9, 9, { 2, 9 }, 12, 0 }, 1, s_ab }, { __LINE__, L"Tahoma", -12, 28, 0xDEADBEEF, WCH2, GGO_METRICS, TRUE, { 7, 9, { 0, 9 }, 8, 0 }, 1, s_ab }, { __LINE__, L"Tahoma", -12, 28, 0xDEADBEEF, WCH3, GGO_METRICS, TRUE, { 7, 9, { 0, 9 }, 8, 0 }, 1, s_ab }, { __LINE__, L"Tahoma", -12, 28, 0xDEADBEEF, WCH4, GGO_METRICS, TRUE, { 6, 9, { 0, 7 }, 7, 0 }, 1, s_ab }, { __LINE__, L"Tahoma", -12, 20, 0xDEADBEEF, WCH5, GGO_METRICS, TRUE, { 1, 2, { 1, 2 }, 4, 0 }, 1, s_ab }, - { __LINE__, L"Tahoma", -12, 20, 0xDEADBEEF, WCH0, GGO_METRICS, TRUE, { 1, 1, { 0, 0 }, 4, 0 }, 512, s_ab }, { __LINE__, L"Tahoma", -12, 36, 0xDEADBEEF, WCH1, GGO_METRICS, TRUE, { 9, 9, { 2, 9 }, 12, 0 }, 512, s_ab }, { __LINE__, L"Tahoma", -12, 28, 0xDEADBEEF, WCH2, GGO_METRICS, TRUE, { 7, 9, { 0, 9 }, 8, 0 }, 512, s_ab }, { __LINE__, L"Tahoma", -12, 28, 0xDEADBEEF, WCH3, GGO_METRICS, TRUE, { 7, 9, { 0, 9 }, 8, 0 }, 512, s_ab }, { __LINE__, L"Tahoma", -12, 28, 0xDEADBEEF, WCH4, GGO_METRICS, TRUE, { 6, 9, { 0, 7 }, 7, 0 }, 512, s_ab }, { __LINE__, L"Tahoma", -12, 20, 0xDEADBEEF, WCH5, GGO_METRICS, TRUE, { 1, 2, { 1, 2 }, 4, 0 }, 512, s_ab }, - { __LINE__, L"Tahoma", -12, 0, 0xDEADBEEF, WCH0, GGO_BITMAP, TRUE, { 1, 1, { 0, 0 }, 4, 0 }, }, { __LINE__, L"Tahoma", -12, 36, 0xDEADBEEF, WCH1, GGO_BITMAP, TRUE, { 9, 9, { 2, 9 }, 12, 0 }, }, { __LINE__, L"Tahoma", -12, 36, 0xDEADBEEF, WCH2, GGO_BITMAP, TRUE, { 7, 9, { 0, 9 }, 8, 0 }, }, { __LINE__, L"Tahoma", -12, 36, 0xDEADBEEF, WCH3, GGO_BITMAP, TRUE, { 7, 9, { 0, 9 }, 8, 0 }, }, { __LINE__, L"Tahoma", -12, 36, 0xDEADBEEF, WCH4, GGO_BITMAP, TRUE, { 6, 9, { 0, 7 }, 7, 0 }, }, { __LINE__, L"Tahoma", -12, 8, 0xDEADBEEF, WCH5, GGO_BITMAP, TRUE, { 1, 2, { 1, 2 }, 4, 0 }, }, - { __LINE__, L"Tahoma", -12, GDI_ERROR, 0xDEADBEEF, WCH0, GGO_BITMAP, TRUE, { 0xCDCDCDCD, 0xCDCDCDCD, { 0xCDCDCDCD, 0xCDCDCDCD }, 0xCDCD, 0xCDCD }, 1, s_ab }, - { __LINE__, L"Tahoma", -12, GDI_ERROR, 0xDEADBEEF, WCH1, GGO_BITMAP, TRUE, { 0xCDCDCDCD, 0xCDCDCDCD, { 0xCDCDCDCD, 0xCDCDCDCD }, 0xCDCD, 0xCDCD }, 1, s_ab }, - { __LINE__, L"Tahoma", -12, GDI_ERROR, 0xDEADBEEF, WCH2, GGO_BITMAP, TRUE, { 0xCDCDCDCD, 0xCDCDCDCD, { 0xCDCDCDCD, 0xCDCDCDCD }, 0xCDCD, 0xCDCD }, 1, s_ab }, - { __LINE__, L"Tahoma", -12, GDI_ERROR, 0xDEADBEEF, WCH3, GGO_BITMAP, TRUE, { 0xCDCDCDCD, 0xCDCDCDCD, { 0xCDCDCDCD, 0xCDCDCDCD }, 0xCDCD, 0xCDCD }, 1, s_ab }, - { __LINE__, L"Tahoma", -12, GDI_ERROR, 0xDEADBEEF, WCH4, GGO_BITMAP, TRUE, { 0xCDCDCDCD, 0xCDCDCDCD, { 0xCDCDCDCD, 0xCDCDCDCD }, 0xCDCD, 0xCDCD }, 1, s_ab }, - { __LINE__, L"Tahoma", -12, GDI_ERROR, 0xDEADBEEF, WCH5, GGO_BITMAP, TRUE, { 0xCDCDCDCD, 0xCDCDCDCD, { 0xCDCDCDCD, 0xCDCDCDCD }, 0xCDCD, 0xCDCD }, 1, s_ab }, - { __LINE__, L"Tahoma", -12, GDI_ERROR, 0xDEADBEEF, WCH0, GGO_BITMAP, TRUE, { 0xCDCDCDCD, 0xCDCDCDCD, { 0xCDCDCDCD, 0xCDCDCDCD }, 0xCDCD, 0xCDCD }, 1, s_ab }, { __LINE__, L"Tahoma", -12, 36, 0xDEADBEEF, WCH1, GGO_BITMAP, TRUE, { 9, 9, { 2, 9 }, 12, 0 }, 512, s_ab }, { __LINE__, L"Tahoma", -12, 36, 0xDEADBEEF, WCH2, GGO_BITMAP, TRUE, { 7, 9, { 0, 9 }, 8, 0 }, 512, s_ab }, { __LINE__, L"Tahoma", -12, 36, 0xDEADBEEF, WCH3, GGO_BITMAP, TRUE, { 7, 9, { 0, 9 }, 8, 0 }, 512, s_ab }, { __LINE__, L"Tahoma", -12, 36, 0xDEADBEEF, WCH4, GGO_BITMAP, TRUE, { 6, 9, { 0, 7 }, 7, 0 }, 512, s_ab }, { __LINE__, L"Tahoma", -12, 8, 0xDEADBEEF, WCH5, GGO_BITMAP, TRUE, { 1, 2, { 1, 2 }, 4, 0 }, 512, s_ab }, - { __LINE__, L"Tahoma", -14, 20, 0xDEADBEEF, WCH0, GGO_METRICS, TRUE, { 1, 1, { 0, 0 }, 5, 0 }, }, { __LINE__, L"Tahoma", -14, 40, 0xDEADBEEF, WCH1, GGO_METRICS, TRUE, { 11, 11, { 2, 11 }, 14, 0 }, }, { __LINE__, L"Tahoma", -14, 28, 0xDEADBEEF, WCH2, GGO_METRICS, TRUE, { 7, 10, { 0, 10 }, 8, 0 }, }, { __LINE__, L"Tahoma", -14, 36, 0xDEADBEEF, WCH3, GGO_METRICS, TRUE, { 9, 10, { -1, 10 }, 8, 0 }, }, { __LINE__, L"Tahoma", -14, 28, 0xDEADBEEF, WCH4, GGO_METRICS, TRUE, { 7, 11, { 0, 8 }, 8, 0 }, }, { __LINE__, L"Tahoma", -14, 20, 0xDEADBEEF, WCH5, GGO_METRICS, TRUE, { 1, 2, { 1, 2 }, 4, 0 }, }, - { __LINE__, L"Tahoma", -14, 20, 0xDEADBEEF, WCH0, GGO_METRICS, TRUE, { 1, 1, { 0, 0 }, 5, 0 }, 1, s_ab }, { __LINE__, L"Tahoma", -14, 40, 0xDEADBEEF, WCH1, GGO_METRICS, TRUE, { 11, 11, { 2, 11 }, 14, 0 }, 1, s_ab }, { __LINE__, L"Tahoma", -14, 28, 0xDEADBEEF, WCH2, GGO_METRICS, TRUE, { 7, 10, { 0, 10 }, 8, 0 }, 1, s_ab }, { __LINE__, L"Tahoma", -14, 36, 0xDEADBEEF, WCH3, GGO_METRICS, TRUE, { 9, 10, { -1, 10 }, 8, 0 }, 1, s_ab }, { __LINE__, L"Tahoma", -14, 28, 0xDEADBEEF, WCH4, GGO_METRICS, TRUE, { 7, 11, { 0, 8 }, 8, 0 }, 1, s_ab }, { __LINE__, L"Tahoma", -14, 20, 0xDEADBEEF, WCH5, GGO_METRICS, TRUE, { 1, 2, { 1, 2 }, 4, 0 }, 1, s_ab }, - { __LINE__, L"Tahoma", -14, 20, 0xDEADBEEF, WCH0, GGO_METRICS, TRUE, { 1, 1, { 0, 0 }, 5, 0 }, 512, s_ab }, { __LINE__, L"Tahoma", -14, 40, 0xDEADBEEF, WCH1, GGO_METRICS, TRUE, { 11, 11, { 2, 11 }, 14, 0 }, 512, s_ab }, { __LINE__, L"Tahoma", -14, 28, 0xDEADBEEF, WCH2, GGO_METRICS, TRUE, { 7, 10, { 0, 10 }, 8, 0 }, 512, s_ab }, { __LINE__, L"Tahoma", -14, 36, 0xDEADBEEF, WCH3, GGO_METRICS, TRUE, { 9, 10, { -1, 10 }, 8, 0 }, 512, s_ab }, { __LINE__, L"Tahoma", -14, 28, 0xDEADBEEF, WCH4, GGO_METRICS, TRUE, { 7, 11, { 0, 8 }, 8, 0 }, 512, s_ab }, { __LINE__, L"Tahoma", -14, 20, 0xDEADBEEF, WCH5, GGO_METRICS, TRUE, { 1, 2, { 1, 2 }, 4, 0 }, 512, s_ab }, - { __LINE__, L"Tahoma", -14, 0, 0xDEADBEEF, WCH0, GGO_BITMAP, TRUE, { 1, 1, { 0, 0 }, 5, 0 }, }, { __LINE__, L"Tahoma", -14, 44, 0xDEADBEEF, WCH1, GGO_BITMAP, TRUE, { 11, 11, { 2, 11 }, 14, 0 }, }, { __LINE__, L"Tahoma", -14, 40, 0xDEADBEEF, WCH2, GGO_BITMAP, TRUE, { 7, 10, { 0, 10 }, 8, 0 }, }, { __LINE__, L"Tahoma", -14, 40, 0xDEADBEEF, WCH3, GGO_BITMAP, TRUE, { 9, 10, { -1, 10 }, 8, 0 }, }, { __LINE__, L"Tahoma", -14, 0x2C, 0xDEADBEEF, WCH4, GGO_BITMAP, TRUE, { 7, 11, { 0, 8 }, 8, 0 }, }, { __LINE__, L"Tahoma", -14, 0x8, 0xDEADBEEF, WCH5, GGO_BITMAP, TRUE, { 1, 2, { 1, 2 }, 4, 0 }, }, - { __LINE__, L"Tahoma", -14, GDI_ERROR, 0xDEADBEEF, WCH0, GGO_BITMAP, TRUE, { 0xCDCDCDCD, 0xCDCDCDCD, { 0xCDCDCDCD, 0xCDCDCDCD }, 0xCDCD, 0xCDCD }, 1, s_ab }, - { __LINE__, L"Tahoma", -14, GDI_ERROR, 0xDEADBEEF, WCH1, GGO_BITMAP, TRUE, { 0xCDCDCDCD, 0xCDCDCDCD, { 0xCDCDCDCD, 0xCDCDCDCD }, 0xCDCD, 0xCDCD }, 1, s_ab }, - { __LINE__, L"Tahoma", -14, GDI_ERROR, 0xDEADBEEF, WCH2, GGO_BITMAP, TRUE, { 0xCDCDCDCD, 0xCDCDCDCD, { 0xCDCDCDCD, 0xCDCDCDCD }, 0xCDCD, 0xCDCD }, 1, s_ab }, - { __LINE__, L"Tahoma", -14, GDI_ERROR, 0xDEADBEEF, WCH3, GGO_BITMAP, TRUE, { 0xCDCDCDCD, 0xCDCDCDCD, { 0xCDCDCDCD, 0xCDCDCDCD }, 0xCDCD, 0xCDCD }, 1, s_ab }, - { __LINE__, L"Tahoma", -14, GDI_ERROR, 0xDEADBEEF, WCH4, GGO_BITMAP, TRUE, { 0xCDCDCDCD, 0xCDCDCDCD, { 0xCDCDCDCD, 0xCDCDCDCD }, 0xCDCD, 0xCDCD }, 1, s_ab }, - { __LINE__, L"Tahoma", -14, GDI_ERROR, 0xDEADBEEF, WCH5, GGO_BITMAP, TRUE, { 0xCDCDCDCD, 0xCDCDCDCD, { 0xCDCDCDCD, 0xCDCDCDCD }, 0xCDCD, 0xCDCD }, 1, s_ab }, - { __LINE__, L"Tahoma", -14, GDI_ERROR, 0xDEADBEEF, WCH0, GGO_BITMAP, TRUE, { 0xCDCDCDCD, 0xCDCDCDCD, { 0xCDCDCDCD, 0xCDCDCDCD }, 0xCDCD, 0xCDCD }, 512, s_ab }, { __LINE__, L"Tahoma", -14, 44, 0xDEADBEEF, WCH1, GGO_BITMAP, TRUE, { 11, 11, { 2, 11 }, 14, 0 }, 512, s_ab }, { __LINE__, L"Tahoma", -14, 40, 0xDEADBEEF, WCH2, GGO_BITMAP, TRUE, { 7, 10, { 0, 10 }, 8, 0 }, 512, s_ab }, { __LINE__, L"Tahoma", -14, 40, 0xDEADBEEF, WCH3, GGO_BITMAP, TRUE, { 9, 10, { -1, 10 }, 8, 0 }, 512, s_ab }, @@ -281,12 +259,6 @@ static const TEST_ENTRY s_entries[] = { __LINE__, L"Marlett", -12, 32, 0xDEADBEEF, WCH3, GGO_BITMAP, TRUE, { 5, 8, { 0, 8 }, 6, 0 }, }, { __LINE__, L"Marlett", -12, 36, 0xDEADBEEF, WCH4, GGO_BITMAP, TRUE, { 8, 9, { 2, 11 }, 12, 0 }, }, { __LINE__, L"Marlett", -12, 32, 0xDEADBEEF, WCH5, GGO_BITMAP, TRUE, { 5, 8, { 0, 8 }, 6, 0 }, }, - { __LINE__, L"Marlett", -12, GDI_ERROR, 0xDEADBEEF, WCH0, GGO_BITMAP, TRUE, { 0xCDCDCDCD, 0xCDCDCDCD, { 0xCDCDCDCD, 0xCDCDCDCD }, 0xCDCD, 0xCDCD }, 1, s_ab }, - { __LINE__, L"Marlett", -12, GDI_ERROR, 0xDEADBEEF, WCH1, GGO_BITMAP, TRUE, { 0xCDCDCDCD, 0xCDCDCDCD, { 0xCDCDCDCD, 0xCDCDCDCD }, 0xCDCD, 0xCDCD }, 1, s_ab }, - { __LINE__, L"Marlett", -12, GDI_ERROR, 0xDEADBEEF, WCH2, GGO_BITMAP, TRUE, { 0xCDCDCDCD, 0xCDCDCDCD, { 0xCDCDCDCD, 0xCDCDCDCD }, 0xCDCD, 0xCDCD }, 1, s_ab }, - { __LINE__, L"Marlett", -12, GDI_ERROR, 0xDEADBEEF, WCH3, GGO_BITMAP, TRUE, { 0xCDCDCDCD, 0xCDCDCDCD, { 0xCDCDCDCD, 0xCDCDCDCD }, 0xCDCD, 0xCDCD }, 1, s_ab }, - { __LINE__, L"Marlett", -12, GDI_ERROR, 0xDEADBEEF, WCH4, GGO_BITMAP, TRUE, { 0xCDCDCDCD, 0xCDCDCDCD, { 0xCDCDCDCD, 0xCDCDCDCD }, 0xCDCD, 0xCDCD }, 1, s_ab }, - { __LINE__, L"Marlett", -12, GDI_ERROR, 0xDEADBEEF, WCH5, GGO_BITMAP, TRUE, { 0xCDCDCDCD, 0xCDCDCDCD, { 0xCDCDCDCD, 0xCDCDCDCD }, 0xCDCD, 0xCDCD }, 1, s_ab }, { __LINE__, L"Marlett", -12, 32, 0xDEADBEEF, WCH0, GGO_BITMAP, TRUE, { 5, 8, { 0, 8 }, 6, 0 }, 512, s_ab }, { __LINE__, L"Marlett", -12, 32, 0xDEADBEEF, WCH1, GGO_BITMAP, TRUE, { 5, 8, { 0, 8 }, 6, 0 }, 512, s_ab }, { __LINE__, L"Marlett", -12, 32, 0xDEADBEEF, WCH2, GGO_BITMAP, TRUE, { 5, 8, { 0, 8 }, 6, 0 }, 512, s_ab }, @@ -318,12 +290,6 @@ static const TEST_ENTRY s_entries[] = { __LINE__, L"Marlett", -14, 36, 0xDEADBEEF, WCH3, GGO_BITMAP, TRUE, { 6, 9, { 0, 9 }, 7, 0 }, }, { __LINE__, L"Marlett", -14, 40, 0xDEADBEEF, WCH4, GGO_BITMAP, TRUE, { 10, 10, { 2, 12 }, 14, 0 }, }, { __LINE__, L"Marlett", -14, 36, 0xDEADBEEF, WCH5, GGO_BITMAP, TRUE, { 6, 9, { 0, 9 }, 7, 0 }, }, - { __LINE__, L"Marlett", -14, GDI_ERROR, 0xDEADBEEF, WCH0, GGO_BITMAP, TRUE, { 0xCDCDCDCD, 0xCDCDCDCD, { 0xCDCDCDCD, 0xCDCDCDCD }, 0xCDCD, 0xCDCD }, 1, s_ab }, - { __LINE__, L"Marlett", -14, GDI_ERROR, 0xDEADBEEF, WCH1, GGO_BITMAP, TRUE, { 0xCDCDCDCD, 0xCDCDCDCD, { 0xCDCDCDCD, 0xCDCDCDCD }, 0xCDCD, 0xCDCD }, 1, s_ab }, - { __LINE__, L"Marlett", -14, GDI_ERROR, 0xDEADBEEF, WCH2, GGO_BITMAP, TRUE, { 0xCDCDCDCD, 0xCDCDCDCD, { 0xCDCDCDCD, 0xCDCDCDCD }, 0xCDCD, 0xCDCD }, 1, s_ab }, - { __LINE__, L"Marlett", -14, GDI_ERROR, 0xDEADBEEF, WCH3, GGO_BITMAP, TRUE, { 0xCDCDCDCD, 0xCDCDCDCD, { 0xCDCDCDCD, 0xCDCDCDCD }, 0xCDCD, 0xCDCD }, 1, s_ab }, - { __LINE__, L"Marlett", -14, GDI_ERROR, 0xDEADBEEF, WCH4, GGO_BITMAP, TRUE, { 0xCDCDCDCD, 0xCDCDCDCD, { 0xCDCDCDCD, 0xCDCDCDCD }, 0xCDCD, 0xCDCD }, 1, s_ab }, - { __LINE__, L"Marlett", -14, GDI_ERROR, 0xDEADBEEF, WCH5, GGO_BITMAP, TRUE, { 0xCDCDCDCD, 0xCDCDCDCD, { 0xCDCDCDCD, 0xCDCDCDCD }, 0xCDCD, 0xCDCD }, 1, s_ab }, { __LINE__, L"Marlett", -14, 36, 0xDEADBEEF, WCH0, GGO_BITMAP, TRUE, { 6, 9, { 0, 9 }, 7, 0 }, 512, s_ab }, { __LINE__, L"Marlett", -14, 36, 0xDEADBEEF, WCH1, GGO_BITMAP, TRUE, { 6, 9, { 0, 9 }, 7, 0 }, 512, s_ab }, { __LINE__, L"Marlett", -14, 36, 0xDEADBEEF, WCH2, GGO_BITMAP, TRUE, { 6, 9, { 0, 9 }, 7, 0 }, 512, s_ab },

5 years

← Newer
1
...
8
9
10
11
12
13
14
...
23
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 2019