wine-commits January 2010

wine-commits@winehq.org

3 participants
615 discussions

Christian Costa : d3drm: Add GUID definitions for all interfaces.
by Alexandre Julliard 29 Jan '10

29 Jan '10

Module: wine Branch: master Commit: 137100f7470a683ea6121b8466371b465fefa188 URL: http://source.winehq.org/git/wine.git/?a=commit;h=137100f7470a683ea6121b846… Author: Christian Costa <titan.costa(a)wanadoo.fr> Date: Fri Jan 29 12:16:17 2010 +0100 d3drm: Add GUID definitions for all interfaces. --- include/d3drmobj.h | 42 ++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 42 insertions(+), 0 deletions(-) diff --git a/include/d3drmobj.h b/include/d3drmobj.h index c91465d..bd22e89 100644 --- a/include/d3drmobj.h +++ b/include/d3drmobj.h @@ -34,7 +34,49 @@ extern "C" { */ DEFINE_GUID(IID_IDirect3DRMObject, 0xeb16cb00, 0xd271, 0x11ce, 0xac, 0x48, 0x00, 0x00, 0xc0, 0x38, 0x25, 0xa1); +DEFINE_GUID(IID_IDirect3DRMObject2, 0x4516ec7c, 0x8f20, 0x11d0, 0x9b, 0x6d, 0x00, 0x00, 0xc0, 0x78, 0x1b, 0xc3); +DEFINE_GUID(IID_IDirect3DRMDevice, 0xe9e19280, 0x6e05, 0x11cf, 0xac, 0x4a, 0x00, 0x00, 0xc0, 0x38, 0x25, 0xa1); +DEFINE_GUID(IID_IDirect3DRMDevice2, 0x4516ec78, 0x8f20, 0x11d0, 0x9b, 0x6d, 0x00, 0x00, 0xc0, 0x78, 0x1b, 0xc3); +DEFINE_GUID(IID_IDirect3DRMDevice3, 0x549f498b, 0xbfeb, 0x11d1, 0x8e, 0xd8, 0x00, 0xa0, 0xc9, 0x67, 0xa4, 0x82); +DEFINE_GUID(IID_IDirect3DRMViewport, 0xeb16cb02, 0xd271, 0x11ce, 0xac, 0x48, 0x00, 0x00, 0xc0, 0x38, 0x25, 0xa1); +DEFINE_GUID(IID_IDirect3DRMViewport2, 0x4a1b1be6, 0xbfed, 0x11d1, 0x8e, 0xd8, 0x00, 0xa0, 0xc9, 0x67, 0xa4, 0x82); +DEFINE_GUID(IID_IDirect3DRMFrame, 0xeb16cb03, 0xd271, 0x11ce, 0xac, 0x48, 0x00, 0x00, 0xc0, 0x38, 0x25, 0xa1); +DEFINE_GUID(IID_IDirect3DRMFrame2, 0xc3dfbd60, 0x3988, 0x11d0, 0x9e, 0xc2, 0x00, 0x00, 0xc0, 0x29, 0x1a, 0xc3); +DEFINE_GUID(IID_IDirect3DRMFrame3, 0xff6b7f70, 0xa40e, 0x11d1, 0x91, 0xf9, 0x00, 0x00, 0xf8, 0x75, 0x8e, 0x66); DEFINE_GUID(IID_IDirect3DRMVisual, 0xeb16cb04, 0xd271, 0x11ce, 0xac, 0x48, 0x00, 0x00, 0xc0, 0x38, 0x25, 0xa1); +DEFINE_GUID(IID_IDirect3DRMMesh, 0xa3a80d01, 0x6e12, 0x11cf, 0xac, 0x4a, 0x00, 0x00, 0xc0, 0x38, 0x25, 0xa1); +DEFINE_GUID(IID_IDirect3DRMMeshBuilder, 0xa3a80d02, 0x6e12, 0x11cf, 0xac, 0x4a, 0x00, 0x00, 0xc0, 0x38, 0x25, 0xa1); +DEFINE_GUID(IID_IDirect3DRMMeshBuilder2, 0x4516ec77, 0x8f20, 0x11d0, 0x9b, 0x6d, 0x00, 0x00, 0xc0, 0x78, 0x1b, 0xc3); +DEFINE_GUID(IID_IDirect3DRMMeshBuilder3, 0x4516ec82, 0x8f20, 0x11d0, 0x9b, 0x6d, 0x00, 0x00, 0xc0, 0x78, 0x1b, 0xc3); +DEFINE_GUID(IID_IDirect3DRMFace, 0xeb16cb07, 0xd271, 0x11ce, 0xac, 0x48, 0x00, 0x00, 0xc0, 0x38, 0x25, 0xa1); +DEFINE_GUID(IID_IDirect3DRMFace2, 0x4516ec81, 0x8f20, 0x11d0, 0x9b, 0x6d, 0x00, 0x00, 0xc0, 0x78, 0x1b, 0xc3); +DEFINE_GUID(IID_IDirect3DRMLight, 0xeb16cb08, 0xd271, 0x11ce, 0xac, 0x48, 0x00, 0x00, 0xc0, 0x38, 0x25, 0xa1); +DEFINE_GUID(IID_IDirect3DRMTexture, 0xeb16cb09, 0xd271, 0x11ce, 0xac, 0x48, 0x00, 0x00, 0xc0, 0x38, 0x25, 0xa1); +DEFINE_GUID(IID_IDirect3DRMTexture2, 0x120f30c0, 0x1629, 0x11d0, 0x94, 0x1c, 0x00, 0x80, 0xc8, 0x0c, 0xfa, 0x7b); +DEFINE_GUID(IID_IDirect3DRMTexture3, 0xff6b7f73, 0xa40e, 0x11d1, 0x91, 0xf9, 0x00, 0x00, 0xf8, 0x75, 0x8e, 0x66); +DEFINE_GUID(IID_IDirect3DRMWrap, 0xeb16cb0a, 0xd271, 0x11ce, 0xac, 0x48, 0x00, 0x00, 0xc0, 0x38, 0x25, 0xa1); +DEFINE_GUID(IID_IDirect3DRMMaterial, 0xeb16cb0b, 0xd271, 0x11ce, 0xac, 0x48, 0x00, 0x00, 0xc0, 0x38, 0x25, 0xa1); +DEFINE_GUID(IID_IDirect3DRMMaterial2, 0xff6b7f75, 0xa40e, 0x11d1, 0x91, 0xf9, 0x00, 0x00, 0xf8, 0x75, 0x8e, 0x66); +DEFINE_GUID(IID_IDirect3DRMAnimation, 0xeb16cb0d, 0xd271, 0x11ce, 0xac, 0x48, 0x00, 0x00, 0xc0, 0x38, 0x25, 0xa1); +DEFINE_GUID(IID_IDirect3DRMAnimation2, 0xff6b7f77, 0xa40e, 0x11d1, 0x91, 0xf9, 0x00, 0x00, 0xf8, 0x75, 0x8e, 0x66); +DEFINE_GUID(IID_IDirect3DRMAnimationSet, 0xeb16cb0e, 0xd271, 0x11ce, 0xac, 0x48, 0x00, 0x00, 0xc0, 0x38, 0x25, 0xa1); +DEFINE_GUID(IID_IDirect3DRMAnimationSet2, 0xff6b7f79, 0xa40e, 0x11d1, 0x91, 0xf9, 0x00, 0x00, 0xf8, 0x75, 0x8e, 0x66); +DEFINE_GUID(IID_IDirect3DRMObjectArray, 0x242f6bc2, 0x3849, 0x11d0, 0x9b, 0x6d, 0x00, 0x00, 0xc0, 0x78, 0x1b, 0xc3); +DEFINE_GUID(IID_IDirect3DRMDeviceArray, 0xeb16cb10, 0xd271, 0x11ce, 0xac, 0x48, 0x00, 0x00, 0xc0, 0x38, 0x25, 0xa1); +DEFINE_GUID(IID_IDirect3DRMViewportArray, 0xeb16cb11, 0xd271, 0x11ce, 0xac, 0x48, 0x00, 0x00, 0xc0, 0x38, 0x25, 0xa1); +DEFINE_GUID(IID_IDirect3DRMFrameArray, 0xeb16cb12, 0xd271, 0x11ce, 0xac, 0x48, 0x00, 0x00, 0xc0, 0x38, 0x25, 0xa1); +DEFINE_GUID(IID_IDirect3DRMVisualArray, 0xeb16cb13, 0xd271, 0x11ce, 0xac, 0x48, 0x00, 0x00, 0xc0, 0x38, 0x25, 0xa1); +DEFINE_GUID(IID_IDirect3DRMLightArray, 0xeb16cb14, 0xd271, 0x11ce, 0xac, 0x48, 0x00, 0x00, 0xc0, 0x38, 0x25, 0xa1); +DEFINE_GUID(IID_IDirect3DRMPickedArray, 0xeb16cb16, 0xd271, 0x11ce, 0xac, 0x48, 0x00, 0x00, 0xc0, 0x38, 0x25, 0xa1); +DEFINE_GUID(IID_IDirect3DRMFaceArray, 0xeb16cb17, 0xd271, 0x11ce, 0xac, 0x48, 0x00, 0x00, 0xc0, 0x38, 0x25, 0xa1); +DEFINE_GUID(IID_IDirect3DRMAnimationArray, 0xd5f1cae0, 0x4bd7, 0x11d1, 0xb9, 0x74, 0x00, 0x60, 0x08, 0x3e, 0x45, 0xf3); +DEFINE_GUID(IID_IDirect3DRMUserVisual, 0x59163de0, 0x6d43, 0x11cf, 0xac, 0x4a, 0x00, 0x00, 0xc0, 0x38, 0x25, 0xa1); +DEFINE_GUID(IID_IDirect3DRMShadow, 0xaf359780, 0x6ba3, 0x11cf, 0xac, 0x4a, 0x00, 0x00, 0xc0, 0x38, 0x25, 0xa1); +DEFINE_GUID(IID_IDirect3DRMShadow2, 0x86b44e25, 0x9c82, 0x11d1, 0xbb, 0x0b, 0x00, 0xa0, 0xc9, 0x81, 0xa0, 0xa6); +DEFINE_GUID(IID_IDirect3DRMInterpolator, 0x242f6bc1, 0x3849, 0x11d0, 0x9b, 0x6d, 0x00, 0x00, 0xc0, 0x78, 0x1b, 0xc3); +DEFINE_GUID(IID_IDirect3DRMProgressiveMesh, 0x4516ec79, 0x8f20, 0x11d0, 0x9b, 0x6d, 0x00, 0x00, 0xc0, 0x78, 0x1b, 0xc3); +DEFINE_GUID(IID_IDirect3DRMPicked2Array, 0x4516ec7b, 0x8f20, 0x11d0, 0x9b, 0x6d, 0x00, 0x00, 0xc0, 0x78, 0x1b, 0xc3); +DEFINE_GUID(IID_IDirect3DRMClippedVisual, 0x5434e733, 0x6d66, 0x11d1, 0xbb, 0x0b, 0x00, 0x00, 0xf8, 0x75, 0x86, 0x5a); typedef struct IDirect3DRMObject *LPDIRECT3DRMOBJECT, **LPLPDIRECT3DRMOBJECT; typedef struct IDirect3DRMObject2 *LPDIRECT3DRMOBJECT2, **LPLPDIRECT3DRMOBJECT2;

1 0

Maarten Lankhorst : qcap: Add optional dependency on libv4l.
by Alexandre Julliard 29 Jan '10

29 Jan '10

Module: wine Branch: master Commit: bf6f0750cdc3695576a0f486ca322ade78aabf57 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bf6f0750cdc3695576a0f486c… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Thu Jan 28 23:27:12 2010 +0100 qcap: Add optional dependency on libv4l. --- configure | 70 +++++++++++++++++++++++++++++++++++++++++++++++++++ configure.ac | 9 ++++++ dlls/qcap/v4l.c | 44 ++++++++++++++++++++++++++------ include/config.h.in | 3 ++ 4 files changed, 118 insertions(+), 8 deletions(-) diff --git a/configure b/configure index 740e95e..2ae042f 100755 --- a/configure +++ b/configure @@ -803,6 +803,7 @@ with_oss with_png with_pthread with_sane +with_v4l with_xcomposite with_xcursor with_xinerama @@ -1488,6 +1489,7 @@ Optional Packages: --without-png do not use PNG --without-pthread do not use the pthread library --without-sane do not use SANE (scanner support) + --without-v4l do not use v4l1 (v4l support) --without-xcomposite do not use the Xcomposite extension --without-xcursor do not use the Xcursor extension --without-xinerama do not use Xinerama (multi-monitor support) @@ -2665,6 +2667,12 @@ if test "${with_sane+set}" = set; then : fi +# Check whether --with-v4l was given. +if test "${with_v4l+set}" = set; then : + withval=$with_v4l; +fi + + # Check whether --with-xcomposite was given. if test "${with_xcomposite+set}" = set; then : withval=$with_xcomposite; if test "x$withval" = "xno"; then ac_cv_header_X11_extensions_Xcomposite_h=no; fi @@ -9615,6 +9623,68 @@ This is an error since --with-sane was requested." "$LINENO" 5 ;; esac fi +if test "x$with_v4l" != "xno" +then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -lv4l1" >&5 +$as_echo_n "checking for -lv4l1... " >&6; } +if test "${ac_cv_lib_soname_v4l1+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + ac_check_soname_save_LIBS=$LIBS +LIBS="-lv4l1 $LIBS" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char v4l1_open (); +int +main () +{ +return v4l1_open (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + case "$LIBEXT" in + dll) ;; + dylib) ac_cv_lib_soname_v4l1=`otool -L conftest$ac_exeext | grep "libv4l1\\.[0-9A-Za-z.]*dylib" | sed -e "s/^.*\/$libv4l1\.[0-9A-Za-z.]*dylib$.*$/\1/"';2,$d'` ;; + *) ac_cv_lib_soname_v4l1=`$ac_cv_path_LDD conftest$ac_exeext | grep "libv4l1\\.$LIBEXT" | sed -e "s/^.*$libv4l1\.$LIBEXT[^ ]*$.*$/\1/"';2,$d'` ;; + esac +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_soname_save_LIBS +fi +if test "x$ac_cv_lib_soname_v4l1" = "x"; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5 +$as_echo "not found" >&6; } + +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_soname_v4l1" >&5 +$as_echo "$ac_cv_lib_soname_v4l1" >&6; } + +cat >>confdefs.h <<_ACEOF +#define SONAME_LIBV4L1 "$ac_cv_lib_soname_v4l1" +_ACEOF + + +fi +fi +if test "x$ac_cv_lib_soname_v4l1" = "x"; then : + case "x$with_v4l" in + x) wine_notices="$wine_notices|libv4l ${notice_platform}development files not found." ;; + xno) ;; + *) as_fn_error "libv4l ${notice_platform}development files not found. +This is an error since --with-v4l was requested." "$LINENO" 5 ;; +esac +fi + if test "x$with_gphoto" != "xno" then ac_save_CPPFLAGS="$CPPFLAGS" diff --git a/configure.ac b/configure.ac index 453ba7a..f823045 100644 --- a/configure.ac +++ b/configure.ac @@ -65,6 +65,7 @@ AC_ARG_WITH(png, AS_HELP_STRING([--without-png],[do not use PNG]), AC_ARG_WITH(pthread, AS_HELP_STRING([--without-pthread],[do not use the pthread library]), [if test "x$withval" = "xno"; then ac_cv_header_pthread_h=no; fi]) AC_ARG_WITH(sane, AS_HELP_STRING([--without-sane],[do not use SANE (scanner support)])) +AC_ARG_WITH(v4l, AS_HELP_STRING([--without-v4l],[do not use v4l1 (v4l support)])) AC_ARG_WITH(xcomposite,AS_HELP_STRING([--without-xcomposite],[do not use the Xcomposite extension]), [if test "x$withval" = "xno"; then ac_cv_header_X11_extensions_Xcomposite_h=no; fi]) AC_ARG_WITH(xcursor, AS_HELP_STRING([--without-xcursor],[do not use the Xcursor extension]), @@ -1138,6 +1139,14 @@ fi WINE_NOTICE_WITH(sane,[test "x$ac_cv_lib_soname_sane" = "x"], [libsane ${notice_platform}development files not found, scanners won't be supported.]) +dnl **** Check for libv4l1 **** +if test "x$with_v4l" != "xno" +then + WINE_CHECK_SONAME(v4l1,v4l1_open,,,) +fi +WINE_NOTICE_WITH(v4l,[test "x$ac_cv_lib_soname_v4l1" = "x"], + [libv4l ${notice_platform}development files not found.]) + dnl **** Check for libgphoto2 **** if test "x$with_gphoto" != "xno" then diff --git a/dlls/qcap/v4l.c b/dlls/qcap/v4l.c index 0546797..85d4d4d 100644 --- a/dlls/qcap/v4l.c +++ b/dlls/qcap/v4l.c @@ -24,6 +24,7 @@ #include "config.h" #include "wine/port.h" +#include "wine/library.h" #define NONAMELESSSTRUCT #define NONAMELESSUNION @@ -73,6 +74,32 @@ WINE_DEFAULT_DEBUG_CHANNEL(qcap_v4l); #ifdef HAVE_LINUX_VIDEODEV_H +static typeof(open) *video_open = open; +static typeof(close) *video_close = close; +static typeof(ioctl) *video_ioctl = ioctl; +static typeof(read) *video_read = read; +static typeof(mmap) *video_mmap = mmap; +static typeof(munmap) *video_munmap = munmap; + +static void video_init(void) +{ +#ifdef SONAME_LIBV4L1 + static void *video_lib; + + if (video_lib) + return; + video_lib = wine_dlopen(SONAME_LIBV4L1, RTLD_NOW, NULL, 0); + if (!video_lib) + return; + video_open = wine_dlsym(video_lib, "v4l1_open", NULL, 0); + video_close = wine_dlsym(video_lib, "v4l1_close", NULL, 0); + video_ioctl = wine_dlsym(video_lib, "v4l1_ioctl", NULL, 0); + video_read = wine_dlsym(video_lib, "v4l1_read", NULL, 0); + video_mmap = wine_dlsym(video_lib, "v4l1_mmap", NULL, 0); + video_munmap = wine_dlsym(video_lib, "v4l1_munmap", NULL, 0); +#endif +} + typedef void (* Renderer)(const Capture *, LPBYTE bufferin, const BYTE *stream); struct _Capture @@ -146,7 +173,7 @@ static int xioctl(int fd, int request, void * arg) int r; do { - r = ioctl (fd, request, arg); + r = video_ioctl (fd, request, arg); } while (-1 == r && EINTR == errno); return r; @@ -168,8 +195,8 @@ static HRESULT V4l_Prepare(Capture *capBox) TRACE("%p: Using %d/%d buffers\n", capBox, capBox->buffers, capBox->gb_buffers.frames); - capBox->pmap = mmap( 0, capBox->gb_buffers.size, PROT_READ|PROT_WRITE, - MAP_SHARED, capBox->fd, 0 ); + capBox->pmap = video_mmap( 0, capBox->gb_buffers.size, PROT_READ|PROT_WRITE, + MAP_SHARED, capBox->fd, 0 ); if (capBox->pmap != MAP_FAILED) { int i; @@ -177,7 +204,7 @@ static HRESULT V4l_Prepare(Capture *capBox) capBox->grab_buf = CoTaskMemAlloc(sizeof(struct video_mmap) * capBox->buffers); if (!capBox->grab_buf) { - munmap(capBox->pmap, capBox->gb_buffers.size); + video_munmap(capBox->pmap, capBox->gb_buffers.size); return E_OUTOFMEMORY; } @@ -211,7 +238,7 @@ static void V4l_Unprepare(Capture *capBox) { for (capBox->curframe = 0; capBox->curframe < capBox->buffers; capBox->curframe++) xioctl(capBox->fd, VIDIOCSYNC, &capBox->grab_buf[capBox->curframe]); - munmap(capBox->pmap, capBox->gb_buffers.size); + video_munmap(capBox->pmap, capBox->gb_buffers.size); CoTaskMemFree(capBox->grab_buf); } else @@ -223,7 +250,7 @@ HRESULT qcap_driver_destroy(Capture *capBox) TRACE("%p\n", capBox); if( capBox->fd != -1 ) - close(capBox->fd); + video_close(capBox->fd); capBox->CritSect.DebugInfo->Spare[0] = 0; DeleteCriticalSection(&capBox->CritSect); CoTaskMemFree(capBox); @@ -546,7 +573,7 @@ static void V4l_GetFrame(Capture * capBox, unsigned char ** pInput) else { int retval; - while ((retval = read(capBox->fd, capBox->grab_data, capBox->imagesize)) == -1) + while ((retval = video_read(capBox->fd, capBox->grab_data, capBox->imagesize)) == -1) if (errno != EAGAIN) break; if (retval == -1) WARN("Error occurred while reading from device: %s\n", strerror(errno)); @@ -782,6 +809,7 @@ Capture * qcap_driver_init( IPin *pOut, USHORT card ) struct video_window window; YUV_Init(); + video_init(); capBox = CoTaskMemAlloc(sizeof(Capture)); if (!capBox) @@ -794,7 +822,7 @@ Capture * qcap_driver_init( IPin *pOut, USHORT card ) sprintf(device, "/dev/video%i", card); TRACE("opening %s\n", device); - capBox->fd = open(device, O_RDWR | O_NONBLOCK); + capBox->fd = video_open(device, O_RDWR | O_NONBLOCK); if (capBox->fd == -1) { WARN("open failed (%d)\n", errno); diff --git a/include/config.h.in b/include/config.h.in index 0d5ce60..4e8fcd1 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -1194,6 +1194,9 @@ /* Define to the soname of the libssl library. */ #undef SONAME_LIBSSL +/* Define to the soname of the libv4l1 library. */ +#undef SONAME_LIBV4L1 + /* Define to the soname of the libX11 library. */ #undef SONAME_LIBX11

1 0

Maarten Lankhorst : kernel32: Work around safety check on siglongjmp.
by Alexandre Julliard 29 Jan '10

29 Jan '10

Module: wine Branch: master Commit: 3d7aabd887ddf1190798e4f7dea31040a16a16d1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3d7aabd887ddf1190798e4f7d… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Tue Jan 26 13:05:28 2010 +0100 kernel32: Work around safety check on siglongjmp. --- dlls/kernel32/fiber.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/dlls/kernel32/fiber.c b/dlls/kernel32/fiber.c index c866661..f6bebf8 100644 --- a/dlls/kernel32/fiber.c +++ b/dlls/kernel32/fiber.c @@ -21,6 +21,10 @@ * - proper handling of 16-bit stack and signal stack */ +/* Fortify source chokes on siglongjmp stack switching, so disable it */ +#undef _FORTIFY_SOURCE +#define _FORTIFY_SOURCE 0 + #include "config.h" #include "wine/port.h"

1 0

Stefan Dösinger : ddraw: Convert VB lock flags to wined3d flags.
by Alexandre Julliard 29 Jan '10

29 Jan '10

Module: wine Branch: master Commit: a9f969094c4e3c03d0d31704aa8ab7097a3786ba URL: http://source.winehq.org/git/wine.git/?a=commit;h=a9f969094c4e3c03d0d31704a… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Jan 27 23:29:34 2010 +0100 ddraw: Convert VB lock flags to wined3d flags. --- dlls/ddraw/vertexbuffer.c | 11 ++++++++++- 1 files changed, 10 insertions(+), 1 deletions(-) diff --git a/dlls/ddraw/vertexbuffer.c b/dlls/ddraw/vertexbuffer.c index df7528b..f16cf12 100644 --- a/dlls/ddraw/vertexbuffer.c +++ b/dlls/ddraw/vertexbuffer.c @@ -236,8 +236,17 @@ IDirect3DVertexBufferImpl_Lock(IDirect3DVertexBuffer7 *iface, IDirect3DVertexBufferImpl *This = (IDirect3DVertexBufferImpl *)iface; WINED3DBUFFER_DESC Desc; HRESULT hr; + DWORD wined3d_flags = 0; TRACE("(%p)->(%08x,%p,%p)\n", This, Flags, Data, Size); + /* Writeonly: Pointless. Event: Unsupported by native according to the sdk + * nosyslock: Not applicable + */ + if(!(Flags & DDLOCK_WAIT)) wined3d_flags |= WINED3DLOCK_DONOTWAIT; + if(Flags & DDLOCK_READONLY) wined3d_flags |= WINED3DLOCK_READONLY; + if(Flags & DDLOCK_NOOVERWRITE) wined3d_flags |= WINED3DLOCK_NOOVERWRITE; + if(Flags & DDLOCK_DISCARDCONTENTS) wined3d_flags |= WINED3DLOCK_DISCARD; + EnterCriticalSection(&ddraw_cs); if(Size) { @@ -253,7 +262,7 @@ IDirect3DVertexBufferImpl_Lock(IDirect3DVertexBuffer7 *iface, } hr = IWineD3DBuffer_Map(This->wineD3DVertexBuffer, 0 /* OffsetToLock */, - 0 /* SizeToLock, 0 == Full lock */, (BYTE **)Data, Flags); + 0 /* SizeToLock, 0 == Full lock */, (BYTE **)Data, wined3d_flags); LeaveCriticalSection(&ddraw_cs); return hr; }

1 0

Stefan Dösinger : ddraw: Test invalid buffer lock parameters.
by Alexandre Julliard 29 Jan '10

29 Jan '10

Module: wine Branch: master Commit: f0266ee51980ffa64ed4a431b91e0eb25308949c URL: http://source.winehq.org/git/wine.git/?a=commit;h=f0266ee51980ffa64ed4a431b… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Jan 27 23:15:23 2010 +0100 ddraw: Test invalid buffer lock parameters. --- dlls/ddraw/tests/d3d.c | 53 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 53 insertions(+), 0 deletions(-) diff --git a/dlls/ddraw/tests/d3d.c b/dlls/ddraw/tests/d3d.c index 5f08929..2d17487 100644 --- a/dlls/ddraw/tests/d3d.c +++ b/dlls/ddraw/tests/d3d.c @@ -3172,6 +3172,58 @@ done: UnregisterClassA("d3d7_test_wndproc_wc", GetModuleHandleA(NULL)); } +static void VertexBufferLockRest(void) +{ + D3DVERTEXBUFFERDESC desc; + IDirect3DVertexBuffer7 *buffer; + HRESULT hr; + unsigned int i; + void *data; + const struct + { + DWORD flags; + const char *debug_string; + HRESULT result; + } + test_data[] = + { + {0, "(none)", D3D_OK }, + {DDLOCK_WAIT, "DDLOCK_WAIT", D3D_OK }, + {DDLOCK_EVENT, "DDLOCK_EVENT", D3D_OK }, + {DDLOCK_READONLY, "DDLOCK_READONLY", D3D_OK }, + {DDLOCK_WRITEONLY, "DDLOCK_WRITEONLY", D3D_OK }, + {DDLOCK_NOSYSLOCK, "DDLOCK_NOSYSLOCK", D3D_OK }, + {DDLOCK_NOOVERWRITE, "DDLOCK_NOOVERWRITE", D3D_OK }, + {DDLOCK_DISCARDCONTENTS, "DDLOCK_DISCARDCONTENTS", D3D_OK }, + + {DDLOCK_READONLY | DDLOCK_WRITEONLY, "DDLOCK_READONLY | DDLOCK_WRITEONLY", D3D_OK }, + {DDLOCK_READONLY | DDLOCK_DISCARDCONTENTS, "DDLOCK_READONLY | DDLOCK_DISCARDCONTENTS", D3D_OK }, + {0xdeadbeef, "0xdeadbeef", D3D_OK }, + }; + + memset(&desc, 0 , sizeof(desc)); + desc.dwSize = sizeof(desc); + desc.dwCaps = 0; + desc.dwFVF = D3DFVF_XYZ; + desc.dwNumVertices = 64; + hr = IDirect3D7_CreateVertexBuffer(lpD3D, &desc, &buffer, 0); + ok(hr == D3D_OK, "IDirect3D7_CreateVertexBuffer failed, 0x%08x\n", hr); + + for(i = 0; i < (sizeof(test_data) / sizeof(*test_data)); i++) + { + hr = IDirect3DVertexBuffer7_Lock(buffer, test_data[i].flags, &data, NULL); + ok(hr == test_data[i].result, "Lock flags %s returned 0x%08x, expected 0x%08x\n", + test_data[i].debug_string, hr, test_data[i].result); + if(SUCCEEDED(hr)) + { + hr = IDirect3DVertexBuffer7_Unlock(buffer); + ok(hr == D3D_OK, "IDirect3DVertexBuffer7_Unlock failed, 0x%08x\n", hr); + } + } + + IDirect3DVertexBuffer7_Release(buffer); +} + START_TEST(d3d) { init_function_pointers(); @@ -3196,6 +3248,7 @@ START_TEST(d3d) D3D7_OldRenderStateTest(); DeviceLoadTest(); SetRenderTargetTest(); + VertexBufferLockRest(); ReleaseDirect3D(); }

1 0

Stefan Dösinger : wined3d: Catch invalid buffer map parameters.
by Alexandre Julliard 29 Jan '10

29 Jan '10

Module: wine Branch: master Commit: d499073c10da4a91053508205a73eaebc968a776 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d499073c10da4a91053508205… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Jan 27 23:04:01 2010 +0100 wined3d: Catch invalid buffer map parameters. --- dlls/wined3d/buffer.c | 35 ++++++++++++++++++++++++++++++++++- 1 files changed, 34 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index e38a861..e0cefc9 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -56,7 +56,13 @@ static inline BOOL buffer_add_dirty_area(struct wined3d_buffer *This, UINT offse } } - if(!offset && !size) + if(offset > This->resource.size || offset + size > This->resource.size) + { + WARN("Invalid range dirtified, marking entire buffer dirty\n"); + offset = 0; + size = This->resource.size; + } + else if(!offset && !size) { size = This->resource.size; } @@ -1026,6 +1032,32 @@ static WINED3DRESOURCETYPE STDMETHODCALLTYPE buffer_GetType(IWineD3DBuffer *ifac /* IWineD3DBuffer methods */ +static DWORD buffer_sanitize_flags(DWORD flags) +{ + /* Not all flags make sense together, but Windows never returns an error. Catch the + * cases that could cause issues */ + if(flags & WINED3DLOCK_READONLY) + { + if(flags & WINED3DLOCK_DISCARD) + { + WARN("WINED3DLOCK_READONLY combined with WINED3DLOCK_DISCARD, ignoring flags\n"); + return 0; + } + if(flags & WINED3DLOCK_NOOVERWRITE) + { + WARN("WINED3DLOCK_READONLY combined with WINED3DLOCK_NOOVERWRITE, ignoring flags\n"); + return 0; + } + } + else if((flags & (WINED3DLOCK_DISCARD | WINED3DLOCK_NOOVERWRITE)) == (WINED3DLOCK_DISCARD | WINED3DLOCK_NOOVERWRITE)) + { + WARN("WINED3DLOCK_DISCARD and WINED3DLOCK_NOOVERWRITE used together, ignoring\n"); + return 0; + } + + return flags; +} + static HRESULT STDMETHODCALLTYPE buffer_Map(IWineD3DBuffer *iface, UINT offset, UINT size, BYTE **data, DWORD flags) { struct wined3d_buffer *This = (struct wined3d_buffer *)iface; @@ -1033,6 +1065,7 @@ static HRESULT STDMETHODCALLTYPE buffer_Map(IWineD3DBuffer *iface, UINT offset, TRACE("iface %p, offset %u, size %u, data %p, flags %#x\n", iface, offset, size, data, flags); + flags = buffer_sanitize_flags(flags); if (!buffer_add_dirty_area(This, offset, size)) return E_OUTOFMEMORY; count = InterlockedIncrement(&This->lock_count);

1 0

Dylan Smith : wordpad: Implement zooming in for print preview.
by Alexandre Julliard 29 Jan '10

29 Jan '10

Module: wine Branch: master Commit: 0c46da86bf5f5bb44ca7e1e4a8e21c38579a7f25 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0c46da86bf5f5bb44ca7e1e4a… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Fri Jan 29 03:02:41 2010 -0500 wordpad: Implement zooming in for print preview. The preview is now drawn onto it's own window rather directly onto the client area of the top level window. This is done to allow for scrollbars, since the page won't usually fit in the window when zoomed in. Refactoring was needed as a result of this, and in order to provide more granularity for updates to avoid EM_FORMATRANGE messages being sent when the page the same page is being displayed. --- programs/wordpad/Da.rc | 2 + programs/wordpad/De.rc | 2 + programs/wordpad/En.rc | 2 + programs/wordpad/Fr.rc | 2 + programs/wordpad/Hu.rc | 2 + programs/wordpad/Ja.rc | 2 + programs/wordpad/Ko.rc | 2 + programs/wordpad/Lt.rc | 2 + programs/wordpad/Nl.rc | 2 + programs/wordpad/No.rc | 2 + programs/wordpad/Pl.rc | 2 + programs/wordpad/Pt.rc | 2 + programs/wordpad/Ru.rc | 2 + programs/wordpad/Si.rc | 2 + programs/wordpad/Sv.rc | 2 + programs/wordpad/Tr.rc | 2 + programs/wordpad/Zh.rc | 2 + programs/wordpad/print.c | 421 +++++++++++++++++++++++++++++++++---------- programs/wordpad/wordpad.c | 21 ++- programs/wordpad/wordpad.h | 15 ++- 20 files changed, 385 insertions(+), 106 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=0c46da86bf5f5bb44ca7e…

1 0

Dylan Smith : wordpad: Fixed spacing calculations for print preview.
by Alexandre Julliard 29 Jan '10

29 Jan '10

Module: wine Branch: master Commit: aaabd9f2f3994b052ca9ece4cec08d715f7e38c1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=aaabd9f2f3994b052ca9ece4c… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Fri Jan 29 03:02:37 2010 -0500 wordpad: Fixed spacing calculations for print preview. --- programs/wordpad/print.c | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/programs/wordpad/print.c b/programs/wordpad/print.c index a6bdf40..18a6de1 100644 --- a/programs/wordpad/print.c +++ b/programs/wordpad/print.c @@ -690,7 +690,7 @@ LRESULT print_preview(HWND hMainWnd) float ratioWidth, ratioHeight, ratio; int xOffset, yOffset; int barheight; - float spacing = 20.0; + float spacing = 10.0; HWND hReBar = GetDlgItem(hMainWnd, IDC_REBAR); PAINTSTRUCT ps; @@ -752,12 +752,12 @@ LRESULT print_preview(HWND hMainWnd) } barheight = SendMessageW(hReBar, RB_GETBARHEIGHT, 0, 0); - ratioHeight = ((float)window.bottom - spacing - (float)barheight) / (float)bmHeight; + ratioHeight = (window.bottom - spacing * 2 - barheight) / (float)bmHeight; if(preview.hdc2) - ratioWidth = ((float)window.right / 2.0 - spacing * 2.0) / (float)bmWidth; + ratioWidth = ((window.right - spacing * 3) / 2.0) / (float)bmWidth; else - ratioWidth = ((float)window.right - spacing * 3.0) / (float)bmWidth; + ratioWidth = (window.right - spacing * 2) / (float)bmWidth; if(ratioWidth > ratioHeight) ratio = ratioHeight; @@ -772,7 +772,7 @@ LRESULT print_preview(HWND hMainWnd) if(!preview.hdc2) xOffset = (window.right - bmNewWidth) / 2; else - xOffset = (window.right - bmNewWidth * 2) / 2; + xOffset = (window.right - bmNewWidth * 2) / 3; window.top = barheight; FillRect(hdc, &window, GetStockObject(GRAY_BRUSH)); @@ -790,8 +790,8 @@ LRESULT print_preview(HWND hMainWnd) if(preview.hdc2) { - background.left += bmNewWidth + spacing; - background.right += bmNewWidth + spacing; + background.left += bmNewWidth + xOffset; + background.right += bmNewWidth + xOffset; FillRect(hdc, &background, GetStockObject(BLACK_BRUSH)); @@ -803,7 +803,7 @@ LRESULT print_preview(HWND hMainWnd) if(preview.hdc2) { - BitBlt(hdc, xOffset + bmNewWidth + spacing, yOffset, bmNewWidth, bmNewHeight, preview.hdcSized2, 0, 0, SRCCOPY); + BitBlt(hdc, xOffset * 2 + bmNewWidth, yOffset, bmNewWidth, bmNewHeight, preview.hdcSized2, 0, 0, SRCCOPY); } DeleteDC(fr.hdcTarget);

1 0

Nikolay Sivov : msxml3: Implement IXMLDOMText::deleteData().
by Alexandre Julliard 29 Jan '10

29 Jan '10

Module: wine Branch: master Commit: a03bc7269092dccb97c1badc045ad7b40f3a6110 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a03bc7269092dccb97c1badc0… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Fri Jan 29 03:47:03 2010 +0300 msxml3: Implement IXMLDOMText::deleteData(). --- dlls/msxml3/tests/domdoc.c | 71 ++++++++++++++++++++++++++++++++++++++++++++ dlls/msxml3/text.c | 43 +++++++++++++++++++++++++- 2 files changed, 112 insertions(+), 2 deletions(-) diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index dab220b..bc052be 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -868,6 +868,77 @@ static void test_domdoc( void ) ok( !lstrcmpW( str, _bstr_("Begin This &is a Middle; test <>\\Append End") ), "incorrect get_text string\n"); SysFreeString(str); + /* delete data */ + /* invalid arguments */ + r = IXMLDOMText_deleteData(nodetext, -1, 1); + ok(r == E_INVALIDARG, "ret %08x\n", r ); + + r = IXMLDOMText_deleteData(nodetext, 0, 0); + ok(r == S_OK, "ret %08x\n", r ); + + r = IXMLDOMText_deleteData(nodetext, 0, -1); + ok(r == E_INVALIDARG, "ret %08x\n", r ); + + r = IXMLDOMText_get_length(nodetext, &nLength); + ok(r == S_OK, "ret %08x\n", r ); + ok(nLength == 43, "expected 43 got %d\n", nLength); + + r = IXMLDOMText_deleteData(nodetext, nLength, 1); + ok(r == S_OK, "ret %08x\n", r ); + + r = IXMLDOMText_deleteData(nodetext, nLength+1, 1); + ok(r == E_INVALIDARG, "ret %08x\n", r ); + + /* delete from start */ + r = IXMLDOMText_deleteData(nodetext, 0, 5); + ok(r == S_OK, "ret %08x\n", r ); + + r = IXMLDOMText_get_length(nodetext, &nLength); + ok(r == S_OK, "ret %08x\n", r ); + ok(nLength == 38, "expected 38 got %d\n", nLength); + + r = IXMLDOMText_get_text(nodetext, &str); + ok(r == S_OK, "ret %08x\n", r ); + /* whitespace preserving needs to be handled here */ + todo_wine ok( !lstrcmpW( str, _bstr_("This &is a Middle; test <>\\Append End") ), "incorrect get_text string\n"); + SysFreeString(str); + + /* delete from end */ + r = IXMLDOMText_deleteData(nodetext, 35, 3); + ok(r == S_OK, "ret %08x\n", r ); + + r = IXMLDOMText_get_length(nodetext, &nLength); + ok(r == S_OK, "ret %08x\n", r ); + ok(nLength == 35, "expected 35 got %d\n", nLength); + + r = IXMLDOMText_get_text(nodetext, &str); + ok(r == S_OK, "ret %08x\n", r ); + todo_wine ok( !lstrcmpW( str, _bstr_("This &is a Middle; test <>\\Append") ), "incorrect get_text string\n"); + SysFreeString(str); + + /* delete from inside */ + r = IXMLDOMText_deleteData(nodetext, 1, 33); + ok(r == S_OK, "ret %08x\n", r ); + + r = IXMLDOMText_get_length(nodetext, &nLength); + ok(r == S_OK, "ret %08x\n", r ); + ok(nLength == 2, "expected 2 got %d\n", nLength); + + r = IXMLDOMText_get_text(nodetext, &str); + ok(r == S_OK, "ret %08x\n", r ); + todo_wine ok( !lstrcmpW( str, _bstr_("") ), "incorrect get_text string\n"); + SysFreeString(str); + + /* delete whole data ... */ + r = IXMLDOMText_get_length(nodetext, &nLength); + ok(r == S_OK, "ret %08x\n", r ); + + r = IXMLDOMText_deleteData(nodetext, 0, nLength); + ok(r == S_OK, "ret %08x\n", r ); + /* ... and try again with empty string */ + r = IXMLDOMText_deleteData(nodetext, 0, nLength); + ok(r == S_OK, "ret %08x\n", r ); + /* test put_data */ V_VT(&var) = VT_BSTR; V_BSTR(&var) = SysAllocString(szstr1); diff --git a/dlls/msxml3/text.c b/dlls/msxml3/text.c index 6380a0e..d9736b1 100644 --- a/dlls/msxml3/text.c +++ b/dlls/msxml3/text.c @@ -686,8 +686,47 @@ static HRESULT WINAPI domtext_deleteData( IXMLDOMText *iface, LONG offset, LONG count) { - FIXME("\n"); - return E_NOTIMPL; + HRESULT hr; + LONG len = -1; + BSTR str; + + TRACE("%p %d %d\n", iface, offset, count); + + hr = IXMLDOMText_get_length(iface, &len); + if(hr != S_OK) return hr; + + if((offset < 0) || (offset > len) || (count < 0)) + return E_INVALIDARG; + + if(len == 0) return S_OK; + + /* cutting start or end */ + if((offset == 0) || ((count + offset) >= len)) + { + if(offset == 0) + IXMLDOMText_substringData(iface, count, len - count, &str); + else + IXMLDOMText_substringData(iface, 0, offset, &str); + hr = IXMLDOMText_put_data(iface, str); + } + else + /* cutting from the inside */ + { + BSTR str_end; + + IXMLDOMText_substringData(iface, 0, offset, &str); + IXMLDOMText_substringData(iface, offset + count, len - count, &str_end); + + hr = IXMLDOMText_put_data(iface, str); + if(hr == S_OK) + hr = IXMLDOMText_appendData(iface, str_end); + + SysFreeString(str_end); + } + + SysFreeString(str); + + return hr; } static HRESULT WINAPI domtext_replaceData(

1 0

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

29 Jan '10

Module: wine Branch: master Commit: 173c4884ac84e245fe33362300506e680272999a URL: http://source.winehq.org/git/wine.git/?a=commit;h=173c4884ac84e245fe3336230… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Fri Jan 29 02:52:24 2010 +0300 msxml3: Implement IXMLDOMCDATASection::deleteData() with tests. --- dlls/msxml3/cdata.c | 43 +++++++++++++++++++++++++- dlls/msxml3/tests/domdoc.c | 71 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 112 insertions(+), 2 deletions(-) diff --git a/dlls/msxml3/cdata.c b/dlls/msxml3/cdata.c index 04b539d..8bc1329 100644 --- a/dlls/msxml3/cdata.c +++ b/dlls/msxml3/cdata.c @@ -684,8 +684,47 @@ static HRESULT WINAPI domcdata_deleteData( IXMLDOMCDATASection *iface, LONG offset, LONG count) { - FIXME("\n"); - return E_NOTIMPL; + HRESULT hr; + LONG len = -1; + BSTR str; + + TRACE("%p %d %d\n", iface, offset, count); + + hr = IXMLDOMCDATASection_get_length(iface, &len); + if(hr != S_OK) return hr; + + if((offset < 0) || (offset > len) || (count < 0)) + return E_INVALIDARG; + + if(len == 0) return S_OK; + + /* cutting start or end */ + if((offset == 0) || ((count + offset) >= len)) + { + if(offset == 0) + IXMLDOMCDATASection_substringData(iface, count, len - count, &str); + else + IXMLDOMCDATASection_substringData(iface, 0, offset, &str); + hr = IXMLDOMCDATASection_put_data(iface, str); + } + else + /* cutting from the inside */ + { + BSTR str_end; + + IXMLDOMCDATASection_substringData(iface, 0, offset, &str); + IXMLDOMCDATASection_substringData(iface, offset + count, len - count, &str_end); + + hr = IXMLDOMCDATASection_put_data(iface, str); + if(hr == S_OK) + hr = IXMLDOMCDATASection_appendData(iface, str_end); + + SysFreeString(str_end); + } + + SysFreeString(str); + + return hr; } static HRESULT WINAPI domcdata_replaceData( diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index 97cb772..dab220b 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -3340,6 +3340,77 @@ static void test_xmlTypes(void) ok( !lstrcmpW( str, _bstr_("Begin This &is a Middle; test <>\\Append End") ), "incorrect get_text string\n"); SysFreeString(str); + /* delete data */ + /* invalid arguments */ + hr = IXMLDOMCDATASection_deleteData(pCDataSec, -1, 1); + ok(hr == E_INVALIDARG, "ret %08x\n", hr ); + + hr = IXMLDOMCDATASection_deleteData(pCDataSec, 0, 0); + ok(hr == S_OK, "ret %08x\n", hr ); + + hr = IXMLDOMCDATASection_deleteData(pCDataSec, 0, -1); + ok(hr == E_INVALIDARG, "ret %08x\n", hr ); + + hr = IXMLDOMCDATASection_get_length(pCDataSec, &len); + ok(hr == S_OK, "ret %08x\n", hr ); + ok(len == 43, "expected 43 got %d\n", len); + + hr = IXMLDOMCDATASection_deleteData(pCDataSec, len, 1); + ok(hr == S_OK, "ret %08x\n", hr ); + + hr = IXMLDOMCDATASection_deleteData(pCDataSec, len+1, 1); + ok(hr == E_INVALIDARG, "ret %08x\n", hr ); + + /* delete from start */ + hr = IXMLDOMCDATASection_deleteData(pCDataSec, 0, 5); + ok(hr == S_OK, "ret %08x\n", hr ); + + hr = IXMLDOMCDATASection_get_length(pCDataSec, &len); + ok(hr == S_OK, "ret %08x\n", hr ); + ok(len == 38, "expected 38 got %d\n", len); + + hr = IXMLDOMCDATASection_get_text(pCDataSec, &str); + ok(hr == S_OK, "ret %08x\n", hr ); + ok( !lstrcmpW( str, _bstr_(" This &is a Middle; test <>\\Append End") ), "incorrect get_text string\n"); + SysFreeString(str); + + /* delete from end */ + hr = IXMLDOMCDATASection_deleteData(pCDataSec, 35, 3); + ok(hr == S_OK, "ret %08x\n", hr ); + + hr = IXMLDOMCDATASection_get_length(pCDataSec, &len); + ok(hr == S_OK, "ret %08x\n", hr ); + ok(len == 35, "expected 35 got %d\n", len); + + hr = IXMLDOMCDATASection_get_text(pCDataSec, &str); + ok(hr == S_OK, "ret %08x\n", hr ); + ok( !lstrcmpW( str, _bstr_(" This &is a Middle; test <>\\Append ") ), "incorrect get_text string\n"); + SysFreeString(str); + + /* delete from inside */ + hr = IXMLDOMCDATASection_deleteData(pCDataSec, 1, 33); + ok(hr == S_OK, "ret %08x\n", hr ); + + hr = IXMLDOMCDATASection_get_length(pCDataSec, &len); + ok(hr == S_OK, "ret %08x\n", hr ); + ok(len == 2, "expected 2 got %d\n", len); + + hr = IXMLDOMCDATASection_get_text(pCDataSec, &str); + ok(hr == S_OK, "ret %08x\n", hr ); + ok( !lstrcmpW( str, _bstr_(" ") ), "incorrect get_text string\n"); + SysFreeString(str); + + /* delete whole data ... */ + hr = IXMLDOMCDATASection_get_length(pCDataSec, &len); + ok(hr == S_OK, "ret %08x\n", hr ); + + hr = IXMLDOMCDATASection_deleteData(pCDataSec, 0, len); + ok(hr == S_OK, "ret %08x\n", hr ); + + /* ... and try again with empty string */ + hr = IXMLDOMCDATASection_deleteData(pCDataSec, 0, len); + ok(hr == S_OK, "ret %08x\n", hr ); + IXMLDOMCDATASection_Release(pCDataSec); }

1 0

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 January 2010