November 2006 - Wine-commits

Jacek Caban : shdocvw: Added [get|put]_Offline implementation.
by Alexandre Julliard 06 Nov '06

06 Nov '06

Module: wine Branch: master Commit: f76253bf00f3e1bb33a9a7bdb0c1bc7211f74d84 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f76253bf00f3e1bb33a9a7bdb… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Nov 5 17:46:13 2006 +0100 shdocvw: Added [get|put]_Offline implementation. --- dlls/shdocvw/shdocvw.h | 1 + dlls/shdocvw/webbrowser.c | 15 +++++++++++---- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/dlls/shdocvw/shdocvw.h b/dlls/shdocvw/shdocvw.h index 8f0d4fd..92a9216 100644 --- a/dlls/shdocvw/shdocvw.h +++ b/dlls/shdocvw/shdocvw.h @@ -127,6 +127,7 @@ struct WebBrowser { VARIANT_BOOL status_bar; VARIANT_BOOL tool_bar; VARIANT_BOOL silent; + VARIANT_BOOL offline; DocHost doc_host; }; diff --git a/dlls/shdocvw/webbrowser.c b/dlls/shdocvw/webbrowser.c index 3746917..312ab76 100644 --- a/dlls/shdocvw/webbrowser.c +++ b/dlls/shdocvw/webbrowser.c @@ -703,15 +703,21 @@ static HRESULT WINAPI WebBrowser_get_Rea static HRESULT WINAPI WebBrowser_get_Offline(IWebBrowser2 *iface, VARIANT_BOOL *pbOffline) { WebBrowser *This = WEBBROWSER_THIS(iface); - FIXME("(%p)->(%p)\n", This, pbOffline); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, pbOffline); + + *pbOffline = This->offline; + return S_OK; } static HRESULT WINAPI WebBrowser_put_Offline(IWebBrowser2 *iface, VARIANT_BOOL bOffline) { WebBrowser *This = WEBBROWSER_THIS(iface); - FIXME("(%p)->(%x)\n", This, bOffline); - return E_NOTIMPL; + + TRACE("(%p)->(%x)\n", This, bOffline); + + This->offline = bOffline ? VARIANT_TRUE : VARIANT_FALSE; + return S_OK; } static HRESULT WINAPI WebBrowser_get_Silent(IWebBrowser2 *iface, VARIANT_BOOL *pbSilent) @@ -922,6 +928,7 @@ static HRESULT WebBrowser_Create(INT ver ret->status_bar = VARIANT_TRUE; ret->tool_bar = VARIANT_TRUE; ret->silent = VARIANT_FALSE; + ret->offline = VARIANT_FALSE; WebBrowser_OleObject_Init(ret); WebBrowser_ViewObject_Init(ret);

1 0

Jacek Caban : shdocvw: Added OnAmbientPropertyChange( DISPID_AMBIENT_OFFLINECONNECTED) implementation.
by Alexandre Julliard 06 Nov '06

06 Nov '06

Module: wine Branch: master Commit: e7c3d0157ad429dda8f6dafbd43a878d12310da0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e7c3d0157ad429dda8f6dafbd… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Nov 5 17:46:54 2006 +0100 shdocvw: Added OnAmbientPropertyChange(DISPID_AMBIENT_OFFLINECONNECTED) implementation. --- dlls/shdocvw/oleobject.c | 16 ++++++++++++++++ 1 files changed, 16 insertions(+), 0 deletions(-) diff --git a/dlls/shdocvw/oleobject.c b/dlls/shdocvw/oleobject.c index ad657b8..488b06c 100644 --- a/dlls/shdocvw/oleobject.c +++ b/dlls/shdocvw/oleobject.c @@ -212,6 +212,20 @@ static HRESULT get_client_disp_property( return hres; } +static HRESULT on_offlineconnected_change(WebBrowser *This) +{ + VARIANT offline; + + get_client_disp_property(This->client, DISPID_AMBIENT_OFFLINEIFNOTCONNECTED, &offline); + + if(V_VT(&offline) == VT_BOOL) + IWebBrowser2_put_Offline(WEBBROWSER2(This), V_BOOL(&offline)); + else if(V_VT(&offline) != VT_EMPTY) + WARN("wrong V_VT(silent) %d\n", V_VT(&offline)); + + return S_OK; +} + static HRESULT on_silent_change(WebBrowser *This) { VARIANT silent; @@ -683,6 +697,8 @@ static HRESULT WINAPI OleControl_OnAmbie TRACE("(%p)->(%d)\n", This, dispID); switch(dispID) { + case DISPID_AMBIENT_OFFLINEIFNOTCONNECTED: + return on_offlineconnected_change(This); case DISPID_AMBIENT_SILENT: return on_silent_change(This); }

1 0

Jacek Caban : shdocvw: Cal on_offlineconnected_change and on_silent_change in SetClientSite.
by Alexandre Julliard 06 Nov '06

06 Nov '06

Module: wine Branch: master Commit: 7858c208a172d104f137b7a89d0afb66b7a55cd5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7858c208a172d104f137b7a89… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Nov 5 17:47:52 2006 +0100 shdocvw: Cal on_offlineconnected_change and on_silent_change in SetClientSite. --- dlls/shdocvw/oleobject.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/shdocvw/oleobject.c b/dlls/shdocvw/oleobject.c index 488b06c..dc795f8 100644 --- a/dlls/shdocvw/oleobject.c +++ b/dlls/shdocvw/oleobject.c @@ -325,6 +325,9 @@ static HRESULT WINAPI OleObject_SetClien create_shell_embedding_hwnd(This); + on_offlineconnected_change(This); + on_silent_change(This); + return S_OK; }

1 0

Mike McCormack : riched20: Fix a leak in the undo stack.
by Alexandre Julliard 06 Nov '06

06 Nov '06

Module: wine Branch: master Commit: 1e85e7c7c20d1f93ef610e45b29bd24ef621e5d9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1e85e7c7c20d1f93ef610e45b… Author: Mike McCormack <mike(a)codeweavers.com> Date: Sun Nov 5 14:33:28 2006 +0900 riched20: Fix a leak in the undo stack. --- dlls/riched20/list.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/riched20/list.c b/dlls/riched20/list.c index db46308..ad7b4b6 100644 --- a/dlls/riched20/list.c +++ b/dlls/riched20/list.c @@ -121,6 +121,8 @@ void ME_DestroyDisplayItem(ME_DisplayIte if (item->type==diUndoSetCharFormat || item->type==diUndoSetDefaultCharFormat) { ME_ReleaseStyle(item->member.ustyle); } + if (item->type==diUndoSplitParagraph) + FREE_OBJ(item->member.para.pFmt); FREE_OBJ(item); }

1 0

Jacek Caban : mshtml: Fixed query_edit_status when Gecko is not available.
by Alexandre Julliard 06 Nov '06

06 Nov '06

Module: wine Branch: master Commit: 53fe2d1531f3a11529d1af80886eb3c192d5e33e URL: http://source.winehq.org/git/wine.git/?a=commit;h=53fe2d1531f3a11529d1af808… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Nov 5 13:52:34 2006 +0100 mshtml: Fixed query_edit_status when Gecko is not available. --- dlls/mshtml/olecmd.c | 13 +++++-------- 1 files changed, 5 insertions(+), 8 deletions(-) diff --git a/dlls/mshtml/olecmd.c b/dlls/mshtml/olecmd.c index 68762a9..dfeb81d 100644 --- a/dlls/mshtml/olecmd.c +++ b/dlls/mshtml/olecmd.c @@ -307,18 +307,15 @@ static DWORD query_edit_status(HTMLDocum nsICommandParams *nsparam; PRBool b = FALSE; - if(!This->nscontainer) { - FIXME("dummy not implemented\n"); - return OLECMDF_SUPPORTED; - } - if(This->usermode != EDITMODE || This->readystate < READYSTATE_INTERACTIVE) return OLECMDF_SUPPORTED; - nsparam = create_nscommand_params(); - get_ns_command_state(This->nscontainer, nscmd, nsparam); + if(This->nscontainer) { + nsparam = create_nscommand_params(); + get_ns_command_state(This->nscontainer, nscmd, nsparam); - nsICommandParams_GetBooleanValue(nsparam, "state_enabled", &b); + nsICommandParams_GetBooleanValue(nsparam, "state_all", &b); + } return OLECMDF_SUPPORTED | OLECMDF_ENABLED | (b ? OLECMDF_LATCHED : 0); }

1 0

Jacek Caban : shdocvw: Set parent window in activate_inplace.
by Alexandre Julliard 06 Nov '06

06 Nov '06

Module: wine Branch: master Commit: 30b24fbf7f55e66c7481ea3c9a9197dc35aba5f8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=30b24fbf7f55e66c7481ea3c9… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Nov 5 17:38:16 2006 +0100 shdocvw: Set parent window in activate_inplace. --- dlls/shdocvw/oleobject.c | 10 ++++++---- dlls/shdocvw/shdocvw.h | 1 - 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/dlls/shdocvw/oleobject.c b/dlls/shdocvw/oleobject.c index aef1dd1..a3e1ed6 100644 --- a/dlls/shdocvw/oleobject.c +++ b/dlls/shdocvw/oleobject.c @@ -30,6 +30,9 @@ #include "htiframe.h" WINE_DEFAULT_DEBUG_CHANNEL(shdocvw); +/* shlwapi.dll */ +HWND WINAPI SHSetParentHwnd(HWND hWnd, HWND hWndParent); + static ATOM shell_embedding_atom = 0; static LRESULT resize_window(WebBrowser *This, LONG width, LONG height) @@ -127,9 +130,9 @@ static HRESULT activate_inplace(WebBrows return E_FAIL; } - hres = IOleInPlaceSite_GetWindow(This->inplace, &This->iphwnd); - if(FAILED(hres)) - This->iphwnd = parent_hwnd; + hres = IOleInPlaceSite_GetWindow(This->inplace, &parent_hwnd); + if(SUCCEEDED(hres)) + SHSetParentHwnd(This->shell_embedding_hwnd, parent_hwnd); IOleInPlaceSite_OnInPlaceActivate(This->inplace); @@ -810,7 +813,6 @@ void WebBrowser_OleObject_Init(WebBrowse This->client = NULL; This->inplace = NULL; This->container = NULL; - This->iphwnd = NULL; This->frame_hwnd = NULL; This->frame = NULL; This->uiwindow = NULL; diff --git a/dlls/shdocvw/shdocvw.h b/dlls/shdocvw/shdocvw.h index 61cdd94..8f0d4fd 100644 --- a/dlls/shdocvw/shdocvw.h +++ b/dlls/shdocvw/shdocvw.h @@ -111,7 +111,6 @@ struct WebBrowser { /* window context */ - HWND iphwnd; HWND frame_hwnd; IOleInPlaceFrame *frame; IOleInPlaceUIWindow *uiwindow;

1 0

Jacek Caban : shdocvw: Ignore hwndParent in DoVerb.
by Alexandre Julliard 06 Nov '06

06 Nov '06

Module: wine Branch: master Commit: ebbcd53c71433973ccd8abaa3f45ebe88e85ff5b URL: http://source.winehq.org/git/wine.git/?a=commit;h=ebbcd53c71433973ccd8abaa3… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Nov 5 17:39:13 2006 +0100 shdocvw: Ignore hwndParent in DoVerb. --- dlls/shdocvw/oleobject.c | 13 +++++++------ dlls/shdocvw/tests/webbrowser.c | 4 ++-- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/dlls/shdocvw/oleobject.c b/dlls/shdocvw/oleobject.c index a3e1ed6..6ccfaef 100644 --- a/dlls/shdocvw/oleobject.c +++ b/dlls/shdocvw/oleobject.c @@ -106,8 +106,9 @@ static void create_shell_embedding_hwnd( TRACE("parent=%p hwnd=%p\n", parent, This->shell_embedding_hwnd); } -static HRESULT activate_inplace(WebBrowser *This, IOleClientSite *active_site, HWND parent_hwnd) +static HRESULT activate_inplace(WebBrowser *This, IOleClientSite *active_site) { + HWND parent_hwnd; HRESULT hres; if(This->inplace) @@ -157,7 +158,7 @@ static HRESULT activate_inplace(WebBrows return S_OK; } -static HRESULT activate_ui(WebBrowser *This, IOleClientSite *active_site, HWND parent_hwnd) +static HRESULT activate_ui(WebBrowser *This, IOleClientSite *active_site) { HRESULT hres; @@ -166,7 +167,7 @@ static HRESULT activate_ui(WebBrowser *T if(This->inplace) return S_OK; - hres = activate_inplace(This, active_site, parent_hwnd); + hres = activate_inplace(This, active_site); if(FAILED(hres)) return hres; @@ -347,13 +348,13 @@ static HRESULT WINAPI OleObject_DoVerb(I { case OLEIVERB_SHOW: TRACE("OLEIVERB_SHOW\n"); - return activate_ui(This, pActiveSite, hwndParent); + return activate_ui(This, pActiveSite); case OLEIVERB_UIACTIVATE: TRACE("OLEIVERB_UIACTIVATE\n"); - return activate_ui(This, pActiveSite, hwndParent); + return activate_ui(This, pActiveSite); case OLEIVERB_INPLACEACTIVATE: TRACE("OLEIVERB_INPLACEACTIVATE\n"); - return activate_inplace(This, pActiveSite, hwndParent); + return activate_inplace(This, pActiveSite); default: FIXME("stub for %d\n", iVerb); break; diff --git a/dlls/shdocvw/tests/webbrowser.c b/dlls/shdocvw/tests/webbrowser.c index 9523640..84bc608 100644 --- a/dlls/shdocvw/tests/webbrowser.c +++ b/dlls/shdocvw/tests/webbrowser.c @@ -725,7 +725,7 @@ static void test_DoVerb(IUnknown *unk) SET_EXPECT(SetMenu); hres = IOleObject_DoVerb(oleobj, OLEIVERB_SHOW, NULL, &ClientSite, - 0, container_hwnd, &rect); + 0, (HWND)0xdeadbeef, &rect); ok(hres == S_OK, "DoVerb failed: %08x\n", hres); CHECK_CALLED(CanInPlaceActivate); @@ -741,7 +741,7 @@ static void test_DoVerb(IUnknown *unk) CHECK_CALLED(SetMenu); hres = IOleObject_DoVerb(oleobj, OLEIVERB_SHOW, NULL, &ClientSite, - 0, container_hwnd, &rect); + 0, (HWND)0xdeadbeef, &rect); ok(hres == S_OK, "DoVerb failed: %08x\n", hres); IOleObject_Release(oleobj);

1 0

Mike McCormack : comctl32: Remove a Nx1 assuption in ImageList_AddMasked().
by Alexandre Julliard 06 Nov '06

06 Nov '06

Module: wine Branch: master Commit: 6772873396dfe5f0b124c9b63c00e18fe3804037 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6772873396dfe5f0b124c9b63… Author: Mike McCormack <mike(a)codeweavers.com> Date: Sun Nov 5 17:59:19 2006 +0900 comctl32: Remove a Nx1 assuption in ImageList_AddMasked(). --- dlls/comctl32/imagelist.c | 6 ++---- 1 files changed, 2 insertions(+), 4 deletions(-) diff --git a/dlls/comctl32/imagelist.c b/dlls/comctl32/imagelist.c index 3f8b49f..20da02f 100644 --- a/dlls/comctl32/imagelist.c +++ b/dlls/comctl32/imagelist.c @@ -300,7 +300,7 @@ INT WINAPI ImageList_AddMasked (HIMAGELIST himl, HBITMAP hBitmap, COLORREF clrMask) { HDC hdcMask, hdcBitmap; - INT nIndex, nImageCount, nMaskXOffset=0; + INT nIndex, nImageCount; BITMAP bmp; HBITMAP hOldBitmap; HBITMAP hMaskBitmap=0; @@ -331,7 +331,6 @@ ImageList_AddMasked (HIMAGELIST himl, HB if(himl->hbmMask) { hdcMask = himl->hdcMask; - nMaskXOffset = nIndex * himl->cx; imagelist_point_from_index( himl, nIndex, &pt ); } else @@ -343,7 +342,6 @@ ImageList_AddMasked (HIMAGELIST himl, HB hdcMask = CreateCompatibleDC(0); hMaskBitmap = CreateBitmap(bmp.bmWidth, bmp.bmHeight, 1, 1, NULL); SelectObject(hdcMask, hMaskBitmap); - nMaskXOffset = 0; imagelist_point_from_index( himl, 0, &pt ); } /* create monochrome image to the mask bitmap */ @@ -370,7 +368,7 @@ ImageList_AddMasked (HIMAGELIST himl, HB BitBlt(hdcBitmap, 0, 0, bmp.bmWidth, bmp.bmHeight, hdcMask, - nMaskXOffset, 0, + pt.x, pt.y, 0x220326); /* NOTSRCAND */ /* Copy result to the imagelist */

1 0

Mike McCormack : comctl32: Switch to a Nx4 tiling.
by Alexandre Julliard 06 Nov '06

06 Nov '06

Module: wine Branch: master Commit: dfb41b35c47c0217eb08fa643484ae8c55f2b333 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dfb41b35c47c0217eb08fa643… Author: Mike McCormack <mike(a)codeweavers.com> Date: Sun Nov 5 18:02:39 2006 +0900 comctl32: Switch to a Nx4 tiling. --- dlls/comctl32/imagelist.c | 47 +++++++++++++++++++++++++++++++++++++------- 1 files changed, 39 insertions(+), 8 deletions(-) diff --git a/dlls/comctl32/imagelist.c b/dlls/comctl32/imagelist.c index 20da02f..843654a 100644 --- a/dlls/comctl32/imagelist.c +++ b/dlls/comctl32/imagelist.c @@ -84,28 +84,59 @@ static inline BOOL is_valid(HIMAGELIST h return himl && himl->magic == IMAGELIST_MAGIC; } +/* + * An imagelist with N images is tiled like this: + * + * N/4 -> + * + * 4 048C.. + * 159D.. + * | 26AE.N + * V 37BF. + */ + +#define TILE_COUNT 4 + +static inline UINT imagelist_width( UINT count ) +{ + return ((count + TILE_COUNT - 1)/TILE_COUNT); +} + static inline void imagelist_point_from_index( HIMAGELIST himl, UINT index, LPPOINT pt ) { - pt->x = index * himl->cx; - pt->y = 0; + pt->x = (index/TILE_COUNT) * himl->cx; + pt->y = (index%TILE_COUNT) * himl->cy; } static inline void imagelist_get_bitmap_size( HIMAGELIST himl, UINT count, UINT cy, SIZE *sz ) { - sz->cx = count * himl->cx; - sz->cy = cy; + sz->cx = imagelist_width( count ) * himl->cx; + sz->cy = cy*TILE_COUNT; } +/* + * imagelist_copy_images() + * + * Copies a block of count images from offset src in the list to offset dest. + * Images are copied a row at at time. Assumes hdcSrc and hdcDest are different. + */ static inline void imagelist_copy_images( HIMAGELIST himl, HDC hdcSrc, HDC hdcDest, UINT src, UINT count, UINT dest ) { POINT ptSrc, ptDest; SIZE sz; + UINT i; - imagelist_point_from_index( himl, src, &ptSrc ); - imagelist_point_from_index( himl, dest, &ptDest ); - imagelist_get_bitmap_size( himl, count, himl->cy, &sz ); - BitBlt (hdcDest, ptSrc.x, ptSrc.y, sz.cx, sz.cy, hdcSrc, ptDest.x, ptDest.y, SRCCOPY); + for ( i=0; i<TILE_COUNT; i++ ) + { + imagelist_point_from_index( himl, src+i, &ptSrc ); + imagelist_point_from_index( himl, dest+i, &ptDest ); + sz.cx = himl->cx * imagelist_width( count - i ); + sz.cy = himl->cy; + + BitBlt( hdcDest, ptDest.x, ptDest.y, sz.cx, sz.cy, + hdcSrc, ptSrc.x, ptSrc.y, SRCCOPY ); + } } /*************************************************************************

1 0

Mike McCormack : riched20: Fixed memory leaks.
by Alexandre Julliard 06 Nov '06

06 Nov '06

Module: wine Branch: master Commit: 01e8eaefdc5d374fae4e872b847370be549b4993 URL: http://source.winehq.org/git/wine.git/?a=commit;h=01e8eaefdc5d374fae4e872b8… Author: Mike McCormack <mike(a)codeweavers.com> Date: Sun Nov 5 14:25:42 2006 +0900 riched20: Fixed memory leaks. --- dlls/riched20/editor.c | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 48eb33d..e8362f1 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -1210,12 +1210,12 @@ void ME_DestroyEditor(ME_TextEditor *edi ME_DisplayItem *pFirst = editor->pBuffer->pFirst; ME_DisplayItem *p = pFirst, *pNext = NULL; int i; - + ME_ClearTempStyle(editor); ME_EmptyUndoStack(editor); while(p) { pNext = p->next; - ME_DestroyDisplayItem(p); + ME_DestroyDisplayItem(p); p = pNext; } ME_ReleaseStyle(editor->pBuffer->pDefaultStyle); @@ -1228,6 +1228,9 @@ void ME_DestroyEditor(ME_TextEditor *edi if(editor->lpOleCallback) IUnknown_Release(editor->lpOleCallback); + FREE_OBJ(editor->pBuffer); + FREE_OBJ(editor->pCursors); + FREE_OBJ(editor); }

1 0