November 2012 - Wine-commits

Nikolay Sivov : comcat: Cleanup from unused includes and imports.
by Alexandre Julliard 12 Nov '12

12 Nov '12

Module: wine Branch: master Commit: bb44713e6d4431492dea28b52fdaed6f27fdfc94 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bb44713e6d4431492dea28b52… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Nov 11 23:10:10 2012 -0500 comcat: Cleanup from unused includes and imports. --- dlls/comcat/Makefile.in | 2 +- dlls/comcat/comcat_main.c | 6 ------ 2 files changed, 1 insertions(+), 7 deletions(-) diff --git a/dlls/comcat/Makefile.in b/dlls/comcat/Makefile.in index 695c66b..d38f779 100644 --- a/dlls/comcat/Makefile.in +++ b/dlls/comcat/Makefile.in @@ -1,5 +1,5 @@ MODULE = comcat.dll -IMPORTS = uuid ole32 user32 advapi32 +IMPORTS = ole32 C_SRCS = \ comcat_main.c diff --git a/dlls/comcat/comcat_main.c b/dlls/comcat/comcat_main.c index 83fc0ee..345cf67 100644 --- a/dlls/comcat/comcat_main.c +++ b/dlls/comcat/comcat_main.c @@ -20,14 +20,8 @@ #include <stdarg.h> -#define COBJMACROS - #include "windef.h" #include "winbase.h" -#include "winuser.h" -#include "winreg.h" -#include "winerror.h" -#include "ole2.h" /*********************************************************************** * DllCanUnloadNow (COMCAT.@)

1 0

Nikolay Sivov : msxml3: Add VT_INT to VARIANT tracing helper.
by Alexandre Julliard 12 Nov '12

12 Nov '12

Module: wine Branch: master Commit: 9860e85ac855b32a0178f6c4ef15322eceb6cace URL: http://source.winehq.org/git/wine.git/?a=commit;h=9860e85ac855b32a0178f6c4e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Nov 7 21:43:44 2012 -0500 msxml3: Add VT_INT to VARIANT tracing helper. --- dlls/msxml3/main.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/msxml3/main.c b/dlls/msxml3/main.c index 3debd06..da3969e 100644 --- a/dlls/msxml3/main.c +++ b/dlls/msxml3/main.c @@ -273,6 +273,8 @@ const char *debugstr_variant(const VARIANT *v) return wine_dbg_sprintf("{VT_I2: %d}", V_I2(v)); case VT_I4: return wine_dbg_sprintf("{VT_I4: %d}", V_I4(v)); + case VT_INT: + return wine_dbg_sprintf("{VT_INT: %d}", V_INT(v)); case VT_R8: return wine_dbg_sprintf("{VT_R8: %lf}", V_R8(v)); case VT_BSTR:

1 0

Nikolay Sivov : msxml3: Fix a redundant newline in transformation result in html mode.
by Alexandre Julliard 12 Nov '12

12 Nov '12

Module: wine Branch: master Commit: f9ab8dab519b25f6d5aa86f403dd6fc910b12264 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f9ab8dab519b25f6d5aa86f40… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Nov 9 22:22:25 2012 -0500 msxml3: Fix a redundant newline in transformation result in html mode. --- dlls/msxml3/node.c | 49 +++++++++++++++++++++++++++++++++++++++++++- dlls/msxml3/tests/domdoc.c | 45 ++++++++++++++++++++++++++++++++++++++- 2 files changed, 91 insertions(+), 3 deletions(-) diff --git a/dlls/msxml3/node.c b/dlls/msxml3/node.c index 36602eb..4835859 100644 --- a/dlls/msxml3/node.c +++ b/dlls/msxml3/node.c @@ -833,6 +833,53 @@ HRESULT node_get_xml(xmlnode *This, BOOL ensure_eol, BSTR *ret) return *ret ? S_OK : E_OUTOFMEMORY; } +static void htmldtd_dumpcontent(xmlOutputBufferPtr buf, xmlDocPtr doc) +{ + xmlDtdPtr cur = doc->intSubset; + + xmlOutputBufferWriteString(buf, "<!DOCTYPE "); + xmlOutputBufferWriteString(buf, (const char *)cur->name); + if (cur->ExternalID) + { + xmlOutputBufferWriteString(buf, " PUBLIC "); + xmlBufferWriteQuotedString(buf->buffer, cur->ExternalID); + if (cur->SystemID) + { + xmlOutputBufferWriteString(buf, " "); + xmlBufferWriteQuotedString(buf->buffer, cur->SystemID); + } + } + else if (cur->SystemID) + { + xmlOutputBufferWriteString(buf, " SYSTEM "); + xmlBufferWriteQuotedString(buf->buffer, cur->SystemID); + } + xmlOutputBufferWriteString(buf, ">\n"); +} + +static void htmldoc_dumpcontent(xmlOutputBufferPtr buf, xmlDocPtr doc) +{ + xmlElementType type; + + /* force HTML output */ + type = doc->type; + doc->type = XML_HTML_DOCUMENT_NODE; + if (doc->intSubset) + htmldtd_dumpcontent(buf, doc); + if (doc->children) + { + xmlNodePtr cur = doc->children; + + while (cur) + { + htmlNodeDumpFormatOutput(buf, doc, cur, NULL, 1); + cur = cur->next; + } + + } + doc->type = type; +} + HRESULT node_transform_node(const xmlnode *This, IXMLDOMNode *stylesheet, BSTR *p) { #ifdef SONAME_LIBXSLT @@ -860,7 +907,7 @@ HRESULT node_transform_node(const xmlnode *This, IXMLDOMNode *stylesheet, BSTR * xmlOutputBufferPtr output = xmlAllocOutputBuffer(NULL); if (output) { - htmlDocContentDumpOutput(output, result->doc, NULL); + htmldoc_dumpcontent(output, result->doc); content = xmlBufferContent(output->buffer); *p = bstr_from_xmlChar(content); xmlOutputBufferClose(output); diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index f59a001..85d2bc4 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -9732,8 +9732,7 @@ todo_wine { hr = IXSLProcessor_get_output(processor, &v); ok(hr == S_OK, "got 0x%08x\n", hr); ok(V_VT(&v) == VT_BSTR, "got type %d\n", V_VT(&v)); - /* we currently output one '\n' instead of empty string */ - todo_wine ok(lstrcmpW(V_BSTR(&v), _bstr_("")) == 0, "got %s\n", wine_dbgstr_w(V_BSTR(&v))); + ok(lstrcmpW(V_BSTR(&v), _bstr_("")) == 0, "got %s\n", wine_dbgstr_w(V_BSTR(&v))); IXMLDOMDocument_Release(doc2); VariantClear(&v); @@ -12469,6 +12468,47 @@ static void test_namedmap_newenum(void) IXMLDOMDocument_Release(doc); } +static const char xsltext_xsl[] = +"<?xml version=\"1.0\"?>" +"<xsl:stylesheet version=\"1.0\" xmlns:xsl=\"http://www.w3.org/1999/XSL/Transform\" >" +"<xsl:output method=\"html\" encoding=\"us-ascii\"/>" +"<xsl:template match=\"/\">" +" <xsl:choose>" +" <xsl:when test=\"testkey\">" +" <xsl:text>testdata</xsl:text>" +" </xsl:when>" +" </xsl:choose>" +"</xsl:template>" +"</xsl:stylesheet>"; + +static void test_xsltext(void) +{ + IXMLDOMDocument *doc, *doc2; + VARIANT_BOOL b; + HRESULT hr; + BSTR ret; + + doc = create_document(&IID_IXMLDOMDocument); + if (!doc) return; + + doc2 = create_document(&IID_IXMLDOMDocument); + + hr = IXMLDOMDocument_loadXML(doc, _bstr_(xsltext_xsl), &b); + EXPECT_HR(hr, S_OK); + + hr = IXMLDOMDocument_loadXML(doc2, _bstr_("<testkey/>"), &b); + EXPECT_HR(hr, S_OK); + + hr = IXMLDOMDocument_transformNode(doc2, (IXMLDOMNode*)doc, &ret); + EXPECT_HR(hr, S_OK); + ok(!lstrcmpW(ret, _bstr_("testdata")), "transform result %s\n", wine_dbgstr_w(ret)); + SysFreeString(ret); + + IXMLDOMDocument_Release(doc2); + IXMLDOMDocument_Release(doc); + free_bstrs(); +} + START_TEST(domdoc) { IXMLDOMDocument *doc; @@ -12552,6 +12592,7 @@ START_TEST(domdoc) test_namedmap_newenum(); test_xsltemplate(); + test_xsltext(); hr = CoCreateInstance(&CLSID_MXNamespaceManager40, NULL, CLSCTX_INPROC_SERVER, &IID_IMXNamespaceManager, (void**)&unk);

1 0

Nikolay Sivov : msxml3: Disable text data escaping for format nodes set with put_data().
by Alexandre Julliard 12 Nov '12

12 Nov '12

Module: wine Branch: master Commit: 47d2f3caf56eb6c06b1d8f6d0f07b9815da685e6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=47d2f3caf56eb6c06b1d8f6d0… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Nov 12 09:29:30 2012 -0500 msxml3: Disable text data escaping for format nodes set with put_data(). --- dlls/msxml3/tests/domdoc.c | 34 +++++++++++++++++++++++++++++----- dlls/msxml3/text.c | 15 +++++++++++++++ 2 files changed, 44 insertions(+), 5 deletions(-) diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index 85d2bc4..4b894b0 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -12185,6 +12185,9 @@ static void test_put_data(void) WCHAR buff[100], *data; IXMLDOMDocument *doc; DOMNodeType *type; + IXMLDOMText *text; + IXMLDOMNode *node; + VARIANT v; BSTR get_data; HRESULT hr; @@ -12199,9 +12202,6 @@ static void test_put_data(void) type = put_data_types; while (*type != NODE_INVALID) { - IXMLDOMNode *node; - VARIANT v; - V_VT(&v) = VT_I2; V_I2(&v) = *type; @@ -12213,8 +12213,6 @@ static void test_put_data(void) { case NODE_TEXT: { - IXMLDOMText *text; - hr = IXMLDOMNode_QueryInterface(node, &IID_IXMLDOMText, (void**)&text); EXPECT_HR(hr, S_OK); hr = IXMLDOMText_put_data(text, data); @@ -12284,6 +12282,32 @@ static void test_put_data(void) type++; } + /* \r\n sequence is never escaped */ + V_VT(&v) = VT_I2; + V_I2(&v) = NODE_TEXT; + + hr = IXMLDOMDocument_createNode(doc, v, _bstr_("name"), NULL, &node); + ok(hr == S_OK, "got 0x%08x\n", hr); + + IXMLDOMNode_QueryInterface(node, &IID_IXMLDOMText, (void**)&text); + + hr = IXMLDOMText_put_data(text, _bstr_("\r\n")); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IXMLDOMText_get_data(text, &get_data); + ok(hr == S_OK, "got 0x%08x\n", hr); +todo_wine + ok(!lstrcmpW(get_data, _bstr_("\n")), "got %s\n", wine_dbgstr_w(get_data)); + SysFreeString(get_data); + + hr = IXMLDOMText_get_xml(text, &get_data); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(!lstrcmpW(get_data, _bstr_("\r\n")), "got %s\n", wine_dbgstr_w(get_data)); + SysFreeString(get_data); + + IXMLDOMText_Release(text); + IXMLDOMNode_Release(node); + IXMLDOMDocument_Release(doc); free_bstrs(); } diff --git a/dlls/msxml3/text.c b/dlls/msxml3/text.c index 6fb29f9..e9c64c1 100644 --- a/dlls/msxml3/text.c +++ b/dlls/msxml3/text.c @@ -26,6 +26,7 @@ #include <stdarg.h> #ifdef HAVE_LIBXML2 # include <libxml/parser.h> +# include <libxml/parserInternals.h> # include <libxml/xmlerror.h> #endif @@ -55,6 +56,11 @@ static inline domtext *impl_from_IXMLDOMText( IXMLDOMText *iface ) return CONTAINING_RECORD(iface, domtext, IXMLDOMText_iface); } +static void domtext_reset_noenc(domtext *This) +{ + This->node.node->name = NULL; +} + static HRESULT WINAPI domtext_QueryInterface( IXMLDOMText *iface, REFIID riid, @@ -182,6 +188,7 @@ static HRESULT WINAPI domtext_put_nodeValue( TRACE("(%p)->(%s)\n", This, debugstr_variant(&value)); + domtext_reset_noenc(This); return node_put_value(&This->node, &value); } @@ -371,6 +378,7 @@ static HRESULT WINAPI domtext_put_text( { domtext *This = impl_from_IXMLDOMText( iface ); TRACE("(%p)->(%s)\n", This, debugstr_w(p)); + domtext_reset_noenc(This); return node_put_text( &This->node, p ); } @@ -608,7 +616,14 @@ static HRESULT WINAPI domtext_put_data( BSTR data) { domtext *This = impl_from_IXMLDOMText( iface ); + static WCHAR rnW[] = {'\r','\n',0}; + TRACE("(%p)->(%s)\n", This, debugstr_w(data)); + + if (data && !strcmpW(rnW, data)) + This->node.node->name = xmlStringTextNoenc; + else + domtext_reset_noenc(This); return node_set_content(&This->node, data); }

1 0

Michael Stefaniuc : user.exe16: Use FIELD_OFFSET to calculate the size of a struct with variable length array .
by Alexandre Julliard 12 Nov '12

12 Nov '12

Module: wine Branch: master Commit: 96e428cc9e30b45ce3c7ea3075dd25816f748f40 URL: http://source.winehq.org/git/wine.git/?a=commit;h=96e428cc9e30b45ce3c7ea307… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Nov 12 10:39:45 2012 +0100 user.exe16: Use FIELD_OFFSET to calculate the size of a struct with variable length array. --- dlls/user.exe16/user.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/user.exe16/user.c b/dlls/user.exe16/user.c index 7f184a2..b99c0ad 100644 --- a/dlls/user.exe16/user.c +++ b/dlls/user.exe16/user.c @@ -1320,7 +1320,8 @@ BOOL16 WINAPI GrayString16( HDC16 hdc, HBRUSH16 hbr, GRAYSTRINGPROC16 gsprc, struct gray_string_info *info; if (!cch) cch = strlen(str16); - if (!(info = HeapAlloc( GetProcessHeap(), 0, sizeof(*info) + cch ))) return FALSE; + info = HeapAlloc( GetProcessHeap(), 0, FIELD_OFFSET( struct gray_string_info, str[cch] )); + if (!info) return FALSE; info->proc = gsprc; info->param = lParam; memcpy( info->str, str16, cch );

1 0

Michael Stefaniuc : msiexec: Use FIELD_OFFSET to calculate the size of a struct with variable length array .
by Alexandre Julliard 12 Nov '12

12 Nov '12

Module: wine Branch: master Commit: b791c25274b83bc9083359f74a53d6cbd637d575 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b791c25274b83bc9083359f74… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Nov 12 10:43:44 2012 +0100 msiexec: Use FIELD_OFFSET to calculate the size of a struct with variable length array. --- programs/msiexec/msiexec.c | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-) diff --git a/programs/msiexec/msiexec.c b/programs/msiexec/msiexec.c index 2227af0..9b378c6 100644 --- a/programs/msiexec/msiexec.c +++ b/programs/msiexec/msiexec.c @@ -109,10 +109,8 @@ static BOOL IsProductCode(LPWSTR str) static VOID StringListAppend(struct string_list **list, LPCWSTR str) { struct string_list *entry; - DWORD size; - size = sizeof *entry + lstrlenW(str) * sizeof (WCHAR); - entry = HeapAlloc(GetProcessHeap(), 0, size); + entry = HeapAlloc(GetProcessHeap(), 0, FIELD_OFFSET(struct string_list, str[lstrlenW(str) + 1])); if(!entry) { WINE_ERR("Out of memory!\n");

1 0

Michael Stefaniuc : msi: Don't over-allocate memory for a MSISELECTVIEW.
by Alexandre Julliard 12 Nov '12

12 Nov '12

Module: wine Branch: master Commit: dad296794365d685082e8fa4eec626e73aea0b80 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dad296794365d685082e8fa4e… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Nov 12 10:28:39 2012 +0100 msi: Don't over-allocate memory for a MSISELECTVIEW. --- dlls/msi/select.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msi/select.c b/dlls/msi/select.c index ada4eed..e8f3885 100644 --- a/dlls/msi/select.c +++ b/dlls/msi/select.c @@ -431,7 +431,7 @@ UINT SELECT_CreateView( MSIDATABASE *db, MSIVIEW **view, MSIVIEW *table, count = select_count_columns( columns ); - sv = msi_alloc_zero( sizeof *sv + count*sizeof (UINT) ); + sv = msi_alloc_zero( FIELD_OFFSET( MSISELECTVIEW, cols[count] )); if( !sv ) return ERROR_FUNCTION_FAILED;

1 0

Hans Leidekker : msvcr100: Add a version resource.
by Alexandre Julliard 12 Nov '12

12 Nov '12

Module: wine Branch: master Commit: e6738c20859e8f07920fccb5512a0daa7374c434 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e6738c20859e8f07920fccb55… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Nov 12 11:46:36 2012 +0100 msvcr100: Add a version resource. --- dlls/msvcr100/Makefile.in | 2 ++ dlls/msvcr100/rsrc.rc | 24 ++++++++++++++++++++++++ 2 files changed, 26 insertions(+), 0 deletions(-) diff --git a/dlls/msvcr100/Makefile.in b/dlls/msvcr100/Makefile.in index 22a2a5b..7714289 100644 --- a/dlls/msvcr100/Makefile.in +++ b/dlls/msvcr100/Makefile.in @@ -6,4 +6,6 @@ EXTRAINCL = -I$(top_srcdir)/include/msvcrt C_SRCS = \ msvcr100.c +RC_SRCS = rsrc.rc + @MAKE_DLL_RULES@ diff --git a/dlls/msvcr100/rsrc.rc b/dlls/msvcr100/rsrc.rc new file mode 100644 index 0000000..26eda98 --- /dev/null +++ b/dlls/msvcr100/rsrc.rc @@ -0,0 +1,24 @@ +/* + * Copyright 2012 Hans Leidekker for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#define WINE_FILEDESCRIPTION_STR "Wine CRT library" +#define WINE_FILENAME_STR "msvcr100.dll" +#define WINE_FILEVERSION 10,0,30319,0 +#define WINE_FILEVERSION_STR "10.0.30319.0" + +#include "wine/wine_common_ver.rc"

1 0

Hans Leidekker : rpcrt4: Implement RpcMgmtIsServerListening.
by Alexandre Julliard 12 Nov '12

12 Nov '12

Module: wine Branch: master Commit: a5750a1fdf05960d03ad3fc30dd3e3a1c70408bb URL: http://source.winehq.org/git/wine.git/?a=commit;h=a5750a1fdf05960d03ad3fc30… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Nov 12 11:46:53 2012 +0100 rpcrt4: Implement RpcMgmtIsServerListening. --- dlls/rpcrt4/rpc_server.c | 10 ++++++++-- 1 files changed, 8 insertions(+), 2 deletions(-) diff --git a/dlls/rpcrt4/rpc_server.c b/dlls/rpcrt4/rpc_server.c index 91b7707..4789d8a 100644 --- a/dlls/rpcrt4/rpc_server.c +++ b/dlls/rpcrt4/rpc_server.c @@ -1663,8 +1663,14 @@ RPC_STATUS WINAPI RpcMgmtEpEltInqBegin(RPC_BINDING_HANDLE Binding, ULONG Inquiry */ RPC_STATUS WINAPI RpcMgmtIsServerListening(RPC_BINDING_HANDLE Binding) { - FIXME("(%p): stub\n", Binding); - return RPC_S_INVALID_BINDING; + RPC_STATUS status = RPC_S_NOT_LISTENING; + + TRACE("(%p)\n", Binding); + + EnterCriticalSection(&listen_cs); + if (manual_listen_count > 0) status = RPC_S_OK; + LeaveCriticalSection(&listen_cs); + return status; } /***********************************************************************

1 0

Nikolay Sivov : scrrun: Use heap helpers for dictionary.
by Alexandre Julliard 12 Nov '12

12 Nov '12

Module: wine Branch: master Commit: 5908cda9a514f865fff62a351d6337934b0b52f4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5908cda9a514f865fff62a351… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Nov 10 09:47:17 2012 -0500 scrrun: Use heap helpers for dictionary. --- dlls/scrrun/dictionary.c | 6 ++---- 1 files changed, 2 insertions(+), 4 deletions(-) diff --git a/dlls/scrrun/dictionary.c b/dlls/scrrun/dictionary.c index b75d23c..4fcaedd 100644 --- a/dlls/scrrun/dictionary.c +++ b/dlls/scrrun/dictionary.c @@ -95,9 +95,7 @@ static ULONG WINAPI dictionary_Release(IDictionary *iface) ref = InterlockedDecrement(&This->ref); if(ref == 0) - { - HeapFree(GetProcessHeap(), 0, This); - } + heap_free(This); return ref; } @@ -333,7 +331,7 @@ HRESULT WINAPI Dictionary_CreateInstance(IClassFactory *factory,IUnknown *outer, *obj = NULL; - This = HeapAlloc(GetProcessHeap(), 0, sizeof(*This)); + This = heap_alloc(sizeof(*This)); if(!This) return E_OUTOFMEMORY; This->IDictionary_iface.lpVtbl = &dictionary_vtbl;

1 0