August 2008 - Wine-commits - list.winehq.org

Vladimir Pankratov : taskmgr: Converted some functions to Unicode.
by Alexandre Julliard 01 Aug '08

01 Aug '08

Module: wine Branch: master Commit: 992d0043822454a290139409bbe4a9cd222eed7d URL: http://source.winehq.org/git/wine.git/?a=commit;h=992d0043822454a290139409b… Author: Vladimir Pankratov <scriptkid(a)mail.ru> Date: Fri Aug 1 12:18:25 2008 +0500 taskmgr: Converted some functions to Unicode. --- programs/taskmgr/trayicon.c | 36 +++++++++++++++++++----------------- 1 files changed, 19 insertions(+), 17 deletions(-) diff --git a/programs/taskmgr/trayicon.c b/programs/taskmgr/trayicon.c index e088f3f..25a5121 100644 --- a/programs/taskmgr/trayicon.c +++ b/programs/taskmgr/trayicon.c @@ -26,13 +26,13 @@ #include <stdlib.h> #include <malloc.h> #include <memory.h> -#include <tchar.h> #include <stdio.h> #include <winnt.h> - +#include <shellapi.h> + +#include "wine/unicode.h" #include "taskmgr.h" #include "perfdata.h" -#include "shellapi.h" HICON TrayIcon_GetProcessorUsageIcon(void) { @@ -140,23 +140,24 @@ done: BOOL TrayIcon_ShellAddTrayIcon(void) { - NOTIFYICONDATA nid; + NOTIFYICONDATAW nid; HICON hIcon = NULL; BOOL bRetVal; + WCHAR wszCPU_Usage[] = {'C','P','U',' ','U','s','a','g','e',':',' ','%','d','%','%',0}; - memset(&nid, 0, sizeof(NOTIFYICONDATA)); + memset(&nid, 0, sizeof(NOTIFYICONDATAW)); hIcon = TrayIcon_GetProcessorUsageIcon(); - nid.cbSize = sizeof(NOTIFYICONDATA); + nid.cbSize = sizeof(NOTIFYICONDATAW); nid.hWnd = hMainWnd; nid.uID = 0; nid.uFlags = NIF_ICON | NIF_MESSAGE | NIF_TIP; nid.uCallbackMessage = WM_ONTRAYICON; nid.hIcon = hIcon; - wsprintf(nid.szTip, _T("CPU Usage: %d%%"), PerfDataGetProcessorUsage()); + wsprintfW(nid.szTip, wszCPU_Usage, PerfDataGetProcessorUsage()); - bRetVal = Shell_NotifyIcon(NIM_ADD, &nid); + bRetVal = Shell_NotifyIconW(NIM_ADD, &nid); if (hIcon) DestroyIcon(hIcon); @@ -166,41 +167,42 @@ BOOL TrayIcon_ShellAddTrayIcon(void) BOOL TrayIcon_ShellRemoveTrayIcon(void) { - NOTIFYICONDATA nid; + NOTIFYICONDATAW nid; BOOL bRetVal; - memset(&nid, 0, sizeof(NOTIFYICONDATA)); + memset(&nid, 0, sizeof(NOTIFYICONDATAW)); - nid.cbSize = sizeof(NOTIFYICONDATA); + nid.cbSize = sizeof(NOTIFYICONDATAW); nid.hWnd = hMainWnd; nid.uID = 0; nid.uFlags = 0; nid.uCallbackMessage = WM_ONTRAYICON; - bRetVal = Shell_NotifyIcon(NIM_DELETE, &nid); + bRetVal = Shell_NotifyIconW(NIM_DELETE, &nid); return bRetVal; } BOOL TrayIcon_ShellUpdateTrayIcon(void) { - NOTIFYICONDATA nid; + NOTIFYICONDATAW nid; HICON hIcon = NULL; BOOL bRetVal; + WCHAR wszCPU_Usage[] = {'C','P','U',' ','U','s','a','g','e',':',' ','%','d','%','%',0}; - memset(&nid, 0, sizeof(NOTIFYICONDATA)); + memset(&nid, 0, sizeof(NOTIFYICONDATAW)); hIcon = TrayIcon_GetProcessorUsageIcon(); - nid.cbSize = sizeof(NOTIFYICONDATA); + nid.cbSize = sizeof(NOTIFYICONDATAW); nid.hWnd = hMainWnd; nid.uID = 0; nid.uFlags = NIF_ICON | NIF_MESSAGE | NIF_TIP; nid.uCallbackMessage = WM_ONTRAYICON; nid.hIcon = hIcon; - wsprintf(nid.szTip, _T("CPU Usage: %d%%"), PerfDataGetProcessorUsage()); + wsprintfW(nid.szTip, wszCPU_Usage, PerfDataGetProcessorUsage()); - bRetVal = Shell_NotifyIcon(NIM_MODIFY, &nid); + bRetVal = Shell_NotifyIconW(NIM_MODIFY, &nid); if (hIcon) DestroyIcon(hIcon);

1 0

Alexandre Julliard : test.h: Fetch environment variables from the Win32 environment not the Unix one.
by Alexandre Julliard 01 Aug '08

01 Aug '08

Module: wine Branch: master Commit: b25eb5542a7411772ab843ec0e27379962fe2980 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b25eb5542a7411772ab843ec0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Aug 1 10:48:45 2008 +0200 test.h: Fetch environment variables from the Win32 environment not the Unix one. --- include/wine/test.h | 11 ++++++----- 1 files changed, 6 insertions(+), 5 deletions(-) diff --git a/include/wine/test.h b/include/wine/test.h index 02fc391..62d8c3a 100644 --- a/include/wine/test.h +++ b/include/wine/test.h @@ -476,17 +476,18 @@ static void usage( const char *argv0 ) /* main function */ int main( int argc, char **argv ) { - char *p; + char p[128]; setvbuf (stdout, NULL, _IONBF, 0); winetest_argc = argc; winetest_argv = argv; - if ((p = getenv( "WINETEST_PLATFORM" ))) winetest_platform = strdup(p); - if ((p = getenv( "WINETEST_DEBUG" ))) winetest_debug = atoi(p); - if ((p = getenv( "WINETEST_INTERACTIVE" ))) winetest_interactive = atoi(p); - if ((p = getenv( "WINETEST_REPORT_SUCCESS"))) report_success = atoi(p); + if (GetEnvironmentVariableA( "WINETEST_PLATFORM", p, sizeof(p) )) winetest_platform = strdup(p); + if (GetEnvironmentVariableA( "WINETEST_DEBUG", p, sizeof(p) )) winetest_debug = atoi(p); + if (GetEnvironmentVariableA( "WINETEST_INTERACTIVE", p, sizeof(p) )) winetest_interactive = atoi(p); + if (GetEnvironmentVariableA( "WINETEST_REPORT_SUCCESS", p, sizeof(p) )) report_success = atoi(p); + if (!argv[1]) { if (winetest_testlist[0].name && !winetest_testlist[1].name) /* only one test */

1 0

Alexandre Julliard : winetest: Set environment variables in the Win32 environment.
by Alexandre Julliard 01 Aug '08

01 Aug '08

Module: wine Branch: master Commit: b008b053a94696942878f44d487901f344c98860 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b008b053a94696942878f44d4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Aug 1 10:48:58 2008 +0200 winetest: Set environment variables in the Win32 environment. --- programs/winetest/main.c | 21 +++++++-------------- 1 files changed, 7 insertions(+), 14 deletions(-) diff --git a/programs/winetest/main.c b/programs/winetest/main.c index 04eaae4..045845a 100644 --- a/programs/winetest/main.c +++ b/programs/winetest/main.c @@ -659,25 +659,18 @@ int WINAPI WinMain (HINSTANCE hInst, HINSTANCE hPrevInst, cmdLine = strtok (NULL, whitespace); } if (!submit) { - static CHAR platform_windows[] = "WINETEST_PLATFORM=windows", - platform_wine[] = "WINETEST_PLATFORM=wine", - debug_yes[] = "WINETEST_DEBUG=1", - interactive_no[] = "WINETEST_INTERACTIVE=0", - report_success_no[] = "WINETEST_REPORT_SUCCESS=0"; - CHAR *platform; - report (R_STATUS, "Starting up"); if (!running_on_visible_desktop ()) report (R_FATAL, "Tests must be run on a visible desktop"); - platform = running_under_wine () ? platform_wine : platform_windows; - - if (reset_env && (putenv (platform) || - putenv (debug_yes) || - putenv (interactive_no) || - putenv (report_success_no))) - report (R_FATAL, "Could not reset environment"); + if (reset_env) + { + SetEnvironmentVariableA( "WINETEST_PLATFORM", running_under_wine () ? "wine" : "windows" ); + SetEnvironmentVariableA( "WINETEST_DEBUG", "1" ); + SetEnvironmentVariableA( "WINETEST_INTERACTIVE", "0" ); + SetEnvironmentVariableA( "WINETEST_REPORT_SUCCESS", "0" ); + } if (!tag) { if (!interactive)

1 0

Piotr Caban : msxml3: Added IVBSAXAttributes implementation.
by Alexandre Julliard 01 Aug '08

01 Aug '08

Module: wine Branch: master Commit: cafbf853ab22a9fe0fb904ef3529e83623f8de83 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cafbf853ab22a9fe0fb904ef3… Author: Piotr Caban <piotr.caban(a)gmail.com> Date: Thu Jul 31 16:47:41 2008 +0200 msxml3: Added IVBSAXAttributes implementation. --- dlls/msxml3/saxreader.c | 300 +++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 300 insertions(+), 0 deletions(-) diff --git a/dlls/msxml3/saxreader.c b/dlls/msxml3/saxreader.c index 0268d0a..facd962 100644 --- a/dlls/msxml3/saxreader.c +++ b/dlls/msxml3/saxreader.c @@ -192,6 +192,305 @@ static void update_position(saxlocator *This, xmlChar *end) } } +/*** IVBSAXAttributes interface ***/ +/*** IUnknown methods ***/ +static HRESULT WINAPI ivbsaxattributes_QueryInterface( + IVBSAXAttributes* iface, + REFIID riid, + void **ppvObject) +{ + saxattributes *This = impl_from_IVBSAXAttributes(iface); + + TRACE("%p %s %p\n", This, debugstr_guid(riid), ppvObject); + + *ppvObject = NULL; + + if (IsEqualGUID(riid, &IID_IUnknown) || + IsEqualGUID(riid, &IID_IDispatch) || + IsEqualGUID(riid, &IID_IVBSAXAttributes)) + { + *ppvObject = iface; + } + else + { + FIXME("interface %s not implemented\n", debugstr_guid(riid)); + return E_NOINTERFACE; + } + + IVBSAXAttributes_AddRef(iface); + + return S_OK; +} + +static ULONG WINAPI ivbsaxattributes_AddRef(IVBSAXAttributes* iface) +{ + saxattributes *This = impl_from_IVBSAXAttributes(iface); + return ISAXAttributes_AddRef((ISAXAttributes*)&This->lpSAXAttributesVtbl); +} + +static ULONG WINAPI ivbsaxattributes_Release(IVBSAXAttributes* iface) +{ + saxattributes *This = impl_from_IVBSAXAttributes(iface); + return ISAXAttributes_Release((ISAXAttributes*)&This->lpSAXAttributesVtbl); +} + +/*** IDispatch methods ***/ +static HRESULT WINAPI ivbsaxattributes_GetTypeInfoCount( IVBSAXAttributes *iface, UINT* pctinfo ) +{ + saxattributes *This = impl_from_IVBSAXAttributes( iface ); + + TRACE("(%p)->(%p)\n", This, pctinfo); + + *pctinfo = 1; + + return S_OK; +} + +static HRESULT WINAPI ivbsaxattributes_GetTypeInfo( + IVBSAXAttributes *iface, + UINT iTInfo, LCID lcid, ITypeInfo** ppTInfo ) +{ + saxattributes *This = impl_from_IVBSAXAttributes( iface ); + HRESULT hr; + + TRACE("(%p)->(%u %u %p)\n", This, iTInfo, lcid, ppTInfo); + + hr = get_typeinfo(IVBSAXAttributes_tid, ppTInfo); + + return hr; +} + +static HRESULT WINAPI ivbsaxattributes_GetIDsOfNames( + IVBSAXAttributes *iface, + REFIID riid, + LPOLESTR* rgszNames, + UINT cNames, + LCID lcid, + DISPID* rgDispId) +{ + saxattributes *This = impl_from_IVBSAXAttributes( iface ); + ITypeInfo *typeinfo; + HRESULT hr; + + TRACE("(%p)->(%s %p %u %u %p)\n", This, debugstr_guid(riid), rgszNames, cNames, + lcid, rgDispId); + + if(!rgszNames || cNames == 0 || !rgDispId) + return E_INVALIDARG; + + hr = get_typeinfo(IVBSAXAttributes_tid, &typeinfo); + if(SUCCEEDED(hr)) + { + hr = ITypeInfo_GetIDsOfNames(typeinfo, rgszNames, cNames, rgDispId); + ITypeInfo_Release(typeinfo); + } + + return hr; +} + +static HRESULT WINAPI ivbsaxattributes_Invoke( + IVBSAXAttributes *iface, + DISPID dispIdMember, + REFIID riid, + LCID lcid, + WORD wFlags, + DISPPARAMS* pDispParams, + VARIANT* pVarResult, + EXCEPINFO* pExcepInfo, + UINT* puArgErr) +{ + saxattributes *This = impl_from_IVBSAXAttributes( iface ); + ITypeInfo *typeinfo; + HRESULT hr; + + TRACE("(%p)->(%d %s %d %d %p %p %p %p)\n", This, dispIdMember, debugstr_guid(riid), + lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); + + hr = get_typeinfo(IVBSAXAttributes_tid, &typeinfo); + if(SUCCEEDED(hr)) + { + hr = ITypeInfo_Invoke(typeinfo, &(This->lpVBSAXAttributesVtbl), dispIdMember, wFlags, pDispParams, + pVarResult, pExcepInfo, puArgErr); + ITypeInfo_Release(typeinfo); + } + + return hr; +} + +/*** IVBSAXAttributes methods ***/ +static HRESULT WINAPI ivbsaxattributes_get_length( + IVBSAXAttributes* iface, + int *nLength) +{ + saxattributes *This = impl_from_IVBSAXAttributes( iface ); + return ISAXAttributes_getLength( + (ISAXAttributes*)&This->lpSAXAttributesVtbl, + nLength); +} + +static HRESULT WINAPI ivbsaxattributes_getURI( + IVBSAXAttributes* iface, + int nIndex, + BSTR *uri) +{ + int len; + saxattributes *This = impl_from_IVBSAXAttributes( iface ); + return ISAXAttributes_getURI( + (ISAXAttributes*)&This->lpSAXAttributesVtbl, + nIndex, (const WCHAR**)uri, &len); +} + +static HRESULT WINAPI ivbsaxattributes_getLocalName( + IVBSAXAttributes* iface, + int nIndex, + BSTR *localName) +{ + int len; + saxattributes *This = impl_from_IVBSAXAttributes( iface ); + return ISAXAttributes_getLocalName( + (ISAXAttributes*)&This->lpSAXAttributesVtbl, + nIndex, (const WCHAR**)localName, &len); +} + +static HRESULT WINAPI ivbsaxattributes_getQName( + IVBSAXAttributes* iface, + int nIndex, + BSTR *QName) +{ + int len; + saxattributes *This = impl_from_IVBSAXAttributes( iface ); + return ISAXAttributes_getQName( + (ISAXAttributes*)&This->lpSAXAttributesVtbl, + nIndex, (const WCHAR**)QName, &len); +} + +static HRESULT WINAPI ivbsaxattributes_getIndexFromName( + IVBSAXAttributes* iface, + BSTR uri, + BSTR localName, + int *index) +{ + saxattributes *This = impl_from_IVBSAXAttributes( iface ); + return ISAXAttributes_getIndexFromName( + (ISAXAttributes*)&This->lpSAXAttributesVtbl, + (const WCHAR*)uri, SysStringLen(uri), + (const WCHAR*)localName, SysStringLen(localName), index); +} + +static HRESULT WINAPI ivbsaxattributes_getIndexFromQName( + IVBSAXAttributes* iface, + BSTR QName, + int *index) +{ + saxattributes *This = impl_from_IVBSAXAttributes( iface ); + return ISAXAttributes_getIndexFromQName( + (ISAXAttributes*)&This->lpSAXAttributesVtbl, + (const WCHAR*)QName, SysStringLen(QName), index); +} + +static HRESULT WINAPI ivbsaxattributes_getType( + IVBSAXAttributes* iface, + int nIndex, + BSTR *type) +{ + int len; + saxattributes *This = impl_from_IVBSAXAttributes( iface ); + return ISAXAttributes_getType( + (ISAXAttributes*)&This->lpSAXAttributesVtbl, + nIndex, (const WCHAR**)type, &len); +} + +static HRESULT WINAPI ivbsaxattributes_getTypeFromName( + IVBSAXAttributes* iface, + BSTR uri, + BSTR localName, + BSTR *type) +{ + int len; + saxattributes *This = impl_from_IVBSAXAttributes( iface ); + return ISAXAttributes_getTypeFromName( + (ISAXAttributes*)&This->lpSAXAttributesVtbl, + (const WCHAR*)uri, SysStringLen(uri), + (const WCHAR*)localName, SysStringLen(localName), + (const WCHAR**)type, &len); +} + +static HRESULT WINAPI ivbsaxattributes_getTypeFromQName( + IVBSAXAttributes* iface, + BSTR QName, + BSTR *type) +{ + int len; + saxattributes *This = impl_from_IVBSAXAttributes( iface ); + return ISAXAttributes_getTypeFromQName( + (ISAXAttributes*)&This->lpSAXAttributesVtbl, + (const WCHAR*)QName, SysStringLen(QName), + (const WCHAR**)type, &len); +} + +static HRESULT WINAPI ivbsaxattributes_getValue( + IVBSAXAttributes* iface, + int nIndex, + BSTR *value) +{ + int len; + saxattributes *This = impl_from_IVBSAXAttributes( iface ); + return ISAXAttributes_getValue( + (ISAXAttributes*)&This->lpSAXAttributesVtbl, + nIndex, (const WCHAR**)value, &len); +} + +static HRESULT WINAPI ivbsaxattributes_getValueFromName( + IVBSAXAttributes* iface, + BSTR uri, + BSTR localName, + BSTR *value) +{ + int len; + saxattributes *This = impl_from_IVBSAXAttributes( iface ); + return ISAXAttributes_getValueFromName( + (ISAXAttributes*)&This->lpSAXAttributesVtbl, + (const WCHAR*)uri, SysStringLen(uri), + (const WCHAR*)localName, SysStringLen(localName), + (const WCHAR**)value, &len); +} + +static HRESULT WINAPI ivbsaxattributes_getValueFromQName( + IVBSAXAttributes* iface, + BSTR QName, + BSTR *value) +{ + int len; + saxattributes *This = impl_from_IVBSAXAttributes( iface ); + return ISAXAttributes_getValueFromQName( + (ISAXAttributes*)&This->lpSAXAttributesVtbl, + (const WCHAR*)QName, SysStringLen(QName), + (const WCHAR**)value, &len); +} + +static const struct IVBSAXAttributesVtbl ivbsaxattributes_vtbl = +{ + ivbsaxattributes_QueryInterface, + ivbsaxattributes_AddRef, + ivbsaxattributes_Release, + ivbsaxattributes_GetTypeInfoCount, + ivbsaxattributes_GetTypeInfo, + ivbsaxattributes_GetIDsOfNames, + ivbsaxattributes_Invoke, + ivbsaxattributes_get_length, + ivbsaxattributes_getURI, + ivbsaxattributes_getLocalName, + ivbsaxattributes_getQName, + ivbsaxattributes_getIndexFromName, + ivbsaxattributes_getIndexFromQName, + ivbsaxattributes_getType, + ivbsaxattributes_getTypeFromName, + ivbsaxattributes_getTypeFromQName, + ivbsaxattributes_getValue, + ivbsaxattributes_getValueFromName, + ivbsaxattributes_getValueFromQName +}; + /*** ISAXAttributes interface ***/ /*** IUnknown methods ***/ static HRESULT WINAPI isaxattributes_QueryInterface( @@ -476,6 +775,7 @@ static HRESULT SAXAttributes_create(saxattributes **attr, if(!attributes) return E_OUTOFMEMORY; + attributes->lpVBSAXAttributesVtbl = &ivbsaxattributes_vtbl; attributes->lpSAXAttributesVtbl = &isaxattributes_vtbl; attributes->ref = 1;

1 0

Piotr Caban : msxml3: Prepare functions for IVBSAX... interfaces implementation.
by Alexandre Julliard 01 Aug '08

01 Aug '08

Module: wine Branch: master Commit: 4c69e86dea6eea4bfa2ac9c948a6729fc60cd199 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4c69e86dea6eea4bfa2ac9c94… Author: Piotr Caban <piotr.caban(a)gmail.com> Date: Thu Jul 31 16:47:26 2008 +0200 msxml3: Prepare functions for IVBSAX... interfaces implementation. --- dlls/msxml3/saxreader.c | 28 ++++++++++++++++++++-------- 1 files changed, 20 insertions(+), 8 deletions(-) diff --git a/dlls/msxml3/saxreader.c b/dlls/msxml3/saxreader.c index d8d47e8..0268d0a 100644 --- a/dlls/msxml3/saxreader.c +++ b/dlls/msxml3/saxreader.c @@ -48,7 +48,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(msxml); typedef struct _saxreader { - const struct IVBSAXXMLReaderVtbl *lpVtbl; + const struct IVBSAXXMLReaderVtbl *lpVBSAXXMLReaderVtbl; const struct ISAXXMLReaderVtbl *lpSAXXMLReaderVtbl; LONG ref; struct ISAXContentHandler *contentHandler; @@ -58,6 +58,7 @@ typedef struct _saxreader typedef struct _saxlocator { + const struct IVBSAXLocatorVtbl *lpVBSAXLocatorVtbl; const struct ISAXLocatorVtbl *lpSAXLocatorVtbl; LONG ref; saxreader *saxreader; @@ -72,6 +73,7 @@ typedef struct _saxlocator typedef struct _saxattributes { + const struct IVBSAXAttributesVtbl *lpVBSAXAttributesVtbl; const struct ISAXAttributesVtbl *lpSAXAttributesVtbl; LONG ref; int nb_attributes; @@ -84,7 +86,7 @@ typedef struct _saxattributes static inline saxreader *impl_from_IVBSAXXMLReader( IVBSAXXMLReader *iface ) { - return (saxreader *)((char*)iface - FIELD_OFFSET(saxreader, lpVtbl)); + return (saxreader *)((char*)iface - FIELD_OFFSET(saxreader, lpVBSAXXMLReaderVtbl)); } static inline saxreader *impl_from_ISAXXMLReader( ISAXXMLReader *iface ) @@ -92,11 +94,21 @@ static inline saxreader *impl_from_ISAXXMLReader( ISAXXMLReader *iface ) return (saxreader *)((char*)iface - FIELD_OFFSET(saxreader, lpSAXXMLReaderVtbl)); } +static inline saxlocator *impl_from_IVBSAXLocator( IVBSAXLocator *iface ) +{ + return (saxlocator *)((char*)iface - FIELD_OFFSET(saxlocator, lpVBSAXLocatorVtbl)); +} + static inline saxlocator *impl_from_ISAXLocator( ISAXLocator *iface ) { return (saxlocator *)((char*)iface - FIELD_OFFSET(saxlocator, lpSAXLocatorVtbl)); } +static inline saxattributes *impl_from_IVBSAXAttributes( IVBSAXAttributes *iface ) +{ + return (saxattributes *)((char*)iface - FIELD_OFFSET(saxattributes, lpVBSAXAttributesVtbl)); +} + static inline saxattributes *impl_from_ISAXAttributes( ISAXAttributes *iface ) { return (saxattributes *)((char*)iface - FIELD_OFFSET(saxattributes, lpSAXAttributesVtbl)); @@ -1065,7 +1077,7 @@ static HRESULT WINAPI saxxmlreader_Invoke( hr = get_typeinfo(IVBSAXXMLReader_tid, &typeinfo); if(SUCCEEDED(hr)) { - hr = ITypeInfo_Invoke(typeinfo, &(This->lpVtbl), dispIdMember, wFlags, pDispParams, + hr = ITypeInfo_Invoke(typeinfo, &(This->lpVBSAXXMLReaderVtbl), dispIdMember, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); ITypeInfo_Release(typeinfo); } @@ -1293,19 +1305,19 @@ static const struct IVBSAXXMLReaderVtbl saxreader_vtbl = static HRESULT WINAPI isaxxmlreader_QueryInterface(ISAXXMLReader* iface, REFIID riid, void **ppvObject) { saxreader *This = impl_from_ISAXXMLReader( iface ); - return saxxmlreader_QueryInterface((IVBSAXXMLReader*)&This->lpVtbl, riid, ppvObject); + return saxxmlreader_QueryInterface((IVBSAXXMLReader*)&This->lpVBSAXXMLReaderVtbl, riid, ppvObject); } static ULONG WINAPI isaxxmlreader_AddRef(ISAXXMLReader* iface) { saxreader *This = impl_from_ISAXXMLReader( iface ); - return saxxmlreader_AddRef((IVBSAXXMLReader*)&This->lpVtbl); + return saxxmlreader_AddRef((IVBSAXXMLReader*)&This->lpVBSAXXMLReaderVtbl); } static ULONG WINAPI isaxxmlreader_Release(ISAXXMLReader* iface) { saxreader *This = impl_from_ISAXXMLReader( iface ); - return saxxmlreader_Release((IVBSAXXMLReader*)&This->lpVtbl); + return saxxmlreader_Release((IVBSAXXMLReader*)&This->lpVBSAXXMLReaderVtbl); } /*** ISAXXMLReader methods ***/ @@ -1686,7 +1698,7 @@ HRESULT SAXXMLReader_create(IUnknown *pUnkOuter, LPVOID *ppObj) if( !reader ) return E_OUTOFMEMORY; - reader->lpVtbl = &saxreader_vtbl; + reader->lpVBSAXXMLReaderVtbl = &saxreader_vtbl; reader->lpSAXXMLReaderVtbl = &isaxreader_vtbl; reader->ref = 1; reader->contentHandler = NULL; @@ -1703,7 +1715,7 @@ HRESULT SAXXMLReader_create(IUnknown *pUnkOuter, LPVOID *ppObj) reader->sax.error = libxmlFatalError; reader->sax.fatalError = libxmlFatalError; - *ppObj = &reader->lpVtbl; + *ppObj = &reader->lpVBSAXXMLReaderVtbl; TRACE("returning iface %p\n", *ppObj);

1 0

Andrew Talbot : dnsapi: Sign-compare warnings fix.
by Alexandre Julliard 01 Aug '08

01 Aug '08

Module: wine Branch: master Commit: 5ca83ae502a6e733af517616a0edef044caeee31 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5ca83ae502a6e733af517616a… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Thu Jul 31 22:26:26 2008 +0100 dnsapi: Sign-compare warnings fix. --- dlls/dnsapi/query.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/dnsapi/query.c b/dlls/dnsapi/query.c index 7ca08a0..6c7e4c8 100644 --- a/dlls/dnsapi/query.c +++ b/dlls/dnsapi/query.c @@ -561,7 +561,7 @@ exit: */ static DNS_STATUS dns_set_serverlist( const IP4_ARRAY *addrs ) { - unsigned int i; + int i; if (addrs->AddrCount > MAXNS) { @@ -579,7 +579,8 @@ static DNS_STATUS dns_set_serverlist( const IP4_ARRAY *addrs ) static DNS_STATUS dns_get_serverlist( PIP4_ARRAY addrs, PDWORD len ) { - unsigned int i, size; + unsigned int size; + int i; size = sizeof(IP4_ARRAY) + sizeof(IP4_ADDRESS) * (_res.nscount - 1); if (!addrs || *len < size)

1 0

Andrew Talbot : dswave: Sign-compare warning fix.
by Alexandre Julliard 01 Aug '08

01 Aug '08

Module: wine Branch: master Commit: 6b540d4513c1d53eb35d132d72bfd51f9a843202 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6b540d4513c1d53eb35d132d7… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Thu Jul 31 22:26:32 2008 +0100 dswave: Sign-compare warning fix. --- dlls/dswave/dswave_main.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/dswave/dswave_main.c b/dlls/dswave/dswave_main.c index 2a951ab..a94c504 100644 --- a/dlls/dswave/dswave_main.c +++ b/dlls/dswave/dswave_main.c @@ -477,7 +477,8 @@ const char *debugstr_dmreturn (DWORD code) { /* generic flag-dumping function */ const char* debugstr_flags (DWORD flags, const flag_info* names, size_t num_names){ char buffer[128] = "", *ptr = &buffer[0]; - unsigned int i, size = sizeof(buffer); + unsigned int i; + int size = sizeof(buffer); for (i=0; i < num_names; i++) {

1 0

Andre Wisplinghoff : user32: Make dde test use skip function.
by Alexandre Julliard 01 Aug '08

01 Aug '08

Module: wine Branch: master Commit: 7abfbd085c43f70f6f0b36e95bfdaf00f87431e3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7abfbd085c43f70f6f0b36e95… Author: Andre Wisplinghoff <andre.wisplinghoff(a)gmail.com> Date: Thu Jul 31 18:07:34 2008 +0200 user32: Make dde test use skip function. --- dlls/user32/tests/dde.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/user32/tests/dde.c b/dlls/user32/tests/dde.c index 127b61d..908d60a 100644 --- a/dlls/user32/tests/dde.c +++ b/dlls/user32/tests/dde.c @@ -1666,7 +1666,7 @@ static void test_DdeCreateStringHandle(void) ret = DdeInitializeW(&dde_inst, client_ddeml_callback, APPCMD_CLIENTONLY, 0); if (GetLastError() == ERROR_CALL_NOT_IMPLEMENTED) { - trace("Skipping the DDE test on a Win9x platform\n"); + skip("DdeInitialize is unimplemented\n"); return; }

1 0

Piotr Caban : msxml3: Reorganize parse_buffer function ( make use of libxml2 parserInternals.h).
by Alexandre Julliard 01 Aug '08

01 Aug '08

Module: wine Branch: master Commit: df5e40ec727895b99d19dbf0ff74a36526e041f4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=df5e40ec727895b99d19dbf0f… Author: Piotr Caban <piotr.caban(a)gmail.com> Date: Thu Jul 31 16:45:30 2008 +0200 msxml3: Reorganize parse_buffer function (make use of libxml2 parserInternals.h). --- dlls/msxml3/saxreader.c | 43 ++++++++++++++++++------------------------- 1 files changed, 18 insertions(+), 25 deletions(-) diff --git a/dlls/msxml3/saxreader.c b/dlls/msxml3/saxreader.c index 5a64e2b..789dce2 100644 --- a/dlls/msxml3/saxreader.c +++ b/dlls/msxml3/saxreader.c @@ -44,6 +44,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(msxml); #ifdef HAVE_LIBXML2 #include <libxml/SAX2.h> +#include <libxml/parserInternals.h> typedef struct _saxreader { @@ -151,6 +152,12 @@ static void update_position(saxlocator *This, xmlChar *end) This->line = 1; This->column = 1; } + else if(This->lastCur < This->pParserCtxt->input->base) + { + This->lastCur = (xmlChar*)This->pParserCtxt->input->base; + This->line = 1; + This->column = 1; + } if(!end) end = (xmlChar*)This->pParserCtxt->input->cur; @@ -1468,7 +1475,7 @@ static HRESULT WINAPI isaxxmlreader_putSecureBaseURL( return E_NOTIMPL; } -static HRESULT parse_buffer(saxreader *This, xmlChar *buffer) +static HRESULT parse_buffer(saxreader *This, const char *buffer, int size) { saxlocator *locator; HRESULT hr; @@ -1477,7 +1484,7 @@ static HRESULT parse_buffer(saxreader *This, xmlChar *buffer) if(FAILED(hr)) return E_FAIL; - locator->pParserCtxt = xmlNewParserCtxt(); + locator->pParserCtxt = xmlCreateMemoryParserCtxt(buffer, size); if(!locator->pParserCtxt) { ISAXLocator_Release((ISAXLocator*)&locator->lpSAXLocatorVtbl); @@ -1487,8 +1494,6 @@ static HRESULT parse_buffer(saxreader *This, xmlChar *buffer) locator->pParserCtxt->sax = &locator->saxreader->sax; locator->pParserCtxt->userData = locator; - xmlSetupParserForBuffer(locator->pParserCtxt, buffer, NULL); - if(xmlParseDocument(locator->pParserCtxt)) hr = E_FAIL; else hr = locator->ret; @@ -1508,7 +1513,6 @@ static HRESULT WINAPI isaxxmlreader_parse( VARIANT varInput) { saxreader *This = impl_from_ISAXXMLReader( iface ); - xmlChar *data = NULL; HRESULT hr; TRACE("(%p)\n", This); @@ -1517,8 +1521,8 @@ static HRESULT WINAPI isaxxmlreader_parse( switch(V_VT(&varInput)) { case VT_BSTR: - data = xmlChar_from_wchar(V_BSTR(&varInput)); - hr = parse_buffer(This, data); + hr = parse_buffer(This, (const char*)V_BSTR(&varInput), + SysStringByteLen(V_BSTR(&varInput))); break; case VT_ARRAY|VT_UI1: { void *pSAData; @@ -1530,13 +1534,9 @@ static HRESULT WINAPI isaxxmlreader_parse( hr = SafeArrayGetUBound(V_ARRAY(&varInput), 1, &uBound); if(hr != S_OK) break; dataRead = (uBound-lBound)*SafeArrayGetElemsize(V_ARRAY(&varInput)); - data = HeapAlloc(GetProcessHeap(), 0, dataRead+1); - if(!data) break; hr = SafeArrayAccessData(V_ARRAY(&varInput), (void**)&pSAData); if(hr != S_OK) break; - memcpy(data, pSAData, dataRead); - data[dataRead] = '\0'; - hr = parse_buffer(This, data); + hr = parse_buffer(This, pSAData, dataRead); SafeArrayUnaccessData(V_ARRAY(&varInput)); break; } @@ -1558,6 +1558,7 @@ static HRESULT WINAPI isaxxmlreader_parse( { STATSTG dataInfo; ULONG dataRead; + char *data; while(1) { @@ -1566,7 +1567,7 @@ static HRESULT WINAPI isaxxmlreader_parse( break; } data = HeapAlloc(GetProcessHeap(), 0, - dataInfo.cbSize.QuadPart+1); + dataInfo.cbSize.QuadPart); while(1) { hr = IStream_Read(stream, data, @@ -1574,8 +1575,8 @@ static HRESULT WINAPI isaxxmlreader_parse( if(hr == E_PENDING) continue; break; } - data[dataInfo.cbSize.QuadPart] = '\0'; - hr = parse_buffer(This, data); + hr = parse_buffer(This, data, dataInfo.cbSize.QuadPart); + HeapFree(GetProcessHeap(), 0, data); IStream_Release(stream); break; } @@ -1585,8 +1586,7 @@ static HRESULT WINAPI isaxxmlreader_parse( BSTR bstrData; IXMLDOMDocument_get_xml(xmlDoc, &bstrData); - data = xmlChar_from_wchar(bstrData); - hr = parse_buffer(This, data); + hr = parse_buffer(This, (const char*)bstrData, SysStringByteLen(bstrData)); IXMLDOMDocument_Release(xmlDoc); hr = E_NOTIMPL; break; @@ -1597,23 +1597,16 @@ static HRESULT WINAPI isaxxmlreader_parse( hr = E_INVALIDARG; } - HeapFree(GetProcessHeap(), 0, data); return hr; } static HRESULT saxreader_onDataAvailable(void *obj, char *ptr, DWORD len) { saxreader *This = obj; - xmlChar *data; HRESULT hr; - data = HeapAlloc(GetProcessHeap(), 0, len+1); - memcpy(data, ptr, len); - data[len] = 0; - - hr = parse_buffer(This, data); + hr = parse_buffer(This, ptr, len); - HeapFree(GetProcessHeap(), 0, data); return hr; }

1 0

Piotr Caban : msxml3: Added ISAXAttributes_getQName implementation.
by Alexandre Julliard 01 Aug '08

01 Aug '08

Module: wine Branch: master Commit: 6818cc6fee24915564f592183bafaa78e6936308 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6818cc6fee24915564f592183… Author: Piotr Caban <piotr.caban(a)gmail.com> Date: Thu Jul 31 16:45:42 2008 +0200 msxml3: Added ISAXAttributes_getQName implementation. --- dlls/msxml3/saxreader.c | 28 +++++++++++++++++++++++++--- 1 files changed, 25 insertions(+), 3 deletions(-) diff --git a/dlls/msxml3/saxreader.c b/dlls/msxml3/saxreader.c index 789dce2..d8d47e8 100644 --- a/dlls/msxml3/saxreader.c +++ b/dlls/msxml3/saxreader.c @@ -79,6 +79,7 @@ typedef struct _saxattributes BSTR *szPrefix; BSTR *szURI; BSTR *szValue; + BSTR *szQName; } saxattributes; static inline saxreader *impl_from_IVBSAXXMLReader( IVBSAXXMLReader *iface ) @@ -293,9 +294,14 @@ static HRESULT WINAPI isaxattributes_getQName( int *pQNameLength) { saxattributes *This = impl_from_ISAXAttributes( iface ); + TRACE("(%p)->(%d)\n", This, nIndex); - FIXME("(%p)->(%d) stub\n", This, nIndex); - return E_NOTIMPL; + if(nIndex >= This->nb_attributes) return E_INVALIDARG; + + *pQNameLength = SysStringLen(This->szQName[nIndex]); + *pQName = This->szQName[nIndex]; + + return S_OK; } static HRESULT WINAPI isaxattributes_getName( @@ -471,9 +477,12 @@ static HRESULT SAXAttributes_create(saxattributes **attr, HeapAlloc(GetProcessHeap(), 0, sizeof(BSTR)*nb_attributes); attributes->szValue = HeapAlloc(GetProcessHeap(), 0, sizeof(BSTR)*nb_attributes); + attributes->szQName = + HeapAlloc(GetProcessHeap(), 0, sizeof(BSTR)*nb_attributes); if(!attributes->szLocalname || !attributes->szPrefix - || !attributes->szURI || !attributes->szValue) + || !attributes->szURI || !attributes->szValue + || !attributes->szQName) { if(attributes->szLocalname) HeapFree(GetProcessHeap(), 0, attributes->szLocalname); @@ -483,11 +492,15 @@ static HRESULT SAXAttributes_create(saxattributes **attr, HeapFree(GetProcessHeap(), 0, attributes->szURI); if(attributes->szValue) HeapFree(GetProcessHeap(), 0, attributes->szValue); + if(attributes->szQName) + HeapFree(GetProcessHeap(), 0, attributes->szQName); return E_FAIL; } for(index=0; index<nb_attributes; index++) { + int len1, len2; + attributes->szLocalname[index] = bstr_from_xmlChar(xmlAttributes[index*5]); attributes->szPrefix[index] = @@ -497,6 +510,15 @@ static HRESULT SAXAttributes_create(saxattributes **attr, attributes->szValue[index] = bstr_from_xmlCharN(xmlAttributes[index*5+3], xmlAttributes[index*5+4]-xmlAttributes[index*5+3]); + + len1 = SysStringLen(attributes->szPrefix[index]); + len2 = SysStringLen(attributes->szLocalname[index]); + attributes->szQName[index] = SysAllocStringLen(NULL, len1+len2); + memcpy(attributes->szQName[index], attributes->szPrefix[index], + len1*sizeof(WCHAR)); + memcpy(attributes->szQName[index]+len1, + attributes->szLocalname[index], len2*sizeof(WCHAR)); + attributes->szQName[index][len1+len2] = '\0'; } *attr = attributes;

1 0