wine-commits July 2013

wine-commits@winehq.org

2 participants
447 discussions

Nikolay Sivov : msxml3: Implement setting attributes properties with IMXAttributes.
by Alexandre Julliard 30 Jul '13

30 Jul '13

Module: wine Branch: master Commit: ccf04d644ba27accd3463075041b0f83f7cd704c URL: http://source.winehq.org/git/wine.git/?a=commit;h=ccf04d644ba27accd34630750… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Jul 30 15:08:03 2013 +0400 msxml3: Implement setting attributes properties with IMXAttributes. --- dlls/msxml3/mxwriter.c | 63 +++++++++++++++++++++++++++++++++++++---------- 1 files changed, 49 insertions(+), 14 deletions(-) diff --git a/dlls/msxml3/mxwriter.c b/dlls/msxml3/mxwriter.c index 03c1b67..dd4e629 100644 --- a/dlls/msxml3/mxwriter.c +++ b/dlls/msxml3/mxwriter.c @@ -1888,14 +1888,20 @@ static HRESULT WINAPI MXAttributes_clear(IMXAttributes *iface) return S_OK; } +static mxattribute *get_attribute_byindex(mxattributes *attrs, int index) +{ + if (index < 0 || index >= attrs->length) return NULL; + return &attrs->attr[index]; +} + static HRESULT WINAPI MXAttributes_removeAttribute(IMXAttributes *iface, int index) { mxattributes *This = impl_from_IMXAttributes( iface ); - mxattribute *src, *dst; + mxattribute *dst; TRACE("(%p)->(%d)\n", This, index); - if (index < 0 || index >= This->length) return E_INVALIDARG; + if (!(dst = get_attribute_byindex(This, index))) return E_INVALIDARG; /* no need to remove last attribute, just make it inaccessible */ if (index + 1 == This->length) @@ -1904,10 +1910,7 @@ static HRESULT WINAPI MXAttributes_removeAttribute(IMXAttributes *iface, int ind return S_OK; } - dst = &This->attr[index]; - src = &This->attr[index+1]; - - memmove(dst, src, (This->length-index-1)*sizeof(*dst)); + memmove(dst, dst + 1, (This->length-index-1)*sizeof(*dst)); This->length--; return S_OK; @@ -1933,29 +1936,61 @@ static HRESULT WINAPI MXAttributes_setLocalName(IMXAttributes *iface, int index, BSTR localName) { mxattributes *This = impl_from_IMXAttributes( iface ); - FIXME("(%p)->(%d %s): stub\n", This, index, debugstr_w(localName)); - return E_NOTIMPL; + mxattribute *attr; + + TRACE("(%p)->(%d %s)\n", This, index, debugstr_w(localName)); + + if (!(attr = get_attribute_byindex(This, index))) return E_INVALIDARG; + + SysFreeString(attr->local); + attr->local = SysAllocString(localName); + + return S_OK; } static HRESULT WINAPI MXAttributes_setQName(IMXAttributes *iface, int index, BSTR QName) { mxattributes *This = impl_from_IMXAttributes( iface ); - FIXME("(%p)->(%d %s): stub\n", This, index, debugstr_w(QName)); - return E_NOTIMPL; + mxattribute *attr; + + TRACE("(%p)->(%d %s)\n", This, index, debugstr_w(QName)); + + if (!(attr = get_attribute_byindex(This, index))) return E_INVALIDARG; + + SysFreeString(attr->qname); + attr->qname = SysAllocString(QName); + + return S_OK; } static HRESULT WINAPI MXAttributes_setURI(IMXAttributes *iface, int index, BSTR uri) { mxattributes *This = impl_from_IMXAttributes( iface ); - FIXME("(%p)->(%d %s): stub\n", This, index, debugstr_w(uri)); - return E_NOTIMPL; + mxattribute *attr; + + TRACE("(%p)->(%d %s)\n", This, index, debugstr_w(uri)); + + if (!(attr = get_attribute_byindex(This, index))) return E_INVALIDARG; + + SysFreeString(attr->uri); + attr->uri = SysAllocString(uri); + + return S_OK; } static HRESULT WINAPI MXAttributes_setValue(IMXAttributes *iface, int index, BSTR value) { mxattributes *This = impl_from_IMXAttributes( iface ); - FIXME("(%p)->(%d %s): stub\n", This, index, debugstr_w(value)); - return E_NOTIMPL; + mxattribute *attr; + + TRACE("(%p)->(%d %s)\n", This, index, debugstr_w(value)); + + if (!(attr = get_attribute_byindex(This, index))) return E_INVALIDARG; + + SysFreeString(attr->value); + attr->value = SysAllocString(value); + + return S_OK; } static const IMXAttributesVtbl MXAttributesVtbl = {

1 0

Nikolay Sivov : msxml3: Implement IMXAttributes_removeAttribute().
by Alexandre Julliard 30 Jul '13

30 Jul '13

Module: wine Branch: master Commit: 11736f36c9d498949c724ad525707d0b530bcd33 URL: http://source.winehq.org/git/wine.git/?a=commit;h=11736f36c9d498949c724ad52… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Jul 30 15:03:22 2013 +0400 msxml3: Implement IMXAttributes_removeAttribute(). --- dlls/msxml3/mxwriter.c | 22 ++++++++++++++++++++-- 1 files changed, 20 insertions(+), 2 deletions(-) diff --git a/dlls/msxml3/mxwriter.c b/dlls/msxml3/mxwriter.c index 3196374..03c1b67 100644 --- a/dlls/msxml3/mxwriter.c +++ b/dlls/msxml3/mxwriter.c @@ -1891,8 +1891,26 @@ static HRESULT WINAPI MXAttributes_clear(IMXAttributes *iface) static HRESULT WINAPI MXAttributes_removeAttribute(IMXAttributes *iface, int index) { mxattributes *This = impl_from_IMXAttributes( iface ); - FIXME("(%p)->(%d): stub\n", This, index); - return E_NOTIMPL; + mxattribute *src, *dst; + + TRACE("(%p)->(%d)\n", This, index); + + if (index < 0 || index >= This->length) return E_INVALIDARG; + + /* no need to remove last attribute, just make it inaccessible */ + if (index + 1 == This->length) + { + This->length--; + return S_OK; + } + + dst = &This->attr[index]; + src = &This->attr[index+1]; + + memmove(dst, src, (This->length-index-1)*sizeof(*dst)); + This->length--; + + return S_OK; } static HRESULT WINAPI MXAttributes_setAttribute(IMXAttributes *iface, int index,

1 0

Nikolay Sivov : include: Added IRowPosition interface definition.
by Alexandre Julliard 30 Jul '13

30 Jul '13

Module: wine Branch: master Commit: 2fe34bfb094b93d825ebe6d1342e28804262398a URL: http://source.winehq.org/git/wine.git/?a=commit;h=2fe34bfb094b93d825ebe6d13… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Jul 30 14:38:38 2013 +0400 include: Added IRowPosition interface definition. --- dlls/msdaps/usrmarshal.c | 60 +++++++++++++++++++++++++++++++++++ include/Makefile.in | 1 + include/oledb.idl | 1 + include/rowpos.idl | 77 ++++++++++++++++++++++++++++++++++++++++++++++ tools/make_makefiles | 1 + 5 files changed, 140 insertions(+), 0 deletions(-) diff --git a/dlls/msdaps/usrmarshal.c b/dlls/msdaps/usrmarshal.c index b93340e..54c9b90 100644 --- a/dlls/msdaps/usrmarshal.c +++ b/dlls/msdaps/usrmarshal.c @@ -1279,3 +1279,63 @@ HRESULT __RPC_STUB IErrorRecords_AddErrorRecord_Stub(IErrorRecords* This, ERRORI return hr; } + +HRESULT __RPC_STUB IRowPosition_Initialize_Stub(IRowPosition* This, IUnknown *rowset, IErrorInfo **errorinfo) +{ + FIXME("(%p)->(%p %p): stub\n", This, rowset, errorinfo); + return E_NOTIMPL; +} + +HRESULT __RPC_STUB IRowPosition_SetRowPosition_Stub(IRowPosition* This, HCHAPTER chapter, HROW row, DBPOSITIONFLAGS flags, IErrorInfo **errorinfo) +{ + FIXME("(%p)->(%lx %lx %d %p): stub\n", This, chapter, row, flags, errorinfo); + return E_NOTIMPL; +} + +HRESULT __RPC_STUB IRowPosition_GetRowset_Stub(IRowPosition* This, REFIID riid, IUnknown **rowset, IErrorInfo **errorinfo) +{ + FIXME("(%p)->(%s %p %p): stub\n", This, debugstr_guid(riid), rowset, errorinfo); + return E_NOTIMPL; +} + +HRESULT __RPC_STUB IRowPosition_GetRowPosition_Stub(IRowPosition* This, HCHAPTER *chapter, HROW *row, DBPOSITIONFLAGS *flags, IErrorInfo **errorinfo) +{ + FIXME("(%p)->(%p %p %p %p): stub\n", This, chapter, row, flags, errorinfo); + return E_NOTIMPL; +} + +HRESULT __RPC_STUB IRowPosition_ClearRowPosition_Stub(IRowPosition* This, IErrorInfo **errorinfo) +{ + FIXME("(%p)->(%p): stub\n", This, errorinfo); + return E_NOTIMPL; +} + +HRESULT CALLBACK IRowPosition_ClearRowPosition_Proxy(IRowPosition* This) +{ + FIXME("(%p): stub\n", This); + return E_NOTIMPL; +} + +HRESULT CALLBACK IRowPosition_GetRowPosition_Proxy(IRowPosition* This, HCHAPTER *chapter, HROW *row, DBPOSITIONFLAGS *flags) +{ + FIXME("(%p)->(%p %p %p): stub\n", This, chapter, row, flags); + return E_NOTIMPL; +} + +HRESULT CALLBACK IRowPosition_GetRowset_Proxy(IRowPosition* This, REFIID riid, IUnknown **rowset) +{ + FIXME("(%p)->(%s %p): stub\n", This, debugstr_guid(riid), rowset); + return E_NOTIMPL; +} + +HRESULT CALLBACK IRowPosition_Initialize_Proxy(IRowPosition* This, IUnknown *rowset) +{ + FIXME("(%p)->(%p): stub\n", This, rowset); + return E_NOTIMPL; +} + +HRESULT CALLBACK IRowPosition_SetRowPosition_Proxy(IRowPosition* This, HCHAPTER chapter, HROW row, DBPOSITIONFLAGS flags) +{ + FIXME("(%p)->(%lx %lx %d): stub\n", This, chapter, row, flags); + return E_NOTIMPL; +} diff --git a/include/Makefile.in b/include/Makefile.in index cecc845..0818999 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -480,6 +480,7 @@ SRCDIR_INCLUDES = \ rmxfguid.h \ row.idl \ rowchg.idl \ + rowpos.idl \ rpc.h \ rpcasync.h \ rpcdce.h \ diff --git a/include/oledb.idl b/include/oledb.idl index 5cd287f..3d47fe7 100644 --- a/include/oledb.idl +++ b/include/oledb.idl @@ -64,6 +64,7 @@ typedef DWORD_PTR DBHASHVALUE; #include "opnrst.idl" #include "row.idl" #include "rowchg.idl" +#include "rowpos.idl" #include "binres.idl" #include "crtrow.idl" #include "errrec.idl" diff --git a/include/rowpos.idl b/include/rowpos.idl new file mode 100644 index 0000000..1ef6807 --- /dev/null +++ b/include/rowpos.idl @@ -0,0 +1,77 @@ +/* + * Copyright (C) 2013 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 + */ + +[ + object, + uuid(0c733a94-2a1c-11ce-ade5-00aa0044773d), + pointer_default(unique) +] +interface IRowPosition : IUnknown +{ + typedef DWORD DBPOSITIONFLAGS; + + enum DBPOSITIONFLAGSENUM { + DBPOSITION_OK, + DBPOSITION_NOROW, + DBPOSITION_BOF, + DBPOSITION_EOF + }; + + [local] + HRESULT ClearRowPosition(); + + [call_as(ClearRowPosition)] + HRESULT RemoteClearRowPosition([out] IErrorInfo **errorinfo); + + [local] + HRESULT GetRowPosition([out] HCHAPTER *chapter, + [out] HROW *row, + [out] DBPOSITIONFLAGS *position_flags); + + [call_as(GetRowPosition)] + HRESULT RemoteGetRowPosition([out] HCHAPTER *chapter, + [out] HROW *row, + [out] DBPOSITIONFLAGS *position_flags, + [out] IErrorInfo **errorinfo); + [local] + HRESULT GetRowset([in] REFIID riid, + [out, iid_is(riid)] IUnknown **rowset); + + [call_as(GetRowset)] + HRESULT RemoteGetRowset([in] REFIID riid, + [out, iid_is(riid)] IUnknown **rowset, + [out] IErrorInfo **errorinfo); + + [local] + HRESULT Initialize([in] IUnknown *rowset); + + [call_as(Initialize)] + HRESULT RemoteInitialize([in] IUnknown *rowset, + [out] IErrorInfo **errorinfo); + + [local] + HRESULT SetRowPosition([in] HCHAPTER chapter, + [in] HROW row, + [in] DBPOSITIONFLAGS flags); + + [call_as(SetRowPosition)] + HRESULT RemoteSetRowPosition([in] HCHAPTER chapter, + [in] HROW row, + [in] DBPOSITIONFLAGS flags, + [out] IErrorInfo **errorinfo); +} diff --git a/tools/make_makefiles b/tools/make_makefiles index 6d4e8a7..566ca0d 100755 --- a/tools/make_makefiles +++ b/tools/make_makefiles @@ -155,6 +155,7 @@ my %private_idl_headers = ( "opnrst.idl" => 1, "row.idl" => 1, "rowchg.idl" => 1, + "rowpos.idl" => 1, "rstbas.idl" => 1, "rstinf.idl" => 1, "rstloc.idl" => 1,

1 0

Alexandre Julliard : configure: Allow specifying relative paths in CFLAGS and LIBS variables.
by Alexandre Julliard 30 Jul '13

30 Jul '13

Module: wine Branch: master Commit: bd049b2839a6a5ab9586147b7e608c9f03bb2be8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bd049b2839a6a5ab9586147b7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jul 30 17:40:23 2013 +0200 configure: Allow specifying relative paths in CFLAGS and LIBS variables. --- aclocal.m4 | 2 ++ configure | 24 ++++++++++++++++++++++++ 2 files changed, 26 insertions(+), 0 deletions(-) diff --git a/aclocal.m4 b/aclocal.m4 index a12ac88..8aa81b2 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -88,6 +88,8 @@ ac_save_CPPFLAGS=$CPPFLAGS CPPFLAGS="$CPPFLAGS $ac_cflags" $6 CPPFLAGS=$ac_save_CPPFLAGS +test -z "$ac_cflags" || ac_cflags=`echo " $ac_cflags" | sed 's/ -I$[[^/]]$/ -I\$(top_builddir)\/\1/g'` +test -z "$ac_libs" || ac_libs=`echo " $ac_libs" | sed 's/ -L$[[^/]]$/ -L\$(top_builddir)\/\1/g'` AS_VAR_POPDEF([ac_libs])dnl AS_VAR_POPDEF([ac_cflags])])dnl diff --git a/configure b/configure index 719db97..5b1e50f 100755 --- a/configure +++ b/configure @@ -9889,6 +9889,8 @@ fi XML2_LIBS="" fi CPPFLAGS=$ac_save_CPPFLAGS +test -z "$XML2_CFLAGS" || XML2_CFLAGS=`echo " $XML2_CFLAGS" | sed 's/ -I$[^/]$/ -I\$(top_builddir)\/\1/g'` +test -z "$XML2_LIBS" || XML2_LIBS=`echo " $XML2_LIBS" | sed 's/ -L$[^/]$/ -L\$(top_builddir)\/\1/g'` fi if test "$ac_cv_lib_xml2_xmlParseMemory" != "yes"; then : @@ -9992,6 +9994,8 @@ fi XSLT_CFLAGS="" fi CPPFLAGS=$ac_save_CPPFLAGS +test -z "$XSLT_CFLAGS" || XSLT_CFLAGS=`echo " $XSLT_CFLAGS" | sed 's/ -I$[^/]$/ -I\$(top_builddir)\/\1/g'` +test -z "$XSLT_LIBS" || XSLT_LIBS=`echo " $XSLT_LIBS" | sed 's/ -L$[^/]$/ -L\$(top_builddir)\/\1/g'` fi if test "x$ac_cv_lib_soname_xslt" = "x"; then : @@ -10081,6 +10085,8 @@ fi CPPFLAGS=$ac_save_CPPFLAGS +test -z "$DBUS_CFLAGS" || DBUS_CFLAGS=`echo " $DBUS_CFLAGS" | sed 's/ -I$[^/]$/ -I\$(top_builddir)\/\1/g'` +test -z "$DBUS_LIBS" || DBUS_LIBS=`echo " $DBUS_LIBS" | sed 's/ -L$[^/]$/ -L\$(top_builddir)\/\1/g'` fi if test "x$ac_cv_lib_soname_dbus_1" = "x" -a \ @@ -10171,6 +10177,8 @@ fi CPPFLAGS=$ac_save_CPPFLAGS +test -z "$HAL_CFLAGS" || HAL_CFLAGS=`echo " $HAL_CFLAGS" | sed 's/ -I$[^/]$/ -I\$(top_builddir)\/\1/g'` +test -z "$HAL_LIBS" || HAL_LIBS=`echo " $HAL_LIBS" | sed 's/ -L$[^/]$/ -L\$(top_builddir)\/\1/g'` if test "x$ac_cv_lib_soname_hal" = "x" -a \ "x$ac_cv_header_DiskArbitration_DiskArbitration_h" != "xyes"; then : @@ -10276,6 +10284,8 @@ fi CPPFLAGS=$ac_save_CPPFLAGS +test -z "$GNUTLS_CFLAGS" || GNUTLS_CFLAGS=`echo " $GNUTLS_CFLAGS" | sed 's/ -I$[^/]$/ -I\$(top_builddir)\/\1/g'` +test -z "$GNUTLS_LIBS" || GNUTLS_LIBS=`echo " $GNUTLS_LIBS" | sed 's/ -L$[^/]$/ -L\$(top_builddir)\/\1/g'` fi if test "x$ac_cv_lib_soname_gnutls" = "x"; then : @@ -10500,6 +10510,8 @@ fi CPPFLAGS=$ac_save_CPPFLAGS +test -z "$SANE_CFLAGS" || SANE_CFLAGS=`echo " $SANE_CFLAGS" | sed 's/ -I$[^/]$/ -I\$(top_builddir)\/\1/g'` +test -z "$SANE_LIBS" || SANE_LIBS=`echo " $SANE_LIBS" | sed 's/ -L$[^/]$/ -L\$(top_builddir)\/\1/g'` fi if test "x$ac_cv_lib_soname_sane" = "x"; then : @@ -10645,6 +10657,8 @@ fi CPPFLAGS=$ac_save_CPPFLAGS +test -z "$GPHOTO2_CFLAGS" || GPHOTO2_CFLAGS=`echo " $GPHOTO2_CFLAGS" | sed 's/ -I$[^/]$/ -I\$(top_builddir)\/\1/g'` +test -z "$GPHOTO2_LIBS" || GPHOTO2_LIBS=`echo " $GPHOTO2_LIBS" | sed 's/ -L$[^/]$/ -L\$(top_builddir)\/\1/g'` if test -n "$GPHOTO2_PORT_CFLAGS"; then : @@ -10713,6 +10727,8 @@ fi CPPFLAGS=$ac_save_CPPFLAGS +test -z "$GPHOTO2_PORT_CFLAGS" || GPHOTO2_PORT_CFLAGS=`echo " $GPHOTO2_PORT_CFLAGS" | sed 's/ -I$[^/]$/ -I\$(top_builddir)\/\1/g'` +test -z "$GPHOTO2_PORT_LIBS" || GPHOTO2_PORT_LIBS=`echo " $GPHOTO2_PORT_LIBS" | sed 's/ -L$[^/]$/ -L\$(top_builddir)\/\1/g'` fi if test "$ac_cv_lib_gphoto2_gp_camera_new" != "yes"; then : @@ -10849,6 +10865,8 @@ fi LCMS2_LIBS="" fi CPPFLAGS=$ac_save_CPPFLAGS +test -z "$LCMS2_CFLAGS" || LCMS2_CFLAGS=`echo " $LCMS2_CFLAGS" | sed 's/ -I$[^/]$/ -I\$(top_builddir)\/\1/g'` +test -z "$LCMS2_LIBS" || LCMS2_LIBS=`echo " $LCMS2_LIBS" | sed 's/ -L$[^/]$/ -L\$(top_builddir)\/\1/g'` fi if test "$ac_cv_lib_lcms2_cmsOpenProfileFromFile" != "yes"; then : @@ -10995,6 +11013,8 @@ $as_echo "#define HAVE_FREETYPE 1" >>confdefs.h FREETYPE_LIBS="" fi CPPFLAGS=$ac_save_CPPFLAGS +test -z "$FREETYPE_CFLAGS" || FREETYPE_CFLAGS=`echo " $FREETYPE_CFLAGS" | sed 's/ -I$[^/]$/ -I\$(top_builddir)\/\1/g'` +test -z "$FREETYPE_LIBS" || FREETYPE_LIBS=`echo " $FREETYPE_LIBS" | sed 's/ -L$[^/]$/ -L\$(top_builddir)\/\1/g'` fi if test "x$ac_cv_header_freetype_freetype_h" != xyes -o "x$wine_cv_fttrigon" != xyes; then : @@ -11316,6 +11336,8 @@ fi CPPFLAGS=$ac_save_CPPFLAGS +test -z "$GSTREAMER_CFLAGS" || GSTREAMER_CFLAGS=`echo " $GSTREAMER_CFLAGS" | sed 's/ -I$[^/]$/ -I\$(top_builddir)\/\1/g'` +test -z "$GSTREAMER_LIBS" || GSTREAMER_LIBS=`echo " $GSTREAMER_LIBS" | sed 's/ -L$[^/]$/ -L\$(top_builddir)\/\1/g'` fi if test "x$ac_cv_lib_gstapp_0_10_gst_app_buffer_new" != xyes -a "x$ac_cv_header_QuickTime_ImageCompression_h" != xyes; then : @@ -11949,6 +11971,8 @@ fi PNG_CFLAGS="" fi CPPFLAGS=$ac_save_CPPFLAGS +test -z "$PNG_CFLAGS" || PNG_CFLAGS=`echo " $PNG_CFLAGS" | sed 's/ -I$[^/]$/ -I\$(top_builddir)\/\1/g'` +test -z "$PNG_LIBS" || PNG_LIBS=`echo " $PNG_LIBS" | sed 's/ -L$[^/]$/ -L\$(top_builddir)\/\1/g'` fi if test "x$ac_cv_lib_soname_png" = "x"; then :

1 0

Alexandre Julliard : configure: Move the checks inside the WINE_PACKAGE_FLAGS macro to enable restoring CPPFLAGS automatically .
by Alexandre Julliard 30 Jul '13

30 Jul '13

Module: wine Branch: master Commit: 75d4023153a27ebdfae0e9235785464728801c09 URL: http://source.winehq.org/git/wine.git/?a=commit;h=75d4023153a27ebdfae0e9235… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jul 30 16:09:51 2013 +0200 configure: Move the checks inside the WINE_PACKAGE_FLAGS macro to enable restoring CPPFLAGS automatically. --- aclocal.m4 | 29 ++++-- configure | 242 ++++++++++++++++++++++++++----------------------- configure.ac | 290 +++++++++++++++++++++++++++------------------------------- 3 files changed, 280 insertions(+), 281 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=75d4023153a27ebdfae0e…

1 0

Alistair Leslie-Hughes : oledb32: Implement DataConvert Variant->R8.
by Alexandre Julliard 30 Jul '13

30 Jul '13

Module: wine Branch: master Commit: d04d1f52309a4fa185cd303c2220ec61bd63f592 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d04d1f52309a4fa185cd303c2… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Tue Jun 25 14:48:04 2013 +1000 oledb32: Implement DataConvert Variant->R8. --- dlls/oledb32/convert.c | 5 ++++ dlls/oledb32/tests/convert.c | 54 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 59 insertions(+), 0 deletions(-) diff --git a/dlls/oledb32/convert.c b/dlls/oledb32/convert.c index e68078b..8875057 100644 --- a/dlls/oledb32/convert.c +++ b/dlls/oledb32/convert.c @@ -361,6 +361,11 @@ static HRESULT WINAPI convert_DataConvert(IDataConvert* iface, case DBTYPE_BSTR: hr = VarR8FromStr(*(WCHAR**)src, LOCALE_USER_DEFAULT, 0, d); break; case DBTYPE_BOOL: hr = VarR8FromBool(*(VARIANT_BOOL*)src, d); break; case DBTYPE_DECIMAL: hr = VarR8FromDec((DECIMAL*)src, d); break; + case DBTYPE_VARIANT: + VariantInit(&tmp); + if ((hr = VariantChangeType(&tmp, (VARIANT*)src, 0, VT_R8)) == S_OK) + *d = V_R8(&tmp); + break; default: FIXME("Unimplemented conversion %04x -> R8\n", src_type); return E_NOTIMPL; } break; diff --git a/dlls/oledb32/tests/convert.c b/dlls/oledb32/tests/convert.c index 5c6694f..61607a9 100644 --- a/dlls/oledb32/tests/convert.c +++ b/dlls/oledb32/tests/convert.c @@ -2276,6 +2276,59 @@ static void test_converttor4(void) ok(dst == 10.0, "got %f\n", dst); } +static void test_converttor8(void) +{ + HRESULT hr; + DOUBLE dst; + BYTE src[20]; + DBSTATUS dst_status; + DBLENGTH dst_len; + VARIANT var; + + dst = 1.0; + dst_len = 0x1234; + hr = IDataConvert_DataConvert(convert, DBTYPE_EMPTY, DBTYPE_R8, 0, &dst_len, src, &dst, sizeof(dst), 0, &dst_status, 0, 0, 0); + ok(hr == S_OK, "got %08x\n", hr); + ok(dst_status == DBSTATUS_S_OK, "got %08x\n", dst_status); + ok(dst_len == sizeof(dst), "got %ld\n", dst_len); + ok(dst == 0.0, "got %f\n", dst); + + dst = 1.0; + dst_len = 0x1234; + hr = IDataConvert_DataConvert(convert, DBTYPE_NULL, DBTYPE_R8, 0, &dst_len, src, &dst, sizeof(dst), 0, &dst_status, 0, 0, 0); + ok(hr == DB_E_UNSUPPORTEDCONVERSION, "got %08x\n", hr); + ok(dst_status == DBSTATUS_E_BADACCESSOR, "got %08x\n", dst_status); + ok(dst_len == 0x1234, "got %ld\n", dst_len); + ok(dst == 1.0, "got %f\n", dst); + + dst = 1.0; + *(signed int*)src = 12345678; + dst_len = 0x1234; + hr = IDataConvert_DataConvert(convert, DBTYPE_I4, DBTYPE_R8, 0, &dst_len, src, &dst, sizeof(dst), 0, &dst_status, 0, 0, 0); + ok(hr == S_OK, "got %08x\n", hr); + ok(dst_status == DBSTATUS_S_OK, "got %08x\n", dst_status); + ok(dst_len == sizeof(dst), "got %ld\n", dst_len); + ok(dst == 12345678.0, "got %f\n", dst); + + dst = 1.0; + *(FLOAT *)src = 10.0; + dst_len = 0x1234; + hr = IDataConvert_DataConvert(convert, DBTYPE_R4, DBTYPE_R8, 0, &dst_len, src, &dst, sizeof(dst), 0, &dst_status, 0, 0, 0); + ok(hr == S_OK, "got %08x\n", hr); + ok(dst_status == DBSTATUS_S_OK, "got %08x\n", dst_status); + ok(dst_len == sizeof(dst), "got %ld\n", dst_len); + ok(dst == 10.0, "got %f\n", dst); + + dst_len = dst = 0x1234; + V_VT(&var) = VT_I2; + V_I2(&var) = 0x4321; + hr = IDataConvert_DataConvert(convert, DBTYPE_VARIANT, DBTYPE_R8, 0, &dst_len, &var, &dst, sizeof(dst), 0, &dst_status, 0, 0, 0); + ok(hr == S_OK, "got %08x\n", hr); + ok(dst_status == DBSTATUS_S_OK, "got %08x\n", dst_status); + ok(dst_len == sizeof(dst), "got %ld\n", dst_len); + ok(dst == 0x4321, "got %f\n", dst); +} + static void test_converttocy(void) { HRESULT hr; @@ -2862,6 +2915,7 @@ START_TEST(convert) test_converttoui1(); test_converttoui4(); test_converttor4(); + test_converttor8(); test_converttofiletime(); test_converttocy(); test_converttoui8();

1 0

Alistair Leslie-Hughes : msdasc.idl: Add coclass DataLinks.
by Alexandre Julliard 30 Jul '13

30 Jul '13

Module: wine Branch: master Commit: 0ad8a18e3a92b1eb8a6bfd8bb86a26908a66613f URL: http://source.winehq.org/git/wine.git/?a=commit;h=0ad8a18e3a92b1eb8a6bfd8bb… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri Jun 14 11:50:22 2013 +1000 msdasc.idl: Add coclass DataLinks. --- include/msdasc.idl | 61 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 61 insertions(+), 0 deletions(-) diff --git a/include/msdasc.idl b/include/msdasc.idl index 16d2372..f3b6a37 100644 --- a/include/msdasc.idl +++ b/include/msdasc.idl @@ -34,6 +34,56 @@ library MSDASC { importlib("stdole2.tlb"); + typedef DWORD DBPROMPTOPTIONS; + + typedef enum tagDBPROMPTOPTIONSENUM + { + DBPROMPTOPTIONS_NONE = 0x00, + DBPROMPTOPTIONS_WIZARDSHEET = 0x01, + DBPROMPTOPTIONS_PROPERTYSHEET = 0x02, + DBPROMPTOPTIONS_BROWSEONLY = 0x08, + DBPROMPTOPTIONS_DISABLE_PROVIDER_SELECTION = 0x10, + DBPROMPTOPTIONS_DISABLESAVEPASSWORD = 0x20 + } DBPROMPTOPTIONSENUM; + + [ + odl, + uuid(2206CCB2-19C1-11D1-89E0-00C04FD7A829), + helpstring("OLE DB Service Component Automation Interface"), + dual, + oleautomation + ] + interface IDataSourceLocator : IDispatch + { + [id(0x60020000), propget] + HRESULT hWnd([out, retval] long* phwndParent); + + [id(0x60020000), propput] + HRESULT hWnd([in] long phwndParent); + + [id(0x60020002), helpstring("PromptNew")] + HRESULT PromptNew([out, retval] IDispatch** ppADOConnection); + + [id(0x60020003), helpstring("PromptEdit")] + HRESULT PromptEdit([in, out] IDispatch** ppADOConnection, [out, retval] VARIANT_BOOL* pbSuccess); + } + + [ + odl, + uuid(2206CCB0-19C1-11D1-89E0-00C04FD7A829), + restricted + ] + interface IDBPromptInitialize : IUnknown + { + HRESULT _stdcall PromptDataSource([in] IUnknown* pUnkOuter, [in] HWND hWndParent, + [in] DBPROMPTOPTIONS dwPromptOptions, [in] ULONG cSourceTypeFilter, + [in] DBSOURCETYPE* rgSourceTypeFilter, [in] LPWSTR pwszszzProviderFilter, + [in] GUID* riid, [in, out] IUnknown** ppDataSource); + + HRESULT _stdcall PromptFileName([in] HWND hWndParent, [in] ULONG dwPromptOptions, + [in] LPWSTR pwszInitialDirectory, [in] LPWSTR pwszInitialFile, [out] LPWSTR* ppwszSelectedFile); + } + [ uuid(2206CCB1-19C1-11D1-89E0-00C04FD7A829), ] @@ -71,4 +121,15 @@ library MSDASC { [default] interface IDataInitialize; } + + [ + uuid(2206CDB2-19C1-11D1-89E0-00C04FD7A829), + progid("DataLinks") + ] + coclass DataLinks + { + [default] interface IDataSourceLocator; + interface IDBPromptInitialize; + interface IDataInitialize; + } }

1 0

Alexandre Julliard : secur32/tests: Run the tests against the winehq. org server.
by Alexandre Julliard 30 Jul '13

30 Jul '13

Module: wine Branch: master Commit: 55e37bdbf3b92f509b897991a4cb5649222f94c1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=55e37bdbf3b92f509b897991a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jul 30 13:01:11 2013 +0200 secur32/tests: Run the tests against the winehq.org server. --- dlls/secur32/tests/schannel.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/secur32/tests/schannel.c b/dlls/secur32/tests/schannel.c index 5076767..0bb07bf 100644 --- a/dlls/secur32/tests/schannel.c +++ b/dlls/secur32/tests/schannel.c @@ -513,11 +513,11 @@ static void test_remote_cert(PCCERT_CONTEXT remote_cert) cert_cnt++; } - ok(cert_cnt == 2, "cert_cnt = %u\n", cert_cnt); + ok(cert_cnt == 3, "cert_cnt = %u\n", cert_cnt); ok(incl_remote, "context does not contain cert itself\n"); } -static const char http_request[] = "HEAD /test.html HTTP/1.1\r\nHost: www.codeweavers.com\r\nConnection: close\r\n\r\n"; +static const char http_request[] = "HEAD /test.html HTTP/1.1\r\nHost: www.winehq.org\r\nConnection: close\r\n\r\n"; static void init_cred(SCHANNEL_CRED *cred) { @@ -639,7 +639,7 @@ static void test_communication(void) return; } - /* Create a socket and connect to www.codeweavers.com */ + /* Create a socket and connect to www.winehq.org */ ret = WSAStartup(0x0202, &wsa_data); if (ret) { @@ -647,10 +647,10 @@ static void test_communication(void) return; } - host = gethostbyname("www.codeweavers.com"); + host = gethostbyname("www.winehq.org"); if (!host) { - skip("Can't resolve www.codeweavers.com\n"); + skip("Can't resolve www.winehq.org\n"); return; } @@ -667,7 +667,7 @@ static void test_communication(void) ret = connect(sock, (struct sockaddr *)&addr, sizeof(addr)); if (ret == SOCKET_ERROR) { - skip("Can't connect to www.codeweavers.com\n"); + skip("Can't connect to www.winehq.org\n"); return; }

1 0

Ken Sharp : kernel32: Correct log on / logon (noun / verb).
by Alexandre Julliard 30 Jul '13

30 Jul '13

1 0

Piotr Caban : scrrun/tests: Add IFilesystem3::CopyFolder tests.
by Alexandre Julliard 30 Jul '13

30 Jul '13

Module: wine Branch: master Commit: f4e4a608cc157275b610eea1093f5e33123dbfce URL: http://source.winehq.org/git/wine.git/?a=commit;h=f4e4a608cc157275b610eea10… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Jul 30 11:32:27 2013 +0200 scrrun/tests: Add IFilesystem3::CopyFolder tests. --- dlls/scrrun/tests/filesystem.c | 125 ++++++++++++++++++++++++++++++++++++++++ 1 files changed, 125 insertions(+), 0 deletions(-) diff --git a/dlls/scrrun/tests/filesystem.c b/dlls/scrrun/tests/filesystem.c index 237c107..0ddbbac 100644 --- a/dlls/scrrun/tests/filesystem.c +++ b/dlls/scrrun/tests/filesystem.c @@ -526,6 +526,130 @@ static void test_GetFile(void) SysFreeString(path); } +static inline BOOL create_file(const WCHAR *name) +{ + HANDLE f = CreateFileW(name, GENERIC_WRITE, 0, NULL, CREATE_NEW, 0, NULL); + CloseHandle(f); + return f != INVALID_HANDLE_VALUE; +} + +static inline void create_path(const WCHAR *folder, const WCHAR *name, WCHAR *ret) +{ + DWORD len = lstrlenW(folder); + memmove(ret, folder, len*sizeof(WCHAR)); + ret[len] = '\\'; + memmove(ret+len+1, name, (lstrlenW(name)+1)*sizeof(WCHAR)); +} + +static void test_CopyFolder(void) +{ + static const WCHAR filesystem3_dir[] = {'f','i','l','e','s','y','s','t','e','m','3','_','t','e','s','t',0}; + static const WCHAR s1[] = {'s','r','c','1',0}; + static const WCHAR s[] = {'s','r','c','*',0}; + static const WCHAR d[] = {'d','s','t',0}; + static const WCHAR empty[] = {0}; + + WCHAR tmp[MAX_PATH]; + BSTR bsrc, bdst; + HRESULT hr; + + if(!CreateDirectoryW(filesystem3_dir, NULL)) { + skip("can't create temporary directory\n"); + return; + } + + create_path(filesystem3_dir, s1, tmp); + bsrc = SysAllocString(tmp); + create_path(filesystem3_dir, d, tmp); + bdst = SysAllocString(tmp); + hr = IFileSystem3_CopyFile(fs3, bsrc, bdst, VARIANT_TRUE); + ok(hr == CTL_E_FILENOTFOUND, "CopyFile returned %x, expected CTL_E_FILENOTFOUND\n", hr); + + hr = IFileSystem3_CopyFolder(fs3, bsrc, bdst, VARIANT_TRUE); + ok(hr == CTL_E_PATHNOTFOUND, "CopyFolder returned %x, expected CTL_E_PATHNOTFOUND\n", hr); + + ok(create_file(bsrc), "can't create %s file\n", wine_dbgstr_w(bsrc)); + hr = IFileSystem3_CopyFile(fs3, bsrc, bdst, VARIANT_TRUE); + ok(hr == S_OK, "CopyFile returned %x, expected S_OK\n", hr); + + hr = IFileSystem3_CopyFolder(fs3, bsrc, bdst, VARIANT_TRUE); + ok(hr == CTL_E_PATHNOTFOUND, "CopyFolder returned %x, expected CTL_E_PATHNOTFOUND\n", hr); + + hr = IFileSystem3_DeleteFile(fs3, bsrc, VARIANT_FALSE); + ok(hr == S_OK, "DeleteFile returned %x, expected S_OK\n", hr); + + ok(CreateDirectoryW(bsrc, NULL), "can't create %s\n", wine_dbgstr_w(bsrc)); + hr = IFileSystem3_CopyFile(fs3, bsrc, bdst, VARIANT_TRUE); + ok(hr == CTL_E_FILENOTFOUND, "CopyFile returned %x, expected CTL_E_FILENOTFOUND\n", hr); + + hr = IFileSystem3_CopyFolder(fs3, bsrc, bdst, VARIANT_TRUE); + ok(hr == CTL_E_FILEALREADYEXISTS, "CopyFolder returned %x, expected CTL_E_FILEALREADYEXISTS\n", hr); + + hr = IFileSystem3_DeleteFile(fs3, bdst, VARIANT_TRUE); + ok(hr == S_OK, "DeleteFile returned %x, expected S_OK\n", hr); + + hr = IFileSystem3_CopyFolder(fs3, bsrc, bdst, VARIANT_TRUE); + ok(hr == S_OK, "CopyFolder returned %x, expected S_OK\n", hr); + + hr = IFileSystem3_CopyFolder(fs3, bsrc, bdst, VARIANT_TRUE); + ok(hr == S_OK, "CopyFolder returned %x, expected S_OK\n", hr); + create_path(tmp, s1, tmp); + ok(GetFileAttributesW(tmp) == INVALID_FILE_ATTRIBUTES, + "%s file exists\n", wine_dbgstr_w(tmp)); + + create_path(filesystem3_dir, d, tmp); + create_path(tmp, empty, tmp); + SysFreeString(bdst); + bdst = SysAllocString(tmp); + hr = IFileSystem3_CopyFolder(fs3, bsrc, bdst, VARIANT_TRUE); + ok(hr == S_OK, "CopyFolder returned %x, expected S_OK\n", hr); + create_path(tmp, s1, tmp); + ok(GetFileAttributesW(tmp) != INVALID_FILE_ATTRIBUTES, + "%s directory doesn't exist\n", wine_dbgstr_w(tmp)); + ok(RemoveDirectoryW(tmp), "can't remove %s directory\n", wine_dbgstr_w(tmp)); + create_path(filesystem3_dir, d, tmp); + SysFreeString(bdst); + bdst = SysAllocString(tmp); + + + create_path(filesystem3_dir, s, tmp); + SysFreeString(bsrc); + bsrc = SysAllocString(tmp); + hr = IFileSystem3_CopyFolder(fs3, bsrc, bdst, VARIANT_TRUE); + ok(hr == S_OK, "CopyFolder returned %x, expected S_OK\n", hr); + create_path(filesystem3_dir, d, tmp); + create_path(tmp, s1, tmp); + ok(GetFileAttributesW(tmp) != INVALID_FILE_ATTRIBUTES, + "%s directory doesn't exist\n", wine_dbgstr_w(tmp)); + + hr = IFileSystem3_DeleteFolder(fs3, bdst, VARIANT_FALSE); + ok(hr == S_OK, "DeleteFolder returned %x, expected S_OK\n", hr); + + hr = IFileSystem3_CopyFolder(fs3, bsrc, bdst, VARIANT_TRUE); + ok(hr == CTL_E_PATHNOTFOUND, "CopyFolder returned %x, expected CTL_E_PATHNOTFOUND\n", hr); + + create_path(filesystem3_dir, s1, tmp); + SysFreeString(bsrc); + bsrc = SysAllocString(tmp); + create_path(tmp, s1, tmp); + ok(create_file(tmp), "can't create %s file\n", wine_dbgstr_w(tmp)); + hr = IFileSystem3_CopyFolder(fs3, bsrc, bdst, VARIANT_FALSE); + ok(hr == S_OK, "CopyFolder returned %x, expected S_OK\n", hr); + + hr = IFileSystem3_CopyFolder(fs3, bsrc, bdst, VARIANT_FALSE); + ok(hr == CTL_E_FILEALREADYEXISTS, "CopyFolder returned %x, expected CTL_E_FILEALREADYEXISTS\n", hr); + + hr = IFileSystem3_CopyFolder(fs3, bsrc, bdst, VARIANT_TRUE); + ok(hr == S_OK, "CopyFolder returned %x, expected S_OK\n", hr); + SysFreeString(bsrc); + SysFreeString(bdst); + + bsrc = SysAllocString(filesystem3_dir); + hr = IFileSystem3_DeleteFolder(fs3, bsrc, VARIANT_FALSE); + ok(hr == S_OK, "DeleteFolder returned %x, expected S_OK\n", hr); + SysFreeString(bsrc); +} + START_TEST(filesystem) { HRESULT hr; @@ -548,6 +672,7 @@ START_TEST(filesystem) test_GetBaseName(); test_GetAbsolutePathName(); test_GetFile(); + test_CopyFolder(); IFileSystem3_Release(fs3);

1 0

← Newer
1
2
3
4
5
6
7
8
...
45
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits July 2013