January 2010 - Wine-commits

Nikolay Sivov : msxml3: Implement IXMLDOMComment::deleteData() with tests.
by Alexandre Julliard 19 Jan '10

19 Jan '10

Module: wine Branch: master Commit: 5f72a8859076a4f1fd2781fc3fecef1b4549a7ac URL: http://source.winehq.org/git/wine.git/?a=commit;h=5f72a8859076a4f1fd2781fc3… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Tue Jan 19 04:48:41 2010 +0300 msxml3: Implement IXMLDOMComment::deleteData() with tests. --- dlls/msxml3/comment.c | 49 +++++++++++++++++++++++++++--- dlls/msxml3/tests/domdoc.c | 70 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 114 insertions(+), 5 deletions(-) diff --git a/dlls/msxml3/comment.c b/dlls/msxml3/comment.c index 09e3c8a..62132a7 100644 --- a/dlls/msxml3/comment.c +++ b/dlls/msxml3/comment.c @@ -541,7 +541,7 @@ static HRESULT WINAPI domcomment_substringData( LONG nLength = 0; HRESULT hr = S_FALSE; - TRACE("%p\n", iface); + TRACE("%p %d %d %p\n", iface, offset, count, p); if(!p) return E_INVALIDARG; @@ -551,7 +551,7 @@ static HRESULT WINAPI domcomment_substringData( return E_INVALIDARG; if(count == 0) - return hr; + return S_FALSE; pContent = xmlNodeGetContent(This->node.node); if(pContent) @@ -630,7 +630,7 @@ static HRESULT WINAPI domcomment_insertData( LONG nLength = 0, nLengthP = 0; xmlChar *str = NULL; - TRACE("%p\n", This); + TRACE("%p %d %p\n", iface, offset, p); /* If have a NULL or empty string, don't do anything. */ if(SysStringLen(p) == 0) @@ -692,8 +692,47 @@ static HRESULT WINAPI domcomment_deleteData( IXMLDOMComment *iface, LONG offset, LONG count) { - FIXME("\n"); - return E_NOTIMPL; + HRESULT hr; + LONG len = -1; + BSTR str; + + TRACE("%p %d %d\n", iface, offset, count); + + hr = IXMLDOMComment_get_length(iface, &len); + if(hr != S_OK) return hr; + + if((offset < 0) || (offset > len) || (count < 0)) + return E_INVALIDARG; + + if(len == 0) return S_OK; + + /* cutting start or end */ + if((offset == 0) || ((count + offset) >= len)) + { + if(offset == 0) + IXMLDOMComment_substringData(iface, count, len - count, &str); + else + IXMLDOMComment_substringData(iface, 0, offset, &str); + hr = IXMLDOMComment_put_data(iface, str); + } + else + /* cutting from the inside */ + { + BSTR str_end; + + IXMLDOMComment_substringData(iface, 0, offset, &str); + IXMLDOMComment_substringData(iface, offset + count, len - count, &str_end); + + hr = IXMLDOMComment_put_data(iface, str); + if(hr == S_OK) + hr = IXMLDOMComment_appendData(iface, str_end); + + SysFreeString(str_end); + } + + SysFreeString(str); + + return hr; } static HRESULT WINAPI domcomment_replaceData( diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index 49ffe1d..97cb772 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -2927,6 +2927,76 @@ static void test_xmlTypes(void) ok( !lstrcmpW( str, _bstr_("Begin This &is a Middle; test <>\\Append End") ), "incorrect get_text string\n"); SysFreeString(str); + /* delete data */ + /* invalid arguments */ + hr = IXMLDOMComment_deleteData(pComment, -1, 1); + ok(hr == E_INVALIDARG, "ret %08x\n", hr ); + + hr = IXMLDOMComment_deleteData(pComment, 0, 0); + ok(hr == S_OK, "ret %08x\n", hr ); + + hr = IXMLDOMComment_deleteData(pComment, 0, -1); + ok(hr == E_INVALIDARG, "ret %08x\n", hr ); + + hr = IXMLDOMComment_get_length(pComment, &len); + ok(hr == S_OK, "ret %08x\n", hr ); + ok(len == 43, "expected 43 got %d\n", len); + + hr = IXMLDOMComment_deleteData(pComment, len, 1); + ok(hr == S_OK, "ret %08x\n", hr ); + + hr = IXMLDOMComment_deleteData(pComment, len+1, 1); + ok(hr == E_INVALIDARG, "ret %08x\n", hr ); + + /* delete from start */ + hr = IXMLDOMComment_deleteData(pComment, 0, 5); + ok(hr == S_OK, "ret %08x\n", hr ); + + hr = IXMLDOMComment_get_length(pComment, &len); + ok(hr == S_OK, "ret %08x\n", hr ); + ok(len == 38, "expected 38 got %d\n", len); + + hr = IXMLDOMComment_get_text(pComment, &str); + ok(hr == S_OK, "ret %08x\n", hr ); + ok( !lstrcmpW( str, _bstr_(" This &is a Middle; test <>\\Append End") ), "incorrect get_text string\n"); + SysFreeString(str); + + /* delete from end */ + hr = IXMLDOMComment_deleteData(pComment, 35, 3); + ok(hr == S_OK, "ret %08x\n", hr ); + + hr = IXMLDOMComment_get_length(pComment, &len); + ok(hr == S_OK, "ret %08x\n", hr ); + ok(len == 35, "expected 35 got %d\n", len); + + hr = IXMLDOMComment_get_text(pComment, &str); + ok(hr == S_OK, "ret %08x\n", hr ); + ok( !lstrcmpW( str, _bstr_(" This &is a Middle; test <>\\Append ") ), "incorrect get_text string\n"); + SysFreeString(str); + + /* delete from inside */ + hr = IXMLDOMComment_deleteData(pComment, 1, 33); + ok(hr == S_OK, "ret %08x\n", hr ); + + hr = IXMLDOMComment_get_length(pComment, &len); + ok(hr == S_OK, "ret %08x\n", hr ); + ok(len == 2, "expected 2 got %d\n", len); + + hr = IXMLDOMComment_get_text(pComment, &str); + ok(hr == S_OK, "ret %08x\n", hr ); + ok( !lstrcmpW( str, _bstr_(" ") ), "incorrect get_text string\n"); + SysFreeString(str); + + /* delete whole data ... */ + hr = IXMLDOMComment_get_length(pComment, &len); + ok(hr == S_OK, "ret %08x\n", hr ); + + hr = IXMLDOMComment_deleteData(pComment, 0, len); + ok(hr == S_OK, "ret %08x\n", hr ); + /* ... and try again with empty string */ + hr = IXMLDOMComment_deleteData(pComment, 0, len); + ok(hr == S_OK, "ret %08x\n", hr ); + IXMLDOMComment_Release(pComment); }

1 0

Austin English : winecoreaudio.drv: Reorder includes to avoid OS X bug.
by Alexandre Julliard 19 Jan '10

19 Jan '10

Module: wine Branch: master Commit: 7222e8b665a85b88993bf37833d5f7ffc387729b URL: http://source.winehq.org/git/wine.git/?a=commit;h=7222e8b665a85b88993bf3783… Author: Austin English <austinenglish(a)gmail.com> Date: Mon Jan 18 23:54:56 2010 -0600 winecoreaudio.drv: Reorder includes to avoid OS X bug. --- dlls/winecoreaudio.drv/audio.c | 9 ++++++--- 1 files changed, 6 insertions(+), 3 deletions(-) diff --git a/dlls/winecoreaudio.drv/audio.c b/dlls/winecoreaudio.drv/audio.c index 8223dff..306a9c8 100644 --- a/dlls/winecoreaudio.drv/audio.c +++ b/dlls/winecoreaudio.drv/audio.c @@ -34,6 +34,12 @@ #include <fcntl.h> #include <assert.h> +#ifdef HAVE_COREAUDIO_COREAUDIO_H +#include <CoreAudio/CoreAudio.h> +#include <CoreFoundation/CoreFoundation.h> +#include <libkern/OSAtomic.h> +#endif + #include "windef.h" #include "winbase.h" #include "winnls.h" @@ -55,9 +61,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(wave); #if defined(HAVE_COREAUDIO_COREAUDIO_H) && defined(HAVE_AUDIOUNIT_AUDIOUNIT_H) -#include <CoreAudio/CoreAudio.h> -#include <CoreFoundation/CoreFoundation.h> -#include <libkern/OSAtomic.h> WINE_DECLARE_DEBUG_CHANNEL(coreaudio);

1 0

Rob Shearman : rpcrt4: Add structure definition for RPC AUTH3 packet and use the size of this on sending to fix authentication against native servers .
by Alexandre Julliard 19 Jan '10

19 Jan '10

Module: wine Branch: master Commit: c66972dfbabf5b16705716d595ee198b730f50f0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c66972dfbabf5b16705716d59… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Tue Jan 19 10:30:31 2010 +0000 rpcrt4: Add structure definition for RPC AUTH3 packet and use the size of this on sending to fix authentication against native servers. Also use the new size to validate incoming AUTH3 packets to be consistent with native. --- dlls/rpcrt4/rpc_defs.h | 8 ++++++++ dlls/rpcrt4/rpc_message.c | 6 +++--- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/dlls/rpcrt4/rpc_defs.h b/dlls/rpcrt4/rpc_defs.h index 8514967..434d396 100644 --- a/dlls/rpcrt4/rpc_defs.h +++ b/dlls/rpcrt4/rpc_defs.h @@ -139,6 +139,13 @@ typedef struct unsigned short num_data_items; } RpcPktHttpHdr; +/* AUTH3 packet */ +typedef struct +{ + RpcPktCommonHdr common; + unsigned int pad; /* ignored */ +} RpcPktAuth3Hdr; + /* Union representing all possible packet headers */ typedef union { @@ -150,6 +157,7 @@ typedef union RpcPktBindAckHdr bind_ack; RpcPktBindNAckHdr bind_nack; RpcPktHttpHdr http; + RpcPktAuth3Hdr auth3; } RpcPktHdr; typedef struct diff --git a/dlls/rpcrt4/rpc_message.c b/dlls/rpcrt4/rpc_message.c index 45a0398..0144f85 100644 --- a/dlls/rpcrt4/rpc_message.c +++ b/dlls/rpcrt4/rpc_message.c @@ -59,7 +59,7 @@ DWORD RPCRT4_GetHeaderSize(const RpcPktHdr *Header) sizeof(Header->request), 0, sizeof(Header->response), sizeof(Header->fault), 0, 0, 0, 0, 0, 0, 0, sizeof(Header->bind), sizeof(Header->bind_ack), sizeof(Header->bind_nack), - 0, 0, sizeof(Header->common), 0, 0, 0, sizeof(Header->http) + 0, 0, sizeof(Header->auth3), 0, 0, 0, sizeof(Header->http) }; ULONG ret = 0; @@ -217,12 +217,12 @@ static RpcPktHdr *RPCRT4_BuildAuthHeader(ULONG DataRepresentation) RpcPktHdr *header; header = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, - sizeof(header->common)); + sizeof(header->auth3)); if (header == NULL) return NULL; RPCRT4_BuildCommonHeader(header, PKT_AUTH3, DataRepresentation); - header->common.frag_len = sizeof(header->common); + header->common.frag_len = sizeof(header->auth3); return header; }

1 0

Alexandre Julliard : winedump: Remove an unused flag.
by Alexandre Julliard 19 Jan '10

19 Jan '10

Module: wine Branch: master Commit: 4e640f8a2b0194fb5a04f602e23ad53df428ea5e URL: http://source.winehq.org/git/wine.git/?a=commit;h=4e640f8a2b0194fb5a04f602e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jan 19 13:06:19 2010 +0100 winedump: Remove an unused flag. --- tools/winedump/pe.c | 6 ++---- tools/winedump/winedump.h | 3 --- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/tools/winedump/pe.c b/tools/winedump/pe.c index 728253e..2c84bd5 100644 --- a/tools/winedump/pe.c +++ b/tools/winedump/pe.c @@ -1560,13 +1560,13 @@ static void do_grab_sym( void ) if (!pName) {printf("Can't grab functions' name table\n"); return;} pOrdl = RVA(exportDir->AddressOfNameOrdinals, exportDir->NumberOfNames * sizeof(WORD)); if (!pOrdl) {printf("Can't grab functions' ordinal table\n"); return;} + pFunc = RVA(exportDir->AddressOfFunctions, exportDir->NumberOfFunctions * sizeof(DWORD)); + if (!pFunc) {printf("Can't grab functions' address table\n"); return;} /* dll_close(); */ if (!(dll_symbols = malloc((exportDir->NumberOfFunctions + 1) * sizeof(dll_symbol)))) fatal ("Out of memory"); - if (exportDir->AddressOfFunctions != exportDir->NumberOfNames || exportDir->Base > 1) - globals.do_ordinals = 1; /* bit map of used funcs */ map = calloc(((exportDir->NumberOfFunctions + 31) & ~31) / 32, sizeof(DWORD)); @@ -1581,8 +1581,6 @@ static void do_grab_sym( void ) dll_symbols[j].ordinal = exportDir->Base + *pOrdl; assert(dll_symbols[j].symbol); } - pFunc = RVA(exportDir->AddressOfFunctions, exportDir->NumberOfFunctions * sizeof(DWORD)); - if (!pFunc) {printf("Can't grab functions' address table\n"); return;} for (i = 0; i < exportDir->NumberOfFunctions; i++) { diff --git a/tools/winedump/winedump.h b/tools/winedump/winedump.h index 1f49369..d7e4e1d 100644 --- a/tools/winedump/winedump.h +++ b/tools/winedump/winedump.h @@ -136,9 +136,6 @@ typedef struct __globals /* Option arguments: dump mode */ const char *dumpsect; /* -j */ - - /* internal options */ - int do_ordinals; } _globals; extern _globals globals;

1 0

Nikolay Sivov : include: Add IXmlReader interface definition.
by Alexandre Julliard 19 Jan '10

19 Jan '10

Module: wine Branch: master Commit: ea762fd2a420e53f89bd1d1f7a53f90d0fc5c7ed URL: http://source.winehq.org/git/wine.git/?a=commit;h=ea762fd2a420e53f89bd1d1f7… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Mon Jan 18 23:43:11 2010 +0300 include: Add IXmlReader interface definition. --- .gitignore | 1 + include/Makefile.in | 3 +- include/xmllite.idl | 82 +++++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 85 insertions(+), 1 deletions(-) diff --git a/.gitignore b/.gitignore index 7dd1f9d..f2a0bd8 100644 --- a/.gitignore +++ b/.gitignore @@ -212,6 +212,7 @@ include/wtypes.h include/wuapi.h include/xmldom.h include/xmldso.h +include/xmllite.h libs/wpp/ppl.yy.c libs/wpp/ppy.tab.c libs/wpp/ppy.tab.h diff --git a/include/Makefile.in b/include/Makefile.in index f957a7b..0c01cfd 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -96,7 +96,8 @@ PUBLIC_IDL_H_SRCS = \ wtypes.idl \ wuapi.idl \ xmldom.idl \ - xmldso.idl + xmldso.idl \ + xmllite.idl IDL_TLB_SRCS = \ stdole2.idl diff --git a/include/xmllite.idl b/include/xmllite.idl new file mode 100644 index 0000000..9ba429f --- /dev/null +++ b/include/xmllite.idl @@ -0,0 +1,82 @@ +/* + * Copyright (C) 2010 Nikolay Sivov + * + * 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 + */ + +import "unknwn.idl"; +import "objidl.idl"; +import "oaidl.idl"; + +typedef enum XmlNodeType { + XmlNodeType_None = 0, + XmlNodeType_Element = 1, + XmlNodeType_Attribute = 2, + XmlNodeType_Text = 3, + XmlNodeType_CDATA = 4, + XmlNodeType_ProcessingInstruction = 7, + XmlNodeType_Comment = 8, + XmlNodeType_DocumentType = 10, + XmlNodeType_Whitespace = 13, + XmlNodeType_EndElement = 15, + XmlNodeType_XmlDeclaration = 17, + _XmlNodeType_Last = 17 +} XmlNodeType; + +/* IXmlReader */ +[ + local, + object, + uuid(7279fc81-709d-4095-b63d-69fe4b0d9030), + pointer_default(unique) +] +interface IXmlReader : IUnknown +{ + HRESULT SetInput( [in] IUnknown *input); + HRESULT GetProperty( [in] UINT property, [out] LONG_PTR *value); + HRESULT SetProperty( [in] UINT property, [in] LONG_PTR value); + HRESULT Read( [out] XmlNodeType *node_type); + HRESULT GetNodeType( [out] XmlNodeType *node_type); + HRESULT MoveToFirstAttribute(void); + HRESULT MoveToNextAttribute(void); + HRESULT MoveToAttributeByName( [in] LPCWSTR local_name, + [in] LPCWSTR namespaceUri); + HRESULT MoveToElement(void); + HRESULT GetQualifiedName( [out] LPCWSTR *qualifiedName, + [out] UINT *qualifiedName_length); + HRESULT GetNamespaceUri( [out] LPCWSTR *namespaceUri, + [out] UINT *nnamespaceUri_length); + HRESULT GetLocalName( [out] LPCWSTR *local_name, + [out] UINT *locale_name_length); + HRESULT GetPrefix( [out] LPCWSTR *prefix, + [out] UINT *prefix_length); + HRESULT GetValue( [out] LPCWSTR *value, + [out] UINT *value_length); + HRESULT ReadValueChunk( [out] WCHAR *buffer, + [in] UINT chunk_size, + [in,out] UINT *read); + HRESULT GetBaseUri( [out] LPCWSTR *baseUri, + [out] UINT *baseUri_length); + BOOL IsDefault(void); + BOOL IsEmptyElement(void); + HRESULT GetLineNumber( [out] UINT *lineNumber); + HRESULT GetLinePosition( [out] UINT *linePosition); + HRESULT GetAttributeCount( [out] UINT *attributeCount); + HRESULT GetDepth( [out] UINT *depth); + BOOL IsEOF(void); +} + +/* IXmlReader construction */ +cpp_quote("STDAPI CreateXmlReader(REFIID riid, void **ppvObject, IMalloc *pMalloc);")

1 0

Nikolay Sivov : xmllite/tests: Add basic test structure for IXmlReader.
by Alexandre Julliard 19 Jan '10

19 Jan '10

Module: wine Branch: master Commit: 80a546cad5ed23c3b430180ed4c943631b1d85a5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=80a546cad5ed23c3b430180ed… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Tue Jan 19 00:05:53 2010 +0300 xmllite/tests: Add basic test structure for IXmlReader. --- configure | 9 ++++ configure.ac | 1 + dlls/xmllite/Makefile.in | 1 + dlls/xmllite/reader.c | 38 +++++++++++++++ dlls/xmllite/tests/Makefile.in | 13 +++++ dlls/xmllite/tests/reader.c | 100 ++++++++++++++++++++++++++++++++++++++++ dlls/xmllite/xmllite.spec | 2 +- 7 files changed, 163 insertions(+), 1 deletions(-) diff --git a/configure b/configure index b92e426..018a237 100755 --- a/configure +++ b/configure @@ -17409,6 +17409,14 @@ dlls/xmllite/Makefile: dlls/xmllite/Makefile.in dlls/Makedll.rules" ac_config_files="$ac_config_files dlls/xmllite/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ + dlls/xmllite/tests/Makefile" +test "x$enable_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\ + xmllite/tests" +ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS +dlls/xmllite/tests/Makefile: dlls/xmllite/tests/Makefile.in dlls/Maketest.rules" +ac_config_files="$ac_config_files dlls/xmllite/tests/Makefile" + +ALL_MAKEFILES="$ALL_MAKEFILES \\ documentation/Makefile" test "x$enable_documentation" != xno && ALL_TOP_DIRS="$ALL_TOP_DIRS \\ documentation" @@ -19218,6 +19226,7 @@ do "dlls/xinput1_3/tests/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/xinput1_3/tests/Makefile" ;; "dlls/xinput9_1_0/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/xinput9_1_0/Makefile" ;; "dlls/xmllite/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/xmllite/Makefile" ;; + "dlls/xmllite/tests/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/xmllite/tests/Makefile" ;; "documentation/Makefile") CONFIG_FILES="$CONFIG_FILES documentation/Makefile" ;; "fonts/Makefile") CONFIG_FILES="$CONFIG_FILES fonts/Makefile" ;; "include/Makefile") CONFIG_FILES="$CONFIG_FILES include/Makefile" ;; diff --git a/configure.ac b/configure.ac index 943938b..01cf3a7 100644 --- a/configure.ac +++ b/configure.ac @@ -2587,6 +2587,7 @@ WINE_CONFIG_MAKEFILE([dlls/xinput1_3/Makefile],[dlls/Makedll.rules],[dlls],[ALL_ WINE_CONFIG_MAKEFILE([dlls/xinput1_3/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS],[enable_tests]) WINE_CONFIG_MAKEFILE([dlls/xinput9_1_0/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) WINE_CONFIG_MAKEFILE([dlls/xmllite/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) +WINE_CONFIG_MAKEFILE([dlls/xmllite/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS],[enable_tests]) WINE_CONFIG_MAKEFILE([documentation/Makefile],[Make.rules],[],[ALL_TOP_DIRS]) WINE_CONFIG_MAKEFILE([fonts/Makefile],[Make.rules],[],[ALL_TOP_DIRS]) WINE_CONFIG_MAKEFILE([include/Makefile],[Make.rules],[],[ALL_TOP_DIRS]) diff --git a/dlls/xmllite/Makefile.in b/dlls/xmllite/Makefile.in index 17d8dd1..9268f7d 100644 --- a/dlls/xmllite/Makefile.in +++ b/dlls/xmllite/Makefile.in @@ -6,6 +6,7 @@ MODULE = xmllite.dll IMPORTS = kernel32 C_SRCS = \ + reader.c \ xmllite_main.c @MAKE_DLL_RULES@ diff --git a/dlls/xmllite/reader.c b/dlls/xmllite/reader.c new file mode 100644 index 0000000..76097a5 --- /dev/null +++ b/dlls/xmllite/reader.c @@ -0,0 +1,38 @@ +/* + * IXmlReader implementation + * + * Copyright 2010 Nikolay Sivov + * + * 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 COBJMACROS + +#include <stdarg.h> +#include "windef.h" +#include "winbase.h" +#include "initguid.h" +#include "objbase.h" +#include "xmllite.h" + +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(xmllite); + +HRESULT WINAPI CreateXmlReader(REFIID riid, void **pObject, IMalloc *pMalloc) +{ + FIXME("(%s, %p, %p)\n", wine_dbgstr_guid(riid), pObject, pMalloc); + return E_NOTIMPL; +} diff --git a/dlls/xmllite/tests/Makefile.in b/dlls/xmllite/tests/Makefile.in new file mode 100644 index 0000000..250c493 --- /dev/null +++ b/dlls/xmllite/tests/Makefile.in @@ -0,0 +1,13 @@ +TOPSRCDIR = @top_srcdir@ +TOPOBJDIR = ../../.. +SRCDIR = @srcdir@ +VPATH = @srcdir@ +TESTDLL = xmllite.dll +IMPORTS = kernel32 ole32 + +CTESTS = \ + reader.c + +(a)MAKE_TEST_RULES@ + +(a)DEPENDENCIES@ # everything below this line is overwritten by make depend diff --git a/dlls/xmllite/tests/reader.c b/dlls/xmllite/tests/reader.c new file mode 100644 index 0000000..4d95353 --- /dev/null +++ b/dlls/xmllite/tests/reader.c @@ -0,0 +1,100 @@ +/* + * XMLLite IXmlReader tests + * + * Copyright 2010 (C) Nikolay Sivov + * + * 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 COBJMACROS + +#include <stdarg.h> + +#include "windef.h" +#include "winbase.h" +#include "ole2.h" +#include "xmllite.h" +#include "initguid.h" +#include "wine/test.h" + +DEFINE_GUID(IID_IXmlReader, 0x7279fc81, 0x709d, 0x4095, 0xb6, 0x3d, 0x69, + 0xfe, 0x4b, 0x0d, 0x90, 0x30); + +HRESULT WINAPI (*pCreateXmlReader)(REFIID riid, void **ppvObject, IMalloc *pMalloc); + +static BOOL init_pointers(void) +{ + /* don't free module here, it's to be unloaded on exit */ + HMODULE mod = LoadLibraryA("xmllite.dll"); + + if (!mod) + { + win_skip("xmllite library not available\n"); + return FALSE; + } + + pCreateXmlReader = (void*)GetProcAddress(mod, "CreateXmlReader"); + if (!pCreateXmlReader) return FALSE; + + return TRUE; +} + +static void test_reader_create(void) +{ + HRESULT hr; + IXmlReader *reader; + IMalloc *imalloc; + + /* crashes native */ + if (0) + { + hr = pCreateXmlReader(&IID_IXmlReader, NULL, NULL); + hr = pCreateXmlReader(NULL, (LPVOID*)&reader, NULL); + } + + hr = pCreateXmlReader(&IID_IXmlReader, (LPVOID*)&reader, NULL); + todo_wine ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); + if (hr != S_OK) + { + skip("Failed to create IXmlReader instance\n"); + return; + } + + hr = CoGetMalloc(1, &imalloc); + ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); + + hr = IMalloc_DidAlloc(imalloc, reader); + ok(hr != 1, "Expected 0 or -1, got %08x\n", hr); + + IXmlReader_Release(reader); +} + +START_TEST(reader) +{ + HRESULT r; + + r = CoInitialize( NULL ); + ok( r == S_OK, "failed to init com\n"); + + if (!init_pointers()) + { + CoUninitialize(); + return; + } + + test_reader_create(); + + CoUninitialize(); +} diff --git a/dlls/xmllite/xmllite.spec b/dlls/xmllite/xmllite.spec index cf43637..9b5a84a 100644 --- a/dlls/xmllite/xmllite.spec +++ b/dlls/xmllite/xmllite.spec @@ -1,4 +1,4 @@ -@ stub CreateXmlReader +@ stdcall CreateXmlReader(ptr ptr ptr) @ stub CreateXmlReaderInputWithEncodingCodePage @ stub CreateXmlReaderInputWithEncodingName @ stub CreateXmlWriter

1 0

Nikolay Sivov : xmllite: Add stub implementation of IXmlReader interface.
by Alexandre Julliard 19 Jan '10

19 Jan '10

Module: wine Branch: master Commit: f9c51f8de96a809c857903e217d4f884d2af9b40 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f9c51f8de96a809c857903e21… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Tue Jan 19 00:18:22 2010 +0300 xmllite: Add stub implementation of IXmlReader interface. --- dlls/xmllite/reader.c | 265 ++++++++++++++++++++++++++++++++++++++++++- dlls/xmllite/tests/reader.c | 7 +- 2 files changed, 264 insertions(+), 8 deletions(-) diff --git a/dlls/xmllite/reader.c b/dlls/xmllite/reader.c index 76097a5..cd30f48 100644 --- a/dlls/xmllite/reader.c +++ b/dlls/xmllite/reader.c @@ -31,8 +31,269 @@ WINE_DEFAULT_DEBUG_CHANNEL(xmllite); -HRESULT WINAPI CreateXmlReader(REFIID riid, void **pObject, IMalloc *pMalloc) +typedef struct _xmlreader +{ + const IXmlReaderVtbl *lpVtbl; + LONG ref; +} xmlreader; + +static inline xmlreader *impl_from_IXmlReader(IXmlReader *iface) +{ + return (xmlreader *)((char*)iface - FIELD_OFFSET(xmlreader, lpVtbl)); +} + +static HRESULT WINAPI xmlreader_QueryInterface(IXmlReader *iface, REFIID riid, void** ppvObject) +{ + xmlreader *This = impl_from_IXmlReader(iface); + + TRACE("%p %s %p\n", This, debugstr_guid(riid), ppvObject); + + if (IsEqualGUID(riid, &IID_IUnknown) || + IsEqualGUID(riid, &IID_IXmlReader)) + { + *ppvObject = iface; + } + else + { + FIXME("interface %s not implemented\n", debugstr_guid(riid)); + return E_NOINTERFACE; + } + + IXmlReader_AddRef(iface); + + return S_OK; +} + +static ULONG WINAPI xmlreader_AddRef(IXmlReader *iface) +{ + xmlreader *This = impl_from_IXmlReader(iface); + TRACE("%p\n", This); + return InterlockedIncrement(&This->ref); +} + +static ULONG WINAPI xmlreader_Release(IXmlReader *iface) +{ + xmlreader *This = impl_from_IXmlReader(iface); + LONG ref; + + TRACE("%p\n", This); + + ref = InterlockedDecrement(&This->ref); + if (ref == 0) + { + HeapFree(GetProcessHeap(), 0, This); + } + + return ref; +} + +static HRESULT WINAPI xmlreader_SetInput(IXmlReader* iface, IUnknown *input) +{ + FIXME("(%p %p): stub\n", iface, input); + return E_NOTIMPL; +} + +static HRESULT WINAPI xmlreader_GetProperty(IXmlReader* iface, UINT property, LONG_PTR *value) +{ + FIXME("(%p %u %p): stub\n", iface, property, value); + return E_NOTIMPL; +} + +static HRESULT WINAPI xmlreader_SetProperty(IXmlReader* iface, UINT property, LONG_PTR value) +{ + FIXME("(%p %u %lu): stub\n", iface, property, value); + return E_NOTIMPL; +} + +static HRESULT WINAPI xmlreader_Read(IXmlReader* iface, XmlNodeType *node_type) +{ + FIXME("(%p %p): stub\n", iface, node_type); + return E_NOTIMPL; +} + +static HRESULT WINAPI xmlreader_GetNodeType(IXmlReader* iface, XmlNodeType *node_type) +{ + FIXME("(%p %p): stub\n", iface, node_type); + return E_NOTIMPL; +} + +static HRESULT WINAPI xmlreader_MoveToFirstAttribute(IXmlReader* iface) +{ + FIXME("(%p): stub\n", iface); + return E_NOTIMPL; +} + +static HRESULT WINAPI xmlreader_MoveToNextAttribute(IXmlReader* iface) +{ + FIXME("(%p): stub\n", iface); + return E_NOTIMPL; +} + +static HRESULT WINAPI xmlreader_MoveToAttributeByName(IXmlReader* iface, + LPCWSTR local_name, + LPCWSTR namespaceUri) +{ + FIXME("(%p %p %p): stub\n", iface, local_name, namespaceUri); + return E_NOTIMPL; +} + +static HRESULT WINAPI xmlreader_MoveToElement(IXmlReader* iface) +{ + FIXME("(%p): stub\n", iface); + return E_NOTIMPL; +} + +static HRESULT WINAPI xmlreader_GetQualifiedName(IXmlReader* iface, LPCWSTR *qualifiedName, + UINT *qualifiedName_length) +{ + FIXME("(%p %p %p): stub\n", iface, qualifiedName, qualifiedName_length); + return E_NOTIMPL; +} + +static HRESULT WINAPI xmlreader_GetNamespaceUri(IXmlReader* iface, + LPCWSTR *namespaceUri, + UINT *namespaceUri_length) { - FIXME("(%s, %p, %p)\n", wine_dbgstr_guid(riid), pObject, pMalloc); + FIXME("(%p %p %p): stub\n", iface, namespaceUri, namespaceUri_length); return E_NOTIMPL; } + +static HRESULT WINAPI xmlreader_GetLocalName(IXmlReader* iface, + LPCWSTR *local_name, + UINT *local_name_length) +{ + FIXME("(%p %p %p): stub\n", iface, local_name, local_name_length); + return E_NOTIMPL; +} + +static HRESULT WINAPI xmlreader_GetPrefix(IXmlReader* iface, + LPCWSTR *prefix, + UINT *prefix_length) +{ + FIXME("(%p %p %p): stub\n", iface, prefix, prefix_length); + return E_NOTIMPL; +} + +static HRESULT WINAPI xmlreader_GetValue(IXmlReader* iface, + LPCWSTR *value, + UINT *value_length) +{ + FIXME("(%p %p %p): stub\n", iface, value, value_length); + return E_NOTIMPL; +} + +static HRESULT WINAPI xmlreader_ReadValueChunk(IXmlReader* iface, + WCHAR *buffer, + UINT chunk_size, + UINT *read) +{ + FIXME("(%p %p %u %p): stub\n", iface, buffer, chunk_size, read); + return E_NOTIMPL; +} + +static HRESULT WINAPI xmlreader_GetBaseUri(IXmlReader* iface, + LPCWSTR *baseUri, + UINT *baseUri_length) +{ + FIXME("(%p %p %p): stub\n", iface, baseUri, baseUri_length); + return E_NOTIMPL; +} + +static BOOL WINAPI xmlreader_IsDefault(IXmlReader* iface) +{ + FIXME("(%p): stub\n", iface); + return E_NOTIMPL; +} + +static BOOL WINAPI xmlreader_IsEmptyElement(IXmlReader* iface) +{ + FIXME("(%p): stub\n", iface); + return E_NOTIMPL; +} + +static HRESULT WINAPI xmlreader_GetLineNumber(IXmlReader* iface, UINT *lineNumber) +{ + FIXME("(%p %p): stub\n", iface, lineNumber); + return E_NOTIMPL; +} + +static HRESULT WINAPI xmlreader_GetLinePosition(IXmlReader* iface, UINT *linePosition) +{ + FIXME("(%p %p): stub\n", iface, linePosition); + return E_NOTIMPL; +} + +static HRESULT WINAPI xmlreader_GetAttributeCount(IXmlReader* iface, UINT *attributeCount) +{ + FIXME("(%p %p): stub\n", iface, attributeCount); + return E_NOTIMPL; +} + +static HRESULT WINAPI xmlreader_GetDepth(IXmlReader* iface, UINT *depth) +{ + FIXME("(%p %p): stub\n", iface, depth); + return E_NOTIMPL; +} + +static BOOL WINAPI xmlreader_IsEOF(IXmlReader* iface) +{ + FIXME("(%p): stub\n", iface); + return E_NOTIMPL; +} + +static const struct IXmlReaderVtbl xmlreader_vtbl = +{ + xmlreader_QueryInterface, + xmlreader_AddRef, + xmlreader_Release, + xmlreader_SetInput, + xmlreader_GetProperty, + xmlreader_SetProperty, + xmlreader_Read, + xmlreader_GetNodeType, + xmlreader_MoveToFirstAttribute, + xmlreader_MoveToNextAttribute, + xmlreader_MoveToAttributeByName, + xmlreader_MoveToElement, + xmlreader_GetQualifiedName, + xmlreader_GetNamespaceUri, + xmlreader_GetLocalName, + xmlreader_GetPrefix, + xmlreader_GetValue, + xmlreader_ReadValueChunk, + xmlreader_GetBaseUri, + xmlreader_IsDefault, + xmlreader_IsEmptyElement, + xmlreader_GetLineNumber, + xmlreader_GetLinePosition, + xmlreader_GetAttributeCount, + xmlreader_GetDepth, + xmlreader_IsEOF +}; + +HRESULT WINAPI CreateXmlReader(REFIID riid, void **pObject, IMalloc *pMalloc) +{ + xmlreader *reader; + + TRACE("(%s, %p, %p)\n", wine_dbgstr_guid(riid), pObject, pMalloc); + + if (pMalloc) FIXME("custom IMalloc not supported yet\n"); + + if (!IsEqualGUID(riid, &IID_IXmlReader)) + { + ERR("Unexpected IID requested -> (%s)\n", wine_dbgstr_guid(riid)); + return E_FAIL; + } + + reader = HeapAlloc(GetProcessHeap(), 0, sizeof (*reader)); + if(!reader) return E_OUTOFMEMORY; + + reader->lpVtbl = &xmlreader_vtbl; + reader->ref = 1; + + *pObject = &reader->lpVtbl; + + TRACE("returning iface %p\n", *pObject); + + return S_OK; +} diff --git a/dlls/xmllite/tests/reader.c b/dlls/xmllite/tests/reader.c index 4d95353..18eed5c 100644 --- a/dlls/xmllite/tests/reader.c +++ b/dlls/xmllite/tests/reader.c @@ -65,12 +65,7 @@ static void test_reader_create(void) } hr = pCreateXmlReader(&IID_IXmlReader, (LPVOID*)&reader, NULL); - todo_wine ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); - if (hr != S_OK) - { - skip("Failed to create IXmlReader instance\n"); - return; - } + ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); hr = CoGetMalloc(1, &imalloc); ok(hr == S_OK, "Expected S_OK, got %08x\n", hr);

1 0

Jörg Höhle : wine.inf: Correct MCI entries.
by Alexandre Julliard 19 Jan '10

19 Jan '10

Module: wine Branch: master Commit: ac1ad1372dbab6b2efffb0a5cf6bea3370866982 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ac1ad1372dbab6b2efffb0a5c… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Thu Dec 3 21:44:50 2009 +0100 wine.inf: Correct MCI entries. --- tools/wine.inf.in | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/wine.inf.in b/tools/wine.inf.in index e03a7e4..d1d528c 100644 --- a/tools/wine.inf.in +++ b/tools/wine.inf.in @@ -492,6 +492,7 @@ HKLM,%Mci32Str%,"AVIVideo",,"mciavi32.dll" HKLM,%Mci32Str%,"CDAudio",,"mcicda.dll" HKLM,%Mci32Str%,"Sequencer",,"mciseq.dll" HKLM,%Mci32Str%,"WaveAudio",,"mciwave.dll" +HKLM,%Mci32Str%,"MPEGVideo",,"mciqtz32.dll" HKLM,%MciExtStr%,"aifc",,"MPEGVideo" HKLM,%MciExtStr%,"asf",,"MPEGVideo" @@ -514,7 +515,6 @@ HKLM,%MciExtStr%,"mpeg",,"MPEGVideo" HKLM,%MciExtStr%,"mpg",,"MPEGVideo" HKLM,%MciExtStr%,"mpv",,"MPEGVideo" HKLM,%MciExtStr%,"mpv2",,"MPEGVideo" -HKLM,%MciExtStr%,"rmi",,"MPEGVideo" HKLM,%MciExtStr%,"rmi",,"Sequencer" HKLM,%MciExtStr%,"snd",,"MPEGVideo" HKLM,%MciExtStr%,"wav",,"WaveAudio"

1 0

Damjan Jovanovic : sti: Add launch application registry.
by Alexandre Julliard 19 Jan '10

19 Jan '10

Module: wine Branch: master Commit: 226998185f0dda70efb0a726139bb1a41abfb60d URL: http://source.winehq.org/git/wine.git/?a=commit;h=226998185f0dda70efb0a7261… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Mon Jan 18 21:29:26 2010 +0200 sti: Add launch application registry. --- dlls/sti/sti.c | 62 ++++++++++++++++++++++++++++++++++++++++++++++--- dlls/sti/tests/sti.c | 29 +++++++++++++++++++++++ 2 files changed, 87 insertions(+), 4 deletions(-) diff --git a/dlls/sti/sti.c b/dlls/sti/sti.c index c88205d..974bd06 100644 --- a/dlls/sti/sti.c +++ b/dlls/sti/sti.c @@ -31,9 +31,19 @@ #include "sti_private.h" #include "wine/debug.h" +#include "wine/unicode.h" WINE_DEFAULT_DEBUG_CHANNEL(sti); +static const WCHAR registeredAppsLaunchPath[] = { + 'S','O','F','T','W','A','R','E','\\', + 'M','i','c','r','o','s','o','f','t','\\', + 'W','i','n','d','o','w','s','\\', + 'C','u','r','r','e','n','t','V','e','r','s','i','o','n','\\', + 'S','t','i','l','l','I','m','a','g','e','\\', + 'R','e','g','i','s','t','e','r','e','d',' ','A','p','p','l','i','c','a','t','i','o','n','s',0 +}; + static inline stillimage *impl_from_StillImageW(IStillImageW *iface) { return (stillimage *)((char*)iface - FIELD_OFFSET(stillimage, lpVtbl)); @@ -119,16 +129,60 @@ static HRESULT WINAPI stillimagew_GetSTILaunchInformation(IStillImageW *iface, L static HRESULT WINAPI stillimagew_RegisterLaunchApplication(IStillImageW *iface, LPWSTR pwszAppName, LPWSTR pwszCommandLine) { + static const WCHAR format[] = {'%','s',' ','%','s',0}; + static const WCHAR commandLineSuffix[] = { + '/','S','t','i','D','e','v','i','c','e',':','%','1',' ', + '/','S','t','i','E','v','e','n','t',':','%','2',0}; + HKEY registeredAppsKey = NULL; + DWORD ret; + HRESULT hr = S_OK; stillimage *This = impl_from_StillImageW(iface); - FIXME("(%p, %s, %s): stub\n", This, debugstr_w(pwszAppName), debugstr_w(pwszCommandLine)); - return E_NOTIMPL; + + TRACE("(%p, %s, %s)\n", This, debugstr_w(pwszAppName), debugstr_w(pwszCommandLine)); + + ret = RegCreateKeyW(HKEY_LOCAL_MACHINE, registeredAppsLaunchPath, &registeredAppsKey); + if (ret == ERROR_SUCCESS) + { + WCHAR *value = HeapAlloc(GetProcessHeap(), 0, + (lstrlenW(pwszCommandLine) + 1 + lstrlenW(commandLineSuffix) + 1) * sizeof(WCHAR)); + if (value) + { + sprintfW(value, format, pwszCommandLine, commandLineSuffix); + ret = RegSetValueExW(registeredAppsKey, pwszAppName, 0, + REG_SZ, (BYTE*)value, (lstrlenW(value)+1)*sizeof(WCHAR)); + if (ret != ERROR_SUCCESS) + hr = HRESULT_FROM_WIN32(ret); + HeapFree(GetProcessHeap(), 0, value); + } + else + hr = E_OUTOFMEMORY; + RegCloseKey(registeredAppsKey); + } + else + hr = HRESULT_FROM_WIN32(ret); + return hr; } static HRESULT WINAPI stillimagew_UnregisterLaunchApplication(IStillImageW *iface, LPWSTR pwszAppName) { stillimage *This = impl_from_StillImageW(iface); - FIXME("(%p, %s): stub\n", This, debugstr_w(pwszAppName)); - return S_OK; + HKEY registeredAppsKey = NULL; + DWORD ret; + HRESULT hr = S_OK; + + TRACE("(%p, %s)\n", This, debugstr_w(pwszAppName)); + + ret = RegCreateKeyW(HKEY_LOCAL_MACHINE, registeredAppsLaunchPath, &registeredAppsKey); + if (ret == ERROR_SUCCESS) + { + ret = RegDeleteValueW(registeredAppsKey, pwszAppName); + if (ret != ERROR_SUCCESS) + hr = HRESULT_FROM_WIN32(ret); + RegCloseKey(registeredAppsKey); + } + else + hr = HRESULT_FROM_WIN32(ret); + return hr; } static HRESULT WINAPI stillimagew_EnableHwNotifications(IStillImageW *iface, LPCWSTR pwszDeviceName, diff --git a/dlls/sti/tests/sti.c b/dlls/sti/tests/sti.c index 0575d29..7b9aade 100644 --- a/dlls/sti/tests/sti.c +++ b/dlls/sti/tests/sti.c @@ -228,6 +228,34 @@ static void test_stillimage_aggregation(void) skip("No StiCreateInstanceW function\n"); } +static void test_launch_app_registry(void) +{ + static WCHAR appName[] = {'w','i','n','e','s','t','i','t','e','s','t','a','p','p',0}; + IStillImageW *pStiW = NULL; + HRESULT hr; + + if (pStiCreateInstanceW == NULL) + { + win_skip("No StiCreateInstanceW function\n"); + return; + } + + hr = pStiCreateInstance(GetModuleHandle(NULL), STI_VERSION_REAL | STI_VERSION_FLAG_UNICODE, &pStiW, NULL); + if (SUCCEEDED(hr)) + { + hr = IStillImage_RegisterLaunchApplication(pStiW, appName, appName); + ok(SUCCEEDED(hr), "could not register launch application, error 0x%X\n", hr); + if (SUCCEEDED(hr)) + { + hr = IStillImage_UnregisterLaunchApplication(pStiW, appName); + ok(SUCCEEDED(hr), "could not unregister launch application, error 0x%X\n", hr); + } + IStillImage_Release(pStiW); + } + else + ok(0, "could not create StillImageW, hr = 0x%X\n", hr); +} + START_TEST(sti) { if (SUCCEEDED(CoInitialize(NULL))) @@ -236,6 +264,7 @@ START_TEST(sti) { test_version_flag_versus_aw(); test_stillimage_aggregation(); + test_launch_app_registry(); FreeLibrary(sti_dll); } else

1 0

Rob Shearman : wpp: Fix expansion of macro bodies following the parsing of a numerical digit.
by Alexandre Julliard 19 Jan '10

19 Jan '10

Module: wine Branch: master Commit: 3fecf9ddcd5dd8ac8d3b48106e8eab7e3e303371 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3fecf9ddcd5dd8ac8d3b48106… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Mon Jan 18 22:15:09 2010 +0000 wpp: Fix expansion of macro bodies following the parsing of a numerical digit. The current regular expression causes all letters and spaces (among other characters) following the appearance of a digit to be classed as a literal, including C identifiers which may need to be expanded. The expression was intended to catch the remaining characters that were not covered by the first two rules ([^a-zA-Z0-9'"#/\\\n]+ and {cident}), but the [^'"#/\\\n] expression caught {cident} as well. While one solution would have been just to catch the expression that match [a-zA-Z0-9]* that don't match {cident}, i.e. [0-9][a-zA-Z0-9]*, in the interests of avoiding unnecessary multiple LITERALs being generated and then combined during parsing the expression also includes the first expression, making it [0-9][a-zA-Z0-9]*[^a-zA-Z0-9'"#/\\\n]*. --- libs/wpp/ppl.l | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/libs/wpp/ppl.l b/libs/wpp/ppl.l index 1ce98fb..06a4f18 100644 --- a/libs/wpp/ppl.l +++ b/libs/wpp/ppl.l @@ -527,7 +527,7 @@ void pp_writestring(const char *format, ...) <pp_mbody>{cident} ppy_lval.cptr = pp_xstrdup(ppy_text); return tIDENT; <pp_mbody>\#\# return tCONCAT; <pp_mbody>\# return tSTRINGIZE; -<pp_mbody>[0-9][^'"#/\\\n]* ppy_lval.cptr = pp_xstrdup(ppy_text); return tLITERAL; +<pp_mbody>[0-9][a-zA-Z0-9]*[^a-zA-Z0-9'"#/\\\n]* ppy_lval.cptr = pp_xstrdup(ppy_text); return tLITERAL; <pp_mbody>(\\\r?)|(\/[^/*'"#\\\n]*) ppy_lval.cptr = pp_xstrdup(ppy_text); return tLITERAL; <pp_mbody>\\\r?\n{ws}+ newline(0); ppy_lval.cptr = pp_xstrdup(" "); return tLITERAL; <pp_mbody>\\\r?\n newline(0);

1 0