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

François Dorin : ole32: Fix return value for DefaultHandler_SetExtent.
by Alexandre Julliard 28 Jul '08

28 Jul '08

Module: wine Branch: master Commit: db941f43b658744551cd402d0fdb6191e6310d5a URL: http://source.winehq.org/git/wine.git/?a=commit;h=db941f43b658744551cd402d0… Author: François Dorin <f.dorin(a)free.fr> Date: Sat Jul 26 15:09:33 2008 +0200 ole32: Fix return value for DefaultHandler_SetExtent. --- dlls/ole32/defaulthandler.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ole32/defaulthandler.c b/dlls/ole32/defaulthandler.c index dda2d4b..afacc51 100644 --- a/dlls/ole32/defaulthandler.c +++ b/dlls/ole32/defaulthandler.c @@ -715,7 +715,7 @@ static HRESULT WINAPI DefaultHandler_SetExtent( dwDrawAspect, psizel->cx, psizel->cy); if (object_is_running(This)) - IOleObject_SetExtent(This->pOleDelegate, dwDrawAspect, psizel); + return IOleObject_SetExtent(This->pOleDelegate, dwDrawAspect, psizel); return OLE_E_NOTRUNNING; }

1 0

Andrew Talbot : advapi32: Remove unused variable.
by Alexandre Julliard 28 Jul '08

28 Jul '08

Module: wine Branch: master Commit: 4a03558e8f6442b589111d6f2e31e0cdbd874b1b URL: http://source.winehq.org/git/wine.git/?a=commit;h=4a03558e8f6442b589111d6f2… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Sat Jul 26 21:46:39 2008 +0100 advapi32: Remove unused variable. --- dlls/advapi32/cred.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/dlls/advapi32/cred.c b/dlls/advapi32/cred.c index 50a27c0..6600912 100644 --- a/dlls/advapi32/cred.c +++ b/dlls/advapi32/cred.c @@ -49,7 +49,6 @@ static const WCHAR wszEncryptionKeyValue[] = {'E','n','c','r','y','p','t','i','o static const WCHAR wszFlagsValue[] = {'F','l','a','g','s',0}; static const WCHAR wszTypeValue[] = {'T','y','p','e',0}; -static const WCHAR wszTargetNameValue[] = {'T','a','r','g','e','t','N','a','m','e',0}; static const WCHAR wszCommentValue[] = {'C','o','m','m','e','n','t',0}; static const WCHAR wszLastWrittenValue[] = {'L','a','s','t','W','r','i','t','t','e','n',0}; static const WCHAR wszPersistValue[] = {'P','e','r','s','i','s','t',0};

1 0

Alexandre Julliard : wine.inf; Don' t overwrite path and temp dir environment variables on upgrades.
by Alexandre Julliard 28 Jul '08

28 Jul '08

Module: wine Branch: master Commit: 3ae17fa003e9c9e1eb182bfe5e998c148788e218 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3ae17fa003e9c9e1eb182bfe5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jul 28 12:05:09 2008 +0200 wine.inf; Don't overwrite path and temp dir environment variables on upgrades. --- tools/wine.inf.in | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/wine.inf.in b/tools/wine.inf.in index da5020d..e8e4df6 100644 --- a/tools/wine.inf.in +++ b/tools/wine.inf.in @@ -274,12 +274,12 @@ HKLM,Software\Microsoft\DirectPlay\Service Providers\Serial Connection For Direc HKLM,System\CurrentControlSet\Control\Session Manager\Environment,"APPDATA",,"%16410%" HKLM,System\CurrentControlSet\Control\Session Manager\Environment,"ComSpec",0x00020000,"%11%\cmd.exe" HKLM,System\CurrentControlSet\Control\Session Manager\Environment,"LOCALAPPDATA",,"%16412%" -HKLM,System\CurrentControlSet\Control\Session Manager\Environment,"PATH",0x00020000,"%11%;%10%" +HKLM,System\CurrentControlSet\Control\Session Manager\Environment,"PATH",0x00020002,"%11%;%10%" HKLM,System\CurrentControlSet\Control\Session Manager\Environment,"ProgramFiles",,"%16422%" HKLM,System\CurrentControlSet\Control\Session Manager\Environment,"SystemDrive",2,"c:" HKLM,System\CurrentControlSet\Control\Session Manager\Environment,"SYSTEMROOT",,"%10%" -HKLM,System\CurrentControlSet\Control\Session Manager\Environment,"TEMP",0x00020000,"%10%\temp" -HKLM,System\CurrentControlSet\Control\Session Manager\Environment,"TMP",0x00020000,"%10%\temp" +HKLM,System\CurrentControlSet\Control\Session Manager\Environment,"TEMP",0x00020002,"%10%\temp" +HKLM,System\CurrentControlSet\Control\Session Manager\Environment,"TMP",0x00020002,"%10%\temp" HKLM,System\CurrentControlSet\Control\Session Manager\Environment,"windir",0x00020000,"%10%" HKLM,System\CurrentControlSet\Control\Session Manager\Environment,"winsysdir",,"%11%"

1 0

Alexandre Julliard : configure: Don't use cups-config --libs, it returns garbage.
by Alexandre Julliard 28 Jul '08

28 Jul '08

Module: wine Branch: master Commit: a991a568b4972fa85252f4d90f563c7bc33696f9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a991a568b4972fa85252f4d90… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jul 28 12:04:46 2008 +0200 configure: Don't use cups-config --libs, it returns garbage. --- configure | 2 +- configure.ac | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/configure b/configure index 0de81c0..840367f 100755 --- a/configure +++ b/configure @@ -15017,7 +15017,7 @@ if test "x$with_cups" != "xno" then ac_save_CPPFLAGS="$CPPFLAGS" ac_cups_cflags=`cups-config --cflags 2>/dev/null` - ac_cups_libs="`cups-config --ldflags 2>/dev/null` `cups-config --libs 2>/dev/null`" + ac_cups_libs=`cups-config --ldflags 2>/dev/null` CPPFLAGS="$CPPFLAGS $ac_cups_cflags" for ac_header in cups/cups.h diff --git a/configure.ac b/configure.ac index 9b29e57..3ac2c96 100644 --- a/configure.ac +++ b/configure.ac @@ -1125,7 +1125,7 @@ if test "x$with_cups" != "xno" then ac_save_CPPFLAGS="$CPPFLAGS" ac_cups_cflags=`cups-config --cflags 2>/dev/null` - ac_cups_libs="`cups-config --ldflags 2>/dev/null` `cups-config --libs 2>/dev/null`" + ac_cups_libs=`cups-config --ldflags 2>/dev/null` CPPFLAGS="$CPPFLAGS $ac_cups_cflags" AC_CHECK_HEADERS(cups/cups.h, [WINE_CHECK_SONAME(cups,cupsGetDefault,

1 0

Stefan Dösinger : wined3d: Add fog and tex types to the ffp fragment description.
by Alexandre Julliard 28 Jul '08

28 Jul '08

Module: wine Branch: master Commit: 294f1b4aad1678da7957bae5470c9cb8ec9cd9fc URL: http://source.winehq.org/git/wine.git/?a=commit;h=294f1b4aad1678da7957bae54… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri Jul 11 21:18:06 2008 -0500 wined3d: Add fog and tex types to the ffp fragment description. --- dlls/wined3d/ati_fragment_shader.c | 12 ++-- dlls/wined3d/utils.c | 135 +++++++++++++++++++++++------------- dlls/wined3d/wined3d_private.h | 17 ++++- 3 files changed, 108 insertions(+), 56 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=294f1b4aad1678da7957b…

1 0

Detlef Riekenberg : crypt32/tests: Fix test on win9x ( CreateFileW not implemented).
by Alexandre Julliard 28 Jul '08

28 Jul '08

Module: wine Branch: master Commit: a6715f856e431ab6df9a7eea6b539ae19193fb09 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a6715f856e431ab6df9a7eea6… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Sun Jul 27 22:04:32 2008 +0200 crypt32/tests: Fix test on win9x (CreateFileW not implemented). --- dlls/crypt32/tests/sip.c | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/crypt32/tests/sip.c b/dlls/crypt32/tests/sip.c index b01229c..d5d2a50 100644 --- a/dlls/crypt32/tests/sip.c +++ b/dlls/crypt32/tests/sip.c @@ -267,7 +267,9 @@ static void test_SIPRetrieveSubjectGUID(void) DeleteFileA(tempfile); /* Create a .cab file */ - file = CreateFileW(tempfileW, GENERIC_WRITE, 0, NULL, CREATE_NEW, 0, NULL); + SetLastError(0xdeadbeef); + file = CreateFileA(tempfile, GENERIC_WRITE, 0, NULL, CREATE_NEW, 0, NULL); + ok(file != INVALID_HANDLE_VALUE, "failed with %u\n", GetLastError()); WriteFile(file, cabFileData, sizeof(cabFileData), &written, NULL); CloseHandle(file); @@ -278,8 +280,9 @@ static void test_SIPRetrieveSubjectGUID(void) GetLastError(), GetLastError() ); ok ( !memcmp(&subject, &cabGUID, sizeof(GUID)), "Expected GUID %s for cabinet file, not %s\n", show_guid(&cabGUID, guid1), show_guid(&subject, guid2)); + /* Clean up */ - DeleteFileW(tempfileW); + DeleteFileA(tempfile); } static void test_SIPLoad(void)

1 0

Stefan Dösinger : wined3d: Do not enable GL_TEXTURE_SHADER_NV unconditionally.
by Alexandre Julliard 28 Jul '08

28 Jul '08

Module: wine Branch: master Commit: 40cfec2582f074a1524b906898b9263130518fd7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=40cfec2582f074a1524b90689… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Jul 24 10:05:25 2008 -0500 wined3d: Do not enable GL_TEXTURE_SHADER_NV unconditionally. --- dlls/wined3d/context.c | 3 --- 1 files changed, 0 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index ca81f3a..bb354f6 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -538,9 +538,6 @@ WineD3DContext *CreateContext(IWineD3DDeviceImpl *This, IWineD3DSurfaceImpl *tar checkGLcall("glEnable(GL_WEIGHT_SUM_UNITY_ARB)"); } if(GL_SUPPORT(NV_TEXTURE_SHADER2)) { - glEnable(GL_TEXTURE_SHADER_NV); - checkGLcall("glEnable(GL_TEXTURE_SHADER_NV)"); - /* Set up the previous texture input for all shader units. This applies to bump mapping, and in d3d * the previous texture where to source the offset from is always unit - 1. */

1 0

Piotr Caban : msxml3: Added stub implementation of ISAXAttributes.
by Alexandre Julliard 28 Jul '08

28 Jul '08

Module: wine Branch: master Commit: 5816c3808e72e528355d1c501681763442680140 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5816c3808e72e528355d1c501… Author: Piotr Caban <piotr.caban(a)gmail.com> Date: Sun Jul 27 19:55:05 2008 +0200 msxml3: Added stub implementation of ISAXAttributes. --- dlls/msxml3/saxreader.c | 280 ++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 279 insertions(+), 1 deletions(-) diff --git a/dlls/msxml3/saxreader.c b/dlls/msxml3/saxreader.c index ce27496..8ec1e46 100644 --- a/dlls/msxml3/saxreader.c +++ b/dlls/msxml3/saxreader.c @@ -69,6 +69,12 @@ typedef struct _saxlocator int column; } saxlocator; +typedef struct _saxattributes +{ + const struct ISAXAttributesVtbl *lpSAXAttributesVtbl; + LONG ref; +} saxattributes; + static inline saxreader *impl_from_IVBSAXXMLReader( IVBSAXXMLReader *iface ) { return (saxreader *)((char*)iface - FIELD_OFFSET(saxreader, lpVtbl)); @@ -84,6 +90,11 @@ static inline saxlocator *impl_from_ISAXLocator( ISAXLocator *iface ) return (saxlocator *)((char*)iface - FIELD_OFFSET(saxlocator, lpSAXLocatorVtbl)); } +static inline saxattributes *impl_from_ISAXAttributes( ISAXAttributes *iface ) +{ + return (saxattributes *)((char*)iface - FIELD_OFFSET(saxattributes, lpSAXAttributesVtbl)); +} + static void format_error_message_from_id(saxlocator *This, HRESULT hr) { @@ -134,6 +145,268 @@ static void update_position(saxlocator *This, xmlChar *end) } } +/*** ISAXAttributes interface ***/ +/*** IUnknown methods ***/ +static HRESULT WINAPI isaxattributes_QueryInterface( + ISAXAttributes* iface, + REFIID riid, + void **ppvObject) +{ + saxattributes *This = impl_from_ISAXAttributes(iface); + + TRACE("%p %s %p\n", This, debugstr_guid(riid), ppvObject); + + *ppvObject = NULL; + + if (IsEqualGUID(riid, &IID_IUnknown) || + IsEqualGUID(riid, &IID_ISAXAttributes)) + { + *ppvObject = iface; + } + else + { + FIXME("interface %s not implemented\n", debugstr_guid(riid)); + return E_NOINTERFACE; + } + + ISAXAttributes_AddRef(iface); + + return S_OK; +} + +static ULONG WINAPI isaxattributes_AddRef(ISAXAttributes* iface) +{ + saxattributes *This = impl_from_ISAXAttributes(iface); + TRACE("%p\n", This); + return InterlockedIncrement(&This->ref); +} + +static ULONG WINAPI isaxattributes_Release(ISAXAttributes* iface) +{ + saxattributes *This = impl_from_ISAXAttributes(iface); + LONG ref; + + TRACE("%p\n", This); + + ref = InterlockedDecrement(&This->ref); + if (ref==0) + { + HeapFree(GetProcessHeap(), 0, This); + } + + return ref; +} + +/*** ISAXAttributes methods ***/ +static HRESULT WINAPI isaxattributes_getLength( + ISAXAttributes* iface, + int *length) +{ + saxattributes *This = impl_from_ISAXAttributes( iface ); + + FIXME("(%p) stub\n", This); + return E_NOTIMPL; +} + +static HRESULT WINAPI isaxattributes_getURI( + ISAXAttributes* iface, + int nIndex, + const WCHAR **pUrl, + int *pUriSize) +{ + saxattributes *This = impl_from_ISAXAttributes( iface ); + + FIXME("(%p)->(%d) stub\n", This, nIndex); + return E_NOTIMPL; +} + +static HRESULT WINAPI isaxattributes_getLocalName( + ISAXAttributes* iface, + int nIndex, + const WCHAR **pLocalName, + int *pLocalNameLength) +{ + saxattributes *This = impl_from_ISAXAttributes( iface ); + + FIXME("(%p)->(%d) stub\n", This, nIndex); + return E_NOTIMPL; +} + +static HRESULT WINAPI isaxattributes_getQName( + ISAXAttributes* iface, + int nIndex, + const WCHAR **pQName, + int *pQNameLength) +{ + saxattributes *This = impl_from_ISAXAttributes( iface ); + + FIXME("(%p)->(%d) stub\n", This, nIndex); + return E_NOTIMPL; +} + +static HRESULT WINAPI isaxattributes_getName( + ISAXAttributes* iface, + int nIndex, + const WCHAR **pUri, + int *pUriLength, + const WCHAR **pLocalName, + int *pLocalNameSize, + const WCHAR **pQName, + int *pQNameLength) +{ + saxattributes *This = impl_from_ISAXAttributes( iface ); + + FIXME("(%p)->(%d) stub\n", This, nIndex); + return E_NOTIMPL; +} + +static HRESULT WINAPI isaxattributes_getIndexFromName( + ISAXAttributes* iface, + const WCHAR *pUri, + int cUriLength, + const WCHAR *pLocalName, + int cocalNameLength, + int *index) +{ + saxattributes *This = impl_from_ISAXAttributes( iface ); + + FIXME("(%p)->(%s, %d, %s, %d) stub\n", This, debugstr_w(pUri), cUriLength, + debugstr_w(pLocalName), cocalNameLength); + return E_NOTIMPL; +} + +static HRESULT WINAPI isaxattributes_getIndexFromQName( + ISAXAttributes* iface, + const WCHAR *pQName, + int nQNameLength, + int *index) +{ + saxattributes *This = impl_from_ISAXAttributes( iface ); + + FIXME("(%p)->(%s, %d) stub\n", This, debugstr_w(pQName), nQNameLength); + return E_NOTIMPL; +} + +static HRESULT WINAPI isaxattributes_getType( + ISAXAttributes* iface, + int nIndex, + const WCHAR **pType, + int *pTypeLength) +{ + saxattributes *This = impl_from_ISAXAttributes( iface ); + + FIXME("(%p)->(%d) stub\n", This, nIndex); + return E_NOTIMPL; +} + +static HRESULT WINAPI isaxattributes_getTypeFromName( + ISAXAttributes* iface, + const WCHAR *pUri, + int nUri, + const WCHAR *pLocalName, + int nLocalName, + const WCHAR **pType, + int *nType) +{ + saxattributes *This = impl_from_ISAXAttributes( iface ); + + FIXME("(%p)->(%s, %d, %s, %d) stub\n", This, debugstr_w(pUri), nUri, + debugstr_w(pLocalName), nLocalName); + return E_NOTIMPL; +} + +static HRESULT WINAPI isaxattributes_getTypeFromQName( + ISAXAttributes* iface, + const WCHAR *pQName, + int nQName, + const WCHAR **pType, + int *nType) +{ + saxattributes *This = impl_from_ISAXAttributes( iface ); + + FIXME("(%p)->(%s, %d) stub\n", This, debugstr_w(pQName), nQName); + return E_NOTIMPL; +} + +static HRESULT WINAPI isaxattributes_getValue( + ISAXAttributes* iface, + int nIndex, + const WCHAR **pValue, + int *nValue) +{ + saxattributes *This = impl_from_ISAXAttributes( iface ); + + FIXME("(%p)->(%d) stub\n", This, nIndex); + return E_NOTIMPL; +} + +static HRESULT WINAPI isaxattributes_getValueFromName( + ISAXAttributes* iface, + const WCHAR *pUri, + int nUri, + const WCHAR *pLocalName, + int nLocalName, + const WCHAR **pValue, + int *nValue) +{ + saxattributes *This = impl_from_ISAXAttributes( iface ); + + FIXME("(%p)->(%s, %d, %s, %d) stub\n", This, debugstr_w(pUri), nUri, + debugstr_w(pLocalName), nLocalName); + return E_NOTIMPL; +} + +static HRESULT WINAPI isaxattributes_getValueFromQName( + ISAXAttributes* iface, + const WCHAR *pQName, + int nQName, + const WCHAR **pValue, + int *nValue) +{ + saxattributes *This = impl_from_ISAXAttributes( iface ); + + FIXME("(%p)->(%s, %d) stub\n", This, debugstr_w(pQName), nQName); + return E_NOTIMPL; +} + +static const struct ISAXAttributesVtbl isaxattributes_vtbl = +{ + isaxattributes_QueryInterface, + isaxattributes_AddRef, + isaxattributes_Release, + isaxattributes_getLength, + isaxattributes_getURI, + isaxattributes_getLocalName, + isaxattributes_getQName, + isaxattributes_getName, + isaxattributes_getIndexFromName, + isaxattributes_getIndexFromQName, + isaxattributes_getType, + isaxattributes_getTypeFromName, + isaxattributes_getTypeFromQName, + isaxattributes_getValue, + isaxattributes_getValueFromName, + isaxattributes_getValueFromQName +}; + +static HRESULT SAXAttributes_create(IUnknown *pUnkOuter, LPVOID *ppObj) +{ + saxattributes *attributes; + + attributes = HeapAlloc(GetProcessHeap(), 0, sizeof(*attributes)); + if(!attributes) + return E_OUTOFMEMORY; + + attributes->lpSAXAttributesVtbl = &isaxattributes_vtbl; + attributes->ref = 1; + + *ppObj = attributes; + + TRACE("returning %p\n", *ppObj); + + return S_OK; +} + /*** LibXML callbacks ***/ static void libxmlStartDocument(void *ctx) { @@ -182,6 +455,7 @@ static void libxmlStartElementNS( BSTR NamespaceUri, LocalName, QName; saxlocator *This = ctx; HRESULT hr; + ISAXAttributes *attr; FIXME("Arguments processing not yet implemented.\n"); @@ -193,17 +467,21 @@ static void libxmlStartElementNS( LocalName = bstr_from_xmlChar(localname); QName = bstr_from_xmlChar(localname); + SAXAttributes_create(NULL, (void*)&attr); + hr = ISAXContentHandler_startElement( This->saxreader->contentHandler, NamespaceUri, SysStringLen(NamespaceUri), LocalName, SysStringLen(LocalName), QName, SysStringLen(QName), - NULL); + attr); SysFreeString(NamespaceUri); SysFreeString(LocalName); SysFreeString(QName); + ISAXAttributes_Release(attr); + if(hr != S_OK) format_error_message_from_id(This, hr); }

1 0

Detlef Riekenberg : kernel32/tests: Fix a crash on win9x ( lpDefault is truncated inplace).
by Alexandre Julliard 28 Jul '08

28 Jul '08

Module: wine Branch: master Commit: 5437f4ce9ce9c6bb61e425c93e6497ea58d8d2bd URL: http://source.winehq.org/git/wine.git/?a=commit;h=5437f4ce9ce9c6bb61e425c93… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Sun Jul 27 15:29:31 2008 +0200 kernel32/tests: Fix a crash on win9x (lpDefault is truncated inplace). --- dlls/kernel32/tests/profile.c | 13 ++++++++++--- 1 files changed, 10 insertions(+), 3 deletions(-) diff --git a/dlls/kernel32/tests/profile.c b/dlls/kernel32/tests/profile.c index 91ff982..46dfe72 100644 --- a/dlls/kernel32/tests/profile.c +++ b/dlls/kernel32/tests/profile.c @@ -363,6 +363,7 @@ static void test_GetPrivateProfileString(void) { DWORD ret; CHAR buf[MAX_PATH]; + CHAR def_val[MAX_PATH]; CHAR path[MAX_PATH]; CHAR windir[MAX_PATH]; LPSTR tempfile; @@ -416,14 +417,18 @@ static void test_GetPrivateProfileString(void) /* lpAppName is empty, lpDefault has trailing blank characters */ lstrcpyA(buf, "kumquat"); - ret = GetPrivateProfileStringA("", "name1", "default ", + /* lpDefault must be writeable (trailing blanks are removed inplace in win9x) */ + lstrcpyA(def_val, "default "); + ret = GetPrivateProfileStringA("", "name1", def_val, buf, MAX_PATH, filename); ok(ret == 7, "Expected 7, got %d\n", ret); ok(!lstrcmpA(buf, "default"), "Expected \"default\", got \"%s\"\n", buf); /* lpAppName is empty, many blank characters in lpDefault */ lstrcpyA(buf, "kumquat"); - ret = GetPrivateProfileStringA("", "name1", "one two ", + /* lpDefault must be writeable (trailing blanks are removed inplace in win9x) */ + lstrcpyA(def_val, "one two "); + ret = GetPrivateProfileStringA("", "name1", def_val, buf, MAX_PATH, filename); ok(ret == 7, "Expected 7, got %d\n", ret); ok(!lstrcmpA(buf, "one two"), "Expected \"one two\", got \"%s\"\n", buf); @@ -473,7 +478,9 @@ static void test_GetPrivateProfileString(void) /* lpKeyName is empty, lpDefault has trailing blank characters */ lstrcpyA(buf, "kumquat"); - ret = GetPrivateProfileStringA("section1", "", "default ", + /* lpDefault must be writeable (trailing blanks are removed inplace in win9x) */ + lstrcpyA(def_val, "default "); + ret = GetPrivateProfileStringA("section1", "", def_val, buf, MAX_PATH, filename); ok(ret == 7, "Expected 7, got %d\n", ret); ok(!lstrcmpA(buf, "default"), "Expected \"default\", got \"%s\"\n", buf);

1 0

Piotr Caban : msxml3: Added ISAXXMLReader_parseURL implementation.
by Alexandre Julliard 28 Jul '08

28 Jul '08

Module: wine Branch: master Commit: b15345d4a87716a4839663fddf8399cbd4c61938 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b15345d4a87716a4839663fdd… Author: Piotr Caban <piotr.caban(a)gmail.com> Date: Sun Jul 27 19:54:48 2008 +0200 msxml3: Added ISAXXMLReader_parseURL implementation. --- dlls/msxml3/saxreader.c | 82 ++++++++++++++++++++++++++++++++-------------- 1 files changed, 57 insertions(+), 25 deletions(-) diff --git a/dlls/msxml3/saxreader.c b/dlls/msxml3/saxreader.c index 3b67d01..ce27496 100644 --- a/dlls/msxml3/saxreader.c +++ b/dlls/msxml3/saxreader.c @@ -1098,17 +1098,11 @@ static HRESULT WINAPI isaxxmlreader_putSecureBaseURL( return E_NOTIMPL; } -static HRESULT WINAPI isaxxmlreader_parse( - ISAXXMLReader* iface, - VARIANT varInput) +static HRESULT parse_buffer(saxreader *This, xmlChar *buffer) { - saxreader *This = impl_from_ISAXXMLReader( iface ); saxlocator *locator; - xmlChar *data = NULL; HRESULT hr; - TRACE("(%p)\n", This); - hr = SAXLocator_create(This, &locator); if(FAILED(hr)) return E_FAIL; @@ -1123,12 +1117,38 @@ static HRESULT WINAPI isaxxmlreader_parse( 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; + + if(locator->pParserCtxt) + { + locator->pParserCtxt->sax = NULL; + xmlFreeParserCtxt(locator->pParserCtxt); + locator->pParserCtxt = NULL; + } + + ISAXLocator_Release((ISAXLocator*)&locator->lpSAXLocatorVtbl); + return S_OK; +} + +static HRESULT WINAPI isaxxmlreader_parse( + ISAXXMLReader* iface, + VARIANT varInput) +{ + saxreader *This = impl_from_ISAXXMLReader( iface ); + xmlChar *data = NULL; + HRESULT hr; + + TRACE("(%p)\n", This); + hr = S_OK; switch(V_VT(&varInput)) { case VT_BSTR: data = xmlChar_from_wchar(V_BSTR(&varInput)); - xmlSetupParserForBuffer(locator->pParserCtxt, data, NULL); + hr = parse_buffer(This, data); break; case VT_ARRAY|VT_UI1: { void *pSAData; @@ -1146,7 +1166,7 @@ static HRESULT WINAPI isaxxmlreader_parse( if(hr != S_OK) break; memcpy(data, pSAData, dataRead); data[dataRead] = '\0'; - xmlSetupParserForBuffer(locator->pParserCtxt, data, NULL); + hr = parse_buffer(This, data); SafeArrayUnaccessData(V_ARRAY(&varInput)); break; } @@ -1185,7 +1205,7 @@ static HRESULT WINAPI isaxxmlreader_parse( break; } data[dataInfo.cbSize.QuadPart] = '\0'; - xmlSetupParserForBuffer(locator->pParserCtxt, data, NULL); + hr = parse_buffer(This, data); IStream_Release(stream); break; } @@ -1196,7 +1216,7 @@ static HRESULT WINAPI isaxxmlreader_parse( IXMLDOMDocument_get_xml(xmlDoc, &bstrData); data = xmlChar_from_wchar(bstrData); - xmlSetupParserForBuffer(locator->pParserCtxt, data, NULL); + hr = parse_buffer(This, data); IXMLDOMDocument_Release(xmlDoc); hr = E_NOTIMPL; break; @@ -1207,20 +1227,23 @@ static HRESULT WINAPI isaxxmlreader_parse( hr = E_INVALIDARG; } - if(hr == S_OK) - { - if(xmlParseDocument(locator->pParserCtxt)) hr = E_FAIL; - else hr = locator->ret; - } + 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); - if(locator->pParserCtxt) - { - locator->pParserCtxt->sax = NULL; - xmlFreeParserCtxt(locator->pParserCtxt); - locator->pParserCtxt = NULL; - } HeapFree(GetProcessHeap(), 0, data); - ISAXLocator_Release((ISAXLocator*)&locator->lpSAXLocatorVtbl); return hr; } @@ -1229,9 +1252,18 @@ static HRESULT WINAPI isaxxmlreader_parseURL( const WCHAR *url) { saxreader *This = impl_from_ISAXXMLReader( iface ); + bsc_t *bsc; + HRESULT hr; - FIXME("(%p)->(%s) stub\n", This, debugstr_w(url)); - return E_NOTIMPL; + TRACE("(%p)->(%s) stub\n", This, debugstr_w(url)); + + hr = bind_url(url, saxreader_onDataAvailable, This, &bsc); + if(FAILED(hr)) + return hr; + + detach_bsc(bsc); + + return S_OK; } static const struct ISAXXMLReaderVtbl isaxreader_vtbl =

1 0