July 2013 - Wine-Commits - list.winehq.org

André Hentschel : usbd.sys: Implement USBD_ParseConfigurationDescriptor using its Ex version.
by Alexandre Julliard July 29, 2013

July 29, 2013

Module: wine Branch: master Commit: ca7ba7053f9a9f79de5a19387073a40d01371e78 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ca7ba7053f9a9f79de5a19387… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun Jul 28 19:41:51 2013 +0200 usbd.sys: Implement USBD_ParseConfigurationDescriptor using its Ex version. --- dlls/usbd.sys/usbd.c | 9 +++++++++ dlls/usbd.sys/usbd.sys.spec | 2 +- include/ddk/usbdlib.h | 1 + 3 files changed, 11 insertions(+), 1 deletions(-) diff --git a/dlls/usbd.sys/usbd.c b/dlls/usbd.sys/usbd.c index ff0362c..fbec22e 100644 --- a/dlls/usbd.sys/usbd.c +++ b/dlls/usbd.sys/usbd.c @@ -198,6 +198,15 @@ PUSB_INTERFACE_DESCRIPTOR WINAPI USBD_ParseConfigurationDescriptorEx( return NULL; } +PUSB_INTERFACE_DESCRIPTOR WINAPI USBD_ParseConfigurationDescriptor( + PUSB_CONFIGURATION_DESCRIPTOR ConfigurationDescriptor, UCHAR InterfaceNumber, + UCHAR AlternateSetting ) +{ + TRACE( "(%p, %u, %u)\n", ConfigurationDescriptor, InterfaceNumber, AlternateSetting ); + return USBD_ParseConfigurationDescriptorEx( ConfigurationDescriptor, ConfigurationDescriptor, + InterfaceNumber, AlternateSetting, -1, -1, -1 ); +} + PUSB_COMMON_DESCRIPTOR WINAPI USBD_ParseDescriptors( PVOID DescriptorBuffer, ULONG TotalLength, diff --git a/dlls/usbd.sys/usbd.sys.spec b/dlls/usbd.sys/usbd.sys.spec index 15cf352..75ce083 100644 --- a/dlls/usbd.sys/usbd.sys.spec +++ b/dlls/usbd.sys/usbd.sys.spec @@ -21,7 +21,7 @@ @ stdcall USBD_GetUSBDIVersion(ptr) @ stub USBD_InitializeDevice @ stub USBD_MakePdoName -@ stub USBD_ParseConfigurationDescriptor +@ stdcall USBD_ParseConfigurationDescriptor(ptr long long) @ stdcall _USBD_ParseConfigurationDescriptorEx(a)28(ptr ptr long long long long long) USBD_ParseConfigurationDescriptorEx @ stdcall _USBD_ParseDescriptors(a)16(ptr long ptr long) USBD_ParseDescriptors @ stub USBD_QueryBusTime diff --git a/include/ddk/usbdlib.h b/include/ddk/usbdlib.h index 86080ce..188744f 100644 --- a/include/ddk/usbdlib.h +++ b/include/ddk/usbdlib.h @@ -30,6 +30,7 @@ PURB WINAPI USBD_CreateConfigurationRequestEx(PUSB_CONFIGURATION_DESCRIPTOR,PUSB ULONG WINAPI USBD_GetInterfaceLength(PUSB_INTERFACE_DESCRIPTOR,PUCHAR); VOID WINAPI USBD_GetUSBDIVersion(PUSBD_VERSION_INFORMATION); PUSB_COMMON_DESCRIPTOR WINAPI USBD_ParseDescriptors(PVOID,ULONG,PVOID,LONG); +PUSB_INTERFACE_DESCRIPTOR WINAPI USBD_ParseConfigurationDescriptor(PUSB_CONFIGURATION_DESCRIPTOR,UCHAR,UCHAR); PUSB_INTERFACE_DESCRIPTOR WINAPI USBD_ParseConfigurationDescriptorEx(PUSB_CONFIGURATION_DESCRIPTOR,PVOID,LONG,LONG,LONG,LONG,LONG); USBD_STATUS WINAPI USBD_ValidateConfigurationDescriptor(PUSB_CONFIGURATION_DESCRIPTOR,ULONG,USHORT,PUCHAR*,ULONG);

1 0

Rico Schüller : d3dx9/tests: Add ID3DXConstantTable struct struct test.
by Alexandre Julliard July 29, 2013

July 29, 2013

Module: wine Branch: master Commit: c76f6085b25a87b73dae149430504f4f0aac22c5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c76f6085b25a87b73dae14943… Author: Rico Schüller <kgbricola(a)web.de> Date: Mon Jul 29 11:13:42 2013 +0200 d3dx9/tests: Add ID3DXConstantTable struct struct test. --- dlls/d3dx9_36/tests/shader.c | 350 ++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 350 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c76f6085b25a87b73dae1…

1 0

Piotr Caban : scrrun: Add IFileSystem3::GetAbsolutePathName implementation.
by Alexandre Julliard July 29, 2013

July 29, 2013

Module: wine Branch: master Commit: 1027c20cd7d5f6b180d904460f068933951ab98f URL: http://source.winehq.org/git/wine.git/?a=commit;h=1027c20cd7d5f6b180d904460… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Jul 25 15:13:13 2013 +0200 scrrun: Add IFileSystem3::GetAbsolutePathName implementation. --- dlls/scrrun/filesystem.c | 49 ++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 47 insertions(+), 2 deletions(-) diff --git a/dlls/scrrun/filesystem.c b/dlls/scrrun/filesystem.c index 8d0f5b1..53ace2a 100644 --- a/dlls/scrrun/filesystem.c +++ b/dlls/scrrun/filesystem.c @@ -862,9 +862,54 @@ static HRESULT WINAPI filesys_GetExtensionName(IFileSystem3 *iface, BSTR Path, static HRESULT WINAPI filesys_GetAbsolutePathName(IFileSystem3 *iface, BSTR Path, BSTR *pbstrResult) { - FIXME("%p %s %p\n", iface, debugstr_w(Path), pbstrResult); + static const WCHAR cur_path[] = {'.',0}; - return E_NOTIMPL; + WCHAR buf[MAX_PATH], ch; + const WCHAR *path; + DWORD i, beg, len, exp_len; + WIN32_FIND_DATAW fdata; + HANDLE fh; + + TRACE("%p %s %p\n", iface, debugstr_w(Path), pbstrResult); + + if(!pbstrResult) + return E_POINTER; + + if(!Path) + path = cur_path; + else + path = Path; + + len = GetFullPathNameW(path, MAX_PATH, buf, NULL); + if(!len) + return E_FAIL; + + buf[0] = toupperW(buf[0]); + if(len>3 && buf[len-1] == '\\') + buf[--len] = 0; + + for(beg=3, i=3; i<=len; i++) { + if(buf[i]!='\\' && buf[i]) + continue; + + ch = buf[i]; + buf[i] = 0; + fh = FindFirstFileW(buf, &fdata); + if(fh == INVALID_HANDLE_VALUE) + break; + + exp_len = strlenW(fdata.cFileName); + if(exp_len == i-beg) + memcpy(buf+beg, fdata.cFileName, exp_len*sizeof(WCHAR)); + FindClose(fh); + buf[i] = ch; + beg = i+1; + } + + *pbstrResult = SysAllocString(buf); + if(!*pbstrResult) + return E_OUTOFMEMORY; + return S_OK; } static HRESULT WINAPI filesys_GetTempName(IFileSystem3 *iface, BSTR *pbstrResult)

1 0

Piotr Caban : scrrun: Add IFileSystem3::GetFile implementation.
by Alexandre Julliard July 29, 2013

July 29, 2013

Module: wine Branch: master Commit: a29d77088ac2b07fb68d84646be2884f49e9df7a URL: http://source.winehq.org/git/wine.git/?a=commit;h=a29d77088ac2b07fb68d84646… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Jul 25 15:13:36 2013 +0200 scrrun: Add IFileSystem3::GetFile implementation. --- dlls/scrrun/filesystem.c | 334 +++++++++++++++++++++++++++++++++++++++++- dlls/scrrun/scrrun.c | 3 +- dlls/scrrun/scrrun_private.h | 1 + 3 files changed, 335 insertions(+), 3 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a29d77088ac2b07fb68d8…

1 0

Hans Leidekker : mscms: Port to liblcms2.
by Alexandre Julliard July 29, 2013

July 29, 2013

Module: wine Branch: master Commit: d40c91262b91f72c44151a1481a77acfe71ba044 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d40c91262b91f72c44151a148… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Jul 26 13:02:40 2013 +0200 mscms: Port to liblcms2. --- configure | 70 ++++++++-------- configure.ac | 20 +++--- dlls/mscms/Makefile.in | 4 +- dlls/mscms/handle.c | 14 ++-- dlls/mscms/icc.c | 93 +++++++++++++--------- dlls/mscms/mscms_main.c | 22 ++---- dlls/mscms/mscms_priv.h | 70 +++-------------- dlls/mscms/profile.c | 184 ++++++++++++++++--------------------------- dlls/mscms/tests/profile.c | 21 ++--- dlls/mscms/transform.c | 28 ++++---- include/config.h.in | 9 +-- 11 files changed, 220 insertions(+), 315 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d40c91262b91f72c44151…

1 0

Hans Leidekker : mscms: Get rid of the MSCMS_ prefix.
by Alexandre Julliard July 29, 2013

July 29, 2013

Module: wine Branch: master Commit: 45191c542cb46cf57f8ac20cc3d43819e9f17993 URL: http://source.winehq.org/git/wine.git/?a=commit;h=45191c542cb46cf57f8ac20cc… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Jul 26 13:03:15 2013 +0200 mscms: Get rid of the MSCMS_ prefix. --- dlls/mscms/handle.c | 48 ++++++++++++++++++------------------ dlls/mscms/mscms_priv.h | 2 +- dlls/mscms/profile.c | 60 ++++++++++++++++++++++------------------------ dlls/mscms/stub.c | 10 ++++---- dlls/mscms/transform.c | 4 +- 5 files changed, 61 insertions(+), 63 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=45191c542cb46cf57f8ac…

1 0

Bruno Jesus : ws2_32/tests: Add more tests for WSASocket().
by Alexandre Julliard July 29, 2013

July 29, 2013

Module: wine Branch: master Commit: a9f3c1974d7f2ff8a4fd476a9197a146e8de0dca URL: http://source.winehq.org/git/wine.git/?a=commit;h=a9f3c1974d7f2ff8a4fd476a9… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Sun Jul 28 02:25:04 2013 -0300 ws2_32/tests: Add more tests for WSASocket(). --- dlls/ws2_32/tests/sock.c | 116 ++++++++++++++++++++++++++++++++++++++++++--- 1 files changed, 108 insertions(+), 8 deletions(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 5a76a7a..fce0b99 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -1665,17 +1665,49 @@ static void test_WSASocket(void) { SOCKET sock = INVALID_SOCKET; WSAPROTOCOL_INFOA *pi; - int providers[] = {6, 0}; - int ret, err; + int wsaproviders[] = {IPPROTO_TCP, IPPROTO_IP}; + int autoprotocols[] = {IPPROTO_TCP, IPPROTO_UDP}; + int items, err, size, socktype, i, j; UINT pi_size; + SetLastError(0xdeadbeef); + ok(WSASocketA(0, 0, 0, NULL, 0, 0) == INVALID_SOCKET, "WSASocketA should have failed\n"); + err = WSAGetLastError(); +todo_wine + ok(err == WSAEINVAL, "Expected 10022, received %d\n", err); + + sock = WSASocketA(AF_INET, 0, 0, NULL, 0, 0); +todo_wine + ok(sock != INVALID_SOCKET, "WSASocketA should have succeeded\n"); + closesocket(sock); + + sock = WSASocketA(AF_INET, SOCK_STREAM, 0, NULL, 0, 0); + ok(sock != INVALID_SOCKET, "WSASocketA should have succeeded\n"); + closesocket(sock); + + sock = WSASocketA(AF_INET, 0, IPPROTO_TCP, NULL, 0, 0); +todo_wine + ok(sock != INVALID_SOCKET, "WSASocketA should have succeeded\n"); + closesocket(sock); + + SetLastError(0xdeadbeef); + ok(WSASocketA(0, SOCK_STREAM, 0, NULL, 0, 0) == INVALID_SOCKET, "WSASocketA should have failed\n"); + err = WSAGetLastError(); +todo_wine + ok(err == WSAEINVAL, "Expected 10022, received %d\n", err); + + sock = WSASocketA(0, 0, IPPROTO_TCP, NULL, 0, 0); +todo_wine + ok(sock != INVALID_SOCKET, "WSASocketA should have succeeded\n"); + closesocket(sock); + /* Set pi_size explicitly to a value below 2*sizeof(WSAPROTOCOL_INFOA) * to avoid a crash on win98. */ pi_size = 0; - ret = WSAEnumProtocolsA(providers, NULL, &pi_size); - ok(ret == SOCKET_ERROR, "WSAEnumProtocolsA({6,0}, NULL, 0) returned %d\n", - ret); + items = WSAEnumProtocolsA(wsaproviders, NULL, &pi_size); + ok(items == SOCKET_ERROR, "WSAEnumProtocolsA({6,0}, NULL, 0) returned %d\n", + items); err = WSAGetLastError(); ok(err == WSAENOBUFS, "WSAEnumProtocolsA error is %d, not WSAENOBUFS(%d)\n", err, WSAENOBUFS); @@ -1687,11 +1719,11 @@ static void test_WSASocket(void) return; } - ret = WSAEnumProtocolsA(providers, pi, &pi_size); - ok(ret != SOCKET_ERROR, "WSAEnumProtocolsA failed, last error is %d\n", + items = WSAEnumProtocolsA(wsaproviders, pi, &pi_size); + ok(items != SOCKET_ERROR, "WSAEnumProtocolsA failed, last error is %d\n", WSAGetLastError()); - if (ret == 0) { + if (items == 0) { skip("No protocols enumerated.\n"); HeapFree(GetProcessHeap(), 0, pi); return; @@ -1703,6 +1735,74 @@ static void test_WSASocket(void) WSAGetLastError()); closesocket(sock); + + HeapFree(GetProcessHeap(), 0, pi); + + pi_size = 0; + items = WSAEnumProtocolsA(NULL, NULL, &pi_size); + ok(items == SOCKET_ERROR, "WSAEnumProtocolsA(NULL, NULL, 0) returned %d\n", + items); + err = WSAGetLastError(); + ok(err == WSAENOBUFS, "WSAEnumProtocolsA error is %d, not WSAENOBUFS(%d)\n", + err, WSAENOBUFS); + + pi = HeapAlloc(GetProcessHeap(), 0, pi_size); + ok(pi != NULL, "Failed to allocate memory\n"); + if (pi == NULL) { + skip("Can't continue without memory.\n"); + return; + } + + items = WSAEnumProtocolsA(NULL, pi, &pi_size); + ok(items != SOCKET_ERROR, "WSAEnumProtocolsA failed, last error is %d\n", + WSAGetLastError()); + + /* when no protocol is specified the first socket type from WSAEnumProtocols is returned */ + sock = WSASocketA(AF_INET, 0, 0, NULL, 0, 0); +todo_wine + ok(sock != INVALID_SOCKET, "Failed to create socket: %d\n", + WSAGetLastError()); + +todo_wine { + size = sizeof(socktype); + socktype = 0xdead; + ok(!getsockopt(sock, SOL_SOCKET, SO_TYPE, (char *) &socktype, &size), "getsockopt failed with %d\n", + WSAGetLastError()); + ok(socktype == pi[0].iSocketType, "Wrong socket type, expected %d received %d\n", + pi[0].iSocketType, socktype); +} + closesocket(sock); + + /* when the protocol is specified the first socket type that matches the protocol is returned */ + for (i = 0; i < sizeof(autoprotocols) / sizeof(autoprotocols[0]); i++) + { + sock = WSASocketA(0, 0, autoprotocols[i], NULL, 0, 0); +todo_wine + ok(sock != INVALID_SOCKET, "Failed to create socket for protocol %d, received %d\n", + autoprotocols[i], WSAGetLastError()); + + size = sizeof(socktype); + socktype = 0xdead; +todo_wine + ok(!getsockopt(sock, SOL_SOCKET, SO_TYPE, (char *) &socktype, &size), "getsockopt failed with %d\n", + WSAGetLastError()); + + for (j = 0; j < items; j++) + { + if (pi[j].iProtocol == autoprotocols[i]) + { +todo_wine + ok(socktype == pi[j].iSocketType, "Wrong socket type, expected %d received %d\n", + pi[j].iSocketType, socktype); + break; + } + } +todo_wine + ok(socktype != 0xdead, "Protocol %d not found in WSAEnumProtocols\n", autoprotocols[i]); + + closesocket(sock); + } + HeapFree(GetProcessHeap(), 0, pi); }

1 0

Nikolay Sivov : msxml3: Implement output indentation for writer.
by Alexandre Julliard July 29, 2013

July 29, 2013

Module: wine Branch: master Commit: b3d85d41d99fbe9518db35761c7e7560d6cdd61b URL: http://source.winehq.org/git/wine.git/?a=commit;h=b3d85d41d99fbe9518db35761… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Jul 27 18:27:27 2013 +0400 msxml3: Implement output indentation for writer. --- dlls/msxml3/mxwriter.c | 62 +++++++++++++++++++++++++++++++++++++++-- dlls/msxml3/tests/saxreader.c | 62 +++++++++++++++++++++++++++++++++++++++- 2 files changed, 119 insertions(+), 5 deletions(-) diff --git a/dlls/msxml3/mxwriter.c b/dlls/msxml3/mxwriter.c index d62e6a3..558582d 100644 --- a/dlls/msxml3/mxwriter.c +++ b/dlls/msxml3/mxwriter.c @@ -1,7 +1,7 @@ /* * MXWriter implementation * - * Copyright 2011-2012 Nikolay Sivov for CodeWeavers + * Copyright 2011-2013 Nikolay Sivov for CodeWeavers * Copyright 2011 Thomas Mullaly * * This library is free software; you can redistribute it and/or @@ -43,6 +43,7 @@ static const WCHAR emptyW[] = {0}; static const WCHAR spaceW[] = {' '}; static const WCHAR quotW[] = {'\"'}; static const WCHAR closetagW[] = {'>','\r','\n'}; +static const WCHAR crlfW[] = {'\r','\n'}; /* should be ordered as encoding names are sorted */ typedef enum @@ -146,6 +147,10 @@ typedef struct BOOL prop_changed; BOOL cdata; + BOOL text; /* last node was text node, so we shouldn't indent next node */ + BOOL newline; /* newline was already added as a part of previous call */ + UINT indent; /* indentation level for next node */ + BSTR version; BSTR encoding; /* exact property value */ @@ -454,14 +459,13 @@ static WCHAR *get_escaped_string(const WCHAR *str, escape_mode mode, int *len) return ret; } -static void write_prolog_buffer(const mxwriter *This) +static void write_prolog_buffer(mxwriter *This) { static const WCHAR versionW[] = {'<','?','x','m','l',' ','v','e','r','s','i','o','n','='}; static const WCHAR encodingW[] = {' ','e','n','c','o','d','i','n','g','=','\"'}; static const WCHAR standaloneW[] = {' ','s','t','a','n','d','a','l','o','n','e','=','\"'}; static const WCHAR yesW[] = {'y','e','s','\"','?','>'}; static const WCHAR noW[] = {'n','o','\"','?','>'}; - static const WCHAR crlfW[] = {'\r','\n'}; /* version */ write_output_buffer(This->buffer, versionW, sizeof(versionW)/sizeof(WCHAR)); @@ -483,6 +487,7 @@ static void write_prolog_buffer(const mxwriter *This) write_output_buffer(This->buffer, noW, sizeof(noW)/sizeof(WCHAR)); write_output_buffer(This->buffer, crlfW, sizeof(crlfW)/sizeof(WCHAR)); + This->newline = TRUE; } /* Attempts to the write data from the mxwriter's buffer to @@ -536,6 +541,41 @@ static void close_element_starttag(const mxwriter *This) write_output_buffer(This->buffer, gtW, 1); } +static void write_node_indent(mxwriter *This) +{ + static const WCHAR tabW[] = {'\t'}; + int indent = This->indent; + + if (!This->props[MXWriter_Indent] || This->text) + { + This->text = FALSE; + return; + } + + /* This is to workaround PI output logic that always puts newline chars, + document prolog PI does that too. */ + if (!This->newline) + write_output_buffer(This->buffer, crlfW, sizeof(crlfW)/sizeof(WCHAR)); + while (indent--) + write_output_buffer(This->buffer, tabW, 1); + + This->newline = FALSE; + This->text = FALSE; +} + +static inline void writer_inc_indent(mxwriter *This) +{ + This->indent++; +} + +static inline void writer_dec_indent(mxwriter *This) +{ + if (This->indent) This->indent--; + /* depth is decreased only when element is closed, meaning it's not a text node + at this point */ + This->text = FALSE; +} + static void set_element_name(mxwriter *This, const WCHAR *name, int len) { SysFreeString(This->element); @@ -1082,8 +1122,11 @@ static HRESULT WINAPI SAXContentHandler_startElement( set_element_name(This, QName ? QName : emptyW, QName ? nQName : 0); + write_node_indent(This); + write_output_buffer(This->buffer, ltW, 1); write_output_buffer(This->buffer, QName, nQName); + writer_inc_indent(This); if (attr) { @@ -1147,6 +1190,8 @@ static HRESULT WINAPI SAXContentHandler_endElement( (nQName == -1 && This->class_version == MSXML6)) return E_INVALIDARG; + writer_dec_indent(This); + if (This->element) { static const WCHAR closeW[] = {'/','>'}; @@ -1157,6 +1202,7 @@ static HRESULT WINAPI SAXContentHandler_endElement( static const WCHAR closetagW[] = {'<','/'}; static const WCHAR gtW[] = {'>'}; + write_node_indent(This); write_output_buffer(This->buffer, closetagW, 2); write_output_buffer(This->buffer, QName, nQName); write_output_buffer(This->buffer, gtW, 1); @@ -1181,6 +1227,9 @@ static HRESULT WINAPI SAXContentHandler_characters( close_element_starttag(This); set_element_name(This, NULL, 0); + if (!This->cdata) + This->text = TRUE; + if (nchars) { if (This->cdata || This->props[MXWriter_DisableEscaping] == VARIANT_TRUE) @@ -1230,6 +1279,7 @@ static HRESULT WINAPI SAXContentHandler_processingInstruction( if (!target) return E_INVALIDARG; + write_node_indent(This); write_output_buffer(This->buffer, openpiW, sizeof(openpiW)/sizeof(WCHAR)); if (*target) @@ -1242,6 +1292,7 @@ static HRESULT WINAPI SAXContentHandler_processingInstruction( } write_output_buffer(This->buffer, closepiW, sizeof(closepiW)/sizeof(WCHAR)); + This->newline = TRUE; return S_OK; } @@ -1381,6 +1432,7 @@ static HRESULT WINAPI SAXLexicalHandler_startCDATA(ISAXLexicalHandler *iface) TRACE("(%p)\n", This); + write_node_indent(This); write_output_buffer(This->buffer, scdataW, sizeof(scdataW)/sizeof(WCHAR)); This->cdata = TRUE; @@ -1411,6 +1463,7 @@ static HRESULT WINAPI SAXLexicalHandler_comment(ISAXLexicalHandler *iface, const if (!chars) return E_INVALIDARG; close_element_starttag(This); + write_node_indent(This); write_output_buffer(This->buffer, copenW, sizeof(copenW)/sizeof(WCHAR)); if (nchars) @@ -1609,6 +1662,9 @@ HRESULT MXWriter_create(MSXML_VERSION version, IUnknown *outer, void **ppObj) This->element = NULL; This->cdata = FALSE; + This->indent = 0; + This->text = FALSE; + This->newline = FALSE; This->dest = NULL; This->dest_written = 0; diff --git a/dlls/msxml3/tests/saxreader.c b/dlls/msxml3/tests/saxreader.c index dec62bb..1eff7f6 100644 --- a/dlls/msxml3/tests/saxreader.c +++ b/dlls/msxml3/tests/saxreader.c @@ -35,6 +35,8 @@ #include "wine/test.h" +static const WCHAR emptyW[] = {0}; + #define EXPECT_HR(hr,hr_exp) \ ok(hr == hr_exp, "got 0x%08x, expected 0x%08x\n", hr, hr_exp) @@ -2890,7 +2892,6 @@ static void test_mxwriter_default_properties(const struct mxwriter_props_t *tabl static void test_mxwriter_properties(void) { static const WCHAR utf16W[] = {'U','T','F','-','1','6',0}; - static const WCHAR emptyW[] = {0}; static const WCHAR testW[] = {'t','e','s','t',0}; ISAXContentHandler *content; IMXWriter *writer; @@ -3041,7 +3042,6 @@ static void test_mxwriter_properties(void) static void test_mxwriter_flush(void) { - static const WCHAR emptyW[] = {0}; ISAXContentHandler *content; IMXWriter *writer; LARGE_INTEGER pos; @@ -5245,6 +5245,63 @@ static void test_mxattr_localname(void) } } +static void test_mxwriter_indent(void) +{ + ISAXContentHandler *content; + IMXWriter *writer; + VARIANT dest; + HRESULT hr; + + hr = CoCreateInstance(&CLSID_MXXMLWriter, NULL, CLSCTX_INPROC_SERVER, &IID_IMXWriter, (void**)&writer); + ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); + + hr = IMXWriter_put_indent(writer, VARIANT_TRUE); + ok(hr == S_OK, "got %08x\n", hr); + + hr = IMXWriter_QueryInterface(writer, &IID_ISAXContentHandler, (void**)&content); + ok(hr == S_OK, "got %08x\n", hr); + + hr = ISAXContentHandler_startDocument(content); + ok(hr == S_OK, "got %08x\n", hr); + + hr = ISAXContentHandler_startElement(content, emptyW, 0, emptyW, 0, _bstr_("a"), -1, NULL); + ok(hr == S_OK, "got %08x\n", hr); + + hr = ISAXContentHandler_characters(content, _bstr_(""), 0); + ok(hr == S_OK, "got %08x\n", hr); + + hr = ISAXContentHandler_startElement(content, emptyW, 0, emptyW, 0, _bstr_("b"), -1, NULL); + ok(hr == S_OK, "got %08x\n", hr); + + hr = ISAXContentHandler_startElement(content, emptyW, 0, emptyW, 0, _bstr_("c"), -1, NULL); + ok(hr == S_OK, "got %08x\n", hr); + + hr = ISAXContentHandler_endElement(content, emptyW, 0, emptyW, 0, _bstr_("c"), -1); + ok(hr == S_OK, "got %08x\n", hr); + + hr = ISAXContentHandler_endElement(content, emptyW, 0, emptyW, 0, _bstr_("b"), -1); + ok(hr == S_OK, "got %08x\n", hr); + + hr = ISAXContentHandler_endElement(content, emptyW, 0, emptyW, 0, _bstr_("a"), -1); + ok(hr == S_OK, "got %08x\n", hr); + + hr = ISAXContentHandler_endDocument(content); + ok(hr == S_OK, "got %08x\n", hr); + + V_VT(&dest) = VT_EMPTY; + hr = IMXWriter_get_output(writer, &dest); + ok(hr == S_OK, "got %08x\n", hr); + ok(V_VT(&dest) == VT_BSTR, "got %d\n", V_VT(&dest)); + ok(!lstrcmpW(_bstr_("<?xml version=\"1.0\" encoding=\"UTF-16\" standalone=\"no\"?>\r\n<a><b>\r\n\t\t<c/>\r\n\t</b>\r\n</a>"), V_BSTR(&dest)), + "got wrong content %s\n", wine_dbgstr_w(V_BSTR(&dest))); + VariantClear(&dest); + + ISAXContentHandler_Release(content); + IMXWriter_Release(writer); + + free_bstrs(); +} + START_TEST(saxreader) { ISAXXMLReader *reader; @@ -5292,6 +5349,7 @@ START_TEST(saxreader) test_mxwriter_stream(); test_mxwriter_encoding(); test_mxwriter_dispex(); + test_mxwriter_indent(); } else win_skip("MXXMLWriter not supported\n");

1 0

Nikolay Sivov : msxml3: Support for external entities in writer.
by Alexandre Julliard July 29, 2013

July 29, 2013

Module: wine Branch: master Commit: 5dc468f025b46a59fc24ea4d94e7f0d6ee5d7565 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5dc468f025b46a59fc24ea4d9… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Jul 27 20:37:46 2013 +0400 msxml3: Support for external entities in writer. --- dlls/msxml3/mxwriter.c | 35 ++++++++++++++++++++++++++++++++--- dlls/msxml3/tests/saxreader.c | 22 ++++++++++++++++++++++ 2 files changed, 54 insertions(+), 3 deletions(-) diff --git a/dlls/msxml3/mxwriter.c b/dlls/msxml3/mxwriter.c index 558582d..3196374 100644 --- a/dlls/msxml3/mxwriter.c +++ b/dlls/msxml3/mxwriter.c @@ -44,6 +44,7 @@ static const WCHAR spaceW[] = {' '}; static const WCHAR quotW[] = {'\"'}; static const WCHAR closetagW[] = {'>','\r','\n'}; static const WCHAR crlfW[] = {'\r','\n'}; +static const WCHAR entityW[] = {'<','!','E','N','T','I','T','Y',' '}; /* should be ordered as encoding names are sorted */ typedef enum @@ -1576,7 +1577,6 @@ static HRESULT WINAPI SAXDeclHandler_internalEntityDecl(ISAXDeclHandler *iface, const WCHAR *name, int n_name, const WCHAR *value, int n_value) { mxwriter *This = impl_from_ISAXDeclHandler( iface ); - static const WCHAR entityW[] = {'<','!','E','N','T','I','T','Y',' '}; TRACE("(%p)->(%s:%d %s:%d)\n", This, debugstr_wn(name, n_name), n_name, debugstr_wn(value, n_value), n_value); @@ -1601,10 +1601,39 @@ static HRESULT WINAPI SAXDeclHandler_externalEntityDecl(ISAXDeclHandler *iface, const WCHAR *name, int n_name, const WCHAR *publicId, int n_publicId, const WCHAR *systemId, int n_systemId) { + static const WCHAR publicW[] = {'P','U','B','L','I','C',' '}; + static const WCHAR systemW[] = {'S','Y','S','T','E','M',' '}; mxwriter *This = impl_from_ISAXDeclHandler( iface ); - FIXME("(%p)->(%s:%d %s:%d %s:%d): stub\n", This, debugstr_wn(name, n_name), n_name, + + TRACE("(%p)->(%s:%d %s:%d %s:%d)\n", This, debugstr_wn(name, n_name), n_name, debugstr_wn(publicId, n_publicId), n_publicId, debugstr_wn(systemId, n_systemId), n_systemId); - return E_NOTIMPL; + + if (!name) return E_INVALIDARG; + if (publicId && !systemId) return E_INVALIDARG; + if (!publicId && !systemId) return E_INVALIDARG; + + write_output_buffer(This->buffer, entityW, sizeof(entityW)/sizeof(WCHAR)); + if (n_name) { + write_output_buffer(This->buffer, name, n_name); + write_output_buffer(This->buffer, spaceW, sizeof(spaceW)/sizeof(WCHAR)); + } + + if (publicId) + { + write_output_buffer(This->buffer, publicW, sizeof(publicW)/sizeof(WCHAR)); + write_output_buffer_quoted(This->buffer, publicId, n_publicId); + write_output_buffer(This->buffer, spaceW, sizeof(spaceW)/sizeof(WCHAR)); + write_output_buffer_quoted(This->buffer, systemId, n_systemId); + } + else + { + write_output_buffer(This->buffer, systemW, sizeof(systemW)/sizeof(WCHAR)); + write_output_buffer_quoted(This->buffer, systemId, n_systemId); + } + + write_output_buffer(This->buffer, closetagW, sizeof(closetagW)/sizeof(WCHAR)); + + return S_OK; } static const ISAXDeclHandlerVtbl SAXDeclHandlerVtbl = { diff --git a/dlls/msxml3/tests/saxreader.c b/dlls/msxml3/tests/saxreader.c index 1eff7f6..5c7d080 100644 --- a/dlls/msxml3/tests/saxreader.c +++ b/dlls/msxml3/tests/saxreader.c @@ -4739,6 +4739,28 @@ static void test_mxwriter_dtd(void) ok(!lstrcmpW(_bstr_("<!ENTITY name \"value\">\r\n"), V_BSTR(&dest)), "got wrong content %s\n", wine_dbgstr_w(V_BSTR(&dest))); VariantClear(&dest); + /* external entities */ + V_VT(&dest) = VT_EMPTY; + hr = IMXWriter_put_output(writer, dest); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = ISAXDeclHandler_externalEntityDecl(decl, NULL, 0, NULL, 0, NULL, 0); + ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + + hr = ISAXDeclHandler_externalEntityDecl(decl, _bstr_("name"), -1, NULL, 0, NULL, 0); + ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + + hr = ISAXDeclHandler_externalEntityDecl(decl, _bstr_("name"), strlen("name"), _bstr_("pubid"), strlen("pubid"), + _bstr_("sysid"), strlen("sysid")); + ok(hr == S_OK, "got 0x%08x\n", hr); + + V_VT(&dest) = VT_EMPTY; + hr = IMXWriter_get_output(writer, &dest); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(V_VT(&dest) == VT_BSTR, "got %d\n", V_VT(&dest)); + ok(!lstrcmpW(_bstr_("<!ENTITY name PUBLIC \"pubid\" \"sysid\">\r\n"), V_BSTR(&dest)), "got wrong content %s\n", wine_dbgstr_w(V_BSTR(&dest))); + VariantClear(&dest); + ISAXContentHandler_Release(content); ISAXLexicalHandler_Release(lexical); ISAXDeclHandler_Release(decl);

1 0

Piotr Caban : oleaut32: Store typeinfo hreftype while saving typelib.
by Alexandre Julliard July 29, 2013

July 29, 2013

Module: wine Branch: master Commit: 00d132ee155f84e344193ce6f7e4401f2f041fc3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=00d132ee155f84e344193ce6f… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Sun Jul 28 10:05:39 2013 +0200 oleaut32: Store typeinfo hreftype while saving typelib. --- dlls/oleaut32/typelib.c | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index f566196..1041e1b 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -9409,10 +9409,14 @@ static DWORD WMSFT_compile_typeinfo(ITypeInfoImpl *info, INT16 index, WMSFT_TLBF else base->posguid = -1; base->flags = info->wTypeFlags; - if(info->Name) + if(info->Name) { base->NameOffset = info->Name->offset; - else + + ((unsigned char*)file->name_seg.data)[info->Name->offset+9] = 0x38; + *(HREFTYPE*)((unsigned char*)file->name_seg.data+info->Name->offset) = info->hreftype; + }else { base->NameOffset = -1; + } base->version = (info->wMinorVerNum << 16) | info->wMajorVerNum; if(info->DocString) base->docstringoffs = info->DocString->offset;

1 0