Wine-Commits

wine-commits@list.winehq.org

December 2005

3 participants
452 discussions

wine/dlls/shdocvw client.c
by Alexandre Julliard Dec. 1, 2005

Dec. 1, 2005

ChangeSet ID: 21582 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/12/01 05:58:27 Modified files: dlls/shdocvw : client.c Log message: Jacek Caban <jacek(a)codeweavers.com> Return S_OK in [On|Can]InPlaceActivate. Handle IOleDocumentSite in QueryInterface. Patch: http://cvs.winehq.org/patch.py?id=21582 Old revision New revision Changes Path 1.6 1.7 +14 -4 wine/dlls/shdocvw/client.c Index: wine/dlls/shdocvw/client.c diff -u -p wine/dlls/shdocvw/client.c:1.6 wine/dlls/shdocvw/client.c:1.7 --- wine/dlls/shdocvw/client.c:1.6 1 Dec 2005 11:58:27 -0000 +++ wine/dlls/shdocvw/client.c 1 Dec 2005 11:58:27 -0000 @@ -47,6 +47,9 @@ static HRESULT WINAPI ClientSite_QueryIn }else if(IsEqualGUID(&IID_IDocHostUIHandler2, riid)) { TRACE("(%p)->(IID_IDocHostUIHandler2 %p)\n", This, ppv); *ppv = DOCHOSTUI2(This); + }else if(IsEqualGUID(&IID_IOleDocumentSite, riid)) { + TRACE("(%p)->(IID_IOleDocumentSite %p)\n", This, ppv); + *ppv = DOCSITE(This); } if(*ppv) { @@ -168,15 +171,21 @@ static HRESULT WINAPI InPlaceSite_Contex static HRESULT WINAPI InPlaceSite_CanInPlaceActivate(IOleInPlaceSite *iface) { WebBrowser *This = INPLACESITE_THIS(iface); - FIXME("(%p)\n", This); - return E_NOTIMPL; + + TRACE("(%p)\n", This); + + /* Nothing to do here */ + return S_OK; } static HRESULT WINAPI InPlaceSite_OnInPlaceActivate(IOleInPlaceSite *iface) { WebBrowser *This = INPLACESITE_THIS(iface); - FIXME("(%p)\n", This); - return E_NOTIMPL; + + TRACE("(%p)\n", This); + + /* Nothing to do here */ + return S_OK; } static HRESULT WINAPI InPlaceSite_OnUIActivate(IOleInPlaceSite *iface) @@ -197,6 +206,7 @@ static HRESULT WINAPI InPlaceSite_GetWin *ppFrame = INPLACEFRAME(This); *ppDoc = NULL; + GetClientRect(This->doc_view_hwnd, lprcPosRect); memcpy(lprcClipRect, lprcPosRect, sizeof(RECT));

1 0

wine/dlls/gdi freetype.c
by Alexandre Julliard Dec. 1, 2005

Dec. 1, 2005

ChangeSet ID: 21581 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/12/01 05:58:23 Modified files: dlls/gdi : freetype.c Log message: Rein Klazes <wijn(a)wanadoo.nl> Make WineEngGetFontData always return the used byte count. Patch: http://cvs.winehq.org/patch.py?id=21581 Old revision New revision Changes Path 1.106 1.107 +14 -2 wine/dlls/gdi/freetype.c Index: wine/dlls/gdi/freetype.c diff -u -p wine/dlls/gdi/freetype.c:1.106 wine/dlls/gdi/freetype.c:1.107 --- wine/dlls/gdi/freetype.c:1.106 1 Dec 2005 11:58:23 -0000 +++ wine/dlls/gdi/freetype.c 1 Dec 2005 11:58:23 -0000 @@ -3692,9 +3692,15 @@ DWORD WineEngGetFontData(GdiFont font, D } /* If the FT_Load_Sfnt_Table function is there we'll use it */ - if(pFT_Load_Sfnt_Table) + if(pFT_Load_Sfnt_Table) { + /* make sure value of len is the value freetype says it needs */ + if( buf && len) { + DWORD needed = 0; + err = pFT_Load_Sfnt_Table(ft_face, table, offset, NULL, &needed); + if( !err && needed < len) len = needed; + } err = pFT_Load_Sfnt_Table(ft_face, table, offset, buf, &len); - else { /* Do it the hard way */ + } else { /* Do it the hard way */ TT_Face tt_face = (TT_Face) ft_face; SFNT_Interface *sfnt; if (FT_Version.major==2 && FT_Version.minor==0) @@ -3707,6 +3713,12 @@ DWORD WineEngGetFontData(GdiFont font, D /* A field was added in the middle of the structure in 2.1.x */ sfnt = *(SFNT_Interface**)((char*)tt_face + 532); } + /* make sure value of len is the value freetype says it needs */ + if( buf && len) { + DWORD needed = 0; + err = sfnt->load_any(tt_face, table, offset, NULL, &needed); + if( !err && needed < len) len = needed; + } err = sfnt->load_any(tt_face, table, offset, buf, &len); } if(err) {

1 0

Jump to page: