October 2008 - Wine-Commits

Austin English : ntdll: Quiet a noisy fixme.
by Alexandre Julliard Oct. 8, 2008

Oct. 8, 2008

Module: wine Branch: master Commit: a1e615813f984215a906c992268a5c8ffba9c3d8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a1e615813f984215a906c9922… Author: Austin English <austinenglish(a)gmail.com> Date: Tue Oct 7 13:07:22 2008 -0500 ntdll: Quiet a noisy fixme. --- dlls/ntdll/file.c | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c index 52e75ab..50fa651 100644 --- a/dlls/ntdll/file.c +++ b/dlls/ntdll/file.c @@ -2416,6 +2416,7 @@ NTSTATUS WINAPI NtLockFile( HANDLE hFile, HANDLE lock_granted_event, NTSTATUS ret; HANDLE handle; BOOLEAN async; + static BOOLEAN warn = TRUE; if (apc || io_status || key) { @@ -2423,7 +2424,11 @@ NTSTATUS WINAPI NtLockFile( HANDLE hFile, HANDLE lock_granted_event, return STATUS_NOT_IMPLEMENTED; } - if (apc_user) FIXME("I/O completion on lock not implemented yet\n"); + if (apc_user && warn) + { + FIXME("I/O completion on lock not implemented yet\n"); + warn = FALSE; + } for (;;) {

1 0

Aric Stewart : browseui: Update AutoComplete Multi to have a stub implemntation of CLSID_ACListISF and IID_IACList2 .
by Alexandre Julliard Oct. 8, 2008

Oct. 8, 2008

Module: wine Branch: master Commit: 19d18f0e5cedc9c83d9c70a39a7f2305d84b3552 URL: http://source.winehq.org/git/wine.git/?a=commit;h=19d18f0e5cedc9c83d9c70a39… Author: Aric Stewart <aric(a)codeweavers.com> Date: Tue Oct 7 13:58:47 2008 -0500 browseui: Update AutoComplete Multi to have a stub implemntation of CLSID_ACListISF and IID_IACList2. --- dlls/browseui/Makefile.in | 1 + dlls/browseui/aclsource.c | 147 +++++++++++++++++++++++++++++++++++++++++ dlls/browseui/browseui.h | 1 + dlls/browseui/browseui_main.c | 1 + dlls/browseui/regsvr.c | 7 ++ include/shlguid.h | 1 + include/shlobj.h | 26 +++++++ 7 files changed, 184 insertions(+), 0 deletions(-) diff --git a/dlls/browseui/Makefile.in b/dlls/browseui/Makefile.in index c1e85cc..845e66a 100644 --- a/dlls/browseui/Makefile.in +++ b/dlls/browseui/Makefile.in @@ -8,6 +8,7 @@ EXTRADEFS = -DCOM_NO_WINDOWS_H C_SRCS = \ aclmulti.c \ + aclsource.c \ browseui_main.c \ compcatcachedaemon.c \ progressdlg.c \ diff --git a/dlls/browseui/aclsource.c b/dlls/browseui/aclsource.c new file mode 100644 index 0000000..4788ad6 --- /dev/null +++ b/dlls/browseui/aclsource.c @@ -0,0 +1,147 @@ +/* + * Shell AutoComplete list + * + * Copyright 2008 CodeWeavers, Aric Stewart + * + * 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 + */ + +#include "config.h" + +#include <stdarg.h> + +#define COBJMACROS + +#include "wine/debug.h" +#include "windef.h" +#include "winbase.h" +#include "winreg.h" +#include "winuser.h" +#include "shlwapi.h" +#include "winerror.h" +#include "objbase.h" + +#include "shlguid.h" +#include "shlobj.h" + +#include "wine/unicode.h" + +#include "browseui.h" + +WINE_DEFAULT_DEBUG_CHANNEL(browseui); + +typedef struct tagACLMulti { + const IACList2Vtbl *acl2Vtbl; + LONG refCount; + DWORD dwOptions; +} ACLShellSource; + +static void ACLShellSource_Destructor(ACLShellSource *This) +{ + TRACE("destroying %p\n", This); + heap_free(This); +} + +static HRESULT WINAPI ACLShellSource_QueryInterface(IACList2 *iface, REFIID iid, LPVOID *ppvOut) +{ + ACLShellSource *This = (ACLShellSource *)iface; + *ppvOut = NULL; + + if (IsEqualIID(iid, &IID_IUnknown) || IsEqualIID(iid, &IID_IACList2) || + IsEqualIID(iid, &IID_IACList)) + { + *ppvOut = This; + } + + if (*ppvOut) + { + IUnknown_AddRef(iface); + return S_OK; + } + + WARN("unsupported interface: %s\n", debugstr_guid(iid)); + return E_NOINTERFACE; +} + +static ULONG WINAPI ACLShellSource_AddRef(IACList2 *iface) +{ + ACLShellSource *This = (ACLShellSource *)iface; + return InterlockedIncrement(&This->refCount); +} + +static ULONG WINAPI ACLShellSource_Release(IACList2 *iface) +{ + ACLShellSource *This = (ACLShellSource *)iface; + ULONG ret; + + ret = InterlockedDecrement(&This->refCount); + if (ret == 0) + ACLShellSource_Destructor(This); + return ret; +} + +static HRESULT WINAPI ACLShellSource_Expand(IACList2 *iface, LPCWSTR wstr) +{ + ACLShellSource *This = (ACLShellSource *)iface; + FIXME("STUB:(%p) %s\n",This,debugstr_w(wstr)); + return E_NOTIMPL; +} + + +static HRESULT WINAPI ACLShellSource_GetOptions(IACList2 *iface, + DWORD *pdwFlag) +{ + ACLShellSource *This = (ACLShellSource *)iface; + *pdwFlag = This->dwOptions; + return S_OK; +} + +static HRESULT WINAPI ACLShellSource_SetOptions(IACList2 *iface, + DWORD dwFlag) +{ + ACLShellSource *This = (ACLShellSource *)iface; + This->dwOptions = dwFlag; + return S_OK; +} + +static const IACList2Vtbl ACLMulti_ACList2Vtbl = +{ + ACLShellSource_QueryInterface, + ACLShellSource_AddRef, + ACLShellSource_Release, + + ACLShellSource_Expand, + + ACLShellSource_SetOptions, + ACLShellSource_GetOptions +}; + +HRESULT ACLShellSource_Constructor(IUnknown *pUnkOuter, IUnknown **ppOut) +{ + ACLShellSource *This; + if (pUnkOuter) + return CLASS_E_NOAGGREGATION; + + This = heap_alloc_zero(sizeof(ACLShellSource)); + if (This == NULL) + return E_OUTOFMEMORY; + + This->acl2Vtbl = &ACLMulti_ACList2Vtbl; + This->refCount = 1; + + TRACE("returning %p\n", This); + *ppOut = (IUnknown *)This; + return S_OK; +} diff --git a/dlls/browseui/browseui.h b/dlls/browseui/browseui.h index 2808647..923aadb 100644 --- a/dlls/browseui/browseui.h +++ b/dlls/browseui/browseui.h @@ -27,6 +27,7 @@ extern HINSTANCE BROWSEUI_hinstance; extern HRESULT ACLMulti_Constructor(IUnknown *punkOuter, IUnknown **ppOut); extern HRESULT ProgressDialog_Constructor(IUnknown *punkOuter, IUnknown **ppOut); extern HRESULT CompCatCacheDaemon_Constructor(IUnknown *punkOuter, IUnknown **ppOut); +extern HRESULT ACLShellSource_Constructor(IUnknown *punkOuter, IUnknown **ppOut); extern const GUID CLSID_CompCatCacheDaemon; diff --git a/dlls/browseui/browseui_main.c b/dlls/browseui/browseui_main.c index 10757c1..447e4f7 100644 --- a/dlls/browseui/browseui_main.c +++ b/dlls/browseui/browseui_main.c @@ -53,6 +53,7 @@ static const struct { {&CLSID_ACLMulti, ACLMulti_Constructor}, {&CLSID_ProgressDialog, ProgressDialog_Constructor}, {&CLSID_CompCatCacheDaemon, CompCatCacheDaemon_Constructor}, + {&CLSID_ACListISF, ACLShellSource_Constructor}, {NULL, NULL} }; diff --git a/dlls/browseui/regsvr.c b/dlls/browseui/regsvr.c index 746e20b..5c265f4 100644 --- a/dlls/browseui/regsvr.c +++ b/dlls/browseui/regsvr.c @@ -462,6 +462,13 @@ static struct regsvr_coclass const coclass_list[] = { "browseui.dll", "Both" }, + { + &CLSID_ACListISF, + "Shell Folder AutoComplete List", + NULL, + "browseui.dll", + "Both" + }, { NULL } /* list terminator */ }; diff --git a/include/shlguid.h b/include/shlguid.h index 23cce28..d9685e6 100644 --- a/include/shlguid.h +++ b/include/shlguid.h @@ -127,6 +127,7 @@ DEFINE_GUID(CLSID_DragDropHelper, 0x4657278a, 0x411b, 0x11d2, 0x83, 0x9a, 0x00, DEFINE_GUID(CLSID_AutoComplete, 0x00bb2763, 0x6a77, 0x11d0, 0xa5, 0x35, 0x00, 0xc0, 0x4f, 0xd7, 0xd0, 0x62); DEFINE_GUID(CLSID_ACLMulti, 0x00bb2765, 0x6a77, 0x11d0, 0xa5, 0x35, 0x00, 0xc0, 0x4f, 0xd7, 0xd0, 0x62); +DEFINE_GUID(CLSID_ACListISF, 0x03c036f1, 0xa186, 0x11d0, 0x82, 0x4a, 0x00, 0xaa, 0x00, 0x5b, 0x043, 0x83); DEFINE_GUID(CLSID_ProgressDialog, 0xf8383852, 0xfcd3, 0x11d1, 0xa6, 0xb9, 0x0, 0x60, 0x97, 0xdf, 0x5b, 0xd4); diff --git a/include/shlobj.h b/include/shlobj.h index 284a020..5ed4978 100644 --- a/include/shlobj.h +++ b/include/shlobj.h @@ -487,6 +487,32 @@ DECLARE_INTERFACE_(IACList,IUnknown) #define IACList_Expand(p,a) (p)->lpVtbl->Expand(p,a) #endif +/* IACList2 interface */ +#define INTERFACE IACList2 +DECLARE_INTERFACE_(IACList2,IACList) +{ + /*** IUnknown methods ***/ + STDMETHOD_(HRESULT,QueryInterface) (THIS_ REFIID riid, void** ppvObject) PURE; + STDMETHOD_(ULONG,AddRef) (THIS) PURE; + STDMETHOD_(ULONG,Release) (THIS) PURE; + /*** IACList methods ***/ + STDMETHOD(Expand)(THIS_ LPCOLESTR str) PURE; + /*** IACList2 methods ***/ + STDMETHOD(SetOptions)(THIS_ DWORD dwFlag) PURE; + STDMETHOD(GetOptions)(THIS_ DWORD* pdwFlag) PURE; +}; +#undef INTERFACE + +#if !defined(__cplusplus) || defined(CINTERFACE) +/*** IUnknown methods ***/ +#define IACList2_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) +#define IACList2_AddRef(p) (p)->lpVtbl->AddRef(p) +#define IACList2_Release(p) (p)->lpVtbl->Release(p) +/*** IACList2 methods ***/ +#define IACList2_GetOptions(p,a) (p)->lpVtbl->GetOptions(p,a) +#define IACList2_SetOptions(p,a) (p)->lpVtbl->SetOptions(p,a) +#endif + /* IProgressDialog interface */ #define PROGDLG_NORMAL 0x00000000 #define PROGDLG_MODAL 0x00000001

1 0

Joris Huizer : version/tests: Corrected memset placement.
by Alexandre Julliard Oct. 8, 2008

Oct. 8, 2008

Module: wine Branch: master Commit: af086800372ad4d6839bedc6baa4ec7c775ef9c4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=af086800372ad4d6839bedc6b… Author: Joris Huizer <joris_huizer(a)yahoo.com> Date: Tue Oct 7 15:30:11 2008 +0200 version/tests: Corrected memset placement. --- dlls/version/tests/install.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/version/tests/install.c b/dlls/version/tests/install.c index ec40d3e..6fc19bb 100644 --- a/dlls/version/tests/install.c +++ b/dlls/version/tests/install.c @@ -183,23 +183,23 @@ static void test_install_file(void) memset(tmpname,0,sizeof(tmpname)); size = MAX_PATH; rc = VerInstallFileA(0x0, szSrcFileName, NULL, NULL, NULL, NULL, tmpname, &size); - memset(tmpname,0,sizeof(tmpname)); ok (rc == 0x10000 && tmpname[0]==0," expected return 0x10000 and no tempname, got %08x/\'%s\'\n",rc,tmpname); + memset(tmpname,0,sizeof(tmpname)); size = MAX_PATH; rc = VerInstallFileA(0x0, szSrcFileName, szDestFileName, NULL, NULL, NULL, tmpname, &size); - memset(tmpname,0,sizeof(tmpname)); ok (rc == 0x10000 && tmpname[0]==0," expected return 0x10000 and no tempname, got %08x/\'%s\'\n",rc,tmpname); + memset(tmpname,0,sizeof(tmpname)); size = MAX_PATH; rc = VerInstallFileA(0x0, szSrcFileName, szDestFileName, szSrcDir, NULL, NULL, tmpname, &size); - memset(tmpname,0,sizeof(tmpname)); ok (rc == 0x10000 && tmpname[0]==0," expected return 0x10000 and no tempname, got %08x/\'%s\'\n",rc,tmpname); /* Source file does not exist*/ + memset(tmpname,0,sizeof(tmpname)); size = MAX_PATH; rc = VerInstallFileA(0x0, szSrcFileName, szDestFileName, szSrcDir, szDestDir, NULL, tmpname, &size); - memset(tmpname,0,sizeof(tmpname)); ok (rc == 0x10000 && tmpname[0]==0," expected return 0x10000 and no tempname, got %08x/\'%s\'\n",rc,tmpname); + memset(tmpname,0,sizeof(tmpname)); size = MAX_PATH; rc = VerInstallFileA(0x0, szSrcFileName, szDestFileName, szSrcDir, szDestDir, szCurDir, tmpname, &size); ok (rc == 0x10000 && tmpname[0]==0," expected return 0x10000 and no tempname, got %08x/\'%s\'\n",rc,tmpname);

1 0

Piotr Caban : msxml: Added CDATA related events handling.
by Alexandre Julliard Oct. 8, 2008

Oct. 8, 2008

Module: wine Branch: master Commit: b84e4789afba7394fd0a925c19ebdd6904ecaa8c URL: http://source.winehq.org/git/wine.git/?a=commit;h=b84e4789afba7394fd0a925c1… Author: Piotr Caban <piotr.caban(a)gmail.com> Date: Tue Oct 7 22:11:11 2008 +0200 msxml: Added CDATA related events handling. --- dlls/msxml3/saxreader.c | 77 +++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 77 insertions(+), 0 deletions(-) diff --git a/dlls/msxml3/saxreader.c b/dlls/msxml3/saxreader.c index 3e7e332..4a98b4b 100644 --- a/dlls/msxml3/saxreader.c +++ b/dlls/msxml3/saxreader.c @@ -1334,6 +1334,82 @@ static void libxmlFatalError(void *ctx, const char *msg, ...) This->ret = E_FAIL; } +static void libxmlCDataBlock(void *ctx, const xmlChar *value, int len) +{ + saxlocator *This = ctx; + HRESULT hr = S_OK; + xmlChar *beg = (xmlChar*)This->pParserCtxt->input->cur-len; + xmlChar *cur, *end; + int realLen; + BSTR Chars; + BOOL lastEvent = FALSE, change; + + while(memcmp(beg-9, "<![CDATA[", sizeof(char[9]))) beg--; + update_position(This, beg); + + if(This->vbInterface && This->saxreader->vblexicalHandler) + hr = IVBSAXLexicalHandler_startCDATA(This->saxreader->vblexicalHandler); + if(!This->vbInterface && This->saxreader->lexicalHandler) + hr = ISAXLexicalHandler_startCDATA(This->saxreader->lexicalHandler); + + if(FAILED(hr)) + return format_error_message_from_id(This, hr); + + realLen = This->pParserCtxt->input->cur-beg-3; + cur = beg; + end = beg; + + while(1) + { + while(end-beg<realLen && *end!='\r') end++; + if(end-beg==realLen) + { + end--; + lastEvent = TRUE; + } + else if(end-beg==realLen-1 && *end=='\r' && *(end+1)=='\n') + lastEvent = TRUE; + + if(*end == '\r') change = TRUE; + else change = FALSE; + + if(change) *end = '\n'; + + if((This->vbInterface && This->saxreader->vbcontentHandler) || + (!This->vbInterface && This->saxreader->contentHandler)) + { + Chars = bstr_from_xmlCharN(cur, end-cur+1); + if(This->vbInterface) + hr = IVBSAXContentHandler_characters( + This->saxreader->vbcontentHandler, &Chars); + else + hr = ISAXContentHandler_characters( + This->saxreader->contentHandler, + Chars, SysStringLen(Chars)); + SysFreeString(Chars); + } + + if(change) *end = '\r'; + + if(lastEvent) + break; + + This->column += end-cur+2; + end += 2; + cur = end; + } + + if(This->vbInterface && This->saxreader->vblexicalHandler) + hr = IVBSAXLexicalHandler_endCDATA(This->saxreader->vblexicalHandler); + if(!This->vbInterface && This->saxreader->lexicalHandler) + hr = ISAXLexicalHandler_endCDATA(This->saxreader->lexicalHandler); + + if(FAILED(hr)) + format_error_message_from_id(This, hr); + + This->column += 4+end-cur; +} + /*** IVBSAXLocator interface ***/ /*** IUnknown methods ***/ static HRESULT WINAPI ivbsaxlocator_QueryInterface(IVBSAXLocator* iface, REFIID riid, void **ppvObject) @@ -2753,6 +2829,7 @@ HRESULT SAXXMLReader_create(IUnknown *pUnkOuter, LPVOID *ppObj) reader->sax.comment = libxmlComment; reader->sax.error = libxmlFatalError; reader->sax.fatalError = libxmlFatalError; + reader->sax.cdataBlock = libxmlCDataBlock; *ppObj = &reader->lpVBSAXXMLReaderVtbl;

1 0

Piotr Caban : msxml: Added ISAXLexicalHandler_comment event.
by Alexandre Julliard Oct. 8, 2008

Oct. 8, 2008

Module: wine Branch: master Commit: db2761a8d6b2c2885df9e32c0738c93b2ac0da25 URL: http://source.winehq.org/git/wine.git/?a=commit;h=db2761a8d6b2c2885df9e32c0… Author: Piotr Caban <piotr.caban(a)gmail.com> Date: Tue Oct 7 22:11:04 2008 +0200 msxml: Added ISAXLexicalHandler_comment event. --- dlls/msxml3/saxreader.c | 32 ++++++++++++++++++++++++++++++++ 1 files changed, 32 insertions(+), 0 deletions(-) diff --git a/dlls/msxml3/saxreader.c b/dlls/msxml3/saxreader.c index 94a7e1d..3e7e332 100644 --- a/dlls/msxml3/saxreader.c +++ b/dlls/msxml3/saxreader.c @@ -1260,6 +1260,37 @@ static void libxmlSetDocumentLocator( format_error_message_from_id(This, hr); } +static void libxmlComment(void *ctx, const xmlChar *value) +{ + saxlocator *This = ctx; + BSTR bValue; + HRESULT hr; + xmlChar *beg = (xmlChar*)This->pParserCtxt->input->cur; + + while(memcmp(beg-4, "<!--", sizeof(char[4]))) beg--; + update_position(This, beg); + + if(!This->vbInterface && !This->saxreader->lexicalHandler) return; + if(This->vbInterface && !This->saxreader->vblexicalHandler) return; + + bValue = bstr_from_xmlChar(value); + + if(This->vbInterface) + hr = IVBSAXLexicalHandler_comment( + This->saxreader->vblexicalHandler, &bValue); + else + hr = ISAXLexicalHandler_comment( + This->saxreader->lexicalHandler, + bValue, SysStringLen(bValue)); + + SysFreeString(bValue); + + if(FAILED(hr)) + format_error_message_from_id(This, hr); + + update_position(This, NULL); +} + static void libxmlFatalError(void *ctx, const char *msg, ...) { saxlocator *This = ctx; @@ -2719,6 +2750,7 @@ HRESULT SAXXMLReader_create(IUnknown *pUnkOuter, LPVOID *ppObj) reader->sax.endElementNs = libxmlEndElementNS; reader->sax.characters = libxmlCharacters; reader->sax.setDocumentLocator = libxmlSetDocumentLocator; + reader->sax.comment = libxmlComment; reader->sax.error = libxmlFatalError; reader->sax.fatalError = libxmlFatalError;

1 0

Piotr Caban : msxml: Fix parsing <.../> elements.
by Alexandre Julliard Oct. 8, 2008

Oct. 8, 2008

Module: wine Branch: master Commit: 1596a1acbf1bebde490d9f4d8d2d6470119d7a6a URL: http://source.winehq.org/git/wine.git/?a=commit;h=1596a1acbf1bebde490d9f4d8… Author: Piotr Caban <piotr.caban(a)gmail.com> Date: Tue Oct 7 22:10:56 2008 +0200 msxml: Fix parsing <.../> elements. --- dlls/msxml3/saxreader.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/dlls/msxml3/saxreader.c b/dlls/msxml3/saxreader.c index 72c66b5..94a7e1d 100644 --- a/dlls/msxml3/saxreader.c +++ b/dlls/msxml3/saxreader.c @@ -1040,7 +1040,10 @@ static void libxmlStartElementNS( saxattributes *attr; int index; - update_position(This, (xmlChar*)This->pParserCtxt->input->cur+1); + if(*(This->pParserCtxt->input->cur) == '/') + update_position(This, (xmlChar*)This->pParserCtxt->input->cur+2); + else + update_position(This, (xmlChar*)This->pParserCtxt->input->cur+1); hr = namespacePush(This, nb_namespaces); if(hr==S_OK && ((This->vbInterface && This->saxreader->vbcontentHandler)

1 0

Piotr Caban : msxml: Rewrite ISAXContentHandler_characters.
by Alexandre Julliard Oct. 8, 2008

Oct. 8, 2008

Module: wine Branch: master Commit: c801c18ad29a1d0351be94cb0e388c6ee6cc5323 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c801c18ad29a1d0351be94cb0… Author: Piotr Caban <piotr.caban(a)gmail.com> Date: Tue Oct 7 22:10:43 2008 +0200 msxml: Rewrite ISAXContentHandler_characters. --- dlls/msxml3/saxreader.c | 167 ++++++++++++++++++++++------------------------- 1 files changed, 77 insertions(+), 90 deletions(-) diff --git a/dlls/msxml3/saxreader.c b/dlls/msxml3/saxreader.c index 62058d1..72c66b5 100644 --- a/dlls/msxml3/saxreader.c +++ b/dlls/msxml3/saxreader.c @@ -75,7 +75,9 @@ typedef struct _saxlocator WCHAR *systemId; xmlChar *lastCur; int line; + int realLine; int column; + int realColumn; BOOL vbInterface; int nsStackSize; int nsStackLast; @@ -197,23 +199,6 @@ static BSTR QName_from_xmlChar(const xmlChar *prefix, const xmlChar *name) return bstr; } -BSTR bstr_from_xmlChar_wn(const xmlChar *buf, int len) -{ - DWORD size; - LPWSTR str; - BSTR bstr; - - if(!buf) return NULL; - - size = MultiByteToWideChar(CP_UTF8, 0, (LPCSTR)buf, len, NULL, 0); - str = (LPWSTR)HeapAlloc(GetProcessHeap(), 0, size*sizeof(WCHAR)); - if(!str) return NULL; - MultiByteToWideChar(CP_UTF8, 0, (LPCSTR)buf, len, str, size); - bstr = SysAllocStringLen(str, size); - HeapFree(GetProcessHeap(), 0, str); - return bstr; -} - static void format_error_message_from_id(saxlocator *This, HRESULT hr) { xmlStopParser(This->pParserCtxt); @@ -247,14 +232,21 @@ static void update_position(saxlocator *This, xmlChar *end) if(This->lastCur == NULL) { This->lastCur = (xmlChar*)This->pParserCtxt->input->base; - This->line = 1; - This->column = 1; + This->realLine = 1; + This->realColumn = 1; } else if(This->lastCur < This->pParserCtxt->input->base) { This->lastCur = (xmlChar*)This->pParserCtxt->input->base; - This->line = 1; - This->column = 1; + This->realLine = 1; + This->realColumn = 1; + } + + if(This->pParserCtxt->input->cur<This->lastCur) + { + This->lastCur = (xmlChar*)This->pParserCtxt->input->base; + This->realLine -= 1; + This->realColumn = 1; } if(!end) end = (xmlChar*)This->pParserCtxt->input->cur; @@ -263,18 +255,26 @@ static void update_position(saxlocator *This, xmlChar *end) { if(*(This->lastCur) == '\n') { - This->line++; - This->column = 1; + This->realLine++; + This->realColumn = 1; } - else if(*(This->lastCur) == '\r' && (This->lastCur==This->pParserCtxt->input->end || *(This->lastCur+1)!='\n')) + else if(*(This->lastCur) == '\r' && + (This->lastCur==This->pParserCtxt->input->end || + *(This->lastCur+1)!='\n')) { - This->line++; - This->column = 1; + This->realLine++; + This->realColumn = 1; } - else This->column++; + else This->realColumn++; This->lastCur++; + + /* Count multibyte UTF8 encoded characters once */ + while((*(This->lastCur)&0xC0) == 0x80) This->lastCur++; } + + This->line = This->realLine; + This->column = This->realColumn; } /*** IVBSAXAttributes interface ***/ @@ -1115,9 +1115,11 @@ static void libxmlEndElementNS( xmlChar *end; int nsNr, index; - end = This->lastCur; - while(*end != '<' && *(end+1) != '/') end++; - update_position(This, end+2); + end = (xmlChar*)This->pParserCtxt->input->cur; + if(*(end-1) != '>' || *(end-2) != '/') + while(*(end-2)!='<' && *(end-1)!='/') end--; + + update_position(This, end); nsNr = namespacePop(This); @@ -1165,6 +1167,8 @@ static void libxmlEndElementNS( SysFreeString(Prefix); } } + + update_position(This, NULL); } static void libxmlCharacters( @@ -1172,82 +1176,65 @@ static void libxmlCharacters( const xmlChar *ch, int len) { - BSTR Chars; saxlocator *This = ctx; + BSTR Chars; HRESULT hr; + xmlChar *cur; xmlChar *end; - xmlChar *lastCurCopy; - xmlChar *chEnd; - int columnCopy; - int lineCopy; - - if(*(This->lastCur-1) != '>' && *(This->lastCur-1) != '/') return; + BOOL lastEvent = FALSE; - if(*(This->lastCur-1) != '>') - { - end = (xmlChar*)This->pParserCtxt->input->cur-len; - while(*(end-1) != '>') end--; - update_position(This, end); - } + if((This->vbInterface && !This->saxreader->vbcontentHandler) + || (!This->vbInterface && !This->saxreader->contentHandler)) + return; - chEnd = This->lastCur+len; - while(*chEnd != '<') chEnd++; + cur = (xmlChar*)ch; + if(*(ch-1)=='\r') cur--; + end = cur; - lastCurCopy = This->lastCur; - columnCopy = This->column; - lineCopy = This->line; - end = This->lastCur; + if(ch<This->pParserCtxt->input->base || ch>This->pParserCtxt->input->end) + This->column++; - if((This->vbInterface && This->saxreader->vbcontentHandler) - || (!This->vbInterface && This->saxreader->contentHandler)) + while(1) { - while(This->lastCur < chEnd) + while(end-ch<len && *end!='\r') end++; + if(end-ch==len) { - end = This->lastCur; - while(end < chEnd-1) - { - if(*end == '\r') break; - end++; - } - - Chars = bstr_from_xmlChar_wn(This->lastCur, end-This->lastCur+2); + end--; + lastEvent = TRUE; + } - if(*end == '\r' && *(end+1) == '\n') - { - memmove((WCHAR*)Chars+(end-This->lastCur), - (WCHAR*)Chars+(end-This->lastCur)+1, - (SysStringLen(Chars)-(end-This->lastCur))*sizeof(WCHAR)); - SysReAllocStringLen(&Chars, Chars, SysStringLen(Chars)-1); - } - else if(*end == '\r') Chars[end-This->lastCur] = '\n'; + if(!lastEvent) *end = '\n'; - if(This->vbInterface) - hr = IVBSAXContentHandler_characters( - This->saxreader->vbcontentHandler, &Chars); - else - hr = ISAXContentHandler_characters( - This->saxreader->contentHandler, - Chars, end-This->lastCur+1); + Chars = bstr_from_xmlCharN(cur, end-cur+1); + if(This->vbInterface) + hr = IVBSAXContentHandler_characters( + This->saxreader->vbcontentHandler, &Chars); + else + hr = ISAXContentHandler_characters( + This->saxreader->contentHandler, + Chars, SysStringLen(Chars)); + SysFreeString(Chars); - SysFreeString(Chars); - if(hr != S_OK) - { - format_error_message_from_id(This, hr); - return; - } + This->column += end-cur+1; - if(*(end+1) == '\n') end++; - if(end < chEnd) end++; + if(lastEvent) + break; - This->column += end-This->lastCur; - This->lastCur = end; + *end = '\r'; + end++; + if(*end == '\n') + { + end++; + This->column++; } + cur = end; - This->lastCur = lastCurCopy; - This->column = columnCopy; - This->line = lineCopy; - update_position(This, chEnd); + if(end-ch == len) break; } + + if(ch<This->pParserCtxt->input->base || ch>This->pParserCtxt->input->end) + This->column = This->realColumn + +This->pParserCtxt->input->cur-This->lastCur; } static void libxmlSetDocumentLocator( @@ -1270,7 +1257,7 @@ static void libxmlSetDocumentLocator( format_error_message_from_id(This, hr); } -void libxmlFatalError(void *ctx, const char *msg, ...) +static void libxmlFatalError(void *ctx, const char *msg, ...) { saxlocator *This = ctx; char message[1024];

1 0

Michael Stefaniuc : shell32/tests: Use FAILED instead of !SUCCEEDED.
by Alexandre Julliard Oct. 8, 2008

Oct. 8, 2008

Module: wine Branch: master Commit: ca0074e7067f6a21842462a69ca9b0172c65da29 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ca0074e7067f6a21842462a69… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Oct 8 01:32:27 2008 +0200 shell32/tests: Use FAILED instead of !SUCCEEDED. --- dlls/shell32/tests/shelllink.c | 12 ++++++------ dlls/shell32/tests/shlexec.c | 2 +- dlls/shell32/tests/shlfileop.c | 2 +- dlls/shell32/tests/shlfolder.c | 2 +- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/shell32/tests/shelllink.c b/dlls/shell32/tests/shelllink.c index 47aa659..83aae3f 100644 --- a/dlls/shell32/tests/shelllink.c +++ b/dlls/shell32/tests/shelllink.c @@ -114,7 +114,7 @@ static void test_get_set(void) r = CoCreateInstance(&CLSID_ShellLink, NULL, CLSCTX_INPROC_SERVER, &IID_IShellLinkA, (LPVOID*)&sl); ok(SUCCEEDED(r), "no IID_IShellLinkA (0x%08x)\n", r); - if (!SUCCEEDED(r)) + if (FAILED(r)) return; /* Test Getting / Setting the description */ @@ -329,7 +329,7 @@ void create_lnk_(int line, const WCHAR* path, lnk_desc_t* desc, int save_fails) r = CoCreateInstance(&CLSID_ShellLink, NULL, CLSCTX_INPROC_SERVER, &IID_IShellLinkA, (LPVOID*)&sl); lok(SUCCEEDED(r), "no IID_IShellLinkA (0x%08x)\n", r); - if (!SUCCEEDED(r)) + if (FAILED(r)) return; if (desc->description) @@ -404,12 +404,12 @@ static void check_lnk_(int line, const WCHAR* path, lnk_desc_t* desc, int todo) r = CoCreateInstance(&CLSID_ShellLink, NULL, CLSCTX_INPROC_SERVER, &IID_IShellLinkA, (LPVOID*)&sl); lok(SUCCEEDED(r), "no IID_IShellLinkA (0x%08x)\n", r); - if (!SUCCEEDED(r)) + if (FAILED(r)) return; r = IShellLinkA_QueryInterface(sl, &IID_IPersistFile, (LPVOID*)&pf); lok(SUCCEEDED(r), "no IID_IPersistFile (0x%08x)\n", r); - if (!SUCCEEDED(r)) + if (FAILED(r)) { IShellLinkA_Release(sl); return; @@ -418,7 +418,7 @@ static void check_lnk_(int line, const WCHAR* path, lnk_desc_t* desc, int todo) r = IPersistFile_Load(pf, path, STGM_READ); lok(SUCCEEDED(r), "load failed (0x%08x)\n", r); IPersistFile_Release(pf); - if (!SUCCEEDED(r)) + if (FAILED(r)) { IShellLinkA_Release(sl); return; @@ -715,7 +715,7 @@ START_TEST(shelllink) r = CoInitialize(NULL); ok(SUCCEEDED(r), "CoInitialize failed (0x%08x)\n", r); - if (!SUCCEEDED(r)) + if (FAILED(r)) return; test_get_set(); diff --git a/dlls/shell32/tests/shlexec.c b/dlls/shell32/tests/shlexec.c index 5eed12b..3c62ac2 100644 --- a/dlls/shell32/tests/shlexec.c +++ b/dlls/shell32/tests/shlexec.c @@ -1505,7 +1505,7 @@ static void init_test(void) r = CoInitialize(NULL); ok(SUCCEEDED(r), "CoInitialize failed (0x%08x)\n", r); - if (!SUCCEEDED(r)) + if (FAILED(r)) exit(1); rc=GetModuleFileName(NULL, argv0, sizeof(argv0)); diff --git a/dlls/shell32/tests/shlfileop.c b/dlls/shell32/tests/shlfileop.c index a4d2559..11cc612 100644 --- a/dlls/shell32/tests/shlfileop.c +++ b/dlls/shell32/tests/shlfileop.c @@ -275,7 +275,7 @@ static void test_get_file_info_iconlist(void) SHFILEINFOW shInfow; hr = SHGetSpecialFolderLocation(NULL, CSIDL_DESKTOP, &pidList); - if (!SUCCEEDED(hr)) { + if (FAILED(hr)) { skip("can't get desktop pidl\n"); return; } diff --git a/dlls/shell32/tests/shlfolder.c b/dlls/shell32/tests/shlfolder.c index a5fff49..30768b0 100644 --- a/dlls/shell32/tests/shlfolder.c +++ b/dlls/shell32/tests/shlfolder.c @@ -1398,7 +1398,7 @@ static void testSHGetFolderPathAndSubDirA(void) skip("SHGetFolderPathA not present!\n"); return; } - if(!SUCCEEDED(pSHGetFolderPathA(NULL, CSIDL_LOCAL_APPDATA, NULL, SHGFP_TYPE_CURRENT, appdata))) + if(FAILED(pSHGetFolderPathA(NULL, CSIDL_LOCAL_APPDATA, NULL, SHGFP_TYPE_CURRENT, appdata))) { skip("SHGetFolderPathA failed for CSIDL_LOCAL_APPDATA!\n"); return;

1 0

Michael Stefaniuc : oleaut32: Use FAILED instead of !SUCCEEDED.
by Alexandre Julliard Oct. 8, 2008

Oct. 8, 2008

Module: wine Branch: master Commit: 0c07d3ba37a511d6a64d65dc3624fca86a9adb6d URL: http://source.winehq.org/git/wine.git/?a=commit;h=0c07d3ba37a511d6a64d65dc3… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Oct 8 01:33:15 2008 +0200 oleaut32: Use FAILED instead of !SUCCEEDED. --- dlls/oleaut32/typelib.c | 6 +++--- dlls/oleaut32/typelib2.c | 2 +- dlls/oleaut32/variant.c | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index 9539bd0..7e069d6 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -394,7 +394,7 @@ HRESULT WINAPI LoadTypeLibEx( /* else fall-through */ case REGKIND_REGISTER: - if (!SUCCEEDED(res = RegisterTypeLib(*pptLib, (LPOLESTR)szPath, NULL))) + if (FAILED(res = RegisterTypeLib(*pptLib, (LPOLESTR)szPath, NULL))) { IUnknown_Release(*pptLib); *pptLib = 0; @@ -491,7 +491,7 @@ HRESULT WINAPI RegisterTypeLib( if (ptlib == NULL || szFullPath == NULL) return E_INVALIDARG; - if (!SUCCEEDED(ITypeLib_GetLibAttr(ptlib, &attr))) + if (FAILED(ITypeLib_GetLibAttr(ptlib, &attr))) return E_FAIL; get_typelib_key( &attr->guid, attr->wMajorVerNum, attr->wMinorVerNum, keyName ); @@ -6449,7 +6449,7 @@ static HRESULT WINAPI ITypeInfo_fnGetRefTypeInfo( ref_type->pImpTLInfo->lcid, &pTLib); - if(!SUCCEEDED(result)) { + if(FAILED(result)) { BSTR libnam=SysAllocString(ref_type->pImpTLInfo->name); result=LoadTypeLib(libnam, &pTLib); SysFreeString(libnam); diff --git a/dlls/oleaut32/typelib2.c b/dlls/oleaut32/typelib2.c index cbcd7f0..0d10f53 100644 --- a/dlls/oleaut32/typelib2.c +++ b/dlls/oleaut32/typelib2.c @@ -1349,7 +1349,7 @@ static HRESULT WINAPI ICreateTypeInfo2_fnAddRefTypeInfo( * implementation of ITypeInfo. So we need to do the following... */ res = ITypeInfo_GetContainingTypeLib(pTInfo, &container, &index); - if (!SUCCEEDED(res)) { + if (FAILED(res)) { TRACE("failed to find containing typelib.\n"); return res; } diff --git a/dlls/oleaut32/variant.c b/dlls/oleaut32/variant.c index e96325f..26a19bb 100644 --- a/dlls/oleaut32/variant.c +++ b/dlls/oleaut32/variant.c @@ -5673,14 +5673,14 @@ HRESULT WINAPI VarPow(LPVARIANT left, LPVARIANT right, LPVARIANT result) } hr = VariantChangeType(&dl,left,0,resvt); - if (!SUCCEEDED(hr)) { + if (FAILED(hr)) { ERR("Could not change passed left argument to VT_R8, handle it differently.\n"); hr = E_FAIL; goto end; } hr = VariantChangeType(&dr,right,0,resvt); - if (!SUCCEEDED(hr)) { + if (FAILED(hr)) { ERR("Could not change passed right argument to VT_R8, handle it differently.\n"); hr = E_FAIL; goto end;

1 0

Michael Stefaniuc : msi: Use the right FAILED/ SUCCEEDED macro instead of negating the opposite.
by Alexandre Julliard Oct. 8, 2008

Oct. 8, 2008

Module: wine Branch: master Commit: 704ebf280e53aea48b43552e8b376b9138b7d461 URL: http://source.winehq.org/git/wine.git/?a=commit;h=704ebf280e53aea48b43552e8… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Oct 8 01:33:34 2008 +0200 msi: Use the right FAILED/SUCCEEDED macro instead of negating the opposite. --- dlls/msi/action.c | 4 ++-- dlls/msi/database.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index d496ddb..7f73eaa 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -2964,7 +2964,7 @@ static BOOL CALLBACK Typelib_EnumResNameProc( HMODULE hModule, LPCWSTR lpszType, TRACE("trying %s\n", debugstr_w(tl_struct->path)); res = LoadTypeLib(tl_struct->path,&tl_struct->ptLib); - if (!SUCCEEDED(res)) + if (FAILED(res)) { msi_free(tl_struct->path); tl_struct->path = NULL; @@ -3046,7 +3046,7 @@ static UINT ITERATE_RegisterTypeLibraries(MSIRECORD *row, LPVOID param) res = RegisterTypeLib(tl_struct.ptLib,tl_struct.path,help); msi_free(help); - if (!SUCCEEDED(res)) + if (FAILED(res)) ERR("Failed to register type library %s\n", debugstr_w(tl_struct.path)); else diff --git a/dlls/msi/database.c b/dlls/msi/database.c index cf6e5eb..134c6e1 100644 --- a/dlls/msi/database.c +++ b/dlls/msi/database.c @@ -125,7 +125,7 @@ UINT MSI_OpenDatabaseW(LPCWSTR szDBPath, LPCWSTR szPersist, MSIDATABASE **pdb) IStorage_SetClass( stg, &CLSID_MsiDatabase ); /* create the _Tables stream */ r = write_stream_data(stg, szTables, NULL, 0, TRUE); - if (!FAILED(r)) + if (SUCCEEDED(r)) r = msi_init_string_table( stg ); } created = TRUE;

1 0