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

Henri Verbeet : wined3d: Get rid of IWineD3DVolumeTexture::Unmap().
by Alexandre Julliard March 15, 2011

March 15, 2011

Module: wine Branch: master Commit: e409b83bcbad1c44ac20e0b9c585f9b0fae48f24 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e409b83bcbad1c44ac20e0b9c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Mar 14 21:02:58 2011 +0100 wined3d: Get rid of IWineD3DVolumeTexture::Unmap(). --- dlls/d3d10core/texture.c | 12 +++++++++--- dlls/d3d8/volumetexture.c | 13 +++++++++---- dlls/d3d9/volumetexture.c | 15 +++++++++------ dlls/wined3d/volumetexture.c | 17 ----------------- include/wine/wined3d.idl | 3 --- 5 files changed, 27 insertions(+), 33 deletions(-) diff --git a/dlls/d3d10core/texture.c b/dlls/d3d10core/texture.c index 8379605..2f73a75 100644 --- a/dlls/d3d10core/texture.c +++ b/dlls/d3d10core/texture.c @@ -375,11 +375,17 @@ static HRESULT STDMETHODCALLTYPE d3d10_texture3d_Map(ID3D10Texture3D *iface, UIN return hr; } -static void STDMETHODCALLTYPE d3d10_texture3d_Unmap(ID3D10Texture3D *iface, UINT sub_resource) +static void STDMETHODCALLTYPE d3d10_texture3d_Unmap(ID3D10Texture3D *iface, UINT sub_resource_idx) { - TRACE("iface %p, sub_resource %u.\n", iface, sub_resource); + struct d3d10_texture3d *texture = (struct d3d10_texture3d *)iface; + struct wined3d_resource *sub_resource; + + TRACE("iface %p, sub_resource_idx %u.\n", iface, sub_resource_idx); + + if (!(sub_resource = IWineD3DVolumeTexture_GetSubResource(texture->wined3d_texture, sub_resource_idx))) + return; - IWineD3DVolumeTexture_Unmap(((struct d3d10_texture3d *)iface)->wined3d_texture, sub_resource); + IWineD3DVolume_Unmap(wined3d_volume_from_resource(sub_resource)); } static void STDMETHODCALLTYPE d3d10_texture3d_GetDesc(ID3D10Texture3D *iface, D3D10_TEXTURE3D_DESC *desc) diff --git a/dlls/d3d8/volumetexture.c b/dlls/d3d8/volumetexture.c index 873822b..8c693f0 100644 --- a/dlls/d3d8/volumetexture.c +++ b/dlls/d3d8/volumetexture.c @@ -298,14 +298,19 @@ static HRESULT WINAPI IDirect3DVolumeTexture8Impl_LockBox(IDirect3DVolumeTexture return hr; } -static HRESULT WINAPI IDirect3DVolumeTexture8Impl_UnlockBox(LPDIRECT3DVOLUMETEXTURE8 iface, UINT Level) { - IDirect3DVolumeTexture8Impl *This = (IDirect3DVolumeTexture8Impl *)iface; +static HRESULT WINAPI IDirect3DVolumeTexture8Impl_UnlockBox(IDirect3DVolumeTexture8 *iface, UINT level) +{ + IDirect3DVolumeTexture8Impl *texture = (IDirect3DVolumeTexture8Impl *)iface; + struct wined3d_resource *sub_resource; HRESULT hr; - TRACE("iface %p, level %u.\n", iface, Level); + TRACE("iface %p, level %u.\n", iface, level); wined3d_mutex_lock(); - hr = IWineD3DVolumeTexture_Unmap(This->wineD3DVolumeTexture, Level); + if (!(sub_resource = IWineD3DVolumeTexture_GetSubResource(texture->wineD3DVolumeTexture, level))) + hr = D3DERR_INVALIDCALL; + else + hr = IDirect3DVolume8_UnlockBox((IDirect3DVolume8 *)wined3d_resource_get_parent(sub_resource)); wined3d_mutex_unlock(); return hr; diff --git a/dlls/d3d9/volumetexture.c b/dlls/d3d9/volumetexture.c index b4b5503..0a8932c 100644 --- a/dlls/d3d9/volumetexture.c +++ b/dlls/d3d9/volumetexture.c @@ -360,16 +360,19 @@ static HRESULT WINAPI IDirect3DVolumeTexture9Impl_LockBox(IDirect3DVolumeTexture return hr; } -static HRESULT WINAPI IDirect3DVolumeTexture9Impl_UnlockBox(LPDIRECT3DVOLUMETEXTURE9 iface, UINT Level) { - IDirect3DVolumeTexture9Impl *This = (IDirect3DVolumeTexture9Impl *)iface; +static HRESULT WINAPI IDirect3DVolumeTexture9Impl_UnlockBox(IDirect3DVolumeTexture9 *iface, UINT level) +{ + IDirect3DVolumeTexture9Impl *texture = (IDirect3DVolumeTexture9Impl *)iface; + struct wined3d_resource *sub_resource; HRESULT hr; - TRACE("iface %p, level %u.\n", iface, Level); + TRACE("iface %p, level %u.\n", iface, level); wined3d_mutex_lock(); - - hr = IWineD3DVolumeTexture_Unmap(This->wineD3DVolumeTexture, Level); - + if (!(sub_resource = IWineD3DVolumeTexture_GetSubResource(texture->wineD3DVolumeTexture, level))) + hr = D3DERR_INVALIDCALL; + else + hr = IDirect3DVolume9_UnlockBox((IDirect3DVolume9 *)wined3d_resource_get_parent(sub_resource)); wined3d_mutex_unlock(); return hr; diff --git a/dlls/wined3d/volumetexture.c b/dlls/wined3d/volumetexture.c index 643141f..9d942d7 100644 --- a/dlls/wined3d/volumetexture.c +++ b/dlls/wined3d/volumetexture.c @@ -273,22 +273,6 @@ static struct wined3d_resource * WINAPI IWineD3DVolumeTextureImpl_GetSubResource return basetexture_get_sub_resource(texture, sub_resource_idx); } -static HRESULT WINAPI IWineD3DVolumeTextureImpl_Unmap(IWineD3DVolumeTexture *iface, UINT sub_resource_idx) -{ - IWineD3DBaseTextureImpl *texture = (IWineD3DBaseTextureImpl *)iface; - struct wined3d_resource *sub_resource; - - TRACE("iface %p, sub_resource_idx %u.\n", iface, sub_resource_idx); - - if (!(sub_resource = basetexture_get_sub_resource(texture, sub_resource_idx))) - { - WARN("Failed to get sub-resource.\n"); - return WINED3DERR_INVALIDCALL; - } - - return IWineD3DVolume_Unmap((IWineD3DVolume *)volume_from_resource(sub_resource)); -} - static HRESULT WINAPI IWineD3DVolumeTextureImpl_AddDirtyBox(IWineD3DVolumeTexture *iface, const WINED3DBOX *dirty_box) { IWineD3DBaseTextureImpl *texture = (IWineD3DBaseTextureImpl *)iface; @@ -333,7 +317,6 @@ static const IWineD3DVolumeTextureVtbl IWineD3DVolumeTexture_Vtbl = IWineD3DVolumeTextureImpl_IsCondNP2, IWineD3DVolumeTextureImpl_GetSubResource, /* volume texture */ - IWineD3DVolumeTextureImpl_Unmap, IWineD3DVolumeTextureImpl_AddDirtyBox }; diff --git a/include/wine/wined3d.idl b/include/wine/wined3d.idl index d7c8b97..34449d0 100644 --- a/include/wine/wined3d.idl +++ b/include/wine/wined3d.idl @@ -2395,9 +2395,6 @@ interface IWineD3DCubeTexture : IWineD3DBaseTexture ] interface IWineD3DVolumeTexture : IWineD3DBaseTexture { - HRESULT Unmap( - [in] UINT sub_resource_idx - ); HRESULT AddDirtyBox( [in] const WINED3DBOX *dirty_box );

1 0

Piotr Caban : shdocvw: Use IID_IBrowserService2 defined in header.
by Alexandre Julliard March 15, 2011

March 15, 2011

Module: wine Branch: master Commit: f1f645b345f8c47b4669ef5cb82c41847775aca7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f1f645b345f8c47b4669ef5cb… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Mar 14 17:50:08 2011 +0100 shdocvw: Use IID_IBrowserService2 defined in header. --- dlls/shdocvw/tests/webbrowser.c | 3 +-- dlls/shdocvw/webbrowser.c | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/dlls/shdocvw/tests/webbrowser.c b/dlls/shdocvw/tests/webbrowser.c index 1088065..e54e35d 100644 --- a/dlls/shdocvw/tests/webbrowser.c +++ b/dlls/shdocvw/tests/webbrowser.c @@ -36,6 +36,7 @@ #include "olectl.h" #include "mshtmdid.h" #include "shobjidl.h" +#include "shdeprecated.h" #include "shlguid.h" #include "exdispid.h" #include "mimeinfo.h" @@ -2643,8 +2644,6 @@ static void test_IServiceProvider(IUnknown *unk) IServiceProvider *servprov = (void*)0xdeadbeef; HRESULT hres; IUnknown *ret = NULL; - static const IID IID_IBrowserService2 = - {0x68BD21CC,0x438B,0x11d2,{0xA5,0x60,0x00,0xA0,0xC,0x2D,0xBF,0xE8}}; hres = IUnknown_QueryInterface(unk, &IID_IServiceProvider, (void**)&servprov); ok(hres == S_OK, "QueryInterface returned %08x, expected S_OK\n", hres); diff --git a/dlls/shdocvw/webbrowser.c b/dlls/shdocvw/webbrowser.c index a0a8020..5df1f03 100644 --- a/dlls/shdocvw/webbrowser.c +++ b/dlls/shdocvw/webbrowser.c @@ -23,6 +23,7 @@ #include "shdocvw.h" #include "exdispid.h" #include "mshtml.h" +#include "shdeprecated.h" WINE_DEFAULT_DEBUG_CHANNEL(shdocvw); @@ -1140,8 +1141,6 @@ static HRESULT STDMETHODCALLTYPE WBServiceProvider_QueryService(IServiceProvider REFGUID guidService, REFIID riid, void **ppv) { WebBrowser *This = impl_from_IServiceProvider(iface); - static const IID IID_IBrowserService2 = - {0x68BD21CC,0x438B,0x11d2,{0xA5,0x60,0x00,0xA0,0xC,0x2D,0xBF,0xE8}}; if(*ppv) ppv = NULL;

1 0

Vincent Povirk : gdiplus: Remove gdi32 fallback for bitmaps from GdipFillRegion.
by Alexandre Julliard March 15, 2011

March 15, 2011

Module: wine Branch: master Commit: 77f5a07c1bd351524fe294b051aee7f37a7f77ba URL: http://source.winehq.org/git/wine.git/?a=commit;h=77f5a07c1bd351524fe294b05… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Thu Mar 10 16:17:20 2011 -0600 gdiplus: Remove gdi32 fallback for bitmaps from GdipFillRegion. We can always do a fill directly to the image bits when gdi32 can do it. --- dlls/gdiplus/graphics.c | 3 --- 1 files changed, 0 insertions(+), 3 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 29dea0a..4d059f8 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -3919,9 +3919,6 @@ GpStatus WINGDIPAPI GdipFillRegion(GpGraphics* graphics, GpBrush* brush, if (stat == NotImplemented) stat = SOFTWARE_GdipFillRegion(graphics, brush, region); - if (stat == NotImplemented && graphics->image) - stat = GDI32_GdipFillRegion(graphics, brush, region); - if (stat == NotImplemented) { FIXME("not implemented for brushtype %i\n", brush->bt);

1 0

Piotr Caban : shdocvw: Added IBrowserService interface stub.
by Alexandre Julliard March 15, 2011

March 15, 2011

Module: wine Branch: master Commit: fa43f4c85012d0dcd685dca025610da08c2d26c0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fa43f4c85012d0dcd685dca02… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Mar 14 17:49:47 2011 +0100 shdocvw: Added IBrowserService interface stub. --- dlls/shdocvw/shellbrowser.c | 358 +++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 358 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=fa43f4c85012d0dcd685d…

1 0

Piotr Caban : include: Added IBrowserService2 definition.
by Alexandre Julliard March 15, 2011

March 15, 2011

Module: wine Branch: master Commit: fbe5abbe0676ecff191f188b715f990d2cff25f6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fbe5abbe0676ecff191f188b7… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Mar 14 17:48:53 2011 +0100 include: Added IBrowserService2 definition. --- include/shdeprecated.idl | 327 ++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 327 insertions(+), 0 deletions(-) diff --git a/include/shdeprecated.idl b/include/shdeprecated.idl index c78e461..9a382d7 100644 --- a/include/shdeprecated.idl +++ b/include/shdeprecated.idl @@ -21,6 +21,8 @@ import "objidl.idl"; import "ocidl.idl"; import "shobjidl.idl"; +import "hlink.idl"; +import "exdisp.idl"; cpp_quote("#define TLOG_BACK -1") cpp_quote("#define TLOG_FORE 1") @@ -108,6 +110,34 @@ interface ITravelLog : IUnknown HRESULT Revert(); }; +typedef void *CIE4ConnectionPoint; + +[ + local, + object, + uuid(0D7D1D00-6FC0-11D0-A974-00C04FD705A2) +] +interface IExpDispSupport : IUnknown +{ + HRESULT FindCIE4ConnectionPoint( + REFIID riid, + CIE4ConnectionPoint **ppccp); + + HRESULT OnTranslateAccelerator( + MSG *pMsg, + DWORD grfModifiers); + + HRESULT OnInvoke( + DISPID dispidMember, + REFIID iid, + LCID lcid, + WORD wFlags, + DISPPARAMS *pdispparams, + VARIANT *pVarResult, + EXCEPINFO *pexcepinfo, + UINT *puArgErr); +}; + typedef enum tagBNSTATE { BNS_NORMAL = 0, @@ -274,3 +304,300 @@ interface IShellService : IUnknown { HRESULT SetOwner( [in] IUnknown *pUnk ); } + +cpp_quote("#if 0") +typedef HANDLE HMONITOR; +cpp_quote("#endif") + +enum { + SECURELOCK_NOCHANGE = -1, + SECURELOCK_SET_UNSECURE = 0, + SECURELOCK_SET_MIXED = 1, + SECURELOCK_SET_SECUREUNKNOWNBIT = 2, + SECURELOCK_SET_SECURE40BIT = 3, + SECURELOCK_SET_SECURE56BIT = 4, + SECURELOCK_SET_FORTEZZA = 5, + SECURELOCK_SET_SECURE128BIT = 6, + SECURELOCK_FIRSTSUGGEST = 7, + SECURELOCK_SUGGEST_UNSECURE = SECURELOCK_FIRSTSUGGEST, + SECURELOCK_SUGGEST_MIXED = 8, + SECURELOCK_SUGGEST_SECUREUNKNOWNBIT = 9, + SECURELOCK_SUGGEST_SECURE40BIT = 10, + SECURELOCK_SUGGEST_SECURE56BIT = 11, + SECURELOCK_SUGGEST_FORTEZZA = 12, + SECURELOCK_SUGGEST_SECURE128BIT = 13, +}; + + +typedef struct { + HWND _hwnd; + ITravelLog *_ptl; + IHlinkFrame *_phlf; + IWebBrowser2 *_pautoWB2; + IExpDispSupport *_pautoEDS; + IShellService *_pautoSS; + int _eSecureLockIcon; + DWORD _fCreatingViewWindow; + UINT _uActivateState; + + LPCITEMIDLIST _pidlNewShellView; + + IOleCommandTarget *_pctView; + + LPITEMIDLIST _pidlCur; + IShellView *_psv; + IShellFolder *_psf; + HWND _hwndView; + LPWSTR _pszTitleCur; + + LPITEMIDLIST _pidlPending; + IShellView *_psvPending; + IShellFolder *_psfPending; + HWND _hwndViewPending; + LPWSTR _pszTitlePending; + + BOOL _fIsViewMSHTML; + BOOL _fPrivacyImpacted; + +} BASEBROWSERDATA, *LPBASEBROWSERDATA; +typedef const BASEBROWSERDATA *LPCBASEBROWSERDATA; + +cpp_quote("#define VIEW_PRIORITY_RESTRICTED 0x00000070") +cpp_quote("#define VIEW_PRIORITY_CACHEHIT 0x00000050") +cpp_quote("#define VIEW_PRIORITY_STALECACHEHIT 0x00000045") +cpp_quote("#define VIEW_PRIORITY_USEASDEFAULT 0x00000043") +cpp_quote("#define VIEW_PRIORITY_SHELLEXT 0x00000040") +cpp_quote("#define VIEW_PRIORITY_CACHEMISS 0x00000030") +cpp_quote("#define VIEW_PRIORITY_INHERIT 0x00000020") +cpp_quote("#define VIEW_PRIORITY_SHELLEXT_ASBACKUP 0x0015") +cpp_quote("#define VIEW_PRIORITY_DESPERATE 0x00000010") +cpp_quote("#define VIEW_PRIORITY_NONE 0x00000000") + +typedef struct tagFolderSetData { + FOLDERSETTINGS _fs; + SHELLVIEWID _vidRestore; + DWORD _dwViewPriority; +} FOLDERSETDATA, *LPFOLDERSETDATA; + +typedef struct SToolbarItem { + IDockingWindow *ptbar; + BORDERWIDTHS rcBorderTool; + LPWSTR pwszItem; + BOOL fShow; + HMONITOR hMon; +} TOOLBARITEM, *LPTOOLBARITEM; + +cpp_quote("#define ITB_VIEW ((UINT)-1)") + +[ + local, + object, + uuid(68BD21CC-438B-11d2-A560-00A0C92DBFE8) +] +interface IBrowserService2 : IBrowserService +{ + LRESULT WndProcBS( + [in] HWND hwnd, + [in] UINT uMsg, + [in, out] WPARAM wParam, + [in, out] LPARAM lParam); + + HRESULT SetAsDefFolderSettings(); + + HRESULT GetViewRect( + [in, out] RECT *prc); + + HRESULT OnSize( + [in] WPARAM wParam); + + HRESULT OnCreate( + [in] struct tagCREATESTRUCTW *pcs); + + LRESULT OnCommand( + [in] WPARAM wParam, + [in] LPARAM lParam); + + HRESULT OnDestroy(); + + LRESULT OnNotify( + [in, out] struct tagNMHDR *pnm); + + HRESULT OnSetFocus(); + + HRESULT OnFrameWindowActivateBS( + [in] BOOL fActive); + + HRESULT ReleaseShellView(); + + HRESULT ActivatePendingView(); + + HRESULT CreateViewWindow( + [in] IShellView *psvNew, + [in] IShellView *psvOld, + [out] LPRECT prcView, + [out] HWND *phwnd); + + HRESULT CreateBrowserPropSheetExt( + [in] REFIID riid, + [out] void **ppv); + + HRESULT GetViewWindow( + [out] HWND *phwndView); + + HRESULT GetBaseBrowserData( + [in, out] LPCBASEBROWSERDATA *pbbd); + + LPBASEBROWSERDATA PutBaseBrowserData(); + + HRESULT InitializeTravelLog( + [in] ITravelLog *ptl, + [in] DWORD dw); + + HRESULT SetTopBrowser(); + + HRESULT Offline( + [in] int iCmd); + + HRESULT AllowViewResize( + [in] BOOL f); + + HRESULT SetActivateState( + [in] UINT u); + + HRESULT UpdateSecureLockIcon( + [in] int eSecureLock); + + HRESULT InitializeDownloadManager(); + + HRESULT InitializeTransitionSite(); + + HRESULT _Initialize( + [in] HWND hwnd, + [in] IUnknown *pauto); + + HRESULT _CancelPendingNavigationAsync(); + + HRESULT _CancelPendingView(); + + HRESULT _MaySaveChanges(); + + HRESULT _PauseOrResumeView( + [in] BOOL fPaused); + + HRESULT _DisableModeless(); + + HRESULT _NavigateToPidl( + [in] LPCITEMIDLIST pidl, + [in] DWORD grfHLNF, + [in] DWORD dwFlags); + + HRESULT _TryShell2Rename( + [in] IShellView *psv, + [in] LPCITEMIDLIST pidlNew); + + HRESULT _SwitchActivationNow(); + + HRESULT _ExecChildren( + [in] IUnknown *punkBar, + [in] BOOL fBroadcast, + [in] const GUID *pguidCmdGroup, + [in] DWORD nCmdID, + [in] DWORD nCmdexecopt, + [in] VARIANTARG *pvarargIn, + [in, out] VARIANTARG *pvarargOut); + + HRESULT _SendChildren( + [in] HWND hwndBar, + [in] BOOL fBroadcast, + [in] UINT uMsg, + [in, out] WPARAM wParam, + [in, out] LPARAM lParam); + + HRESULT GetFolderSetData( + [in, out] struct tagFolderSetData *pfsd); + + HRESULT _OnFocusChange( + [in] UINT itb); + + HRESULT v_ShowHideChildWindows( + [in] BOOL fChildOnly); + + UINT _get_itbLastFocus(); + + HRESULT _put_itbLastFocus( + [in] UINT itbLastFocus); + + HRESULT _UIActivateView( + [in] UINT uState); + + HRESULT _GetViewBorderRect( + [in, out] RECT* prc); + + HRESULT _UpdateViewRectSize(); + + HRESULT _ResizeNextBorder( + [in] UINT itb); + + HRESULT _ResizeView(); + + HRESULT _GetEffectiveClientArea( + [in, out] LPRECT lprectBorder, + [in] HMONITOR hmon); + + IStream* v_GetViewStream( + [in] LPCITEMIDLIST pidl, + [in] DWORD grfMode, + [in] LPCWSTR pwszName); + + LRESULT ForwardViewMsg( + [in] UINT uMsg, + [in] WPARAM wParam, + [in] LPARAM lParam); + + HRESULT SetAcceleratorMenu( + [in] HACCEL hacc); + + int _GetToolbarCount(); + + LPTOOLBARITEM _GetToolbarItem( + [in] int itb); + + HRESULT _SaveToolbars( + [in] IStream *pstm); + + HRESULT _LoadToolbars( + [in] IStream *pstm); + + HRESULT _CloseAndReleaseToolbars( + [in] BOOL fClose); + + HRESULT v_MayGetNextToolbarFocus( + [in] LPMSG lpMsg, + [in] UINT itbNext, + [in] int citb, + [out] LPTOOLBARITEM *pptbi, + [out] HWND *phwnd); + + HRESULT _ResizeNextBorderHelper( + [in] UINT itb, + [in] BOOL bUseHmonitor); + + UINT _FindTBar( + [in] IUnknown *punkSrc); + + HRESULT _SetFocus( + [in] LPTOOLBARITEM ptbi, + [in] HWND hwnd, + [in] LPMSG lpMsg); + + HRESULT v_MayTranslateAccelerator( + [in] MSG* pmsg); + + HRESULT _GetBorderDWHelper( + [in] IUnknown *punkSrc, + [in] LPRECT lprectBorder, + [in] BOOL bUseHmonitor); + + HRESULT v_CheckZoneCrossing( + [in, out] LPCITEMIDLIST pidl); +};

1 0

Piotr Caban : include: Added IDockingWindow definition.
by Alexandre Julliard March 15, 2011

March 15, 2011

Module: wine Branch: master Commit: 869231b439d8defb6bfa1ba07a415f3dcc1bed80 URL: http://source.winehq.org/git/wine.git/?a=commit;h=869231b439d8defb6bfa1ba07… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Mar 14 17:48:39 2011 +0100 include: Added IDockingWindow definition. --- include/shlguid.h | 1 - include/shobjidl.idl | 21 +++++++++++++++++++++ 2 files changed, 21 insertions(+), 1 deletions(-) diff --git a/include/shlguid.h b/include/shlguid.h index 3af4398..e11f9ff 100644 --- a/include/shlguid.h +++ b/include/shlguid.h @@ -99,7 +99,6 @@ DEFINE_GUID(SID_SCommDlgBrowser, 0x80f30233, 0xb7df, 0x11d2, 0xa3, 0x3b, 0x00, #define IID_IShellExecuteHook WINELIB_NAME_AW(IID_IShellExecuteHook) #define IID_INewShortcutHook WINELIB_NAME_AW(IID_INewShortcutHook) -DEFINE_GUID(IID_IDockingWindow, 0x012dd920L, 0x7B26, 0x11D0, 0x8C, 0xA9, 0x00, 0xA0, 0xC9, 0x2D, 0xBF, 0xE8); DEFINE_GUID(IID_IDockingWindowSite, 0x2A342FC2L, 0x7B26, 0x11D0, 0x8C, 0xA9, 0x00, 0xA0, 0xC9, 0x2D, 0xBF, 0xE8); DEFINE_GUID(IID_IInputObject, 0x068284FAA, 0x6A48, 0x11D0, 0x8C, 0x78, 0x00, 0xC0, 0x4F, 0xD9, 0x18, 0xB4); DEFINE_GUID(IID_IInputObjectSite, 0x0F1DB8392, 0x7331, 0x11D0, 0x8C, 0x99, 0x00, 0xA0, 0xC9, 0x2D, 0xBF, 0xE8); diff --git a/include/shobjidl.idl b/include/shobjidl.idl index 176b63f..c4eac65 100644 --- a/include/shobjidl.idl +++ b/include/shobjidl.idl @@ -1308,6 +1308,27 @@ interface ICommDlgBrowser3 : ICommDlgBrowser2 [in] IShellView *ppshv); } +/***************************************************************************** + * IDockingWindow interface + */ +[ + object, + uuid(012dd920-7b26-11d0-8ca9-00a0c92dbfe8) +] +interface IDockingWindow : IOleWindow +{ + HRESULT ShowDW( + [in] BOOL fShow); + + HRESULT CloseDW( + [in] DWORD dwReserved); + + HRESULT ResizeBorderDW( + [in] LPCRECT prcBorder, + [in] IUnknown *punkToolbarSite, + [in] BOOL fReserved); +}; + /***************************************************************************** * IDockingWindowFrame interface

1 0

Piotr Caban : shdocvw: Added navigation error handling.
by Alexandre Julliard March 15, 2011

March 15, 2011

Module: wine Branch: master Commit: ac53980faaef82823cb234169b687ef759b1cd53 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ac53980faaef82823cb234169… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Mar 14 17:49:27 2011 +0100 shdocvw: Added navigation error handling. --- dlls/shdocvw/dochost.c | 34 +++++++++++++++++++++++++++ dlls/shdocvw/navigate.c | 58 +++++++++++++++++++++++++++++++++++++++++++--- dlls/shdocvw/shdocvw.h | 1 + 3 files changed, 89 insertions(+), 4 deletions(-) diff --git a/dlls/shdocvw/dochost.c b/dlls/shdocvw/dochost.c index 7b11c24..3c0dbd2 100644 --- a/dlls/shdocvw/dochost.c +++ b/dlls/shdocvw/dochost.c @@ -472,6 +472,40 @@ static HRESULT WINAPI ClOleCommandTarget_Exec(IOleCommandTarget *iface, This->doc_navigate = V_UNKNOWN(pvaIn); return S_OK; + case 1: { + IHTMLWindow2 *win2; + SAFEARRAY *sa = V_ARRAY(pvaIn); + VARIANT status_code, url, htmlwindow; + LONG ind; + HRESULT hres; + + if(V_VT(pvaIn) != VT_ARRAY || !sa) + return E_INVALIDARG; + + ind = 0; + hres = SafeArrayGetElement(sa, &ind, &status_code); + if(FAILED(hres) || V_VT(&status_code)!=VT_I4) + return E_INVALIDARG; + + ind = 1; + hres = SafeArrayGetElement(sa, &ind, &url); + if(FAILED(hres) || V_VT(&url)!=VT_BSTR) + return E_INVALIDARG; + + ind = 3; + hres = SafeArrayGetElement(sa, &ind, &htmlwindow); + if(FAILED(hres) || V_VT(&htmlwindow)!=VT_UNKNOWN || !V_UNKNOWN(&htmlwindow)) + return E_INVALIDARG; + + hres = IUnknown_QueryInterface(V_UNKNOWN(&htmlwindow), &IID_IHTMLWindow2, (void**)&win2); + if(FAILED(hres)) + return E_INVALIDARG; + + handle_navigation_error(This, V_I4(&status_code), V_BSTR(&url), win2); + IHTMLWindow2_Release(win2); + return S_OK; + } + default: FIXME("unsupported command %d of CGID_DocHostCmdPriv\n", nCmdID); return E_NOTIMPL; diff --git a/dlls/shdocvw/navigate.c b/dlls/shdocvw/navigate.c index 6e3ea46..a6899b0 100644 --- a/dlls/shdocvw/navigate.c +++ b/dlls/shdocvw/navigate.c @@ -241,6 +241,51 @@ static HRESULT WINAPI BindStatusCallback_OnProgress(IBindStatusCallback *iface, return S_OK; } +void handle_navigation_error(DocHost* doc_host, HRESULT hres, BSTR url, IHTMLWindow2 *win2) +{ + VARIANT var_status_code, var_frame_name, var_url; + DISPPARAMS dispparams; + VARIANTARG params[5]; + VARIANT_BOOL cancel = VARIANT_FALSE; + + dispparams.cArgs = 5; + dispparams.cNamedArgs = 0; + dispparams.rgdispidNamedArgs = NULL; + dispparams.rgvarg = params; + + V_VT(params) = VT_BOOL|VT_BYREF; + V_BOOLREF(params) = &cancel; + + V_VT(params+1) = VT_VARIANT|VT_BYREF; + V_VARIANTREF(params+1) = &var_status_code; + V_VT(&var_status_code) = VT_I4; + V_I4(&var_status_code) = hres; + + V_VT(params+2) = VT_VARIANT|VT_BYREF; + V_VARIANTREF(params+2) = &var_frame_name; + V_VT(&var_frame_name) = VT_BSTR; + if(win2) { + hres = IHTMLWindow2_get_name(win2, &V_BSTR(&var_frame_name)); + if(FAILED(hres)) + V_BSTR(&var_frame_name) = NULL; + } else + V_BSTR(&var_frame_name) = NULL; + + V_VT(params+3) = VT_VARIANT|VT_BYREF; + V_VARIANTREF(params+3) = &var_url; + V_VT(&var_url) = VT_BSTR; + V_BSTR(&var_url) = url; + + V_VT(params+4) = VT_DISPATCH; + V_DISPATCH(params+4) = doc_host->disp; + + call_sink(doc_host->cps.wbe2, DISPID_NAVIGATEERROR, &dispparams); + SysFreeString(V_BSTR(&var_frame_name)); + + if(!cancel) + FIXME("Navigate to error page\n"); +} + static HRESULT WINAPI BindStatusCallback_OnStopBinding(IBindStatusCallback *iface, HRESULT hresult, LPCWSTR szError) { @@ -250,10 +295,15 @@ static HRESULT WINAPI BindStatusCallback_OnStopBinding(IBindStatusCallback *ifac set_status_text(This, emptyW); - if(This->doc_host) { - IOleClientSite_Release(&This->doc_host->IOleClientSite_iface); - This->doc_host = NULL; - } + if(!This->doc_host) + return S_OK; + + /* FIXME: Check HTTP status code */ + if(FAILED(hresult)) + handle_navigation_error(This->doc_host, hresult, This->url, NULL); + + IOleClientSite_Release(&This->doc_host->IOleClientSite_iface); + This->doc_host = NULL; return S_OK; } diff --git a/dlls/shdocvw/shdocvw.h b/dlls/shdocvw/shdocvw.h index 3692e15..7abd004 100644 --- a/dlls/shdocvw/shdocvw.h +++ b/dlls/shdocvw/shdocvw.h @@ -240,6 +240,7 @@ HRESULT navigate_url(DocHost*,LPCWSTR,const VARIANT*,const VARIANT*,VARIANT*,VAR HRESULT go_home(DocHost*); void set_doc_state(DocHost*,READYSTATE); HRESULT get_location_url(DocHost*,BSTR*); +void handle_navigation_error(DocHost*,HRESULT,BSTR,IHTMLWindow2*); #define WM_DOCHOSTTASK (WM_USER+0x300) void push_dochost_task(DocHost*,task_header_t*,task_proc_t,BOOL);

1 0

Piotr Caban : shdocvw: Added IShellBrowser interface stub.
by Alexandre Julliard March 15, 2011

March 15, 2011

Module: wine Branch: master Commit: df181d99f32470ce14b867fbaadb0e7b63a167cb URL: http://source.winehq.org/git/wine.git/?a=commit;h=df181d99f32470ce14b867fba… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Mar 14 17:49:37 2011 +0100 shdocvw: Added IShellBrowser interface stub. --- dlls/shdocvw/Makefile.in | 1 + dlls/shdocvw/client.c | 15 +++ dlls/shdocvw/shdocvw.h | 1 + dlls/shdocvw/shellbrowser.c | 264 +++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 281 insertions(+), 0 deletions(-) diff --git a/dlls/shdocvw/Makefile.in b/dlls/shdocvw/Makefile.in index c4ffa16..fe85d48 100644 --- a/dlls/shdocvw/Makefile.in +++ b/dlls/shdocvw/Makefile.in @@ -18,6 +18,7 @@ C_SRCS = \ oleobject.c \ persist.c \ shdocvw_main.c \ + shellbrowser.c \ shlinstobj.c \ taskbarlist.c \ urlhist.c \ diff --git a/dlls/shdocvw/client.c b/dlls/shdocvw/client.c index 12fd464..3443170 100644 --- a/dlls/shdocvw/client.c +++ b/dlls/shdocvw/client.c @@ -622,6 +622,21 @@ static HRESULT WINAPI ClServiceProvider_QueryService(IServiceProvider *iface, RE return IDispatch_QueryInterface(This->disp, riid, ppv); } + if(IsEqualGUID(&IID_IShellBrowser, guidService)) { + IShellBrowser *sb; + HRESULT hres; + + TRACE("(%p)->(IID_IShellBrowser %s %p)\n", This, debugstr_guid(riid), ppv); + + hres = ShellBrowser_Create(&sb); + if(FAILED(hres)) + return hres; + + hres = IShellBrowser_QueryInterface(sb, riid, ppv); + IShellBrowser_Release(sb); + return hres; + } + FIXME("(%p)->(%s %s %p)\n", This, debugstr_guid(guidService), debugstr_guid(riid), ppv); return E_NOINTERFACE; diff --git a/dlls/shdocvw/shdocvw.h b/dlls/shdocvw/shdocvw.h index 7abd004..7a68499 100644 --- a/dlls/shdocvw/shdocvw.h +++ b/dlls/shdocvw/shdocvw.h @@ -229,6 +229,7 @@ void ConnectionPointContainer_Destroy(ConnectionPointContainer*); void HlinkFrame_Init(HlinkFrame*,IUnknown*,DocHost*); BOOL HlinkFrame_QI(HlinkFrame*,REFIID,void**); +HRESULT ShellBrowser_Create(IShellBrowser**); HRESULT WebBrowserV1_Create(IUnknown*,REFIID,void**); HRESULT WebBrowserV2_Create(IUnknown*,REFIID,void**); diff --git a/dlls/shdocvw/shellbrowser.c b/dlls/shdocvw/shellbrowser.c new file mode 100644 index 0000000..47cd095 --- /dev/null +++ b/dlls/shdocvw/shellbrowser.c @@ -0,0 +1,264 @@ +/* + * Implementation of IShellBrowser interface + * + * 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 + */ + +#include "wine/debug.h" +#include "shdocvw.h" + +WINE_DEFAULT_DEBUG_CHANNEL(shdocvw); + +typedef struct { + IShellBrowser IShellBrowser_iface; + + LONG ref; +} ShellBrowser; + +static inline ShellBrowser *impl_from_IShellBrowser(IShellBrowser *iface) +{ + return CONTAINING_RECORD(iface, ShellBrowser, IShellBrowser_iface); +} + +static HRESULT WINAPI ShellBrowser_QueryInterface( + IShellBrowser* iface, + REFIID riid, + void **ppvObject) +{ + ShellBrowser *This = impl_from_IShellBrowser(iface); + *ppvObject = NULL; + + if(IsEqualGUID(&IID_IShellBrowser, riid) || IsEqualGUID(&IID_IOleWindow, riid) + || IsEqualGUID(&IID_IUnknown, riid)) + *ppvObject = &This->IShellBrowser_iface; + + if(*ppvObject) { + TRACE("%p %s %p\n", This, debugstr_guid(riid), ppvObject); + IUnknown_AddRef((IUnknown*)*ppvObject); + return S_OK; + } + + FIXME("%p %s %p\n", This, debugstr_guid(riid), ppvObject); + return E_NOINTERFACE; +} + +static ULONG WINAPI ShellBrowser_AddRef( + IShellBrowser* iface) +{ + ShellBrowser *This = impl_from_IShellBrowser(iface); + LONG ref = InterlockedIncrement(&This->ref); + + TRACE("(%p) ref=%d\n", This, ref); + + return ref; +} + +static ULONG WINAPI ShellBrowser_Release( + IShellBrowser* iface) +{ + ShellBrowser *This = impl_from_IShellBrowser(iface); + LONG ref = InterlockedDecrement(&This->ref); + + TRACE("(%p) ref=%d\n", This, ref); + + if(!ref) + heap_free(This); + return ref; +} + +static HRESULT WINAPI ShellBrowser_GetWindow( + IShellBrowser* iface, + HWND *phwnd) +{ + ShellBrowser *This = impl_from_IShellBrowser(iface); + FIXME("%p %p\n", This, phwnd); + return E_NOTIMPL; +} + +static HRESULT WINAPI ShellBrowser_ContextSensitiveHelp( + IShellBrowser* iface, + BOOL fEnterMode) +{ + ShellBrowser *This = impl_from_IShellBrowser(iface); + FIXME("%p %d\n", This, fEnterMode); + return E_NOTIMPL; +} + +static HRESULT WINAPI ShellBrowser_InsertMenusSB( + IShellBrowser* iface, + HMENU hmenuShared, + LPOLEMENUGROUPWIDTHS lpMenuWidths) +{ + ShellBrowser *This = impl_from_IShellBrowser(iface); + FIXME("%p %p %p\n", This, hmenuShared, lpMenuWidths); + return E_NOTIMPL; +} + +static HRESULT WINAPI ShellBrowser_SetMenuSB( + IShellBrowser* iface, + HMENU hmenuShared, + HOLEMENU holemenuReserved, + HWND hwndActiveObject) +{ + ShellBrowser *This = impl_from_IShellBrowser(iface); + FIXME("%p %p %p %p\n", This, hmenuShared, holemenuReserved, hwndActiveObject); + return E_NOTIMPL; +} + +static HRESULT WINAPI ShellBrowser_RemoveMenusSB( + IShellBrowser* iface, + HMENU hmenuShared) +{ + ShellBrowser *This = impl_from_IShellBrowser(iface); + FIXME("%p %p\n", This, hmenuShared); + return E_NOTIMPL; +} + +static HRESULT WINAPI ShellBrowser_SetStatusTextSB( + IShellBrowser* iface, + LPCOLESTR pszStatusText) +{ + ShellBrowser *This = impl_from_IShellBrowser(iface); + FIXME("%p %s\n", This, debugstr_w(pszStatusText)); + return E_NOTIMPL; +} + +static HRESULT WINAPI ShellBrowser_EnableModelessSB( + IShellBrowser* iface, + BOOL fEnable) +{ + ShellBrowser *This = impl_from_IShellBrowser(iface); + FIXME("%p %d\n", This, fEnable); + return E_NOTIMPL; +} + +static HRESULT WINAPI ShellBrowser_TranslateAcceleratorSB( + IShellBrowser* iface, + MSG *pmsg, + WORD wID) +{ + ShellBrowser *This = impl_from_IShellBrowser(iface); + FIXME("%p %p %d\n", This, pmsg, (int)wID); + return E_NOTIMPL; +} + +static HRESULT WINAPI ShellBrowser_BrowseObject( + IShellBrowser* iface, + LPCITEMIDLIST pidl, + UINT wFlags) +{ + ShellBrowser *This = impl_from_IShellBrowser(iface); + FIXME("%p %p %u\n", This, pidl, wFlags); + return E_NOTIMPL; +} + +static HRESULT WINAPI ShellBrowser_GetViewStateStream( + IShellBrowser* iface, + DWORD grfMode, + IStream **ppStrm) +{ + ShellBrowser *This = impl_from_IShellBrowser(iface); + FIXME("%p %x %p\n", This, grfMode, ppStrm); + return E_NOTIMPL; +} + +static HRESULT WINAPI ShellBrowser_GetControlWindow( + IShellBrowser* iface, + UINT id, + HWND *phwnd) +{ + ShellBrowser *This = impl_from_IShellBrowser(iface); + FIXME("%p %u %p\n", This, id, phwnd); + return E_NOTIMPL; +} + +static HRESULT WINAPI ShellBrowser_SendControlMsg( + IShellBrowser* iface, + UINT id, + UINT uMsg, + WPARAM wParam, + LPARAM lParam, + LRESULT *pret) +{ + ShellBrowser *This = impl_from_IShellBrowser(iface); + FIXME("%p %u %u %p\n", This, id, uMsg, pret); + return E_NOTIMPL; +} + +static HRESULT WINAPI ShellBrowser_QueryActiveShellView( + IShellBrowser* iface, + IShellView **ppshv) +{ + ShellBrowser *This = impl_from_IShellBrowser(iface); + FIXME("%p %p\n", This, ppshv); + return E_NOTIMPL; +} + +static HRESULT WINAPI ShellBrowser_OnViewWindowActive( + IShellBrowser* iface, + IShellView *pshv) +{ + ShellBrowser *This = impl_from_IShellBrowser(iface); + FIXME("%p %p\n", This, pshv); + return E_NOTIMPL; +} + +static HRESULT WINAPI ShellBrowser_SetToolbarItems( + IShellBrowser* iface, + LPTBBUTTONSB lpButtons, + UINT nButtons, + UINT uFlags) +{ + ShellBrowser *This = impl_from_IShellBrowser(iface); + FIXME("%p %p %u %u\n", This, lpButtons, nButtons, uFlags); + return E_NOTIMPL; +} + +static const IShellBrowserVtbl ShellBrowserVtbl = { + ShellBrowser_QueryInterface, + ShellBrowser_AddRef, + ShellBrowser_Release, + ShellBrowser_GetWindow, + ShellBrowser_ContextSensitiveHelp, + ShellBrowser_InsertMenusSB, + ShellBrowser_SetMenuSB, + ShellBrowser_RemoveMenusSB, + ShellBrowser_SetStatusTextSB, + ShellBrowser_EnableModelessSB, + ShellBrowser_TranslateAcceleratorSB, + ShellBrowser_BrowseObject, + ShellBrowser_GetViewStateStream, + ShellBrowser_GetControlWindow, + ShellBrowser_SendControlMsg, + ShellBrowser_QueryActiveShellView, + ShellBrowser_OnViewWindowActive, + ShellBrowser_SetToolbarItems +}; + +HRESULT ShellBrowser_Create(IShellBrowser **ppv) +{ + ShellBrowser *sb = heap_alloc(sizeof(ShellBrowser)); + if(!*ppv) + return E_OUTOFMEMORY; + + sb->IShellBrowser_iface.lpVtbl = &ShellBrowserVtbl; + + sb->ref = 1; + + *ppv = &sb->IShellBrowser_iface; + return S_OK; +}

1 0

Jacek Caban : winegecko: Added 1.2.0 release.
by Alexandre Julliard March 15, 2011

March 15, 2011

Module: tools Branch: master Commit: b49d42ef9424e3eb4d6786da65db89077f9ab215 URL: http://source.winehq.org/git/tools.git/?a=commit;h=b49d42ef9424e3eb4d6786da… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Mar 15 13:44:35 2011 +0100 winegecko: Added 1.2.0 release. --- winegecko.php | 24 +++++++++++++++++++++--- 1 files changed, 21 insertions(+), 3 deletions(-) diff --git a/winegecko.php b/winegecko.php index 4440279..8709a72 100644 --- a/winegecko.php +++ b/winegecko.php @@ -29,8 +29,24 @@ if(isset($_GET['v'])) { $sFileSuffix = $sVersion.'-'.$_GET['arch']; } +if(!$sFileSuffix) + $sFileSuffix = $sVersion; + +switch($sVersion) { +case '0.0.1': +case '0.1.0': +case '0.9.0': +case '0.9.1': +case '1.0.0': +case '1.1.0': + $sExt = 'cab'; + break; +default: + $sExt = 'msi'; +} + // Name of the file -$sFileName = sprintf('%s/%s/wine_gecko-%s.cab', $sFolder, $sVersion, $sFileSuffix ? $sFileSuffix : $sVersion); +$sFileName = sprintf('%s/%s/wine_gecko-%s.%s', $sFolder, $sVersion, $sFileSuffix, $sExt); // Size array $aFileSizes = array( @@ -40,11 +56,13 @@ $aFileSizes = array( '0.9.1'=>7806837, '1.0.0-x86'=>8119486, '1.1.0-x86'=>8868851, - '1.1.0-x86_64'=>8940997 + '1.1.0-x86_64'=>8940997, + '1.2.0-x86'=>12604928, + '1.2.0-x86_64'=>12841472 ); // Exact size of the file: -$iFileSize = $aFileSizes[$sFileSuffix ? $sFileSuffix : $sVersion]; +$iFileSize = $aFileSizes[$sFileSuffix]; if(!$iFileSize) { header("HTTP/1.0 404 Not Found"); exit;

1 0

André Hentschel : advapi32/tests: Add some skips.
by Alexandre Julliard March 14, 2011

March 14, 2011

Module: wine Branch: master Commit: e2a3b4b4e59d519d07be925c057aa3e82ff1a8ea URL: http://source.winehq.org/git/wine.git/?a=commit;h=e2a3b4b4e59d519d07be925c0… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun Mar 13 15:32:59 2011 +0100 advapi32/tests: Add some skips. --- dlls/advapi32/tests/registry.c | 11 ++++++++--- 1 files changed, 8 insertions(+), 3 deletions(-) diff --git a/dlls/advapi32/tests/registry.c b/dlls/advapi32/tests/registry.c index 2809559..91164bd 100644 --- a/dlls/advapi32/tests/registry.c +++ b/dlls/advapi32/tests/registry.c @@ -2064,8 +2064,13 @@ static void test_classesroot(void) delete_key( hkey ); RegCloseKey( hkey ); } - if (RegCreateKeyExA( HKEY_CURRENT_USER, "Software\\Classes\\WineTestCls", 0, NULL, 0, - KEY_QUERY_VALUE|KEY_SET_VALUE, NULL, &hkey, NULL )) return; + res = RegCreateKeyExA( HKEY_CURRENT_USER, "Software\\Classes\\WineTestCls", 0, NULL, 0, + KEY_QUERY_VALUE|KEY_SET_VALUE, NULL, &hkey, NULL ); + if (res == ERROR_ACCESS_DENIED) + { + skip("not enough privileges to add a user class\n"); + return; + } /* try to open that key in hkcr */ res = RegOpenKeyExA( HKEY_CLASSES_ROOT, "WineTestCls", 0, @@ -2075,7 +2080,7 @@ static void test_classesroot(void) "test key not found in hkcr: %d\n", res); if (res) { - trace( "HKCR key merging not supported\n" ); + skip("HKCR key merging not supported\n"); delete_key( hkey ); RegCloseKey( hkey ); return;

1 0