March 2011 - Wine-commits - list.winehq.org

Erich Hoover : winex11: Use GetCursorFrameInfo to obtain animated frame delay.
by Alexandre Julliard 07 Mar '11

07 Mar '11

Module: wine Branch: master Commit: 2a026493415771e0560f26cb2e12518ffe1dc876 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2a026493415771e0560f26cb2… Author: Erich Hoover <ehoover(a)mines.edu> Date: Sat Mar 5 22:42:31 2011 -0700 winex11: Use GetCursorFrameInfo to obtain animated frame delay. --- dlls/winex11.drv/mouse.c | 9 ++++++++- 1 files changed, 8 insertions(+), 1 deletions(-) diff --git a/dlls/winex11.drv/mouse.c b/dlls/winex11.drv/mouse.c index 7778203..a527a2e 100644 --- a/dlls/winex11.drv/mouse.c +++ b/dlls/winex11.drv/mouse.c @@ -296,6 +296,7 @@ static XcursorImage *create_xcursor_frame( HDC hdc, const ICONINFOEXW *iinfo, HA int width, int height, int istep ) { XcursorImage *image, *ret = NULL; + DWORD delay_jiffies, is_static; int x, y, i, has_alpha; XcursorPixel *ptr; @@ -310,7 +311,13 @@ static XcursorImage *create_xcursor_frame( HDC hdc, const ICONINFOEXW *iinfo, HA image->xhot = iinfo->xHotspot; image->yhot = iinfo->yHotspot; - image->delay = 100; /* TODO: find a way to get the proper delay */ + + /* TODO: Handle animated cursors that use multiple rates */ + image->delay = 100; /* fallback delay, 100 ms */ + if (GetCursorFrameInfo(icon, 0x0 /* unknown parameter */, 0 /* obtain first rate */, &delay_jiffies, &is_static) != 0) + image->delay = (100 * delay_jiffies) / 6; /* convert jiffies (1/60s) to milliseconds */ + else + WARN("Failed to retrieve animated cursor framerate.\n"); /* draw the cursor frame to a temporary buffer then copy it into the XcursorImage */ memset( color_bits, 0x00, color_size );

1 0

Jörg Höhle : mciwave: Fix precondition to avoid having 2 simultaneous players.
by Alexandre Julliard 07 Mar '11

07 Mar '11

Module: wine Branch: master Commit: fc1e8e79c207a4eadc9832e188fc7471e30517ee URL: http://source.winehq.org/git/wine.git/?a=commit;h=fc1e8e79c207a4eadc9832e18… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Sat Mar 5 16:32:23 2011 +0100 mciwave: Fix precondition to avoid having 2 simultaneous players. --- dlls/mciwave/mciwave.c | 15 ++++++++++----- 1 files changed, 10 insertions(+), 5 deletions(-) diff --git a/dlls/mciwave/mciwave.c b/dlls/mciwave/mciwave.c index 9a62f8f..effecf4 100644 --- a/dlls/mciwave/mciwave.c +++ b/dlls/mciwave/mciwave.c @@ -756,8 +756,8 @@ static DWORD WAVE_mciPlay(MCIDEVICEID wDevID, DWORD_PTR dwFlags, DWORD_PTR pmt, return MCIERR_FILE_NOT_FOUND; } - if (wmw->dwStatus == MCI_MODE_PAUSE && !wmw->fInput) { - /* FIXME: parameters (start/end) in lpParams may not be used */ + if (wmw->dwStatus == MCI_MODE_PAUSE && !wmw->fInput && !(dwFlags & (MCI_FROM | MCI_TO))) { + /* FIXME: notification is different with Resume than Play */ return WAVE_mciResume(wDevID, dwFlags, (LPMCI_GENERIC_PARMS)lpParms); } @@ -765,8 +765,12 @@ static DWORD WAVE_mciPlay(MCIDEVICEID wDevID, DWORD_PTR dwFlags, DWORD_PTR pmt, * We have to set MCI_MODE_PLAY before we do this so that the app can spin * on MCI_STATUS, so we have to allow it here if we're not going to start this thread. */ - if ((wmw->dwStatus != MCI_MODE_STOP) && ((wmw->dwStatus != MCI_MODE_PLAY) && (dwFlags & MCI_WAIT))) { - return MCIERR_INTERNAL; + if ( !(wmw->dwStatus == MCI_MODE_STOP) && + !((wmw->dwStatus == MCI_MODE_PLAY) && (dwFlags & MCI_WAIT) && !wmw->hWave)) { + /* FIXME: Check FROM/TO parameters first. */ + /* FIXME: Play; Play [notify|wait] must hook into the running player. */ + dwRet = WAVE_mciStop(wDevID, MCI_WAIT, NULL); + if (dwRet) return dwRet; } if (wmw->lpWaveFormat->wFormatTag == WAVE_FORMAT_PCM) { @@ -1011,7 +1015,8 @@ static DWORD WAVE_mciRecord(MCIDEVICEID wDevID, DWORD_PTR dwFlags, DWORD_PTR pmt * We have to set MCI_MODE_RECORD before we do this so that the app can spin * on MCI_STATUS, so we have to allow it here if we're not going to start this thread. */ - if ((wmw->dwStatus != MCI_MODE_STOP) && ((wmw->dwStatus != MCI_MODE_RECORD) && (dwFlags & MCI_WAIT))) { + if ( !(wmw->dwStatus == MCI_MODE_STOP) && + !((wmw->dwStatus == MCI_MODE_RECORD) && (dwFlags & MCI_WAIT) && !wmw->hWave)) { return MCIERR_INTERNAL; }

1 0

Alexandre Julliard : winex11: Don' t unmap off-screen windows on PropertyNotify events.
by Alexandre Julliard 07 Mar '11

07 Mar '11

Module: wine Branch: master Commit: b1af55d551cce6bc2690c37b95646cf89827c8d2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b1af55d551cce6bc2690c37b9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Mar 7 15:11:10 2011 +0100 winex11: Don't unmap off-screen windows on PropertyNotify events. --- dlls/winex11.drv/window.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index 50b2ec0..0e55619 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -2501,7 +2501,7 @@ void CDECL X11DRV_WindowPosChanged( HWND hwnd, HWND insert_after, UINT swp_flags if (data->mapped && event_type != ReparentNotify) { if (((swp_flags & SWP_HIDEWINDOW) && !(new_style & WS_VISIBLE)) || - (event_type != ConfigureNotify && + (!event_type && !is_window_rect_mapped( rectWindow ) && is_window_rect_mapped( &old_window_rect ))) unmap_window( display, data ); }

1 0

Alexandre Julliard : winex11: Remove the unused clipboard format flags.
by Alexandre Julliard 07 Mar '11

07 Mar '11

Module: wine Branch: master Commit: c7d2a4dddf0ead2f0f23ddd1924d81d3e93430f1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c7d2a4dddf0ead2f0f23ddd19… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Mar 7 16:59:39 2011 +0100 winex11: Remove the unused clipboard format flags. --- dlls/winex11.drv/clipboard.c | 12 +++--------- 1 files changed, 3 insertions(+), 9 deletions(-) diff --git a/dlls/winex11.drv/clipboard.c b/dlls/winex11.drv/clipboard.c index 1a3704d..2789724 100644 --- a/dlls/winex11.drv/clipboard.c +++ b/dlls/winex11.drv/clipboard.c @@ -114,7 +114,6 @@ typedef struct tagWINE_CLIPFORMAT { struct list entry; UINT wFormatID; UINT drvData; - UINT wFlags; DRVIMPORTFUNC lpDrvImportFunc; DRVEXPORTFUNC lpDrvExportFunc; } WINE_CLIPFORMAT, *LPWINE_CLIPFORMAT; @@ -128,10 +127,8 @@ typedef struct tagWINE_CLIPDATA { LPWINE_CLIPFORMAT lpFormat; } WINE_CLIPDATA, *LPWINE_CLIPDATA; -#define CF_FLAG_BUILTINFMT 0x0001 /* Built-in windows format */ -#define CF_FLAG_UNOWNED 0x0002 /* cached data is not owned */ -#define CF_FLAG_SYNTHESIZED 0x0004 /* Implicitly converted data */ -#define CF_FLAG_UNICODE 0x0008 /* Data is in unicode */ +#define CF_FLAG_UNOWNED 0x0001 /* cached data is not owned */ +#define CF_FLAG_SYNTHESIZED 0x0002 /* Implicitly converted data */ static int selectionAcquired = 0; /* Contains the current selection masks */ static Window selectionWindow = None; /* The top level X window which owns the selection */ @@ -332,7 +329,6 @@ void X11DRV_InitClipboard(void) if (!(format = HeapAlloc( GetProcessHeap(), 0, sizeof(*format )))) break; format->wFormatID = builtin_formats[i].id; format->drvData = GET_ATOM(builtin_formats[i].data); - format->wFlags = CF_FLAG_BUILTINFMT; format->lpDrvImportFunc = builtin_formats[i].import; format->lpDrvExportFunc = builtin_formats[i].export; list_add_tail( &format_list, &format->entry ); @@ -410,8 +406,7 @@ static WINE_CLIPFORMAT *register_format( UINT id, Atom prop ) /* walk format chain to see if it's already registered */ LIST_FOR_EACH_ENTRY( lpFormat, &format_list, WINE_CLIPFORMAT, entry ) - if ((lpFormat->wFormatID == id) && (lpFormat->wFlags & CF_FLAG_BUILTINFMT) == 0) - return lpFormat; + if (lpFormat->wFormatID == id) return lpFormat; return X11DRV_CLIPBOARD_InsertClipboardFormat(id, prop); } @@ -469,7 +464,6 @@ static WINE_CLIPFORMAT *X11DRV_CLIPBOARD_InsertClipboardFormat( UINT id, Atom pr WARN("No more memory for a new format!\n"); return NULL; } - lpNewFormat->wFlags = 0; lpNewFormat->wFormatID = id; lpNewFormat->drvData = prop; lpNewFormat->lpDrvImportFunc = X11DRV_CLIPBOARD_ImportClipboardData;

1 0

Nikolay Sivov : msvcrt: Added partially complete _wcsupr_s_l ( without locale support).
by Alexandre Julliard 07 Mar '11

07 Mar '11

Module: wine Branch: master Commit: 46ae113e7128956a4a77eac60e6019d640a92f4a URL: http://source.winehq.org/git/wine.git/?a=commit;h=46ae113e7128956a4a77eac60… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Mar 5 02:28:28 2011 +0300 msvcrt: Added partially complete _wcsupr_s_l (without locale support). --- dlls/msvcr100/msvcr100.spec | 2 +- dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcr90/msvcr90.spec | 2 +- dlls/msvcrt/wcs.c | 16 +++++++++++++--- 4 files changed, 16 insertions(+), 6 deletions(-) diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index 42d8310..d732d69 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -1318,7 +1318,7 @@ @ cdecl _wcsupr(wstr) msvcrt._wcsupr @ stub _wcsupr_l @ cdecl _wcsupr_s(wstr long) msvcrt._wcsupr_s -@ stub _wcsupr_s_l +@ cdecl _wcsupr_s_l(wstr long ptr) msvcrt._wcsupr_s_l @ stub _wcsxfrm_l @ cdecl _wctime32(ptr) msvcrt._wctime32 @ stub _wctime32_s diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index f9eaaf0..1631fdb 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -1171,7 +1171,7 @@ @ cdecl _wcsupr(wstr) msvcrt._wcsupr @ stub _wcsupr_l @ cdecl _wcsupr_s(wstr long) msvcrt._wcsupr_s -@ stub _wcsupr_s_l +@ cdecl _wcsupr_s_l(wstr long ptr) msvcrt._wcsupr_s_l @ stub _wcsxfrm_l @ cdecl _wctime32(ptr) msvcrt._wctime32 @ stub _wctime32_s diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index b7288da..8148caf 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -1158,7 +1158,7 @@ @ cdecl _wcsupr(wstr) msvcrt._wcsupr @ stub _wcsupr_l @ cdecl _wcsupr_s(wstr long) msvcrt._wcsupr_s -@ stub _wcsupr_s_l +@ cdecl _wcsupr_s_l(wstr long ptr) msvcrt._wcsupr_s_l @ stub _wcsxfrm_l @ cdecl _wctime32(ptr) msvcrt._wctime32 @ stub _wctime32_s diff --git a/dlls/msvcrt/wcs.c b/dlls/msvcrt/wcs.c index d45094a..93aa0f0 100644 --- a/dlls/msvcrt/wcs.c +++ b/dlls/msvcrt/wcs.c @@ -103,10 +103,10 @@ MSVCRT_wchar_t* CDECL _wcsset( MSVCRT_wchar_t* str, MSVCRT_wchar_t c ) } /****************************************************************** - * _wcsupr_s (MSVCRT.@) - * + * _wcsupr_s_l (MSVCRT.@) */ -INT CDECL MSVCRT__wcsupr_s( MSVCRT_wchar_t* str, MSVCRT_size_t n ) +int CDECL MSVCRT__wcsupr_s_l( MSVCRT_wchar_t* str, MSVCRT_size_t n, + MSVCRT__locale_t locale ) { MSVCRT_wchar_t* ptr = str; @@ -120,6 +120,7 @@ INT CDECL MSVCRT__wcsupr_s( MSVCRT_wchar_t* str, MSVCRT_size_t n ) while (n--) { if (!*ptr) return 0; + /* FIXME: add locale support */ *ptr = toupperW(*ptr); ptr++; } @@ -132,6 +133,15 @@ INT CDECL MSVCRT__wcsupr_s( MSVCRT_wchar_t* str, MSVCRT_size_t n ) } /****************************************************************** + * _wcsupr_s (MSVCRT.@) + * + */ +INT CDECL MSVCRT__wcsupr_s( MSVCRT_wchar_t* str, MSVCRT_size_t n ) +{ + return MSVCRT__wcsupr_s_l( str, n, NULL ); +} + +/****************************************************************** * _wcslwr_s (MSVCRT.@) */ int CDECL MSVCRT__wcslwr_s( MSVCRT_wchar_t* str, MSVCRT_size_t n )

1 0

Nikolay Sivov : msxml3: Trace ref counts for all dom objects.
by Alexandre Julliard 07 Mar '11

07 Mar '11

Module: wine Branch: master Commit: d05435167ac313733edfaccb89a7747f7dc6822c URL: http://source.winehq.org/git/wine.git/?a=commit;h=d05435167ac313733edfaccb8… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Mar 5 21:32:31 2011 +0300 msxml3: Trace ref counts for all dom objects. --- dlls/msxml3/attribute.c | 8 +++++--- dlls/msxml3/cdata.c | 8 +++++--- dlls/msxml3/comment.c | 8 +++++--- dlls/msxml3/docfrag.c | 8 +++++--- dlls/msxml3/doctype.c | 6 ++---- dlls/msxml3/domimpl.c | 8 +++++--- dlls/msxml3/element.c | 4 ++-- dlls/msxml3/entityref.c | 8 +++++--- dlls/msxml3/nodelist.c | 8 +++++--- dlls/msxml3/nodemap.c | 8 +++++--- dlls/msxml3/pi.c | 8 +++++--- dlls/msxml3/text.c | 8 +++++--- 12 files changed, 54 insertions(+), 36 deletions(-) diff --git a/dlls/msxml3/attribute.c b/dlls/msxml3/attribute.c index a6196a1..f61428a 100644 --- a/dlls/msxml3/attribute.c +++ b/dlls/msxml3/attribute.c @@ -89,16 +89,18 @@ static ULONG WINAPI domattr_AddRef( IXMLDOMAttribute *iface ) { domattr *This = impl_from_IXMLDOMAttribute( iface ); - return InterlockedIncrement( &This->ref ); + ULONG ref = InterlockedIncrement( &This->ref ); + TRACE("(%p)->(%d)\n", This, ref); + return ref; } static ULONG WINAPI domattr_Release( IXMLDOMAttribute *iface ) { domattr *This = impl_from_IXMLDOMAttribute( iface ); - ULONG ref; + ULONG ref = InterlockedDecrement( &This->ref ); - ref = InterlockedDecrement( &This->ref ); + TRACE("(%p)->(%d)\n", This, ref); if ( ref == 0 ) { destroy_xmlnode(&This->node); diff --git a/dlls/msxml3/cdata.c b/dlls/msxml3/cdata.c index cdcebb0..f81cf2f 100644 --- a/dlls/msxml3/cdata.c +++ b/dlls/msxml3/cdata.c @@ -89,16 +89,18 @@ static ULONG WINAPI domcdata_AddRef( IXMLDOMCDATASection *iface ) { domcdata *This = impl_from_IXMLDOMCDATASection( iface ); - return InterlockedIncrement( &This->ref ); + ULONG ref = InterlockedIncrement( &This->ref ); + TRACE("(%p)->(%d)\n", This, ref); + return ref; } static ULONG WINAPI domcdata_Release( IXMLDOMCDATASection *iface ) { domcdata *This = impl_from_IXMLDOMCDATASection( iface ); - ULONG ref; + ULONG ref = InterlockedDecrement( &This->ref ); - ref = InterlockedDecrement( &This->ref ); + TRACE("(%p)->(%d)\n", This, ref); if ( ref == 0 ) { destroy_xmlnode(&This->node); diff --git a/dlls/msxml3/comment.c b/dlls/msxml3/comment.c index 433cca9..4c5f107 100644 --- a/dlls/msxml3/comment.c +++ b/dlls/msxml3/comment.c @@ -89,16 +89,18 @@ static ULONG WINAPI domcomment_AddRef( IXMLDOMComment *iface ) { domcomment *This = impl_from_IXMLDOMComment( iface ); - return InterlockedIncrement( &This->ref ); + ULONG ref = InterlockedIncrement( &This->ref ); + TRACE("(%p)->(%d)\n", This, ref); + return ref; } static ULONG WINAPI domcomment_Release( IXMLDOMComment *iface ) { domcomment *This = impl_from_IXMLDOMComment( iface ); - ULONG ref; + ULONG ref = InterlockedDecrement( &This->ref ); - ref = InterlockedDecrement( &This->ref ); + TRACE("(%p)->(%d)\n", This, ref); if ( ref == 0 ) { destroy_xmlnode(&This->node); diff --git a/dlls/msxml3/docfrag.c b/dlls/msxml3/docfrag.c index 89b82a9..0c4193a 100644 --- a/dlls/msxml3/docfrag.c +++ b/dlls/msxml3/docfrag.c @@ -88,16 +88,18 @@ static ULONG WINAPI domfrag_AddRef( IXMLDOMDocumentFragment *iface ) { domfrag *This = impl_from_IXMLDOMDocumentFragment( iface ); - return InterlockedIncrement( &This->ref ); + ULONG ref = InterlockedIncrement( &This->ref ); + TRACE("(%p)->(%d)\n", This, ref); + return ref; } static ULONG WINAPI domfrag_Release( IXMLDOMDocumentFragment *iface ) { domfrag *This = impl_from_IXMLDOMDocumentFragment( iface ); - ULONG ref; + ULONG ref = InterlockedDecrement( &This->ref ); - ref = InterlockedDecrement( &This->ref ); + TRACE("(%p)->(%d)\n", This, ref); if ( ref == 0 ) { destroy_xmlnode(&This->node); diff --git a/dlls/msxml3/doctype.c b/dlls/msxml3/doctype.c index 9ebe1f0..360d2a0 100644 --- a/dlls/msxml3/doctype.c +++ b/dlls/msxml3/doctype.c @@ -91,9 +91,7 @@ static ULONG WINAPI domdoctype_AddRef( { domdoctype *This = impl_from_IXMLDOMDocumentType( iface ); LONG ref = InterlockedIncrement(&This->ref); - - TRACE("(%p) ref=%d\n", This, ref); - + TRACE("(%p)->(%d)\n", This, ref); return ref; } @@ -103,7 +101,7 @@ static ULONG WINAPI domdoctype_Release( domdoctype *This = impl_from_IXMLDOMDocumentType( iface ); ULONG ref = InterlockedDecrement(&This->ref); - TRACE("(%p) ref=%d\n", This, ref); + TRACE("(%p)->(%d)\n", This, ref); if(!ref) { destroy_xmlnode(&This->node); diff --git a/dlls/msxml3/domimpl.c b/dlls/msxml3/domimpl.c index 54936bb..9743cc6 100644 --- a/dlls/msxml3/domimpl.c +++ b/dlls/msxml3/domimpl.c @@ -83,16 +83,18 @@ static ULONG WINAPI dimimpl_AddRef( IXMLDOMImplementation *iface ) { domimpl *This = impl_from_IXMLDOMImplementation( iface ); - return InterlockedIncrement( &This->ref ); + ULONG ref = InterlockedIncrement( &This->ref ); + TRACE("(%p)->(%d)\n", This, ref); + return ref; } static ULONG WINAPI dimimpl_Release( IXMLDOMImplementation *iface ) { domimpl *This = impl_from_IXMLDOMImplementation( iface ); - ULONG ref; + ULONG ref = InterlockedDecrement( &This->ref ); - ref = InterlockedDecrement( &This->ref ); + TRACE("(%p)->(%d)\n", This, ref); if ( ref == 0 ) { heap_free( This ); diff --git a/dlls/msxml3/element.c b/dlls/msxml3/element.c index 5559fd2..8d81f67 100644 --- a/dlls/msxml3/element.c +++ b/dlls/msxml3/element.c @@ -100,7 +100,7 @@ static ULONG WINAPI domelem_AddRef( domelem *This = impl_from_IXMLDOMElement( iface ); LONG ref = InterlockedIncrement(&This->ref); - TRACE("(%p) ref=%d\n", This, ref); + TRACE("(%p)->(%d)\n", This, ref); return ref; } @@ -111,7 +111,7 @@ static ULONG WINAPI domelem_Release( domelem *This = impl_from_IXMLDOMElement( iface ); ULONG ref = InterlockedDecrement(&This->ref); - TRACE("(%p) ref=%d\n", This, ref); + TRACE("(%p)->(%d)\n", This, ref); if(!ref) { destroy_xmlnode(&This->node); diff --git a/dlls/msxml3/entityref.c b/dlls/msxml3/entityref.c index add4d8a..7ce85ed 100644 --- a/dlls/msxml3/entityref.c +++ b/dlls/msxml3/entityref.c @@ -88,16 +88,18 @@ static ULONG WINAPI entityref_AddRef( IXMLDOMEntityReference *iface ) { entityref *This = impl_from_IXMLDOMEntityReference( iface ); - return InterlockedIncrement( &This->ref ); + ULONG ref = InterlockedIncrement( &This->ref ); + TRACE("(%p)->(%d)\n", This, ref); + return ref; } static ULONG WINAPI entityref_Release( IXMLDOMEntityReference *iface ) { entityref *This = impl_from_IXMLDOMEntityReference( iface ); - ULONG ref; + ULONG ref = InterlockedDecrement( &This->ref ); - ref = InterlockedDecrement( &This->ref ); + TRACE("(%p)->(%d)\n", This, ref); if ( ref == 0 ) { destroy_xmlnode(&This->node); diff --git a/dlls/msxml3/nodelist.c b/dlls/msxml3/nodelist.c index 749b179..67bcd2a 100644 --- a/dlls/msxml3/nodelist.c +++ b/dlls/msxml3/nodelist.c @@ -93,16 +93,18 @@ static ULONG WINAPI xmlnodelist_AddRef( IXMLDOMNodeList *iface ) { xmlnodelist *This = impl_from_IXMLDOMNodeList( iface ); - return InterlockedIncrement( &This->ref ); + ULONG ref = InterlockedIncrement( &This->ref ); + TRACE("(%p)->(%d)\n", This, ref); + return ref; } static ULONG WINAPI xmlnodelist_Release( IXMLDOMNodeList *iface ) { xmlnodelist *This = impl_from_IXMLDOMNodeList( iface ); - ULONG ref; + ULONG ref = InterlockedDecrement( &This->ref ); - ref = InterlockedDecrement( &This->ref ); + TRACE("(%p)->(%d)\n", This, ref); if ( ref == 0 ) { xmldoc_release( This->parent->doc ); diff --git a/dlls/msxml3/nodemap.c b/dlls/msxml3/nodemap.c index 7055da5..660eab6 100644 --- a/dlls/msxml3/nodemap.c +++ b/dlls/msxml3/nodemap.c @@ -95,16 +95,18 @@ static ULONG WINAPI xmlnodemap_AddRef( IXMLDOMNamedNodeMap *iface ) { xmlnodemap *This = impl_from_IXMLDOMNamedNodeMap( iface ); - return InterlockedIncrement( &This->ref ); + ULONG ref = InterlockedIncrement( &This->ref ); + TRACE("(%p)->(%d)\n", This, ref); + return ref; } static ULONG WINAPI xmlnodemap_Release( IXMLDOMNamedNodeMap *iface ) { xmlnodemap *This = impl_from_IXMLDOMNamedNodeMap( iface ); - ULONG ref; + ULONG ref = InterlockedDecrement( &This->ref ); - ref = InterlockedDecrement( &This->ref ); + TRACE("(%p)->(%d)\n", This, ref); if ( ref == 0 ) { IXMLDOMNode_Release( This->node ); diff --git a/dlls/msxml3/pi.c b/dlls/msxml3/pi.c index 335b584..49a221d 100644 --- a/dlls/msxml3/pi.c +++ b/dlls/msxml3/pi.c @@ -88,16 +88,18 @@ static ULONG WINAPI dom_pi_AddRef( IXMLDOMProcessingInstruction *iface ) { dom_pi *This = impl_from_IXMLDOMProcessingInstruction( iface ); - return InterlockedIncrement( &This->ref ); + ULONG ref = InterlockedIncrement( &This->ref ); + TRACE("(%p)->(%d)\n", This, ref); + return ref; } static ULONG WINAPI dom_pi_Release( IXMLDOMProcessingInstruction *iface ) { dom_pi *This = impl_from_IXMLDOMProcessingInstruction( iface ); - ULONG ref; + ULONG ref = InterlockedDecrement( &This->ref ); - ref = InterlockedDecrement( &This->ref ); + TRACE("(%p)->(%d)\n", This, ref); if ( ref == 0 ) { destroy_xmlnode(&This->node); diff --git a/dlls/msxml3/text.c b/dlls/msxml3/text.c index b17d1d4..3e3d3b2 100644 --- a/dlls/msxml3/text.c +++ b/dlls/msxml3/text.c @@ -90,16 +90,18 @@ static ULONG WINAPI domtext_AddRef( IXMLDOMText *iface ) { domtext *This = impl_from_IXMLDOMText( iface ); - return InterlockedIncrement( &This->ref ); + ULONG ref = InterlockedIncrement( &This->ref ); + TRACE("(%p)->(%d)\n", This, ref); + return ref; } static ULONG WINAPI domtext_Release( IXMLDOMText *iface ) { domtext *This = impl_from_IXMLDOMText( iface ); - ULONG ref; + ULONG ref = InterlockedDecrement( &This->ref ); - ref = InterlockedDecrement( &This->ref ); + TRACE("(%p)->(%d)\n", This, ref); if ( ref == 0 ) { destroy_xmlnode(&This->node);

1 0

Nikolay Sivov : msxml3: Properly update xmldoc refcounts on insertBefore().
by Alexandre Julliard 07 Mar '11

07 Mar '11

Module: wine Branch: master Commit: 0f3c247e46dbc7935bf6e2d563ce16f01cada9ee URL: http://source.winehq.org/git/wine.git/?a=commit;h=0f3c247e46dbc7935bf6e2d56… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Mar 6 22:28:29 2011 +0300 msxml3: Properly update xmldoc refcounts on insertBefore(). insertBefore() is able to work on nodes from different documents, so on adding child or sibling it's possible that libxml2 switches doc pointer for a node, we need to update refcounts to cover that case. --- dlls/msxml3/node.c | 7 ++++ dlls/msxml3/tests/domdoc.c | 66 +++++++++++++++++++++++++++++++++++++++++-- 2 files changed, 69 insertions(+), 4 deletions(-) diff --git a/dlls/msxml3/node.c b/dlls/msxml3/node.c index fc15a5d..18b3db2 100644 --- a/dlls/msxml3/node.c +++ b/dlls/msxml3/node.c @@ -295,6 +295,7 @@ HRESULT node_insert_before(xmlnode *This, IXMLDOMNode *new_child, const VARIANT xmlNodePtr new_child_node; IXMLDOMNode *before = NULL; xmlnode *node_obj; + xmlDocPtr doc; HRESULT hr; if(!new_child) @@ -336,7 +337,10 @@ HRESULT node_insert_before(xmlnode *This, IXMLDOMNode *new_child, const VARIANT /* unlink from current parent first */ if(node_obj->parent) IXMLDOMNode_removeChild(node_obj->parent, node_obj->iface, NULL); + doc = new_child_node->doc; + xmldoc_add_ref(before_node_obj->node->doc); xmlAddPrevSibling(before_node_obj->node, new_child_node); + xmldoc_release(doc); node_obj->parent = This->parent; } else @@ -344,7 +348,10 @@ HRESULT node_insert_before(xmlnode *This, IXMLDOMNode *new_child, const VARIANT /* unlink from current parent first */ if(node_obj->parent) IXMLDOMNode_removeChild(node_obj->parent, node_obj->iface, NULL); + doc = new_child_node->doc; + xmldoc_add_ref(This->node->doc); xmlAddChild(This->node, new_child_node); + xmldoc_release(doc); node_obj->parent = This->iface; } diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index 439207f..9dca668 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -2064,6 +2064,7 @@ static void test_refs(void) doc = create_document(&IID_IXMLDOMDocument); if (!doc) return; + EXPECT_REF(doc, 1); ref = IXMLDOMDocument_Release(doc); ok( ref == 0, "ref %d\n", ref); @@ -2076,6 +2077,7 @@ static void test_refs(void) ok( b == VARIANT_TRUE, "failed to load XML string\n"); SysFreeString( str ); + EXPECT_REF(doc, 1); IXMLDOMDocument_AddRef( doc ); EXPECT_REF(doc, 2); IXMLDOMDocument_AddRef( doc ); @@ -2089,19 +2091,27 @@ static void test_refs(void) ok( element != NULL, "should be an element\n"); EXPECT_REF(doc, 1); + todo_wine EXPECT_REF(element, 2); + + IXMLDOMElement_AddRef(element); + todo_wine EXPECT_REF(element, 3); + IXMLDOMElement_Release(element); r = IXMLDOMElement_get_childNodes( element, &node_list ); ok( r == S_OK, "rets %08x\n", r); + todo_wine EXPECT_REF(element, 2); EXPECT_REF(node_list, 1); IXMLDOMNodeList_get_item( node_list, 0, &node ); ok( r == S_OK, "rets %08x\n", r); + EXPECT_REF(node_list, 1); + EXPECT_REF(node, 1); IXMLDOMNodeList_get_item( node_list, 0, &node2 ); ok( r == S_OK, "rets %08x\n", r); - - EXPECT_REF(node, 1); + EXPECT_REF(node_list, 1); + EXPECT_REF(node2, 1); ref = IXMLDOMNode_Release( node ); ok( ref == 0, "ref %d\n", ref ); @@ -2121,18 +2131,22 @@ static void test_refs(void) /* IUnknown must be unique however we obtain it */ r = IXMLDOMElement_QueryInterface( element, &IID_IUnknown, (void**)&unk ); ok( r == S_OK, "rets %08x\n", r ); + EXPECT_REF(element, 2); r = IXMLDOMElement_QueryInterface( element, &IID_IXMLDOMNode, (void**)&node ); ok( r == S_OK, "rets %08x\n", r ); + todo_wine EXPECT_REF(element, 2); r = IXMLDOMNode_QueryInterface( node, &IID_IUnknown, (void**)&unk2 ); ok( r == S_OK, "rets %08x\n", r ); + todo_wine EXPECT_REF(element, 2); ok( unk == unk2, "unk %p unk2 %p\n", unk, unk2 ); + todo_wine ok( element != (void*)node, "node %p element %p\n", node, element ); IUnknown_Release( unk2 ); IUnknown_Release( unk ); IXMLDOMNode_Release( node ); + todo_wine EXPECT_REF(element, 2); IXMLDOMElement_Release( element ); - } static void test_create(void) @@ -2156,6 +2170,8 @@ static void test_create(void) doc = create_document(&IID_IXMLDOMDocument); if (!doc) return; + EXPECT_REF(doc, 1); + /* types not supported for creation */ V_VT(&var) = VT_I1; V_I1(&var) = NODE_DOCUMENT; @@ -2452,9 +2468,12 @@ static void test_create(void) V_I4(&var) = NODE_ELEMENT; r = IXMLDOMDocument_createNode( doc, var, str, NULL, &node ); ok( r == S_OK, "returns %08x\n", r ); + + EXPECT_REF(doc, 1); r = IXMLDOMDocument_appendChild( doc, node, &root ); ok( r == S_OK, "returns %08x\n", r ); ok( node == root, "%p %p\n", node, root ); + EXPECT_REF(doc, 1); EXPECT_REF(node, 2); @@ -8250,7 +8269,45 @@ static void test_insertBefore(void) SysFreeString(p); IXMLDOMDocument_Release(doc); - free_bstrs(); +} + +static void test_appendChild(void) +{ + IXMLDOMDocument *doc, *doc2; + IXMLDOMElement *elem, *elem2; + HRESULT hr; + + doc = create_document(&IID_IXMLDOMDocument); + doc2 = create_document(&IID_IXMLDOMDocument); + + hr = IXMLDOMDocument_createElement(doc, _bstr_("elem"), &elem); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IXMLDOMDocument_createElement(doc2, _bstr_("elem2"), &elem2); + ok(hr == S_OK, "got 0x%08x\n", hr); + + EXPECT_REF(doc, 1); + todo_wine EXPECT_REF(elem, 2); + EXPECT_REF(doc2, 1); + todo_wine EXPECT_REF(elem2, 2); + EXPECT_NO_CHILDREN(doc); + EXPECT_NO_CHILDREN(doc2); + + /* append from another document */ + hr = IXMLDOMDocument_appendChild(doc2, (IXMLDOMNode*)elem, NULL); + ok(hr == S_OK, "got 0x%08x\n", hr); + + EXPECT_REF(doc, 1); + todo_wine EXPECT_REF(elem, 2); + EXPECT_REF(doc2, 1); + todo_wine EXPECT_REF(elem2, 2); + EXPECT_NO_CHILDREN(doc); + EXPECT_CHILDREN(doc2); + + IXMLDOMElement_Release(elem); + IXMLDOMElement_Release(elem2); + IXMLDOMDocument_Release(doc); + IXMLDOMDocument_Release(doc2); } START_TEST(domdoc) @@ -8318,6 +8375,7 @@ START_TEST(domdoc) test_put_nodeTypedValue(); test_get_xml(); test_insertBefore(); + test_appendChild(); test_xsltemplate(); CoUninitialize();

1 0

Nikolay Sivov : msxml3: Implement get_nodeTypedValue() for nodes that can' t have type.
by Alexandre Julliard 07 Mar '11

07 Mar '11

Module: wine Branch: master Commit: 46fa4791053addd2f52f1ea2a19d38b162831d3e URL: http://source.winehq.org/git/wine.git/?a=commit;h=46fa4791053addd2f52f1ea2a… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Mar 7 00:39:13 2011 +0300 msxml3: Implement get_nodeTypedValue() for nodes that can't have type. --- dlls/msxml3/cdata.c | 6 ++-- dlls/msxml3/comment.c | 6 ++-- dlls/msxml3/docfrag.c | 6 ++-- dlls/msxml3/doctype.c | 6 ++-- dlls/msxml3/domdoc.c | 6 ++-- dlls/msxml3/pi.c | 6 ++-- dlls/msxml3/tests/domdoc.c | 75 +++++++++++++++++++++++++++++++++++++++++++- 7 files changed, 92 insertions(+), 19 deletions(-) diff --git a/dlls/msxml3/cdata.c b/dlls/msxml3/cdata.c index f81cf2f..e9de472 100644 --- a/dlls/msxml3/cdata.c +++ b/dlls/msxml3/cdata.c @@ -433,11 +433,11 @@ static HRESULT WINAPI domcdata_get_definition( static HRESULT WINAPI domcdata_get_nodeTypedValue( IXMLDOMCDATASection *iface, - VARIANT* var1) + VARIANT* v) { domcdata *This = impl_from_IXMLDOMCDATASection( iface ); - FIXME("(%p)->(%p)\n", This, var1); - return return_null_var(var1); + TRACE("(%p)->(%p)\n", This, v); + return node_get_content(&This->node, v); } static HRESULT WINAPI domcdata_put_nodeTypedValue( diff --git a/dlls/msxml3/comment.c b/dlls/msxml3/comment.c index 4c5f107..a75d178 100644 --- a/dlls/msxml3/comment.c +++ b/dlls/msxml3/comment.c @@ -432,11 +432,11 @@ static HRESULT WINAPI domcomment_get_definition( static HRESULT WINAPI domcomment_get_nodeTypedValue( IXMLDOMComment *iface, - VARIANT* var1) + VARIANT* v) { domcomment *This = impl_from_IXMLDOMComment( iface ); - FIXME("(%p)->(%p)\n", This, var1); - return return_null_var(var1); + TRACE("(%p)->(%p)\n", This, v); + return node_get_content(&This->node, v); } static HRESULT WINAPI domcomment_put_nodeTypedValue( diff --git a/dlls/msxml3/docfrag.c b/dlls/msxml3/docfrag.c index 0c4193a..bc2b77f 100644 --- a/dlls/msxml3/docfrag.c +++ b/dlls/msxml3/docfrag.c @@ -436,11 +436,11 @@ static HRESULT WINAPI domfrag_get_definition( static HRESULT WINAPI domfrag_get_nodeTypedValue( IXMLDOMDocumentFragment *iface, - VARIANT* var1) + VARIANT *v) { domfrag *This = impl_from_IXMLDOMDocumentFragment( iface ); - FIXME("(%p)->(%p)\n", This, var1); - return return_null_var(var1); + TRACE("(%p)->(%p)\n", This, v); + return return_null_var(v); } static HRESULT WINAPI domfrag_put_nodeTypedValue( diff --git a/dlls/msxml3/doctype.c b/dlls/msxml3/doctype.c index 360d2a0..6c757b3 100644 --- a/dlls/msxml3/doctype.c +++ b/dlls/msxml3/doctype.c @@ -407,11 +407,11 @@ static HRESULT WINAPI domdoctype_get_definition( static HRESULT WINAPI domdoctype_get_nodeTypedValue( IXMLDOMDocumentType *iface, - VARIANT* var1) + VARIANT* v) { domdoctype *This = impl_from_IXMLDOMDocumentType( iface ); - FIXME("(%p)->(%p): stub\n", This, var1); - return E_NOTIMPL; + TRACE("(%p)->(%p)\n", This, v); + return return_null_var(v); } static HRESULT WINAPI domdoctype_put_nodeTypedValue( diff --git a/dlls/msxml3/domdoc.c b/dlls/msxml3/domdoc.c index a5f9e9e..c9d1c48 100644 --- a/dlls/msxml3/domdoc.c +++ b/dlls/msxml3/domdoc.c @@ -1328,11 +1328,11 @@ static HRESULT WINAPI domdoc_get_definition( static HRESULT WINAPI domdoc_get_nodeTypedValue( IXMLDOMDocument3 *iface, - VARIANT* typedValue ) + VARIANT* v ) { domdoc *This = impl_from_IXMLDOMDocument3( iface ); - FIXME("(%p)->(%p)\n", This, typedValue); - return return_null_var(typedValue); + TRACE("(%p)->(%p)\n", This, v); + return return_null_var(v); } static HRESULT WINAPI domdoc_put_nodeTypedValue( diff --git a/dlls/msxml3/pi.c b/dlls/msxml3/pi.c index 49a221d..b9a2c7e 100644 --- a/dlls/msxml3/pi.c +++ b/dlls/msxml3/pi.c @@ -447,11 +447,11 @@ static HRESULT WINAPI dom_pi_get_definition( static HRESULT WINAPI dom_pi_get_nodeTypedValue( IXMLDOMProcessingInstruction *iface, - VARIANT* var1) + VARIANT* v) { dom_pi *This = impl_from_IXMLDOMProcessingInstruction( iface ); - FIXME("(%p)->(%p)\n", This, var1); - return return_null_var(var1); + TRACE("(%p)->(%p)\n", This, v); + return node_get_content(&This->node, v); } static HRESULT WINAPI dom_pi_put_nodeTypedValue( diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index 9dca668..210c709 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -6009,7 +6009,12 @@ static const nodetypedvalue_t get_nodetypedvalue[] = { static void test_nodeTypedValue(void) { const nodetypedvalue_t *entry = get_nodetypedvalue; - IXMLDOMDocument *doc; + IXMLDOMProcessingInstruction *pi; + IXMLDOMDocumentFragment *frag; + IXMLDOMDocumentType *doctype; + IXMLDOMDocument *doc, *doc2; + IXMLDOMCDATASection *cdata; + IXMLDOMComment *comment; IXMLDOMNode *node; VARIANT_BOOL b; VARIANT value; @@ -6035,8 +6040,10 @@ static void test_nodeTypedValue(void) hr = IXMLDOMDocument_get_nodeTypedValue(doc, NULL); ok(hr == E_INVALIDARG, "ret %08x\n", hr ); + V_VT(&value) = VT_EMPTY; hr = IXMLDOMDocument_get_nodeTypedValue(doc, &value); ok(hr == S_FALSE, "ret %08x\n", hr ); + ok(V_VT(&value) == VT_NULL, "got %d\n", V_VT(&value)); hr = IXMLDOMDocument_selectSingleNode(doc, _bstr_("root/string"), &node); ok(hr == S_OK, "ret %08x\n", hr ); @@ -6082,6 +6089,72 @@ static void test_nodeTypedValue(void) IXMLDOMNode_Release(node); } + hr = IXMLDOMDocument_createProcessingInstruction(doc, _bstr_("foo"), _bstr_("value"), &pi); + ok(hr == S_OK, "ret %08x\n", hr ); + { + V_VT(&value) = VT_NULL; + V_BSTR(&value) = (void*)0xdeadbeef; + hr = IXMLDOMProcessingInstruction_get_nodeTypedValue(pi, &value); + ok(hr == S_OK, "ret %08x\n", hr ); + ok(V_VT(&value) == VT_BSTR, "got %d\n", V_VT(&value)); + ok(!lstrcmpW(V_BSTR(&value), _bstr_("value")), "got wrong value\n"); + IXMLDOMProcessingInstruction_Release(pi); + } + + hr = IXMLDOMDocument_createCDATASection(doc, _bstr_("[1]*2=3; &gee thats not right!"), &cdata); + ok(hr == S_OK, "ret %08x\n", hr ); + { + V_VT(&value) = VT_NULL; + V_BSTR(&value) = (void*)0xdeadbeef; + hr = IXMLDOMCDATASection_get_nodeTypedValue(cdata, &value); + ok(hr == S_OK, "ret %08x\n", hr ); + ok(V_VT(&value) == VT_BSTR, "got %d\n", V_VT(&value)); + ok(!lstrcmpW(V_BSTR(&value), _bstr_("[1]*2=3; &gee thats not right!")), "got wrong value\n"); + IXMLDOMCDATASection_Release(cdata); + } + + hr = IXMLDOMDocument_createComment(doc, _bstr_("comment"), &comment); + ok(hr == S_OK, "ret %08x\n", hr ); + { + V_VT(&value) = VT_NULL; + V_BSTR(&value) = (void*)0xdeadbeef; + hr = IXMLDOMComment_get_nodeTypedValue(comment, &value); + ok(hr == S_OK, "ret %08x\n", hr ); + ok(V_VT(&value) == VT_BSTR, "got %d\n", V_VT(&value)); + ok(!lstrcmpW(V_BSTR(&value), _bstr_("comment")), "got wrong value\n"); + IXMLDOMComment_Release(comment); + } + + hr = IXMLDOMDocument_createDocumentFragment(doc, &frag); + ok(hr == S_OK, "ret %08x\n", hr ); + { + V_VT(&value) = VT_EMPTY; + hr = IXMLDOMDocumentFragment_get_nodeTypedValue(frag, &value); + ok(hr == S_FALSE, "ret %08x\n", hr ); + ok(V_VT(&value) == VT_NULL, "got %d\n", V_VT(&value)); + IXMLDOMDocumentFragment_Release(frag); + } + + doc2 = create_document(&IID_IXMLDOMDocument); + + b = VARIANT_FALSE; + hr = IXMLDOMDocument_loadXML(doc2, _bstr_(szEmailXML), &b); + ok(hr == S_OK, "ret %08x\n", hr ); + ok(b == VARIANT_TRUE, "got %d\n", b); + + hr = IXMLDOMDocument_get_doctype(doc2, &doctype); + todo_wine ok(hr == S_OK, "ret %08x\n", hr ); + if (hr == S_OK) + { + V_VT(&value) = VT_EMPTY; + hr = IXMLDOMDocumentType_get_nodeTypedValue(doctype, &value); + ok(hr == S_FALSE, "ret %08x\n", hr ); + ok(V_VT(&value) == VT_NULL, "got %d\n", V_VT(&value)); + IXMLDOMDocumentType_Release(doctype); + } + + IXMLDOMDocument_Release(doc2); + while (entry->name) { hr = IXMLDOMDocument_selectSingleNode(doc, _bstr_(entry->name), &node);

1 0

Nikolay Sivov : msxml3: Implemented get_doctype() with basic tests.
by Alexandre Julliard 07 Mar '11

07 Mar '11

Module: wine Branch: master Commit: f9f431186f2f55e4b0988cf05cf9177ec120ce19 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f9f431186f2f55e4b0988cf05… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Mar 7 00:53:54 2011 +0300 msxml3: Implemented get_doctype() with basic tests. --- dlls/msxml3/domdoc.c | 24 +++++++++++++++++++++--- dlls/msxml3/tests/domdoc.c | 39 +++++++++++++++++++++++++++++++++++---- 2 files changed, 56 insertions(+), 7 deletions(-) diff --git a/dlls/msxml3/domdoc.c b/dlls/msxml3/domdoc.c index c9d1c48..beec0b4 100644 --- a/dlls/msxml3/domdoc.c +++ b/dlls/msxml3/domdoc.c @@ -1517,11 +1517,29 @@ static HRESULT WINAPI domdoc_transformNodeToObject( static HRESULT WINAPI domdoc_get_doctype( IXMLDOMDocument3 *iface, - IXMLDOMDocumentType** documentType ) + IXMLDOMDocumentType** doctype ) { domdoc *This = impl_from_IXMLDOMDocument3(iface); - FIXME("(%p)\n", This); - return E_NOTIMPL; + IXMLDOMNode *node; + xmlDtdPtr dtd; + HRESULT hr; + + TRACE("(%p)->(%p)\n", This, doctype); + + if (!doctype) return E_INVALIDARG; + + *doctype = NULL; + + dtd = xmlGetIntSubset(get_doc(This)); + if (!dtd) return S_FALSE; + + node = create_node((xmlNodePtr)dtd); + if (!node) return S_FALSE; + + hr = IXMLDOMNode_QueryInterface(node, &IID_IXMLDOMDocumentType, (void**)doctype); + IXMLDOMNode_Release(node); + + return hr; } diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index 210c709..be9a430 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -6009,9 +6009,9 @@ static const nodetypedvalue_t get_nodetypedvalue[] = { static void test_nodeTypedValue(void) { const nodetypedvalue_t *entry = get_nodetypedvalue; + IXMLDOMDocumentType *doctype, *doctype2; IXMLDOMProcessingInstruction *pi; IXMLDOMDocumentFragment *frag; - IXMLDOMDocumentType *doctype; IXMLDOMDocument *doc, *doc2; IXMLDOMCDATASection *cdata; IXMLDOMComment *comment; @@ -6142,17 +6142,28 @@ static void test_nodeTypedValue(void) ok(hr == S_OK, "ret %08x\n", hr ); ok(b == VARIANT_TRUE, "got %d\n", b); + EXPECT_REF(doc2, 1); + hr = IXMLDOMDocument_get_doctype(doc2, &doctype); - todo_wine ok(hr == S_OK, "ret %08x\n", hr ); - if (hr == S_OK) + ok(hr == S_OK, "ret %08x\n", hr ); + + EXPECT_REF(doc2, 1); + todo_wine EXPECT_REF(doctype, 2); + { V_VT(&value) = VT_EMPTY; hr = IXMLDOMDocumentType_get_nodeTypedValue(doctype, &value); ok(hr == S_FALSE, "ret %08x\n", hr ); ok(V_VT(&value) == VT_NULL, "got %d\n", V_VT(&value)); - IXMLDOMDocumentType_Release(doctype); } + hr = IXMLDOMDocument_get_doctype(doc2, &doctype2); + ok(hr == S_OK, "ret %08x\n", hr ); + ok(doctype != doctype2, "got %p, was %p\n", doctype2, doctype); + + IXMLDOMDocumentType_Release(doctype2); + IXMLDOMDocumentType_Release(doctype); + IXMLDOMDocument_Release(doc2); while (entry->name) @@ -8383,6 +8394,25 @@ static void test_appendChild(void) IXMLDOMDocument_Release(doc2); } +static void test_get_doctype(void) +{ + IXMLDOMDocumentType *doctype; + IXMLDOMDocument *doc; + HRESULT hr; + + doc = create_document(&IID_IXMLDOMDocument); + + hr = IXMLDOMDocument_get_doctype(doc, NULL); + ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + + doctype = (void*)0xdeadbeef; + hr = IXMLDOMDocument_get_doctype(doc, &doctype); + ok(hr == S_FALSE, "got 0x%08x\n", hr); + ok(doctype == NULL, "got %p\n", doctype); + + IXMLDOMDocument_Release(doc); +} + START_TEST(domdoc) { IXMLDOMDocument *doc; @@ -8449,6 +8479,7 @@ START_TEST(domdoc) test_get_xml(); test_insertBefore(); test_appendChild(); + test_get_doctype(); test_xsltemplate(); CoUninitialize();

1 0

Juan Lang : wininet: Store entries in url cache with valid last-modified date.
by Alexandre Julliard 07 Mar '11

07 Mar '11

Module: wine Branch: master Commit: 28e92293369d3a33e5f269091864c6116e75814a URL: http://source.winehq.org/git/wine.git/?a=commit;h=28e92293369d3a33e5f269091… Author: Juan Lang <juan.lang(a)gmail.com> Date: Fri Mar 4 11:43:54 2011 -0800 wininet: Store entries in url cache with valid last-modified date. --- dlls/wininet/http.c | 227 ++++++++++++++++++++++++++++++++++++----------- dlls/wininet/internet.h | 1 + 2 files changed, 176 insertions(+), 52 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=28e92293369d3a33e5f26…

1 0