November 2009 - Wine-Commits

Nikolay Sivov : comctl32/imagelist: Get rid of magic field, use vtable pointer instead. Keep original layout.
by Alexandre Julliard Nov. 16, 2009

Nov. 16, 2009

Module: wine Branch: master Commit: 3e20458acafcf2c92cce4dfb30dafb28bb6dc99f URL: http://source.winehq.org/git/wine.git/?a=commit;h=3e20458acafcf2c92cce4dfb3… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Sun Nov 15 07:57:11 2009 +0300 comctl32/imagelist: Get rid of magic field, use vtable pointer instead. Keep original layout. --- dlls/comctl32/imagelist.c | 12 ++++++------ dlls/comctl32/imagelist.h | 30 +++++++++++++++--------------- 2 files changed, 21 insertions(+), 21 deletions(-) diff --git a/dlls/comctl32/imagelist.c b/dlls/comctl32/imagelist.c index 71f77b0..a49622c 100644 --- a/dlls/comctl32/imagelist.c +++ b/dlls/comctl32/imagelist.c @@ -81,11 +81,7 @@ static INTERNALDRAG InternalDrag = { 0, 0, 0, 0, 0, 0, FALSE, 0 }; static HBITMAP ImageList_CreateImage(HDC hdc, HIMAGELIST himl, UINT count, UINT width); static HRESULT ImageListImpl_CreateInstance(const IUnknown *pUnkOuter, REFIID iid, void** ppv); - -static inline BOOL is_valid(HIMAGELIST himl) -{ - return himl && himl->magic == IMAGELIST_MAGIC; -} +static inline BOOL is_valid(HIMAGELIST himl); /* * An imagelist with N images is tiled like this: @@ -607,7 +603,6 @@ ImageList_Create (INT cx, INT cy, UINT flags, cGrow = (cGrow < 4) ? 4 : (cGrow + 3) & ~3; - himl->magic = IMAGELIST_MAGIC; himl->cx = cx; himl->cy = cy; himl->flags = flags; @@ -3320,6 +3315,11 @@ static const IImageListVtbl ImageListImpl_Vtbl = { ImageListImpl_GetOverlayImage }; +static inline BOOL is_valid(HIMAGELIST himl) +{ + return himl && himl->lpVtbl == &ImageListImpl_Vtbl; +} + /************************************************************************* * HIMAGELIST_QueryInterface [COMCTL32.@] * diff --git a/dlls/comctl32/imagelist.h b/dlls/comctl32/imagelist.h index efcd1b0..a979ebf 100644 --- a/dlls/comctl32/imagelist.h +++ b/dlls/comctl32/imagelist.h @@ -30,31 +30,31 @@ struct _IMAGELIST { const struct IImageListVtbl *lpVtbl; /* 00: IImageList vtable */ - LONG ref; /* 04: reference count */ - DWORD magic; /* 08: 'SAMX' */ - INT cCurImage; /* 0C: ImageCount */ - INT cMaxImage; /* 10: maximages */ - INT cGrow; /* 14: cGrow */ - INT cx; /* 18: cx */ - INT cy; /* 1C: cy */ + INT cCurImage; /* 04: ImageCount */ + INT cMaxImage; /* 08: maximages */ + INT cGrow; /* 0C: cGrow */ + INT cx; /* 10: cx */ + INT cy; /* 14: cy */ DWORD x4; - UINT flags; /* 24: flags */ - COLORREF clrFg; /* 28: foreground color */ - COLORREF clrBk; /* 2C: background color */ + UINT flags; /* 1C: flags */ + COLORREF clrFg; /* 20: foreground color */ + COLORREF clrBk; /* 24: background color */ - HBITMAP hbmImage; /* 30: images Bitmap */ - HBITMAP hbmMask; /* 34: masks Bitmap */ - HDC hdcImage; /* 38: images MemDC */ - HDC hdcMask; /* 3C: masks MemDC */ - INT nOvlIdx[15]; /* 40: overlay images index */ + HBITMAP hbmImage; /* 28: images Bitmap */ + HBITMAP hbmMask; /* 2C: masks Bitmap */ + HDC hdcImage; /* 30: images MemDC */ + HDC hdcMask; /* 34: masks MemDC */ + INT nOvlIdx[15]; /* 38: overlay images index */ /* not yet found out */ HBRUSH hbrBlend25; HBRUSH hbrBlend50; INT cInitial; UINT uBitsPixel; + + LONG ref; /* reference count */ }; #define IMAGELIST_MAGIC 0x53414D58

1 0

Maarten Lankhorst : dsound: Implement DirectSoundCaptureEnumerateA on top of DirectSoundCaptureEnumerateW .
by Alexandre Julliard Nov. 16, 2009

Nov. 16, 2009

Module: wine Branch: master Commit: 708eaaa6be40dd99bdd10b348e586f0f0791f137 URL: http://source.winehq.org/git/wine.git/?a=commit;h=708eaaa6be40dd99bdd10b348… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Sat Nov 14 14:30:49 2009 +0100 dsound: Implement DirectSoundCaptureEnumerateA on top of DirectSoundCaptureEnumerateW. --- dlls/dsound/dsound_main.c | 42 ++++++------------------------------------ 1 files changed, 6 insertions(+), 36 deletions(-) diff --git a/dlls/dsound/dsound_main.c b/dlls/dsound/dsound_main.c index eaeb778..bfb8708 100644 --- a/dlls/dsound/dsound_main.c +++ b/dlls/dsound/dsound_main.c @@ -400,51 +400,21 @@ HRESULT WINAPI DirectSoundEnumerateW( * Success: DS_OK * Failure: DSERR_INVALIDPARAM */ -HRESULT WINAPI -DirectSoundCaptureEnumerateA( +HRESULT WINAPI DirectSoundCaptureEnumerateA( LPDSENUMCALLBACKA lpDSEnumCallback, LPVOID lpContext) { - unsigned devs, wid; - DSDRIVERDESC desc; - GUID guid; - int err; - - TRACE("(%p,%p)\n", lpDSEnumCallback, lpContext ); + struct morecontext context; if (lpDSEnumCallback == NULL) { - WARN("invalid parameter: lpDSEnumCallback == NULL\n"); + WARN("invalid parameter: lpDSEnumCallback == NULL\n"); return DSERR_INVALIDPARAM; } - devs = waveInGetNumDevs(); - if (devs > 0) { - if (GetDeviceID(&DSDEVID_DefaultCapture, &guid) == DS_OK) { - for (wid = 0; wid < devs; ++wid) { - if (IsEqualGUID( &guid, &DSOUND_capture_guids[wid] ) ) { - err = mmErr(waveInMessage(UlongToHandle(wid),DRV_QUERYDSOUNDDESC,(DWORD_PTR)&desc,0)); - if (err == DS_OK) { - TRACE("calling lpDSEnumCallback(NULL,\"%s\",\"%s\",%p)\n", - "Primary Sound Capture Driver",desc.szDrvname,lpContext); - if (lpDSEnumCallback(NULL, "Primary Sound Capture Driver", desc.szDrvname, lpContext) == FALSE) - return DS_OK; - } - } - } - } - } - - for (wid = 0; wid < devs; ++wid) { - err = mmErr(waveInMessage(UlongToHandle(wid),DRV_QUERYDSOUNDDESC,(DWORD_PTR)&desc,0)); - if (err == DS_OK) { - TRACE("calling lpDSEnumCallback(%s,\"%s\",\"%s\",%p)\n", - debugstr_guid(&DSOUND_capture_guids[wid]),desc.szDesc,desc.szDrvname,lpContext); - if (lpDSEnumCallback(&DSOUND_capture_guids[wid], desc.szDesc, desc.szDrvname, lpContext) == FALSE) - return DS_OK; - } - } + context.callA = lpDSEnumCallback; + context.data = lpContext; - return DS_OK; + return DirectSoundCaptureEnumerateW(a_to_w_callback, &context); } /***************************************************************************

1 0

Nikolay Sivov : comctl32/imagelist: Use defined flags instead of magic numbers in tests.
by Alexandre Julliard Nov. 16, 2009

Nov. 16, 2009

Module: wine Branch: master Commit: 4afc54540d7ed3db2d7fd931345e841d6d2a1036 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4afc54540d7ed3db2d7fd9313… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Sun Nov 15 07:58:05 2009 +0300 comctl32/imagelist: Use defined flags instead of magic numbers in tests. --- dlls/comctl32/tests/imagelist.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/comctl32/tests/imagelist.c b/dlls/comctl32/tests/imagelist.c index 942590e..a931e9c 100644 --- a/dlls/comctl32/tests/imagelist.c +++ b/dlls/comctl32/tests/imagelist.c @@ -336,7 +336,7 @@ static BOOL DoTest1(void) HICON hicon3 ; /* create an imagelist to play with */ - himl = ImageList_Create(84,84,0x10,0,3); + himl = ImageList_Create(84, 84, ILC_COLOR16, 0, 3); ok(himl!=0,"failed to create imagelist\n"); /* load the icons to add to the image list */ @@ -402,7 +402,7 @@ static BOOL DoTest2(void) HICON hicon3 ; /* create an imagelist to play with */ - himl = ImageList_Create(84,84,0x10,0,3); + himl = ImageList_Create(84, 84, ILC_COLOR16, 0, 3); ok(himl!=0,"failed to create imagelist\n"); /* load the icons to add to the image list */ @@ -451,7 +451,7 @@ static BOOL DoTest3(void) ok(hdc!=NULL, "couldn't get DC\n"); /* create an imagelist to play with */ - himl = ImageList_Create(48,48,0x10,0,3); + himl = ImageList_Create(48, 48, ILC_COLOR16, 0, 3); ok(himl!=0,"failed to create imagelist\n"); /* load the icons to add to the image list */

1 0

Nikolay Sivov : comctl32/imagelist: Make ImageList_Destroy just decrease refcount. Move actual destruction to ::Release.
by Alexandre Julliard Nov. 16, 2009

Nov. 16, 2009

Module: wine Branch: master Commit: 7caa61fde648ad7c3275e9d4358ec10b182c2e6b URL: http://source.winehq.org/git/wine.git/?a=commit;h=7caa61fde648ad7c3275e9d43… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Sun Nov 15 15:13:48 2009 +0300 comctl32/imagelist: Make ImageList_Destroy just decrease refcount. Move actual destruction to ::Release. --- dlls/comctl32/imagelist.c | 34 +++++++++++++++------------------- dlls/comctl32/tests/imagelist.c | 30 +++++++++++++++++++++++++++++- 2 files changed, 44 insertions(+), 20 deletions(-) diff --git a/dlls/comctl32/imagelist.c b/dlls/comctl32/imagelist.c index a49622c..cc92486 100644 --- a/dlls/comctl32/imagelist.c +++ b/dlls/comctl32/imagelist.c @@ -692,25 +692,6 @@ ImageList_Destroy (HIMAGELIST himl) if (!is_valid(himl)) return FALSE; - /* delete image bitmaps */ - if (himl->hbmImage) - DeleteObject (himl->hbmImage); - if (himl->hbmMask) - DeleteObject (himl->hbmMask); - - /* delete image & mask DCs */ - if (himl->hdcImage) - DeleteDC(himl->hdcImage); - if (himl->hdcMask) - DeleteDC(himl->hdcMask); - - /* delete blending brushes */ - if (himl->hbrBlend25) - DeleteObject (himl->hbrBlend25); - if (himl->hbrBlend50) - DeleteObject (himl->hbrBlend50); - - /* Free the IImageList instance */ IImageList_Release((IImageList *) himl); return TRUE; } @@ -2972,7 +2953,22 @@ static ULONG WINAPI ImageListImpl_Release(IImageList *iface) TRACE("(%p) refcount=%u\n", iface, ref); if (ref == 0) + { + /* delete image bitmaps */ + if (This->hbmImage) DeleteObject (This->hbmImage); + if (This->hbmMask) DeleteObject (This->hbmMask); + + /* delete image & mask DCs */ + if (This->hdcImage) DeleteDC (This->hdcImage); + if (This->hdcMask) DeleteDC (This->hdcMask); + + /* delete blending brushes */ + if (This->hbrBlend25) DeleteObject (This->hbrBlend25); + if (This->hbrBlend50) DeleteObject (This->hbrBlend50); + + This->lpVtbl = NULL; HeapFree(GetProcessHeap(), 0, This); + } return ref; } diff --git a/dlls/comctl32/tests/imagelist.c b/dlls/comctl32/tests/imagelist.c index a931e9c..b97ca9a 100644 --- a/dlls/comctl32/tests/imagelist.c +++ b/dlls/comctl32/tests/imagelist.c @@ -1251,8 +1251,36 @@ static void test_iimagelist(void) IImageList *imgl; HIMAGELIST himl; HRESULT hr; + ULONG ret; - if (!pImageList_CoCreateInstance || !pHIMAGELIST_QueryInterface) + if (!pHIMAGELIST_QueryInterface) + { + win_skip("XP imagelist functions not available\n"); + return; + } + + /* test reference counting on destruction */ + imgl = (IImageList*)createImageList(32, 32); + ret = IUnknown_AddRef(imgl); + ok(ret == 2, "Expected 2, got %d\n", ret); + ret = ImageList_Destroy((HIMAGELIST)imgl); + ok(ret == TRUE, "Expected TRUE, got %d\n", ret); + ret = ImageList_Destroy((HIMAGELIST)imgl); + ok(ret == TRUE, "Expected TRUE, got %d\n", ret); + ret = ImageList_Destroy((HIMAGELIST)imgl); + ok(ret == FALSE, "Expected FALSE, got %d\n", ret); + + imgl = (IImageList*)createImageList(32, 32); + ret = IUnknown_AddRef(imgl); + ok(ret == 2, "Expected 2, got %d\n", ret); + ret = ImageList_Destroy((HIMAGELIST)imgl); + ok(ret == TRUE, "Expected TRUE, got %d\n", ret); + ret = IImageList_Release(imgl); + ok(ret == 0, "Expected 0, got %d\n", ret); + ret = ImageList_Destroy((HIMAGELIST)imgl); + ok(ret == FALSE, "Expected FALSE, got %d\n", ret); + + if (!pImageList_CoCreateInstance) { win_skip("Vista imagelist functions not available\n"); return;

1 0

Maarten Lankhorst : dsound: Move duplex definitions to duplex.c.
by Alexandre Julliard Nov. 16, 2009

Nov. 16, 2009

Module: wine Branch: master Commit: a8f587e8dec383deeef3386dc516bc9d59999da0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a8f587e8dec383deeef3386dc… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Sat Nov 14 14:55:58 2009 +0100 dsound: Move duplex definitions to duplex.c. --- dlls/dsound/dsound_private.h | 51 ------------------------------------------ dlls/dsound/duplex.c | 43 +++++++++++++++++++++++++++++++++++ 2 files changed, 43 insertions(+), 51 deletions(-) diff --git a/dlls/dsound/dsound_private.h b/dlls/dsound/dsound_private.h index e028358..e1567e5 100644 --- a/dlls/dsound/dsound_private.h +++ b/dlls/dsound/dsound_private.h @@ -52,11 +52,6 @@ typedef struct IDirectSound8_IDirectSound8 IDirectSound8_IDirectSound8; typedef struct IDirectSoundBufferImpl IDirectSoundBufferImpl; typedef struct IDirectSoundCaptureImpl IDirectSoundCaptureImpl; typedef struct IDirectSoundCaptureBufferImpl IDirectSoundCaptureBufferImpl; -typedef struct IDirectSoundFullDuplexImpl IDirectSoundFullDuplexImpl; -typedef struct IDirectSoundFullDuplex_IUnknown IDirectSoundFullDuplex_IUnknown; -typedef struct IDirectSoundFullDuplex_IDirectSound IDirectSoundFullDuplex_IDirectSound; -typedef struct IDirectSoundFullDuplex_IDirectSound8 IDirectSoundFullDuplex_IDirectSound8; -typedef struct IDirectSoundFullDuplex_IDirectSoundCapture IDirectSoundFullDuplex_IDirectSoundCapture; typedef struct IDirectSoundNotifyImpl IDirectSoundNotifyImpl; typedef struct IDirectSoundCaptureNotifyImpl IDirectSoundCaptureNotifyImpl; typedef struct IDirectSound3DListenerImpl IDirectSound3DListenerImpl; @@ -310,52 +305,6 @@ HRESULT IDirectSoundCaptureBufferImpl_Create( LPCDSCBUFFERDESC lpcDSCBufferDesc); /***************************************************************************** - * IDirectSoundFullDuplex implementation structure - */ -struct IDirectSoundFullDuplexImpl -{ - /* IUnknown fields */ - const IDirectSoundFullDuplexVtbl *lpVtbl; - LONG ref; - - /* IDirectSoundFullDuplexImpl fields */ - DirectSoundDevice *renderer_device; - DirectSoundCaptureDevice *capture_device; - - LPUNKNOWN pUnknown; - LPDIRECTSOUND pDS; - LPDIRECTSOUND8 pDS8; - LPDIRECTSOUNDCAPTURE pDSC; -}; - -/***************************************************************************** - * IDirectSoundFullDuplex COM components - */ -struct IDirectSoundFullDuplex_IUnknown { - const IUnknownVtbl *lpVtbl; - LONG ref; - IDirectSoundFullDuplexImpl *pdsfd; -}; - -struct IDirectSoundFullDuplex_IDirectSound { - const IDirectSoundVtbl *lpVtbl; - LONG ref; - IDirectSoundFullDuplexImpl *pdsfd; -}; - -struct IDirectSoundFullDuplex_IDirectSound8 { - const IDirectSound8Vtbl *lpVtbl; - LONG ref; - IDirectSoundFullDuplexImpl *pdsfd; -}; - -struct IDirectSoundFullDuplex_IDirectSoundCapture { - const IDirectSoundCaptureVtbl *lpVtbl; - LONG ref; - IDirectSoundFullDuplexImpl *pdsfd; -}; - -/***************************************************************************** * IDirectSound3DListener implementation structure */ struct IDirectSound3DListenerImpl diff --git a/dlls/dsound/duplex.c b/dlls/dsound/duplex.c index 1fe6bbc..8fbf1d6 100644 --- a/dlls/dsound/duplex.c +++ b/dlls/dsound/duplex.c @@ -37,6 +37,49 @@ WINE_DEFAULT_DEBUG_CHANNEL(dsound); +/***************************************************************************** + * IDirectSoundFullDuplex implementation structure + */ +typedef struct IDirectSoundFullDuplexImpl +{ + /* IUnknown fields */ + const IDirectSoundFullDuplexVtbl *lpVtbl; + LONG ref; + + /* IDirectSoundFullDuplexImpl fields */ + DirectSoundDevice *renderer_device; + DirectSoundCaptureDevice *capture_device; + + LPUNKNOWN pUnknown; + LPDIRECTSOUND pDS; + LPDIRECTSOUND8 pDS8; + LPDIRECTSOUNDCAPTURE pDSC; +} IDirectSoundFullDuplexImpl; + +typedef struct IDirectSoundFullDuplex_IUnknown { + const IUnknownVtbl *lpVtbl; + LONG ref; + IDirectSoundFullDuplexImpl *pdsfd; +} IDirectSoundFullDuplex_IUnknown; + +typedef struct IDirectSoundFullDuplex_IDirectSound { + const IDirectSoundVtbl *lpVtbl; + LONG ref; + IDirectSoundFullDuplexImpl *pdsfd; +} IDirectSoundFullDuplex_IDirectSound; + +typedef struct IDirectSoundFullDuplex_IDirectSound8 { + const IDirectSound8Vtbl *lpVtbl; + LONG ref; + IDirectSoundFullDuplexImpl *pdsfd; +} IDirectSoundFullDuplex_IDirectSound8; + +typedef struct IDirectSoundFullDuplex_IDirectSoundCapture { + const IDirectSoundCaptureVtbl *lpVtbl; + LONG ref; + IDirectSoundFullDuplexImpl *pdsfd; +} IDirectSoundFullDuplex_IDirectSoundCapture; + /******************************************************************************* * IUnknown */

1 0

Maarten Lankhorst : dsound: Move DirectSoundCaptureEnumerate to dsound_main .c.
by Alexandre Julliard Nov. 16, 2009

Nov. 16, 2009

Module: wine Branch: master Commit: 03c16aaba92f2a4b0945064ddc92ac806ab6af54 URL: http://source.winehq.org/git/wine.git/?a=commit;h=03c16aaba92f2a4b0945064dd… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Sat Nov 14 14:29:07 2009 +0100 dsound: Move DirectSoundCaptureEnumerate to dsound_main.c. --- dlls/dsound/capture.c | 130 --------------------------------------------- dlls/dsound/dsound_main.c | 130 +++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 130 insertions(+), 130 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=03c16aaba92f2a4b09450…

1 0

Jacek Caban : mshtml: Added IHTMLElement::put_outerHTML implementation.
by Alexandre Julliard Nov. 16, 2009

Nov. 16, 2009

Module: wine Branch: master Commit: b553019dc3d2b196a6363917410ba9aa5c690784 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b553019dc3d2b196a63639174… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Nov 16 01:26:57 2009 +0100 mshtml: Added IHTMLElement::put_outerHTML implementation. --- dlls/mshtml/htmlelem.c | 59 +++++++++++++++++++++++++++++++++++++++++++++- dlls/mshtml/tests/dom.c | 48 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 105 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c index b794b73..b885470 100644 --- a/dlls/mshtml/htmlelem.c +++ b/dlls/mshtml/htmlelem.c @@ -908,8 +908,63 @@ static HRESULT WINAPI HTMLElement_get_innerText(IHTMLElement *iface, BSTR *p) static HRESULT WINAPI HTMLElement_put_outerHTML(IHTMLElement *iface, BSTR v) { HTMLElement *This = HTMLELEM_THIS(iface); - FIXME("(%p)->(%s)\n", This, debugstr_w(v)); - return E_NOTIMPL; + nsIDOMDocumentFragment *nsfragment; + nsIDOMDocumentRange *nsdocrange; + nsIDOMNSRange *nsrange; + nsIDOMNode *nsparent; + nsIDOMRange *range; + nsAString html_str; + nsresult nsres; + HRESULT hres = S_OK; + + TRACE("(%p)->(%s)\n", This, debugstr_w(v)); + + nsres = nsIDOMHTMLDocument_QueryInterface(This->node.doc->nsdoc, &IID_nsIDOMDocumentRange, (void**)&nsdocrange); + if(NS_FAILED(nsres)) + return E_FAIL; + + nsres = nsIDOMDocumentRange_CreateRange(nsdocrange, &range); + nsIDOMDocumentRange_Release(nsdocrange); + if(NS_FAILED(nsres)) { + ERR("CreateRange failed: %08x\n", nsres); + return E_FAIL; + } + + nsres = nsIDOMRange_QueryInterface(range, &IID_nsIDOMNSRange, (void**)&nsrange); + nsIDOMRange_Release(range); + if(NS_FAILED(nsres)) { + ERR("Could not get nsIDOMNSRange: %08x\n", nsres); + return E_FAIL; + } + + nsAString_Init(&html_str, v); + nsIDOMNSRange_CreateContextualFragment(nsrange, &html_str, &nsfragment); + nsIDOMNSRange_Release(nsrange); + nsAString_Finish(&html_str); + if(NS_FAILED(nsres)) { + ERR("CreateContextualFragment failed: %08x\n", nsres); + return E_FAIL; + } + + nsres = nsIDOMNode_GetParentNode(This->node.nsnode, &nsparent); + if(NS_SUCCEEDED(nsres) && nsparent) { + nsIDOMNode *nstmp; + + nsres = nsIDOMNode_ReplaceChild(nsparent, (nsIDOMNode*)nsfragment, This->node.nsnode, &nstmp); + nsIDOMNode_Release(nsparent); + if(NS_FAILED(nsres)) { + ERR("ReplaceChild failed: %08x\n", nsres); + hres = E_FAIL; + }else if(nstmp) { + nsIDOMNode_Release(nstmp); + } + }else { + ERR("GetParentNode failed: %08x\n", nsres); + hres = E_FAIL; + } + + nsIDOMDocumentFragment_Release(nsfragment); + return hres; } static HRESULT WINAPI HTMLElement_get_outerHTML(IHTMLElement *iface, BSTR *p) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index cf69c63..c965c79 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -52,6 +52,11 @@ static const char elem_test_str[] = "<img id=\"imgid\"/>" "<iframe src=\"about:blank\" id=\"ifr\"></iframe>" "</body></html>"; +static const char elem_test2_str[] = + "<html><head><title>test</title><style>.body { margin-right: 0px; }</style>" + "<body><div id=\"divid\"></div></body>" + "</html>"; + static const char indent_test_str[] = "<html><head><title>test</title></head><body>abc<br /><a href=\"about:blank\">123</a></body></html>"; static const char cond_comment_str[] = @@ -1572,6 +1577,21 @@ static void _test_elem_set_innerhtml(unsigned line, IUnknown *unk, const char *i SysFreeString(html); } +#define test_elem_set_outerhtml(e,t) _test_elem_set_outerhtml(__LINE__,e,t) +static void _test_elem_set_outerhtml(unsigned line, IUnknown *unk, const char *outer_html) +{ + IHTMLElement *elem = _get_elem_iface(line, unk); + BSTR html; + HRESULT hres; + + html = a2bstr(outer_html); + hres = IHTMLElement_put_outerHTML(elem, html); + ok_(__FILE__,line)(hres == S_OK, "put_outerHTML failed: %08x\n", hres); + + IHTMLElement_Release(elem); + SysFreeString(html); +} + #define get_first_child(n) _get_first_child(__LINE__,n) static IHTMLDOMNode *_get_first_child(unsigned line, IUnknown *unk) { @@ -5390,6 +5410,33 @@ static void test_elems(IHTMLDocument2 *doc) IHTMLWindow2_Release(window); } +static void test_elems2(IHTMLDocument2 *doc) +{ + IHTMLElement *elem, *elem2; + + static const elem_type_t outer_types[] = { + ET_BR, + ET_A + }; + + elem = get_doc_elem_by_id(doc, "divid"); + + test_elem_set_innerhtml((IUnknown*)elem, "<div id=\"innerid\"></div>"); + elem2 = get_doc_elem_by_id(doc, "innerid"); + ok(elem2 != NULL, "elem2 == NULL\n"); + test_elem_set_outerhtml((IUnknown*)elem2, "<br><a href=\"about:blank\" id=\"aid\">a</a>"); + test_elem_all((IUnknown*)elem, outer_types, sizeof(outer_types)/sizeof(*outer_types)); + IHTMLElement_Release(elem2); + + elem2 = get_doc_elem_by_id(doc, "aid"); + ok(elem2 != NULL, "elem2 == NULL\n"); + test_elem_set_outerhtml((IUnknown*)elem2, ""); + test_elem_all((IUnknown*)elem, outer_types, 1); + IHTMLElement_Release(elem2); + + IHTMLElement_Release(elem); +} + static void test_create_elems(IHTMLDocument2 *doc) { IHTMLElement *elem, *body, *elem2; @@ -5924,6 +5971,7 @@ START_TEST(dom) }else { skip("IE running in Enhanced Security Configuration\n"); } + run_domtest(elem_test2_str, test_elems2); run_domtest(doc_blank, test_create_elems); run_domtest(doc_blank, test_defaults); run_domtest(indent_test_str, test_indent);

1 0

Maarten Lankhorst : dsound: Implement DirectSoundEnumerateA on top of DirectSoundEnumerateW.
by Alexandre Julliard Nov. 16, 2009

Nov. 16, 2009

Module: wine Branch: master Commit: 9ec5f957cc696ff1dcbc9af10ae757e55b79fb66 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9ec5f957cc696ff1dcbc9af10… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Sat Nov 14 14:27:13 2009 +0100 dsound: Implement DirectSoundEnumerateA on top of DirectSoundEnumerateW. --- dlls/dsound/dsound_main.c | 57 +++++++++++++++++--------------------------- 1 files changed, 22 insertions(+), 35 deletions(-) diff --git a/dlls/dsound/dsound_main.c b/dlls/dsound/dsound_main.c index 44897bc..5b0770a 100644 --- a/dlls/dsound/dsound_main.c +++ b/dlls/dsound/dsound_main.c @@ -272,6 +272,22 @@ HRESULT WINAPI GetDeviceID(LPCGUID pGuidSrc, LPGUID pGuidDest) return DS_OK; } +struct morecontext +{ + LPDSENUMCALLBACKA callA; + LPVOID data; +}; + +static BOOL CALLBACK a_to_w_callback(LPGUID guid, LPCWSTR descW, LPCWSTR modW, LPVOID data) +{ + struct morecontext *context = data; + char descA[MAXPNAMELEN], modA[MAXPNAMELEN]; + + WideCharToMultiByte(CP_ACP, 0, descW, -1, descA, sizeof(descA), NULL, NULL); + WideCharToMultiByte(CP_ACP, 0, modW, -1, modA, sizeof(modA), NULL, NULL); + + return context->callA(guid, descA, modA, context->data); +} /*************************************************************************** * DirectSoundEnumerateA [DSOUND.2] @@ -290,46 +306,17 @@ HRESULT WINAPI DirectSoundEnumerateA( LPDSENUMCALLBACKA lpDSEnumCallback, LPVOID lpContext) { - unsigned devs, wod; - DSDRIVERDESC desc; - GUID guid; - int err; - - TRACE("lpDSEnumCallback = %p, lpContext = %p\n", - lpDSEnumCallback, lpContext); + struct morecontext context; if (lpDSEnumCallback == NULL) { - WARN("invalid parameter: lpDSEnumCallback == NULL\n"); - return DSERR_INVALIDPARAM; + WARN("invalid parameter: lpDSEnumCallback == NULL\n"); + return DSERR_INVALIDPARAM; } - devs = waveOutGetNumDevs(); - if (devs > 0) { - if (GetDeviceID(&DSDEVID_DefaultPlayback, &guid) == DS_OK) { - for (wod = 0; wod < devs; ++wod) { - if (IsEqualGUID( &guid, &DSOUND_renderer_guids[wod]) ) { - err = mmErr(waveOutMessage(UlongToHandle(wod),DRV_QUERYDSOUNDDESC,(DWORD_PTR)&desc,0)); - if (err == DS_OK) { - TRACE("calling lpDSEnumCallback(NULL,\"%s\",\"%s\",%p)\n", - "Primary Sound Driver","",lpContext); - if (lpDSEnumCallback(NULL, "Primary Sound Driver", "", lpContext) == FALSE) - return DS_OK; - } - } - } - } - } + context.callA = lpDSEnumCallback; + context.data = lpContext; - for (wod = 0; wod < devs; ++wod) { - err = mmErr(waveOutMessage(UlongToHandle(wod),DRV_QUERYDSOUNDDESC,(DWORD_PTR)&desc,0)); - if (err == DS_OK) { - TRACE("calling lpDSEnumCallback(%s,\"%s\",\"%s\",%p)\n", - debugstr_guid(&DSOUND_renderer_guids[wod]),desc.szDesc,desc.szDrvname,lpContext); - if (lpDSEnumCallback(&DSOUND_renderer_guids[wod], desc.szDesc, desc.szDrvname, lpContext) == FALSE) - return DS_OK; - } - } - return DS_OK; + return DirectSoundEnumerateW(a_to_w_callback, &context); } /***************************************************************************

1 0

Jacek Caban : mshtml: Don't use nselem in InsertAdjacentNode implementation .
by Alexandre Julliard Nov. 16, 2009

Nov. 16, 2009

Module: wine Branch: master Commit: 90d078950c028772da1d90a5b1dd12629d16368c URL: http://source.winehq.org/git/wine.git/?a=commit;h=90d078950c028772da1d90a5b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Nov 16 01:27:27 2009 +0100 mshtml: Don't use nselem in InsertAdjacentNode implementation. --- dlls/mshtml/htmlelem.c | 22 ++++++++-------------- 1 files changed, 8 insertions(+), 14 deletions(-) diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c index b885470..0864e49 100644 --- a/dlls/mshtml/htmlelem.c +++ b/dlls/mshtml/htmlelem.c @@ -1014,19 +1014,13 @@ static HRESULT HTMLElement_InsertAdjacentNode(HTMLElement *This, BSTR where, nsI static const WCHAR wszAfterEnd[] = {'a','f','t','e','r','E','n','d',0}; nsresult nsres; - if(!This->nselem) { - FIXME("NULL nselem\n"); - return E_NOTIMPL; - } - if (!strcmpiW(where, wszBeforeBegin)) { nsIDOMNode *unused; nsIDOMNode *parent; - nsres = nsIDOMNode_GetParentNode(This->nselem, &parent); + nsres = nsIDOMNode_GetParentNode(This->node.nsnode, &parent); if (!parent) return E_INVALIDARG; - nsres = nsIDOMNode_InsertBefore(parent, nsnode, - (nsIDOMNode *)This->nselem, &unused); + nsres = nsIDOMNode_InsertBefore(parent, nsnode, This->node.nsnode, &unused); if (unused) nsIDOMNode_Release(unused); nsIDOMNode_Release(parent); } @@ -1034,15 +1028,15 @@ static HRESULT HTMLElement_InsertAdjacentNode(HTMLElement *This, BSTR where, nsI { nsIDOMNode *unused; nsIDOMNode *first_child; - nsIDOMNode_GetFirstChild(This->nselem, &first_child); - nsres = nsIDOMNode_InsertBefore(This->nselem, nsnode, first_child, &unused); + nsIDOMNode_GetFirstChild(This->node.nsnode, &first_child); + nsres = nsIDOMNode_InsertBefore(This->node.nsnode, nsnode, first_child, &unused); if (unused) nsIDOMNode_Release(unused); if (first_child) nsIDOMNode_Release(first_child); } else if (!strcmpiW(where, wszBeforeEnd)) { nsIDOMNode *unused; - nsres = nsIDOMNode_AppendChild(This->nselem, nsnode, &unused); + nsres = nsIDOMNode_AppendChild(This->node.nsnode, nsnode, &unused); if (unused) nsIDOMNode_Release(unused); } else if (!strcmpiW(where, wszAfterEnd)) @@ -1050,10 +1044,10 @@ static HRESULT HTMLElement_InsertAdjacentNode(HTMLElement *This, BSTR where, nsI nsIDOMNode *unused; nsIDOMNode *next_sibling; nsIDOMNode *parent; - nsIDOMNode_GetParentNode(This->nselem, &parent); + nsIDOMNode_GetParentNode(This->node.nsnode, &parent); if (!parent) return E_INVALIDARG; - nsIDOMNode_GetNextSibling(This->nselem, &next_sibling); + nsIDOMNode_GetNextSibling(This->node.nsnode, &next_sibling); if (next_sibling) { nsres = nsIDOMNode_InsertBefore(parent, nsnode, next_sibling, &unused); @@ -1109,7 +1103,7 @@ static HRESULT WINAPI HTMLElement_insertAdjacentHTML(IHTMLElement *iface, BSTR w return E_FAIL; } - nsIDOMRange_SetStartBefore(range, (nsIDOMNode *)This->nselem); + nsIDOMRange_SetStartBefore(range, This->node.nsnode); nsIDOMRange_QueryInterface(range, &IID_nsIDOMNSRange, (void **)&nsrange); nsIDOMRange_Release(range);

1 0

Eric Pouech : gdi.exe: Rewrite QueryAbort16 to be independant of gdi32. dll internals.
by Alexandre Julliard Nov. 16, 2009

Nov. 16, 2009

Module: wine Branch: master Commit: 40eea7acd7834771d1f12cbf7b3fddf5694b3e97 URL: http://source.winehq.org/git/wine.git/?a=commit;h=40eea7acd7834771d1f12cbf7… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Sun Nov 15 22:10:05 2009 +0100 gdi.exe: Rewrite QueryAbort16 to be independant of gdi32.dll internals. --- dlls/gdi32/gdi16.c | 21 +++++++++++++++++++++ dlls/gdi32/printdrv16.c | 25 ------------------------- 2 files changed, 21 insertions(+), 25 deletions(-) diff --git a/dlls/gdi32/gdi16.c b/dlls/gdi32/gdi16.c index 6579f86..37a15e9 100644 --- a/dlls/gdi32/gdi16.c +++ b/dlls/gdi32/gdi16.c @@ -135,6 +135,27 @@ static struct gdi_thunk* GDI_FindThunk(HDC16 hdc) } /********************************************************************** + * QueryAbort (GDI.155) + * + * Calls the app's AbortProc function if avail. + * + * RETURNS + * TRUE if no AbortProc avail or AbortProc wants to continue printing. + * FALSE if AbortProc wants to abort printing. + */ +BOOL16 WINAPI QueryAbort16(HDC16 hdc16, INT16 reserved) +{ + struct gdi_thunk* thunk = GDI_FindThunk(hdc16); + + if (!thunk) { + ERR("Invalid hdc 0x%x\n", hdc16); + return FALSE; + } + return GDI_Callback3216( thunk->pfn16, HDC_32(hdc16), 0 ); +} + + +/********************************************************************** * SetAbortProc (GDI.381) */ INT16 WINAPI SetAbortProc16(HDC16 hdc16, ABORTPROC16 abrtprc) diff --git a/dlls/gdi32/printdrv16.c b/dlls/gdi32/printdrv16.c index d71a752..f0b8cf0 100644 --- a/dlls/gdi32/printdrv16.c +++ b/dlls/gdi32/printdrv16.c @@ -57,31 +57,6 @@ static const char DefaultDevMode[] = "Default DevMode"; static const char PrinterDriverData[] = "PrinterDriverData"; static const char Printers[] = "System\\CurrentControlSet\\Control\\Print\\Printers\\"; -/********************************************************************** - * QueryAbort (GDI.155) - * - * Calls the app's AbortProc function if avail. - * - * RETURNS - * TRUE if no AbortProc avail or AbortProc wants to continue printing. - * FALSE if AbortProc wants to abort printing. - */ -BOOL16 WINAPI QueryAbort16(HDC16 hdc16, INT16 reserved) -{ - BOOL ret = TRUE; - HDC hdc = HDC_32( hdc16 ); - DC *dc = get_dc_ptr( hdc ); - - if(!dc) { - ERR("Invalid hdc %p\n", hdc); - return FALSE; - } - if (dc->pAbortProc) ret = dc->pAbortProc(hdc, 0); - release_dc_ptr( dc ); - return ret; -} - - /****************** misc. printer related functions */ /*

1 0