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

Piotr Caban : include: Added IBrowserService interface definition.
by Alexandre Julliard March 11, 2011

March 11, 2011

Module: wine Branch: master Commit: 457368897f25cef6d50e2e548643e352d63cbd04 URL: http://source.winehq.org/git/wine.git/?a=commit;h=457368897f25cef6d50e2e548… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Mar 11 11:13:39 2011 +0100 include: Added IBrowserService interface definition. --- include/shdeprecated.idl | 245 ++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 245 insertions(+), 0 deletions(-) diff --git a/include/shdeprecated.idl b/include/shdeprecated.idl index 304b087..c78e461 100644 --- a/include/shdeprecated.idl +++ b/include/shdeprecated.idl @@ -19,6 +19,251 @@ */ import "objidl.idl"; +import "ocidl.idl"; +import "shobjidl.idl"; + +cpp_quote("#define TLOG_BACK -1") +cpp_quote("#define TLOG_FORE 1") + +cpp_quote("#define TLMENUF_INCLUDECURRENT 0x00000001") +cpp_quote("#define TLMENUF_CHECKCURRENT (TLMENUF_INCLUDECURRENT | 0x00000002)") +cpp_quote("#define TLMENUF_BACK 0x00000010") +cpp_quote("#define TLMENUF_FORE 0x00000020") +cpp_quote("#define TLMENUF_BACKANDFORTH (TLMENUF_BACK | TLMENUF_FORE | TLMENUF_INCLUDECURRENT)") + +[ + hidden, + local, + object, + uuid(F46EDB3B-BC2F-11d0-9412-00AA00A3EBD3) +] +interface ITravelEntry : IUnknown +{ + HRESULT Invoke( + [in] IUnknown *punk); + + HRESULT Update( + [in] IUnknown *punk, + [in] BOOL fIsLocalAnchor); + + HRESULT GetPidl( + [out] LPITEMIDLIST *ppidl); +}; + +[ + hidden, + local, + object, + uuid(66A9CB08-4802-11d2-A561-00A0C92DBFE8) +] +interface ITravelLog : IUnknown +{ + HRESULT AddEntry( + [in] IUnknown *punk, + [in] BOOL fIsLocalAnchor); + + HRESULT UpdateEntry( + [in] IUnknown *punk, + [in] BOOL fIsLocalAnchor); + + HRESULT UpdateExternal( + [in] IUnknown *punk, + [in] IUnknown *punkHLBrowseContext); + + HRESULT Travel( + [in] IUnknown *punk, + [in] int iOffset); + + HRESULT GetTravelEntry( + [in] IUnknown *punk, + [in] int iOffset, + [optional, out] ITravelEntry **ppte); + + HRESULT FindTravelEntry( + [in] IUnknown *punk, + [in] LPCITEMIDLIST pidl, + [out] ITravelEntry **ppte); + + HRESULT GetToolTipText( + [in] IUnknown *punk, + [in] int iOffset, + [in] int idsTemplate, + [out, size_is(cchText)] LPWSTR pwzText, + [in] DWORD cchText); + + HRESULT InsertMenuEntries( + [in] IUnknown *punk, + [in] HMENU hmenu, + [in] int nPos, + [in] int idFirst, + [in] int idLast, + [in] DWORD dwFlags); + + HRESULT Clone( + [out] ITravelLog **pptl); + + DWORD CountEntries( + [in] IUnknown *punk); + + HRESULT Revert(); +}; + +typedef enum tagBNSTATE +{ + BNS_NORMAL = 0, + BNS_BEGIN_NAVIGATE = 1, + BNS_NAVIGATE = 2 + +} BNSTATE; + +enum { + SBSC_HIDE = 0, + SBSC_SHOW = 1, + SBSC_TOGGLE = 2, + SBSC_QUERY = 3 +}; + +cpp_quote("#define BSF_REGISTERASDROPTARGET 0x00000001") +cpp_quote("#define BSF_THEATERMODE 0x00000002") +cpp_quote("#define BSF_NOLOCALFILEWARNING 0x00000010") +cpp_quote("#define BSF_UISETBYAUTOMATION 0x00000100") +cpp_quote("#define BSF_RESIZABLE 0x00000200") +cpp_quote("#define BSF_CANMAXIMIZE 0x00000400") +cpp_quote("#define BSF_TOPBROWSER 0x00000800") +cpp_quote("#define BSF_NAVNOHISTORY 0x00001000") +cpp_quote("#define BSF_HTMLNAVCANCELED 0x00002000") +cpp_quote("#define BSF_DONTSHOWNAVCANCELPAGE 0x00004000") +cpp_quote("#define BSF_SETNAVIGATABLECODEPAGE 0x00008000") +cpp_quote("#define BSF_DELEGATEDNAVIGATION 0x00010000") +cpp_quote("#define BSF_TRUSTEDFORACTIVEX 0x00020000") + +cpp_quote("#define HLNF_CALLERUNTRUSTED 0x00200000") +cpp_quote("#define HLNF_TRUSTEDFORACTIVEX 0x00400000") +cpp_quote("#define HLNF_DISABLEWINDOWRESTRICTIONS 0x00800000") +cpp_quote("#define HLNF_TRUSTFIRSTDOWNLOAD 0x01000000") +cpp_quote("#define HLNF_UNTRUSTEDFORDOWNLOAD 0x02000000") +cpp_quote("#define SHHLNF_NOAUTOSELECT 0x04000000") +cpp_quote("#define SHHLNF_WRITENOHISTORY 0x08000000") +cpp_quote("#define HLNF_EXTERNALNAVIGATE 0x10000000") +cpp_quote("#define HLNF_ALLOW_AUTONAVIGATE 0x20000000") +cpp_quote("#define HLNF_NEWWINDOWSMANAGED 0x80000000") + +[ + local, + object, + uuid(02ba3b52-0547-11d1-b833-00c04fc9b31f) +] +interface IBrowserService : IUnknown +{ + HRESULT GetParentSite( + [out] IOleInPlaceSite **ppipsite); + + HRESULT SetTitle( + [in] IShellView *psv, + [in] LPCWSTR pszName); + + HRESULT GetTitle( + [in] IShellView *psv, + [out, size_is(cchName)] LPWSTR pszName, + [in] DWORD cchName); + + HRESULT GetOleObject( + [out] IOleObject **ppobjv); + + HRESULT GetTravelLog( + [out, optional] ITravelLog **pptl); + + HRESULT ShowControlWindow( + [in] UINT id, + [in] BOOL fShow); + + HRESULT IsControlWindowShown( + [in] UINT id, + [out] BOOL *pfShown); + + HRESULT IEGetDisplayName( + [in] PCIDLIST_ABSOLUTE pidl, + [out] LPWSTR pwszName, + [in] UINT uFlags); + + HRESULT IEParseDisplayName( + [in] UINT uiCP, + [in] LPCWSTR pwszPath, + [out] PIDLIST_ABSOLUTE *ppidlOut); + + HRESULT DisplayParseError( + [in] HRESULT hres, + [in] LPCWSTR pwszPath); + + HRESULT NavigateToPidl( + [in] PCIDLIST_ABSOLUTE pidl, + [in] DWORD grfHLNF); + + HRESULT SetNavigateState( + [in] BNSTATE bnstate); + + HRESULT GetNavigateState( + [out] BNSTATE *pbnstate); + + HRESULT NotifyRedirect( + [in] IShellView *psv, + [in] PCIDLIST_ABSOLUTE pidl, + [out] BOOL *pfDidBrowse); + + HRESULT UpdateWindowList(); + + HRESULT UpdateBackForwardState(); + + HRESULT SetFlags( + [in] DWORD dwFlags, + [in] DWORD dwFlagMask); + + HRESULT GetFlags( + [out] DWORD *pdwFlags); + + HRESULT CanNavigateNow(); + + HRESULT GetPidl( + [out] PIDLIST_ABSOLUTE *ppidl); + + HRESULT SetReferrer( + [in] PCIDLIST_ABSOLUTE pidl); + + DWORD GetBrowserIndex(); + + HRESULT GetBrowserByIndex( + [in] DWORD dwID, + [out] IUnknown **ppunk); + + HRESULT GetHistoryObject( + [out] IOleObject **ppole, + [out] IStream **pstm, + [out] IBindCtx **ppbc); + + HRESULT SetHistoryObject( + [in] IOleObject *pole, + [in] BOOL fIsLocalAnchor); + + HRESULT CacheOLEServer( + [in] IOleObject *pole); + + HRESULT GetSetCodePage( + [in] VARIANT *pvarIn, + [out] VARIANT *pvarOut); + + HRESULT OnHttpEquiv( + [in] IShellView *psv, + [in] BOOL fDone, + [in] VARIANT *pvarargIn, + [out] VARIANT *pvarargOut); + + HRESULT GetPalette( + [out] HPALETTE *hpal); + + HRESULT RegisterWindow( + [in] BOOL fForceRegister, + [in] int swc); +} [ object,

1 0

Piotr Caban : include: Added IDocObjectService interface definition.
by Alexandre Julliard March 11, 2011

March 11, 2011

Module: wine Branch: master Commit: 3660bf72a75ba614c0eddd1ec520ce98513de32d URL: http://source.winehq.org/git/wine.git/?a=commit;h=3660bf72a75ba614c0eddd1ec… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Mar 11 11:13:58 2011 +0100 include: Added IDocObjectService interface definition. --- .gitignore | 1 + dlls/uuid/uuid.c | 1 + include/Makefile.in | 1 + include/docobjectservice.idl | 67 ++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 70 insertions(+), 0 deletions(-) diff --git a/.gitignore b/.gitignore index 0a6a589..84bddc8 100644 --- a/.gitignore +++ b/.gitignore @@ -167,6 +167,7 @@ include/devicetopology.h include/dimm.h include/dispex.h include/docobj.h +include/docobjectservice.h include/downloadmgr.h include/dxgi.h include/dxgitype.h diff --git a/dlls/uuid/uuid.c b/dlls/uuid/uuid.c index 8df7334..d4ad2ae 100644 --- a/dlls/uuid/uuid.c +++ b/dlls/uuid/uuid.c @@ -62,6 +62,7 @@ DEFINE_GUID(GUID_NULL,0,0,0,0,0,0,0,0,0,0,0); #include "mlang.h" #include "mshtml.h" #include "mshtmhst.h" +#include "docobjectservice.h" #include "richole.h" #include "downloadmgr.h" #include "objsel.h" diff --git a/include/Makefile.in b/include/Makefile.in index e5c2b53..e677f38 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -30,6 +30,7 @@ PUBLIC_IDL_H_SRCS = \ dimm.idl \ dispex.idl \ docobj.idl \ + docobjectservice.idl \ downloadmgr.idl \ dxgi.idl \ dxgitype.idl \ diff --git a/include/docobjectservice.idl b/include/docobjectservice.idl new file mode 100644 index 0000000..7478551 --- /dev/null +++ b/include/docobjectservice.idl @@ -0,0 +1,67 @@ +/* + * Copyright 2011 Piotr Caban for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +import "objidl.idl"; +import "mshtml.idl"; + +[ + local, + object, + uuid(3050f801-98b5-11cf-bb82-00aa00bdce0b) +] +interface IDocObjectService : IUnknown +{ + HRESULT FireBeforeNavigate2( + [in] IDispatch *pDispatch, + [in] LPCWSTR lpszUrl, + [in] DWORD dwFlags, + [in] LPCWSTR lpszFrameName, + [in] BYTE *pPostData, + [in] DWORD cbPostData, + [in] LPCWSTR lpszHeaders, + [in] BOOL fPlayNavSound, + [out] BOOL *pfCancel); + + HRESULT FireNavigateComplete2( + [in] IHTMLWindow2 *pHTMLWindow2, + [in] DWORD dwFlags); + + HRESULT FireDownloadBegin(void); + + HRESULT FireDownloadComplete(void); + + HRESULT FireDocumentComplete( + [in] IHTMLWindow2 *pHTMLWindow, + [in] DWORD dwFlags); + + HRESULT UpdateDesktopComponent( + [in] IHTMLWindow2 *pHTMLWindow); + + HRESULT GetPendingUrl( + [out] BSTR *pbstrPendingUrl); + + HRESULT ActiveElementChanged( + [in] IHTMLElement *pHTMLElement); + + HRESULT GetUrlSearchComponent( + [out] BSTR *pbstrSearch); + + HRESULT IsErrorUrl( + [in] LPCWSTR lpszUrl, + [out] BOOL *pfIsError); +};

1 0

Alexandre Julliard : gdi32: Move all the metafile DC setting functions to mfdrv/dc.c
by Alexandre Julliard March 11, 2011

March 11, 2011

Module: wine Branch: master Commit: 7d1dd28d25e8d7dd2494022d17434eb5a9234549 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7d1dd28d25e8d7dd2494022d1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Mar 11 12:03:41 2011 +0100 gdi32: Move all the metafile DC setting functions to mfdrv/dc.c --- dlls/gdi32/Makefile.in | 1 - dlls/gdi32/mfdrv/dc.c | 64 +++++++++++++++++++++++-- dlls/gdi32/mfdrv/graphics.c | 22 --------- dlls/gdi32/mfdrv/mapping.c | 107 ------------------------------------------- 4 files changed, 58 insertions(+), 136 deletions(-) diff --git a/dlls/gdi32/Makefile.in b/dlls/gdi32/Makefile.in index 0de8477..45740b1 100644 --- a/dlls/gdi32/Makefile.in +++ b/dlls/gdi32/Makefile.in @@ -32,7 +32,6 @@ C_SRCS = \ mfdrv/dc.c \ mfdrv/graphics.c \ mfdrv/init.c \ - mfdrv/mapping.c \ mfdrv/objects.c \ mfdrv/text.c \ opengl.c \ diff --git a/dlls/gdi32/mfdrv/dc.c b/dlls/gdi32/mfdrv/dc.c index 4929f0d..fb66d2b 100644 --- a/dlls/gdi32/mfdrv/dc.c +++ b/dlls/gdi32/mfdrv/dc.c @@ -40,6 +40,16 @@ INT CDECL MFDRV_SetBkMode( PHYSDEV dev, INT mode ) return MFDRV_MetaParam1( dev, META_SETBKMODE, (WORD)mode) ? mode : 0; } +COLORREF CDECL MFDRV_SetBkColor( PHYSDEV dev, COLORREF color ) +{ + return MFDRV_MetaParam2(dev, META_SETBKCOLOR, HIWORD(color), LOWORD(color)) ? color : CLR_INVALID; +} + +COLORREF CDECL MFDRV_SetTextColor( PHYSDEV dev, COLORREF color ) +{ + return MFDRV_MetaParam2(dev, META_SETTEXTCOLOR, HIWORD(color), LOWORD(color)) ? color : CLR_INVALID; +} + INT CDECL MFDRV_SetROP2( PHYSDEV dev, INT rop ) { return MFDRV_MetaParam1( dev, META_SETROP2, (WORD)rop) ? rop : 0; @@ -62,14 +72,12 @@ INT CDECL MFDRV_SetStretchBltMode( PHYSDEV dev, INT mode ) INT CDECL MFDRV_IntersectClipRect( PHYSDEV dev, INT left, INT top, INT right, INT bottom ) { - return MFDRV_MetaParam4( dev, META_INTERSECTCLIPRECT, left, top, right, - bottom ); + return MFDRV_MetaParam4( dev, META_INTERSECTCLIPRECT, left, top, right, bottom ); } INT CDECL MFDRV_ExcludeClipRect( PHYSDEV dev, INT left, INT top, INT right, INT bottom ) { - return MFDRV_MetaParam4( dev, META_EXCLUDECLIPRECT, left, top, right, - bottom ); + return MFDRV_MetaParam4( dev, META_EXCLUDECLIPRECT, left, top, right, bottom ); } INT CDECL MFDRV_OffsetClipRgn( PHYSDEV dev, INT x, INT y ) @@ -77,6 +85,51 @@ INT CDECL MFDRV_OffsetClipRgn( PHYSDEV dev, INT x, INT y ) return MFDRV_MetaParam2( dev, META_OFFSETCLIPRGN, x, y ); } +INT CDECL MFDRV_SetMapMode( PHYSDEV dev, INT mode ) +{ + return MFDRV_MetaParam1( dev, META_SETMAPMODE, mode ); +} + +BOOL CDECL MFDRV_SetViewportExtEx( PHYSDEV dev, INT x, INT y, SIZE *size ) +{ + return MFDRV_MetaParam2( dev, META_SETVIEWPORTEXT, x, y ); +} + +BOOL CDECL MFDRV_SetViewportOrgEx( PHYSDEV dev, INT x, INT y, POINT *pt ) +{ + return MFDRV_MetaParam2( dev, META_SETVIEWPORTORG, x, y ); +} + +BOOL CDECL MFDRV_SetWindowExtEx( PHYSDEV dev, INT x, INT y, SIZE *size ) +{ + return MFDRV_MetaParam2( dev, META_SETWINDOWEXT, x, y ); +} + +BOOL CDECL MFDRV_SetWindowOrgEx( PHYSDEV dev, INT x, INT y, POINT *pt ) +{ + return MFDRV_MetaParam2( dev, META_SETWINDOWORG, x, y ); +} + +BOOL CDECL MFDRV_OffsetViewportOrgEx( PHYSDEV dev, INT x, INT y, POINT *pt ) +{ + return MFDRV_MetaParam2( dev, META_OFFSETVIEWPORTORG, x, y ); +} + +BOOL CDECL MFDRV_OffsetWindowOrgEx( PHYSDEV dev, INT x, INT y, POINT *pt ) +{ + return MFDRV_MetaParam2( dev, META_OFFSETWINDOWORG, x, y ); +} + +BOOL CDECL MFDRV_ScaleViewportExtEx( PHYSDEV dev, INT xNum, INT xDenom, INT yNum, INT yDenom, SIZE *size ) +{ + return MFDRV_MetaParam4( dev, META_SCALEVIEWPORTEXT, xNum, xDenom, yNum, yDenom ); +} + +BOOL CDECL MFDRV_ScaleWindowExtEx( PHYSDEV dev, INT xNum, INT xDenom, INT yNum, INT yDenom, SIZE *size ) +{ + return MFDRV_MetaParam4( dev, META_SCALEWINDOWEXT, xNum, xDenom, yNum, yDenom ); +} + BOOL CDECL MFDRV_SetTextJustification( PHYSDEV dev, INT extra, INT breaks ) { return MFDRV_MetaParam2( dev, META_SETTEXTJUSTIFICATION, extra, breaks ); @@ -89,8 +142,7 @@ INT CDECL MFDRV_SetTextCharacterExtra( PHYSDEV dev, INT extra ) DWORD CDECL MFDRV_SetMapperFlags( PHYSDEV dev, DWORD flags ) { - return MFDRV_MetaParam2( dev, META_SETMAPPERFLAGS, HIWORD(flags), - LOWORD(flags) ) ? flags : GDI_ERROR; + return MFDRV_MetaParam2( dev, META_SETMAPPERFLAGS, HIWORD(flags), LOWORD(flags) ) ? flags : GDI_ERROR; } BOOL CDECL MFDRV_AbortPath( PHYSDEV dev ) diff --git a/dlls/gdi32/mfdrv/graphics.c b/dlls/gdi32/mfdrv/graphics.c index e2cc6eb..0ee1b0c 100644 --- a/dlls/gdi32/mfdrv/graphics.c +++ b/dlls/gdi32/mfdrv/graphics.c @@ -430,28 +430,6 @@ INT CDECL MFDRV_ExtSelectClipRgn( PHYSDEV dev, HRGN hrgn, INT mode ) /********************************************************************** - * MFDRV_SetBkColor - */ -COLORREF CDECL -MFDRV_SetBkColor( PHYSDEV dev, COLORREF color ) -{ - return MFDRV_MetaParam2(dev, META_SETBKCOLOR, HIWORD(color), - LOWORD(color)) ? color : CLR_INVALID; -} - - -/********************************************************************** - * MFDRV_SetTextColor - */ -COLORREF CDECL -MFDRV_SetTextColor( PHYSDEV dev, COLORREF color ) -{ - return MFDRV_MetaParam2(dev, META_SETTEXTCOLOR, HIWORD(color), - LOWORD(color)) ? color : CLR_INVALID; -} - - -/********************************************************************** * MFDRV_PolyBezier * Since MetaFiles don't record Beziers and they don't even record * approximations to them using lines, we need this stub function. diff --git a/dlls/gdi32/mfdrv/mapping.c b/dlls/gdi32/mfdrv/mapping.c deleted file mode 100644 index 0b88515..0000000 --- a/dlls/gdi32/mfdrv/mapping.c +++ /dev/null @@ -1,107 +0,0 @@ -/* - * Metafile GDI mapping mode functions - * - * Copyright 1996 Alexandre Julliard - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - */ - -#include <stdarg.h> -#include "windef.h" -#include "winbase.h" -#include "wingdi.h" -#include "gdi_private.h" -#include "mfdrv/metafiledrv.h" - - -/*********************************************************************** - * MFDRV_SetMapMode - */ -INT CDECL MFDRV_SetMapMode( PHYSDEV dev, INT mode ) -{ - return MFDRV_MetaParam1( dev, META_SETMAPMODE, mode ); -} - - -/*********************************************************************** - * MFDRV_SetViewportExtEx - */ -BOOL CDECL MFDRV_SetViewportExtEx( PHYSDEV dev, INT x, INT y, SIZE *size ) -{ - return MFDRV_MetaParam2( dev, META_SETVIEWPORTEXT, x, y ); -} - - -/*********************************************************************** - * MFDRV_SetViewportOrgEx - */ -BOOL CDECL MFDRV_SetViewportOrgEx( PHYSDEV dev, INT x, INT y, POINT *pt ) -{ - return MFDRV_MetaParam2( dev, META_SETVIEWPORTORG, x, y ); -} - - -/*********************************************************************** - * MFDRV_SetWindowExtEx - */ -BOOL CDECL MFDRV_SetWindowExtEx( PHYSDEV dev, INT x, INT y, SIZE *size ) -{ - return MFDRV_MetaParam2( dev, META_SETWINDOWEXT, x, y ); -} - - -/*********************************************************************** - * MFDRV_SetWindowOrgEx - */ -BOOL CDECL MFDRV_SetWindowOrgEx( PHYSDEV dev, INT x, INT y, POINT *pt ) -{ - return MFDRV_MetaParam2( dev, META_SETWINDOWORG, x, y ); -} - - -/*********************************************************************** - * MFDRV_OffsetViewportOrgEx - */ -BOOL CDECL MFDRV_OffsetViewportOrgEx( PHYSDEV dev, INT x, INT y, POINT *pt ) -{ - return MFDRV_MetaParam2( dev, META_OFFSETVIEWPORTORG, x, y ); -} - - -/*********************************************************************** - * MFDRV_OffsetWindowOrgEx - */ -BOOL CDECL MFDRV_OffsetWindowOrgEx( PHYSDEV dev, INT x, INT y, POINT *pt ) -{ - return MFDRV_MetaParam2( dev, META_OFFSETWINDOWORG, x, y ); -} - - -/*********************************************************************** - * MFDRV_ScaleViewportExtEx - */ -BOOL CDECL MFDRV_ScaleViewportExtEx( PHYSDEV dev, INT xNum, INT xDenom, INT yNum, INT yDenom, SIZE *size ) -{ - return MFDRV_MetaParam4( dev, META_SCALEVIEWPORTEXT, xNum, xDenom, yNum, yDenom ); -} - - -/*********************************************************************** - * MFDRV_ScaleWindowExtEx - */ -BOOL CDECL MFDRV_ScaleWindowExtEx( PHYSDEV dev, INT xNum, INT xDenom, INT yNum, INT yDenom, SIZE *size ) -{ - return MFDRV_MetaParam4( dev, META_SCALEWINDOWEXT, xNum, xDenom, yNum, yDenom ); -}

1 0

Piotr Caban : mshtml: Added IHTMLPrivateWindow_GetAddressBarUrl implementation.
by Alexandre Julliard March 11, 2011

March 11, 2011

Module: wine Branch: master Commit: 12b85befc0bc211d1af51b54eea6c13d24ec6171 URL: http://source.winehq.org/git/wine.git/?a=commit;h=12b85befc0bc211d1af51b54e… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Mar 11 11:14:08 2011 +0100 mshtml: Added IHTMLPrivateWindow_GetAddressBarUrl implementation. --- dlls/mshtml/htmlwindow.c | 9 +++++++-- dlls/mshtml/tests/htmldoc.c | 14 ++++++++++++-- 2 files changed, 19 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/htmlwindow.c b/dlls/mshtml/htmlwindow.c index 99d03b3..0e42021 100644 --- a/dlls/mshtml/htmlwindow.c +++ b/dlls/mshtml/htmlwindow.c @@ -1777,8 +1777,13 @@ static HRESULT WINAPI HTMLPrivateWindow_FindWindowByName(IHTMLPrivateWindow *ifa static HRESULT WINAPI HTMLPrivateWindow_GetAddressBar(IHTMLPrivateWindow *iface, BSTR *url) { HTMLWindow *This = impl_from_IHTMLPrivateWindow(iface); - FIXME("(%p)->(%p)\n", This, url); - return E_NOTIMPL; + TRACE("(%p)->(%p)\n", This, url); + + if(!url) + return E_INVALIDARG; + + *url = SysAllocString(This->url); + return S_OK; } static const IHTMLPrivateWindowVtbl HTMLPrivateWindowVtbl = { diff --git a/dlls/mshtml/tests/htmldoc.c b/dlls/mshtml/tests/htmldoc.c index ab5e17b..11b2036 100644 --- a/dlls/mshtml/tests/htmldoc.c +++ b/dlls/mshtml/tests/htmldoc.c @@ -3533,7 +3533,6 @@ static void test_put_href(IHTMLDocument2 *doc, BOOL use_replace) str2 = a2bstr(""); V_VT(&vempty) = VT_EMPTY; hres = IHTMLPrivateWindow_SuperNavigate(priv_window, str, str2, NULL, NULL, &vempty, &vempty, 0); - SysFreeString(str); SysFreeString(str2); ok(hres == S_OK, "SuperNavigate failed: %08x\n", hres); @@ -3548,9 +3547,20 @@ static void test_put_href(IHTMLDocument2 *doc, BOOL use_replace) test_GetCurMoniker(doc_unk, doc_mon, NULL); doc_mon = NULL; } - IHTMLPrivateWindow_Release(priv_window); + hres = IHTMLPrivateWindow_GetAddressBarUrl(priv_window, &str2); + ok(hres == S_OK, "GetAddressBarUrl failed: %08x\n", hres); + ok(!strcmp_wa(str2, use_replace?"about:blank":"http://www.winehq.org/"), + "unexpected address bar url: %s\n", wine_dbgstr_w(str2)); + SysFreeString(str2); test_download(DWL_VERBDONE); + + hres = IHTMLPrivateWindow_GetAddressBarUrl(priv_window, &str2); + ok(hres == S_OK, "GetAddressBarUrl failed: %08x\n", hres); + ok(!lstrcmpW(str2, str), "unexpected address bar url: %s\n", wine_dbgstr_w(str2)); + SysFreeString(str2); + SysFreeString(str); + IHTMLPrivateWindow_Release(priv_window); } static void test_open_window(IHTMLDocument2 *doc)

1 0

Nikolay Sivov : msxml3: Fix reference counting behaviour for named map.
by Alexandre Julliard March 11, 2011

March 11, 2011

Module: wine Branch: master Commit: 68cc66d8000bb7b0acd13986b54a95155b434790 URL: http://source.winehq.org/git/wine.git/?a=commit;h=68cc66d8000bb7b0acd13986b… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Mar 10 21:56:51 2011 +0300 msxml3: Fix reference counting behaviour for named map. --- dlls/msxml3/element.c | 6 ++-- dlls/msxml3/msxml_private.h | 2 +- dlls/msxml3/nodemap.c | 46 ++++++++++-------------------------------- dlls/msxml3/tests/domdoc.c | 45 ++++++++++++++++++++++++++++++++++++++++- 4 files changed, 58 insertions(+), 41 deletions(-) diff --git a/dlls/msxml3/element.c b/dlls/msxml3/element.c index 8d81f67..4c3a9b3 100644 --- a/dlls/msxml3/element.c +++ b/dlls/msxml3/element.c @@ -314,13 +314,13 @@ static HRESULT WINAPI domelem_get_nextSibling( static HRESULT WINAPI domelem_get_attributes( IXMLDOMElement *iface, - IXMLDOMNamedNodeMap** attributeMap) + IXMLDOMNamedNodeMap** map) { domelem *This = impl_from_IXMLDOMElement( iface ); - TRACE("(%p)->(%p)\n", This, attributeMap); + TRACE("(%p)->(%p)\n", This, map); - *attributeMap = create_nodemap((IXMLDOMNode*)&This->IXMLDOMElement_iface); + *map = create_nodemap(This->node.node); return S_OK; } diff --git a/dlls/msxml3/msxml_private.h b/dlls/msxml3/msxml_private.h index 72de7ba..4e3b35b 100644 --- a/dlls/msxml3/msxml_private.h +++ b/dlls/msxml3/msxml_private.h @@ -186,7 +186,7 @@ extern IUnknown *create_pi( xmlNodePtr pi ); extern IUnknown *create_comment( xmlNodePtr comment ); extern IUnknown *create_cdata( xmlNodePtr text ); extern IXMLDOMNodeList *create_children_nodelist( xmlNodePtr ); -extern IXMLDOMNamedNodeMap *create_nodemap( IXMLDOMNode *node ); +extern IXMLDOMNamedNodeMap *create_nodemap( const xmlNodePtr ); extern IUnknown *create_doc_Implementation(void); extern IUnknown *create_doc_fragment( xmlNodePtr fragment ); extern IUnknown *create_doc_entity_ref( xmlNodePtr entity ); diff --git a/dlls/msxml3/nodemap.c b/dlls/msxml3/nodemap.c index 660eab6..20475ca 100644 --- a/dlls/msxml3/nodemap.c +++ b/dlls/msxml3/nodemap.c @@ -48,7 +48,8 @@ typedef struct _xmlnodemap IXMLDOMNamedNodeMap IXMLDOMNamedNodeMap_iface; ISupportErrorInfo ISupportErrorInfo_iface; LONG ref; - IXMLDOMNode *node; + + xmlNodePtr node; LONG iterator; } xmlnodemap; @@ -109,7 +110,7 @@ static ULONG WINAPI xmlnodemap_Release( TRACE("(%p)->(%d)\n", This, ref); if ( ref == 0 ) { - IXMLDOMNode_Release( This->node ); + xmldoc_release( This->node->doc ); heap_free( This ); } @@ -217,7 +218,6 @@ static HRESULT WINAPI xmlnodemap_setNamedItem( { xmlnodemap *This = impl_from_IXMLDOMNamedNodeMap( iface ); xmlNodePtr nodeNew; - xmlNodePtr node; xmlnode *ThisNew; TRACE("(%p)->(%p %p)\n", This, newItem, namedItem ); @@ -227,10 +227,6 @@ static HRESULT WINAPI xmlnodemap_setNamedItem( if(namedItem) *namedItem = NULL; - node = xmlNodePtr_from_domnode( This->node, 0 ); - if ( !node ) - return E_FAIL; - /* Must be an Attribute */ ThisNew = get_node_obj( newItem ); if(!ThisNew) return E_FAIL; @@ -242,7 +238,7 @@ static HRESULT WINAPI xmlnodemap_setNamedItem( if(xmldoc_remove_orphan(ThisNew->node->doc, ThisNew->node) != S_OK) WARN("%p is not an orphan of %p\n", ThisNew->node, ThisNew->node->doc); - nodeNew = xmlAddChild(node, ThisNew->node); + nodeNew = xmlAddChild(This->node, ThisNew->node); if(namedItem) *namedItem = create_node( nodeNew ); @@ -265,7 +261,6 @@ static HRESULT WINAPI xmlnodemap_get_item( IXMLDOMNode** listItem) { xmlnodemap *This = impl_from_IXMLDOMNamedNodeMap( iface ); - xmlNodePtr node; xmlAttrPtr curr; LONG attrIndex; @@ -276,8 +271,7 @@ static HRESULT WINAPI xmlnodemap_get_item( if (index < 0) return S_FALSE; - node = xmlNodePtr_from_domnode( This->node, 0 ); - curr = node->properties; + curr = This->node->properties; for (attrIndex = 0; attrIndex < index; attrIndex++) { if (curr->next == NULL) @@ -295,7 +289,6 @@ static HRESULT WINAPI xmlnodemap_get_length( IXMLDOMNamedNodeMap *iface, LONG *listLength) { - xmlNodePtr node; xmlAttrPtr first; xmlAttrPtr curr; LONG attrCount; @@ -307,11 +300,7 @@ static HRESULT WINAPI xmlnodemap_get_length( if( !listLength ) return E_INVALIDARG; - node = xmlNodePtr_from_domnode( This->node, 0 ); - if ( !node ) - return E_FAIL; - - first = node->properties; + first = This->node->properties; if (first == NULL) { *listLength = 0; return S_OK; @@ -336,7 +325,6 @@ static HRESULT WINAPI xmlnodemap_getQualifiedItem( { xmlnodemap *This = impl_from_IXMLDOMNamedNodeMap( iface ); xmlAttrPtr attr; - xmlNodePtr node; xmlChar *href; xmlChar *name; @@ -344,10 +332,6 @@ static HRESULT WINAPI xmlnodemap_getQualifiedItem( if (!baseName || !qualifiedItem) return E_INVALIDARG; - node = xmlNodePtr_from_domnode(This->node, XML_ELEMENT_NODE); - if ( !node ) - return E_FAIL; - if (namespaceURI && *namespaceURI) { href = xmlChar_from_wchar(namespaceURI); @@ -363,7 +347,7 @@ static HRESULT WINAPI xmlnodemap_getQualifiedItem( return E_OUTOFMEMORY; } - attr = xmlHasNsProp(node, name, href); + attr = xmlHasNsProp(This->node, name, href); heap_free(name); heap_free(href); @@ -387,7 +371,6 @@ static HRESULT WINAPI xmlnodemap_removeQualifiedItem( { xmlnodemap *This = impl_from_IXMLDOMNamedNodeMap( iface ); xmlAttrPtr attr; - xmlNodePtr node; xmlChar *name; xmlChar *href; @@ -395,10 +378,6 @@ static HRESULT WINAPI xmlnodemap_removeQualifiedItem( if (!baseName) return E_INVALIDARG; - node = xmlNodePtr_from_domnode( This->node, XML_ELEMENT_NODE ); - if ( !node ) - return E_FAIL; - if (namespaceURI && *namespaceURI) { href = xmlChar_from_wchar(namespaceURI); @@ -414,7 +393,7 @@ static HRESULT WINAPI xmlnodemap_removeQualifiedItem( return E_OUTOFMEMORY; } - attr = xmlHasNsProp( node, name, href ); + attr = xmlHasNsProp( This->node, name, href ); heap_free(name); heap_free(href); @@ -445,7 +424,6 @@ static HRESULT WINAPI xmlnodemap_nextNode( IXMLDOMNode** nextItem) { xmlnodemap *This = impl_from_IXMLDOMNamedNodeMap( iface ); - xmlNodePtr node; xmlAttrPtr curr; LONG attrIndex; @@ -453,8 +431,7 @@ static HRESULT WINAPI xmlnodemap_nextNode( *nextItem = NULL; - node = xmlNodePtr_from_domnode( This->node, 0 ); - curr = node->properties; + curr = This->node->properties; for (attrIndex = 0; attrIndex < This->iterator; attrIndex++) { if (curr->next == NULL) @@ -551,7 +528,7 @@ static const struct ISupportErrorInfoVtbl support_error_vtbl = support_error_InterfaceSupportsErrorInfo }; -IXMLDOMNamedNodeMap *create_nodemap( IXMLDOMNode *node ) +IXMLDOMNamedNodeMap *create_nodemap( const xmlNodePtr node ) { xmlnodemap *nodemap; @@ -565,8 +542,7 @@ IXMLDOMNamedNodeMap *create_nodemap( IXMLDOMNode *node ) nodemap->ref = 1; nodemap->iterator = 0; - IXMLDOMNode_AddRef( node ); - /* Since we AddRef a node here, we don't need to call xmldoc_add_ref() */ + xmldoc_add_ref(node->doc); return &nodemap->IXMLDOMNamedNodeMap_iface; } diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index 42fd22a..370c56e 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -8329,6 +8329,7 @@ static void test_get_nodeTypeString(void) ok(!lstrcmpW(str, _bstr_(entry->string)), "got string %s, expected %s. node type %d\n", wine_dbgstr_w(str), entry->string, entry->type); SysFreeString(str); + IXMLDOMNode_Release(node); entry++; } @@ -8358,14 +8359,15 @@ static void test_get_attributes(void) const get_attributes_t *entry = get_attributes; IXMLDOMNamedNodeMap *map; IXMLDOMDocument *doc; - IXMLDOMNode *node; + IXMLDOMNode *node, *node2; VARIANT_BOOL b; HRESULT hr; BSTR str; + LONG length; doc = create_document(&IID_IXMLDOMDocument); - str = SysAllocString( szComplete3 ); + str = SysAllocString( szComplete4 ); hr = IXMLDOMDocument_loadXML(doc, str, &b); SysFreeString(str); @@ -8403,6 +8405,43 @@ static void test_get_attributes(void) IXMLDOMNode_Release(node); + /* last child is element */ + EXPECT_REF(doc, 1); + hr = IXMLDOMDocument_get_lastChild(doc, &node); + ok(hr == S_OK, "got %08x\n", hr); + EXPECT_REF(doc, 1); + + EXPECT_REF(node, 1); + hr = IXMLDOMNode_get_attributes(node, &map); + ok(hr == S_OK, "got %08x\n", hr); + EXPECT_REF(node, 1); + EXPECT_REF(doc, 1); + + EXPECT_REF(map, 1); + hr = IXMLDOMNamedNodeMap_get_item(map, 0, &node2); + ok(hr == S_OK, "got %08x\n", hr); + EXPECT_REF(node, 1); + EXPECT_REF(node2, 1); + EXPECT_REF(map, 1); + EXPECT_REF(doc, 1); + IXMLDOMNode_Release(node2); + + /* release node before map release, map still works */ + IXMLDOMNode_Release(node); + + length = 0; + hr = IXMLDOMNamedNodeMap_get_length(map, &length); + ok(hr == S_OK, "got %08x\n", hr); + ok(length == 1, "got %d\n", length); + + node2 = NULL; + hr = IXMLDOMNamedNodeMap_get_item(map, 0, &node2); + ok(hr == S_OK, "got %08x\n", hr); + EXPECT_REF(node2, 1); + IXMLDOMNode_Release(node2); + + IXMLDOMNamedNodeMap_Release(map); + while (entry->type) { VARIANT var; @@ -8423,6 +8462,8 @@ static void test_get_attributes(void) hr, entry->hr, entry->type); ok(map == NULL, "got %p\n", map); + IXMLDOMNode_Release(node); + entry++; }

1 0

Michael Stefaniuc : shdocvw: COM cleanup for the ITaskbarList iface.
by Alexandre Julliard March 11, 2011

March 11, 2011

Module: wine Branch: master Commit: 4f382430f2176bc576c80e89c8324107278c0ed6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4f382430f2176bc576c80e89c… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Mar 11 11:39:07 2011 +0100 shdocvw: COM cleanup for the ITaskbarList iface. --- dlls/shdocvw/taskbarlist.c | 15 ++++++++++----- 1 files changed, 10 insertions(+), 5 deletions(-) diff --git a/dlls/shdocvw/taskbarlist.c b/dlls/shdocvw/taskbarlist.c index 2c38080..d853506 100644 --- a/dlls/shdocvw/taskbarlist.c +++ b/dlls/shdocvw/taskbarlist.c @@ -27,10 +27,15 @@ WINE_DEFAULT_DEBUG_CHANNEL(shdocvw); struct taskbar_list { - const struct ITaskbarListVtbl *lpVtbl; + ITaskbarList ITaskbarList_iface; LONG refcount; }; +static inline struct taskbar_list *impl_from_ITaskbarList(ITaskbarList *iface) +{ + return CONTAINING_RECORD(iface, struct taskbar_list, ITaskbarList_iface); +} + /* IUnknown methods */ static HRESULT STDMETHODCALLTYPE taskbar_list_QueryInterface(ITaskbarList *iface, REFIID riid, void **object) @@ -53,7 +58,7 @@ static HRESULT STDMETHODCALLTYPE taskbar_list_QueryInterface(ITaskbarList *iface static ULONG STDMETHODCALLTYPE taskbar_list_AddRef(ITaskbarList *iface) { - struct taskbar_list *This = (struct taskbar_list *)iface; + struct taskbar_list *This = impl_from_ITaskbarList(iface); ULONG refcount = InterlockedIncrement(&This->refcount); TRACE("%p increasing refcount to %u\n", This, refcount); @@ -63,7 +68,7 @@ static ULONG STDMETHODCALLTYPE taskbar_list_AddRef(ITaskbarList *iface) static ULONG STDMETHODCALLTYPE taskbar_list_Release(ITaskbarList *iface) { - struct taskbar_list *This = (struct taskbar_list *)iface; + struct taskbar_list *This = impl_from_ITaskbarList(iface); ULONG refcount = InterlockedDecrement(&This->refcount); TRACE("%p decreasing refcount to %u\n", This, refcount); @@ -150,12 +155,12 @@ HRESULT TaskbarList_Create(IUnknown *outer, REFIID riid, void **taskbar_list) return E_OUTOFMEMORY; } - object->lpVtbl = &taskbar_list_vtbl; + object->ITaskbarList_iface.lpVtbl = &taskbar_list_vtbl; object->refcount = 0; TRACE("Created ITaskbarList %p\n", object); - hr = ITaskbarList_QueryInterface((ITaskbarList *)object, riid, taskbar_list); + hr = ITaskbarList_QueryInterface(&object->ITaskbarList_iface, riid, taskbar_list); if (FAILED(hr)) { HeapFree(GetProcessHeap(), 0, object);

1 0

Alexandre Julliard : gdi32: Move all the enhanced metafile DC setting functions to enhmfdrv/dc.c
by Alexandre Julliard March 11, 2011

March 11, 2011

Module: wine Branch: master Commit: 8c3766c5e7bf63826a4c4f1064483c9821ee43e8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8c3766c5e7bf63826a4c4f106… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Mar 11 12:03:41 2011 +0100 gdi32: Move all the enhanced metafile DC setting functions to enhmfdrv/dc.c --- dlls/gdi32/Makefile.in | 1 - dlls/gdi32/enhmfdrv/dc.c | 204 ++++++++++++++++++++++++++++++++++++++++ dlls/gdi32/enhmfdrv/graphics.c | 50 ---------- dlls/gdi32/enhmfdrv/mapping.c | 188 ------------------------------------ 4 files changed, 204 insertions(+), 239 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=8c3766c5e7bf63826a4c4…

1 0

Alexandre Julliard : gdi32: Add null driver entry points for the device printer functions.
by Alexandre Julliard March 11, 2011

March 11, 2011

Module: wine Branch: master Commit: d1db4c859c53f6e7f9789dd213874faa7312d8a0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d1db4c859c53f6e7f9789dd21… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Mar 11 12:15:38 2011 +0100 gdi32: Add null driver entry points for the device printer functions. --- dlls/gdi32/driver.c | 48 ++++++++++++++++++++++++++++++++++++------------ dlls/gdi32/gdiobj.c | 5 +++-- 2 files changed, 39 insertions(+), 14 deletions(-) diff --git a/dlls/gdi32/driver.c b/dlls/gdi32/driver.c index 3d5f0e7..e1a9897 100644 --- a/dlls/gdi32/driver.c +++ b/dlls/gdi32/driver.c @@ -334,6 +334,12 @@ static BOOL CDECL nulldrv_DeleteObject( PHYSDEV dev, HGDIOBJ obj ) return TRUE; } +static DWORD CDECL nulldrv_DeviceCapabilities( LPSTR buffer, LPCSTR device, LPCSTR port, + WORD cap, LPSTR output, DEVMODEA *devmode ) +{ + return -1; +} + static BOOL CDECL nulldrv_Ellipse( PHYSDEV dev, INT left, INT top, INT right, INT bottom ) { return TRUE; @@ -349,11 +355,28 @@ static INT CDECL nulldrv_EndPage( PHYSDEV dev ) return 0; } +static INT CDECL nulldrv_ExtDeviceMode( LPSTR buffer, HWND hwnd, DEVMODEA *output, LPSTR device, + LPSTR port, DEVMODEA *input, LPSTR profile, DWORD mode ) +{ + return -1; +} + +static INT CDECL nulldrv_ExtEscape( PHYSDEV dev, INT escape, INT in_size, const void *in_data, + INT out_size, void *out_data ) +{ + return 0; +} + static BOOL CDECL nulldrv_ExtFloodFill( PHYSDEV dev, INT x, INT y, COLORREF color, UINT type ) { return TRUE; } +static BOOL CDECL nulldrv_GdiComment( PHYSDEV dev, UINT size, const BYTE *data ) +{ + return FALSE; +} + static COLORREF CDECL nulldrv_GetPixel( PHYSDEV dev, INT x, INT y ) { return 0; @@ -613,7 +636,7 @@ const DC_FUNCTIONS null_driver = NULL, /* pDeleteDC */ nulldrv_DeleteObject, /* pDeleteObject */ NULL, /* pDescribePixelFormat */ - NULL, /* pDeviceCapabilities */ + nulldrv_DeviceCapabilities, /* pDeviceCapabilities */ nulldrv_Ellipse, /* pEllipse */ nulldrv_EndDoc, /* pEndDoc */ nulldrv_EndPage, /* pEndPage */ @@ -621,8 +644,8 @@ const DC_FUNCTIONS null_driver = NULL, /* pEnumICMProfiles */ NULL, /* pEnumDeviceFonts */ nulldrv_ExcludeClipRect, /* pExcludeClipRect */ - NULL, /* pExtDeviceMode */ - NULL, /* pExtEscape */ + nulldrv_ExtDeviceMode, /* pExtDeviceMode */ + nulldrv_ExtEscape, /* pExtEscape */ nulldrv_ExtFloodFill, /* pExtFloodFill */ nulldrv_ExtSelectClipRgn, /* pExtSelectClipRgn */ NULL, /* pExtTextOut */ @@ -630,7 +653,7 @@ const DC_FUNCTIONS null_driver = nulldrv_FillRgn, /* pFillRgn */ NULL, /* pFlattenPath */ nulldrv_FrameRgn, /* pFrameRgn */ - NULL, /* pGdiComment */ + nulldrv_GdiComment, /* pGdiComment */ NULL, /* pGetBitmapBits */ NULL, /* pGetCharWidth */ NULL, /* pGetDIBits */ @@ -887,9 +910,9 @@ INT WINAPI GDI_CallExtDeviceMode16( HWND hwnd, if ((dc = get_dc_ptr( hdc ))) { - if (dc->funcs->pExtDeviceMode) - ret = dc->funcs->pExtDeviceMode( buf, hwnd, lpdmOutput, lpszDevice, lpszPort, - lpdmInput, lpszProfile, fwMode ); + PHYSDEV physdev = GET_DC_PHYSDEV( dc, pExtDeviceMode ); + ret = physdev->funcs->pExtDeviceMode( buf, hwnd, lpdmOutput, lpszDevice, lpszPort, + lpdmInput, lpszProfile, fwMode ); release_dc_ptr( dc ); } DeleteDC( hdc ); @@ -941,9 +964,9 @@ DWORD WINAPI GDI_CallDeviceCapabilities16( LPCSTR lpszDevice, LPCSTR lpszPort, if ((dc = get_dc_ptr( hdc ))) { - if (dc->funcs->pDeviceCapabilities) - ret = dc->funcs->pDeviceCapabilities( buf, lpszDevice, lpszPort, - fwCapability, lpszOutput, lpdm ); + PHYSDEV physdev = GET_DC_PHYSDEV( dc, pDeviceCapabilities ); + ret = physdev->funcs->pDeviceCapabilities( buf, lpszDevice, lpszPort, + fwCapability, lpszOutput, lpdm ); release_dc_ptr( dc ); } DeleteDC( hdc ); @@ -1069,10 +1092,11 @@ INT WINAPI ExtEscape( HDC hdc, INT nEscape, INT cbInput, LPCSTR lpszInData, { INT ret = 0; DC * dc = get_dc_ptr( hdc ); + if (dc) { - if (dc->funcs->pExtEscape) - ret = dc->funcs->pExtEscape( dc->physDev, nEscape, cbInput, lpszInData, cbOutput, lpszOutData ); + PHYSDEV physdev = GET_DC_PHYSDEV( dc, pExtEscape ); + ret = physdev->funcs->pExtEscape( physdev, nEscape, cbInput, lpszInData, cbOutput, lpszOutData ); release_dc_ptr( dc ); } return ret; diff --git a/dlls/gdi32/gdiobj.c b/dlls/gdi32/gdiobj.c index 35b8068..4d84342 100644 --- a/dlls/gdi32/gdiobj.c +++ b/dlls/gdi32/gdiobj.c @@ -1278,10 +1278,11 @@ BOOL WINAPI GdiComment(HDC hdc, UINT cbSize, const BYTE *lpData) { DC *dc = get_dc_ptr(hdc); BOOL ret = FALSE; + if(dc) { - if (dc->funcs->pGdiComment) - ret = dc->funcs->pGdiComment( dc->physDev, cbSize, lpData ); + PHYSDEV physdev = GET_DC_PHYSDEV( dc, pGdiComment ); + ret = physdev->funcs->pGdiComment( physdev, cbSize, lpData ); release_dc_ptr( dc ); } return ret;

1 0

Alexandre Julliard : gdi32: Add null driver entry points for the pixel format functions.
by Alexandre Julliard March 11, 2011

March 11, 2011

Module: wine Branch: master Commit: 806d0c4f86db654dc72a28cfd94b98233ef102fb URL: http://source.winehq.org/git/wine.git/?a=commit;h=806d0c4f86db654dc72a28cfd… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Mar 11 12:26:25 2011 +0100 gdi32: Add null driver entry points for the pixel format functions. --- dlls/gdi32/driver.c | 36 +++++++++++++++++++++--- dlls/gdi32/painting.c | 70 +++++++++++++++++++++---------------------------- 2 files changed, 61 insertions(+), 45 deletions(-) diff --git a/dlls/gdi32/driver.c b/dlls/gdi32/driver.c index e1a9897..61cbfe5 100644 --- a/dlls/gdi32/driver.c +++ b/dlls/gdi32/driver.c @@ -323,6 +323,11 @@ static BOOL CDECL nulldrv_Arc( PHYSDEV dev, INT left, INT top, INT right, INT bo return TRUE; } +static INT CDECL nulldrv_ChoosePixelFormat( PHYSDEV dev, const PIXELFORMATDESCRIPTOR *descr ) +{ + return 0; +} + static BOOL CDECL nulldrv_Chord( PHYSDEV dev, INT left, INT top, INT right, INT bottom, INT xstart, INT ystart, INT xend, INT yend ) { @@ -334,6 +339,12 @@ static BOOL CDECL nulldrv_DeleteObject( PHYSDEV dev, HGDIOBJ obj ) return TRUE; } +static INT CDECL nulldrv_DescribePixelFormat( PHYSDEV dev, INT format, + UINT size, PIXELFORMATDESCRIPTOR * descr ) +{ + return 0; +} + static DWORD CDECL nulldrv_DeviceCapabilities( LPSTR buffer, LPCSTR device, LPCSTR port, WORD cap, LPSTR output, DEVMODEA *devmode ) { @@ -382,6 +393,11 @@ static COLORREF CDECL nulldrv_GetPixel( PHYSDEV dev, INT x, INT y ) return 0; } +static INT CDECL nulldrv_GetPixelFormat( PHYSDEV dev ) +{ + return 0; +} + static BOOL CDECL nulldrv_LineTo( PHYSDEV dev, INT x, INT y ) { return TRUE; @@ -505,6 +521,11 @@ static COLORREF CDECL nulldrv_SetPixel( PHYSDEV dev, INT x, INT y, COLORREF colo return color; } +static BOOL CDECL nulldrv_SetPixelFormat( PHYSDEV dev, INT format, const PIXELFORMATDESCRIPTOR *descr ) +{ + return FALSE; +} + static INT CDECL nulldrv_SetPolyFillMode( PHYSDEV dev, INT mode ) { return mode; @@ -555,6 +576,11 @@ static INT CDECL nulldrv_StartPage( PHYSDEV dev ) return 1; } +static BOOL CDECL nulldrv_SwapBuffers( PHYSDEV dev ) +{ + return TRUE; +} + static BOOL CDECL nulldrv_wglCopyContext( HGLRC ctx_src, HGLRC ctx_dst, UINT mask ) { return FALSE; @@ -626,7 +652,7 @@ const DC_FUNCTIONS null_driver = nulldrv_ArcTo, /* pArcTo */ NULL, /* pBeginPath */ NULL, /* pBitBlt */ - NULL, /* pChoosePixelFormat */ + nulldrv_ChoosePixelFormat, /* pChoosePixelFormat */ nulldrv_Chord, /* pChord */ NULL, /* pCloseFigure */ NULL, /* pCreateBitmap */ @@ -635,7 +661,7 @@ const DC_FUNCTIONS null_driver = NULL, /* pDeleteBitmap */ NULL, /* pDeleteDC */ nulldrv_DeleteObject, /* pDeleteObject */ - NULL, /* pDescribePixelFormat */ + nulldrv_DescribePixelFormat, /* pDescribePixelFormat */ nulldrv_DeviceCapabilities, /* pDeviceCapabilities */ nulldrv_Ellipse, /* pEllipse */ nulldrv_EndDoc, /* pEndDoc */ @@ -662,7 +688,7 @@ const DC_FUNCTIONS null_driver = NULL, /* pGetICMProfile */ NULL, /* pGetNearestColor */ nulldrv_GetPixel, /* pGetPixel */ - NULL, /* pGetPixelFormat */ + nulldrv_GetPixelFormat, /* pGetPixelFormat */ NULL, /* pGetSystemPaletteEntries */ NULL, /* pGetTextExtentExPoint */ NULL, /* pGetTextMetrics */ @@ -715,7 +741,7 @@ const DC_FUNCTIONS null_driver = nulldrv_SetMapMode, /* pSetMapMode */ nulldrv_SetMapperFlags, /* pSetMapperFlags */ nulldrv_SetPixel, /* pSetPixel */ - NULL, /* pSetPixelFormat */ + nulldrv_SetPixelFormat, /* pSetPixelFormat */ nulldrv_SetPolyFillMode, /* pSetPolyFillMode */ nulldrv_SetROP2, /* pSetROP2 */ nulldrv_SetRelAbs, /* pSetRelAbs */ @@ -735,7 +761,7 @@ const DC_FUNCTIONS null_driver = NULL, /* pStretchDIBits */ NULL, /* pStrokeAndFillPath */ NULL, /* pStrokePath */ - NULL, /* pSwapBuffers */ + nulldrv_SwapBuffers, /* pSwapBuffers */ NULL, /* pUnrealizePalette */ NULL, /* pWidenPath */ nulldrv_wglCopyContext, /* pwglCopyContext */ diff --git a/dlls/gdi32/painting.c b/dlls/gdi32/painting.c index 8c788d5..22cc50c 100644 --- a/dlls/gdi32/painting.c +++ b/dlls/gdi32/painting.c @@ -545,12 +545,12 @@ INT WINAPI ChoosePixelFormat( HDC hdc, const PIXELFORMATDESCRIPTOR* ppfd ) TRACE("(%p,%p)\n",hdc,ppfd); - if (!dc) return 0; - - if (!dc->funcs->pChoosePixelFormat) FIXME(" :stub\n"); - else ret = dc->funcs->pChoosePixelFormat(dc->physDev,ppfd); - - release_dc_ptr( dc ); + if (dc) + { + PHYSDEV physdev = GET_DC_PHYSDEV( dc, pChoosePixelFormat ); + ret = physdev->funcs->pChoosePixelFormat( physdev, ppfd ); + release_dc_ptr( dc ); + } return ret; } @@ -576,13 +576,13 @@ BOOL WINAPI SetPixelFormat( HDC hdc, INT iPixelFormat, TRACE("(%p,%d,%p)\n",hdc,iPixelFormat,ppfd); - if (!dc) return 0; - - update_dc( dc ); - if (!dc->funcs->pSetPixelFormat) FIXME(" :stub\n"); - else bRet = dc->funcs->pSetPixelFormat(dc->physDev,iPixelFormat,ppfd); - - release_dc_ptr( dc ); + if (dc) + { + PHYSDEV physdev = GET_DC_PHYSDEV( dc, pSetPixelFormat ); + update_dc( dc ); + bRet = physdev->funcs->pSetPixelFormat( physdev, iPixelFormat, ppfd ); + release_dc_ptr( dc ); + } return bRet; } @@ -605,13 +605,13 @@ INT WINAPI GetPixelFormat( HDC hdc ) TRACE("(%p)\n",hdc); - if (!dc) return 0; - - update_dc( dc ); - if (!dc->funcs->pGetPixelFormat) FIXME(" :stub\n"); - else ret = dc->funcs->pGetPixelFormat(dc->physDev); - - release_dc_ptr( dc ); + if (dc) + { + PHYSDEV physdev = GET_DC_PHYSDEV( dc, pGetPixelFormat ); + update_dc( dc ); + ret = physdev->funcs->pGetPixelFormat( physdev ); + release_dc_ptr( dc ); + } return ret; } @@ -638,19 +638,13 @@ INT WINAPI DescribePixelFormat( HDC hdc, INT iPixelFormat, UINT nBytes, TRACE("(%p,%d,%d,%p): stub\n",hdc,iPixelFormat,nBytes,ppfd); - if (!dc) return 0; - - update_dc( dc ); - if (!dc->funcs->pDescribePixelFormat) + if (dc) { - FIXME(" :stub\n"); - ppfd->nSize = nBytes; - ppfd->nVersion = 1; - ret = 3; + PHYSDEV physdev = GET_DC_PHYSDEV( dc, pDescribePixelFormat ); + update_dc( dc ); + ret = physdev->funcs->pDescribePixelFormat( physdev, iPixelFormat, nBytes, ppfd ); + release_dc_ptr( dc ); } - else ret = dc->funcs->pDescribePixelFormat(dc->physDev,iPixelFormat,nBytes,ppfd); - - release_dc_ptr( dc ); return ret; } @@ -673,17 +667,13 @@ BOOL WINAPI SwapBuffers( HDC hdc ) TRACE("(%p)\n",hdc); - if (!dc) return TRUE; - - update_dc( dc ); - if (!dc->funcs->pSwapBuffers) + if (dc) { - FIXME(" :stub\n"); - bRet = TRUE; + PHYSDEV physdev = GET_DC_PHYSDEV( dc, pSwapBuffers ); + update_dc( dc ); + bRet = physdev->funcs->pSwapBuffers( physdev ); + release_dc_ptr( dc ); } - else bRet = dc->funcs->pSwapBuffers(dc->physDev); - - release_dc_ptr( dc ); return bRet; }

1 0

Dmitry Timoshkov : winecfg: Protect from closing the root key.
by Alexandre Julliard March 11, 2011

March 11, 2011

Module: wine Branch: master Commit: 88a4b618b1d9e0f6a9b07740a884b63f13b8edeb URL: http://source.winehq.org/git/wine.git/?a=commit;h=88a4b618b1d9e0f6a9b07740a… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Fri Mar 11 16:04:37 2011 +0800 winecfg: Protect from closing the root key. --- programs/winecfg/winecfg.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/programs/winecfg/winecfg.c b/programs/winecfg/winecfg.c index c41d2ba..1d2ec50 100644 --- a/programs/winecfg/winecfg.c +++ b/programs/winecfg/winecfg.c @@ -113,7 +113,7 @@ static WCHAR *get_config_key (HKEY root, const WCHAR *subkey, const WCHAR *name, WINE_TRACE("subkey=%s, name=%s, def=%s\n", wine_dbgstr_w(subkey), wine_dbgstr_w(name), wine_dbgstr_w(def)); - res = RegOpenKeyW(root, subkey, &hSubKey); + res = RegOpenKeyExW(root, subkey, 0, MAXIMUM_ALLOWED, &hSubKey); if (res != ERROR_SUCCESS) { if (res == ERROR_FILE_NOT_FOUND) @@ -146,7 +146,7 @@ static WCHAR *get_config_key (HKEY root, const WCHAR *subkey, const WCHAR *name, WINE_TRACE("buffer=%s\n", wine_dbgstr_w(buffer)); end: - if (hSubKey && hSubKey != root) RegCloseKey(hSubKey); + RegCloseKey(hSubKey); return buffer; } @@ -471,7 +471,7 @@ static WCHAR **enumerate_valuesW(HKEY root, WCHAR *path) WCHAR **values = NULL; struct list *cursor; - res = RegOpenKeyW(root, path, &key); + res = RegOpenKeyExW(root, path, 0, MAXIMUM_ALLOWED, &key); if (res == ERROR_SUCCESS) { while (TRUE) @@ -641,7 +641,7 @@ static void process_setting(struct setting *s) else { WINE_TRACE("Removing %s:%s\n", wine_dbgstr_w(s->path), wine_dbgstr_w(s->name)); - if (!RegOpenKeyW( s->root, s->path, &key )) + if (!RegOpenKeyExW( s->root, s->path, 0, MAXIMUM_ALLOWED, &key )) { /* NULL name means remove that path/section entirely */ if (s->name) RegDeleteValueW( key, s->name );

1 0