October 2008 - Wine-Commits

Henri Verbeet : shell32: Implement IShellView2_CreateViewWindow2.
by Alexandre Julliard Oct. 14, 2008

Oct. 14, 2008

Module: wine Branch: master Commit: 67f86a410fa0dbfa7d0f7a5549f8c6f0aa49b20a URL: http://source.winehq.org/git/wine.git/?a=commit;h=67f86a410fa0dbfa7d0f7a554… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Oct 14 09:01:08 2008 +0200 shell32: Implement IShellView2_CreateViewWindow2. --- dlls/shell32/shlview.c | 190 +++++++++++++++++++++++++++++------------------- 1 files changed, 116 insertions(+), 74 deletions(-) diff --git a/dlls/shell32/shlview.c b/dlls/shell32/shlview.c index 1f7dcc7..20a1efb 100644 --- a/dlls/shell32/shlview.c +++ b/dlls/shell32/shlview.c @@ -1684,6 +1684,10 @@ static HRESULT WINAPI IShellView_fnQueryInterface(IShellView2 * iface,REFIID rii { *ppvObj = (IShellView*)This; } + else if(IsEqualIID(riid, &IID_IShellView2)) + { + *ppvObj = (IShellView2*)This; + } else if(IsEqualIID(riid, &IID_IOleCommandTarget)) { *ppvObj = (IOleCommandTarget*)&(This->lpvtblOleCommandTarget); @@ -1863,79 +1867,25 @@ static HRESULT WINAPI IShellView_fnRefresh(IShellView2 * iface) return S_OK; } -static HRESULT WINAPI IShellView_fnCreateViewWindow( - IShellView2 * iface, - IShellView *lpPrevView, - LPCFOLDERSETTINGS lpfs, - IShellBrowser * psb, - RECT * prcView, - HWND *phWnd) +static HRESULT WINAPI IShellView_fnCreateViewWindow(IShellView2 *iface, IShellView *lpPrevView, + LPCFOLDERSETTINGS lpfs, IShellBrowser *psb, RECT *prcView, HWND *phWnd) { - IShellViewImpl *This = (IShellViewImpl *)iface; - - WNDCLASSW wc; - *phWnd = 0; - - - TRACE("(%p)->(shlview=%p set=%p shlbrs=%p rec=%p hwnd=%p) incomplete\n",This, lpPrevView,lpfs, psb, prcView, phWnd); - TRACE("-- vmode=%x flags=%x left=%i top=%i right=%i bottom=%i\n",lpfs->ViewMode, lpfs->fFlags ,prcView->left,prcView->top, prcView->right, prcView->bottom); - - /*set up the member variables*/ - This->pShellBrowser = psb; - This->FolderSettings = *lpfs; - - /*get our parent window*/ - IShellBrowser_AddRef(This->pShellBrowser); - IShellBrowser_GetWindow(This->pShellBrowser, &(This->hWndParent)); - - /* try to get the ICommDlgBrowserInterface, adds a reference !!! */ - This->pCommDlgBrowser=NULL; - if ( SUCCEEDED (IShellBrowser_QueryInterface( This->pShellBrowser, - (REFIID)&IID_ICommDlgBrowser, (LPVOID*) &This->pCommDlgBrowser))) - { - TRACE("-- CommDlgBrowser\n"); - } - - /*if our window class has not been registered, then do so*/ - if(!GetClassInfoW(shell32_hInstance, SV_CLASS_NAME, &wc)) - { - ZeroMemory(&wc, sizeof(wc)); - wc.style = CS_HREDRAW | CS_VREDRAW; - wc.lpfnWndProc = ShellView_WndProc; - wc.cbClsExtra = 0; - wc.cbWndExtra = 0; - wc.hInstance = shell32_hInstance; - wc.hIcon = 0; - wc.hCursor = LoadCursorW(0, (LPWSTR)IDC_ARROW); - wc.hbrBackground = (HBRUSH) (COLOR_WINDOW + 1); - wc.lpszMenuName = NULL; - wc.lpszClassName = SV_CLASS_NAME; - - if(!RegisterClassW(&wc)) - return E_FAIL; - } - - *phWnd = CreateWindowExW(0, - SV_CLASS_NAME, - NULL, - WS_CHILD | WS_TABSTOP, - prcView->left, - prcView->top, - prcView->right - prcView->left, - prcView->bottom - prcView->top, - This->hWndParent, - 0, - shell32_hInstance, - (LPVOID)This); - - CheckToolbar(This); + HRESULT hr; + SV2CVW2_PARAMS view_params; + view_params.cbSize = sizeof(view_params); + view_params.psvPrev = lpPrevView; + view_params.pfs = lpfs; + view_params.psbOwner = psb; + view_params.prcView = prcView; + view_params.pvid = NULL; + view_params.hwndView = 0; - if(!*phWnd) return E_FAIL; + TRACE("(%p) Forwarding to CreateViewWindow2\n", iface); - SetWindowPos(*phWnd, HWND_TOP, 0, 0, 0, 0, SWP_NOMOVE | SWP_NOSIZE | SWP_SHOWWINDOW); - UpdateWindow(*phWnd); + hr = IShellView2_CreateViewWindow2(iface, &view_params); + *phWnd = view_params.hwndView; - return S_OK; + return hr; } static HRESULT WINAPI IShellView_fnDestroyViewWindow(IShellView2 * iface) @@ -2078,8 +2028,100 @@ static HRESULT WINAPI IShellView2_fnGetView(IShellView2* iface, SHELLVIEWID *vie static HRESULT WINAPI IShellView2_fnCreateViewWindow2(IShellView2* iface, LPSV2CVW2_PARAMS view_params) { - FIXME("(%p)->(view_params %p) stub!\n", iface, view_params); - return E_NOTIMPL; + IShellViewImpl *This = (IShellViewImpl *)iface; + WNDCLASSW wc; + HWND wnd; + + TRACE("(%p)->(view_params %p)\n", iface, view_params); + + if (view_params->cbSize != sizeof(*view_params)) + { + FIXME("Got unexpected cbSize %#x\n", view_params->cbSize); + return E_FAIL; + } + + TRACE("-- psvPrev %p, pfs %p, psbOwner %p, prcView %p\n", + view_params->psvPrev, view_params->pfs, view_params->psbOwner, view_params->prcView); + TRACE("-- vmode %#x, flags %#x, left %d, top %d, right %d, bottom %d\n", + view_params->pfs->ViewMode, view_params->pfs->fFlags, view_params->prcView->left, + view_params->prcView->top, view_params->prcView->right, view_params->prcView->bottom); + + /* Set up the member variables */ + This->pShellBrowser = view_params->psbOwner; + This->FolderSettings = *view_params->pfs; + + if (view_params->pvid) + { + if (IsEqualGUID(view_params->pvid, &VID_LargeIcons)) + This->FolderSettings.ViewMode = FVM_ICON; + else if (IsEqualGUID(view_params->pvid, &VID_SmallIcons)) + This->FolderSettings.ViewMode = FVM_SMALLICON; + else if (IsEqualGUID(view_params->pvid, &VID_List)) + This->FolderSettings.ViewMode = FVM_LIST; + else if (IsEqualGUID(view_params->pvid, &VID_Details)) + This->FolderSettings.ViewMode = FVM_DETAILS; + else if (IsEqualGUID(view_params->pvid, &VID_Thumbnails)) + This->FolderSettings.ViewMode = FVM_THUMBNAIL; + else if (IsEqualGUID(view_params->pvid, &VID_Tile)) + This->FolderSettings.ViewMode = FVM_TILE; + else if (IsEqualGUID(view_params->pvid, &VID_ThumbStrip)) + This->FolderSettings.ViewMode = FVM_THUMBSTRIP; + else + FIXME("Ignoring unrecognized VID %s\n", debugstr_guid(view_params->pvid)); + } + + /* Get our parent window */ + IShellBrowser_AddRef(This->pShellBrowser); + IShellBrowser_GetWindow(This->pShellBrowser, &(This->hWndParent)); + + /* Try to get the ICommDlgBrowserInterface, adds a reference !!! */ + This->pCommDlgBrowser = NULL; + if (SUCCEEDED(IShellBrowser_QueryInterface(This->pShellBrowser, &IID_ICommDlgBrowser, (void **)&This->pCommDlgBrowser))) + { + TRACE("-- CommDlgBrowser %p\n", This->pCommDlgBrowser); + } + + /* If our window class has not been registered, then do so */ + if (!GetClassInfoW(shell32_hInstance, SV_CLASS_NAME, &wc)) + { + ZeroMemory(&wc, sizeof(wc)); + wc.style = CS_HREDRAW | CS_VREDRAW; + wc.lpfnWndProc = ShellView_WndProc; + wc.cbClsExtra = 0; + wc.cbWndExtra = 0; + wc.hInstance = shell32_hInstance; + wc.hIcon = 0; + wc.hCursor = LoadCursorW(0, (LPWSTR)IDC_ARROW); + wc.hbrBackground = (HBRUSH)(COLOR_WINDOW + 1); + wc.lpszMenuName = NULL; + wc.lpszClassName = SV_CLASS_NAME; + + if (!RegisterClassW(&wc)) return E_FAIL; + } + + wnd = CreateWindowExW(0, + SV_CLASS_NAME, + NULL, + WS_CHILD | WS_TABSTOP, + view_params->prcView->left, + view_params->prcView->top, + view_params->prcView->right - view_params->prcView->left, + view_params->prcView->bottom - view_params->prcView->top, + This->hWndParent, + 0, + shell32_hInstance, + (LPVOID)This); + + CheckToolbar(This); + + if (!wnd) return E_FAIL; + + SetWindowPos(wnd, HWND_TOP, 0, 0, 0, 0, SWP_NOMOVE | SWP_NOSIZE | SWP_SHOWWINDOW); + UpdateWindow(wnd); + + view_params->hwndView = wnd; + + return S_OK; } static HRESULT WINAPI IShellView2_fnHandleRename(IShellView2* iface, LPCITEMIDLIST new_pidl)

1 0

Henri Verbeet : shell32: Add VIDs.
by Alexandre Julliard Oct. 14, 2008

Oct. 14, 2008

Module: wine Branch: master Commit: eeb762d06c5f7ef258bd10f94d192741c381a905 URL: http://source.winehq.org/git/wine.git/?a=commit;h=eeb762d06c5f7ef258bd10f94… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Oct 14 09:01:08 2008 +0200 shell32: Add VIDs. --- include/shlguid.h | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/include/shlguid.h b/include/shlguid.h index d9685e6..d7c2b55 100644 --- a/include/shlguid.h +++ b/include/shlguid.h @@ -153,4 +153,12 @@ DEFINE_GUID(CLSID_CAnchorBrowsePropertyPage, 0x3050F3BB, 0x98B5, 0x11CF, 0xBB,0x DEFINE_GUID(CLSID_CDocBrowsePropertyPage, 0x3050F3B4, 0x98B5, 0x11CF, 0xBB,0x82, 0x00,0xAA,0x00,0xBD,0xCE,0x0B); DEFINE_GUID(CLSID_CImageBrowsePropertyPage, 0x3050F3B3, 0x98B5, 0x11CF, 0xBB,0x82, 0x00,0xAA,0x00,0xBD,0xCE,0x0B); +DEFINE_GUID(VID_LargeIcons, 0x0057d0e0, 0x3573, 0x11cf, 0xae, 0x69, 0x08, 0x00, 0x2b, 0x2e, 0x12, 0x62); +DEFINE_GUID(VID_SmallIcons, 0x089000c0, 0x3573, 0x11cf, 0xae, 0x69, 0x08, 0x00, 0x2b, 0x2e, 0x12, 0x62); +DEFINE_GUID(VID_List, 0x0e1fa5e0, 0x3573, 0x11cf, 0xae, 0x69, 0x08, 0x00, 0x2b, 0x2e, 0x12, 0x62); +DEFINE_GUID(VID_Details, 0x137e7700, 0x3573, 0x11cf, 0xae, 0x69, 0x08, 0x00, 0x2b, 0x2e, 0x12, 0x62); +DEFINE_GUID(VID_Thumbnails, 0x8bebb290, 0x52d0, 0x11d0, 0xb7, 0xf4, 0x00, 0xc0, 0x4f, 0xd7, 0x06, 0xec); +DEFINE_GUID(VID_Tile, 0x65f125e5, 0x7be1, 0x4810, 0xba, 0x9d, 0xd2, 0x71, 0xc8, 0x43, 0x2c, 0xe3); +DEFINE_GUID(VID_ThumbStrip, 0x8eefa624, 0xd1e9, 0x445b, 0x94, 0xb7, 0x74, 0xfb, 0xce, 0x2e, 0xa1, 0x1a); + #endif /* __WINE_SHLGUID_H */

1 0

Henri Verbeet : shell32: Add IShellView32 stubs.
by Alexandre Julliard Oct. 14, 2008

Oct. 14, 2008

Module: wine Branch: master Commit: 5cfb3c4a6fefa25b847b5eb086acfc1038998847 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5cfb3c4a6fefa25b847b5eb08… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Oct 14 09:01:08 2008 +0200 shell32: Add IShellView32 stubs. --- dlls/shell32/shlview.c | 68 +++++++++++++++++++++++++++++++++-------------- 1 files changed, 48 insertions(+), 20 deletions(-) diff --git a/dlls/shell32/shlview.c b/dlls/shell32/shlview.c index c890e0d..1f7dcc7 100644 --- a/dlls/shell32/shlview.c +++ b/dlls/shell32/shlview.c @@ -78,7 +78,7 @@ typedef struct typedef struct { - const IShellViewVtbl* lpVtbl; + const IShellView2Vtbl* lpVtbl; LONG ref; const IOleCommandTargetVtbl* lpvtblOleCommandTarget; const IDropTargetVtbl* lpvtblDropTarget; @@ -109,7 +109,7 @@ typedef struct POINT ptLastMousePos; /* Mouse position at last DragOver call */ } IShellViewImpl; -static const IShellViewVtbl svvt; +static const IShellView2Vtbl svvt; static const IOleCommandTargetVtbl ctvt; static const IDropTargetVtbl dtvt; static const IDropSourceVtbl dsvt; @@ -1668,7 +1668,7 @@ static LRESULT CALLBACK ShellView_WndProc(HWND hWnd, UINT uMessage, WPARAM wPara ********************************************************** * IShellView_QueryInterface */ -static HRESULT WINAPI IShellView_fnQueryInterface(IShellView * iface,REFIID riid, LPVOID *ppvObj) +static HRESULT WINAPI IShellView_fnQueryInterface(IShellView2 * iface,REFIID riid, LPVOID *ppvObj) { IShellViewImpl *This = (IShellViewImpl *)iface; @@ -1714,7 +1714,7 @@ static HRESULT WINAPI IShellView_fnQueryInterface(IShellView * iface,REFIID riid /********************************************************** * IShellView_AddRef */ -static ULONG WINAPI IShellView_fnAddRef(IShellView * iface) +static ULONG WINAPI IShellView_fnAddRef(IShellView2 * iface) { IShellViewImpl *This = (IShellViewImpl *)iface; ULONG refCount = InterlockedIncrement(&This->ref); @@ -1726,7 +1726,7 @@ static ULONG WINAPI IShellView_fnAddRef(IShellView * iface) /********************************************************** * IShellView_Release */ -static ULONG WINAPI IShellView_fnRelease(IShellView * iface) +static ULONG WINAPI IShellView_fnRelease(IShellView2 * iface) { IShellViewImpl *This = (IShellViewImpl *)iface; ULONG refCount = InterlockedDecrement(&This->ref); @@ -1758,7 +1758,7 @@ static ULONG WINAPI IShellView_fnRelease(IShellView * iface) /********************************************************** * ShellView_GetWindow */ -static HRESULT WINAPI IShellView_fnGetWindow(IShellView * iface,HWND * phWnd) +static HRESULT WINAPI IShellView_fnGetWindow(IShellView2 * iface,HWND * phWnd) { IShellViewImpl *This = (IShellViewImpl *)iface; @@ -1769,7 +1769,7 @@ static HRESULT WINAPI IShellView_fnGetWindow(IShellView * iface,HWND * phWnd) return S_OK; } -static HRESULT WINAPI IShellView_fnContextSensitiveHelp(IShellView * iface,BOOL fEnterMode) +static HRESULT WINAPI IShellView_fnContextSensitiveHelp(IShellView2 * iface,BOOL fEnterMode) { IShellViewImpl *This = (IShellViewImpl *)iface; @@ -1784,7 +1784,7 @@ static HRESULT WINAPI IShellView_fnContextSensitiveHelp(IShellView * iface,BOOL * FIXME: * use the accel functions */ -static HRESULT WINAPI IShellView_fnTranslateAccelerator(IShellView * iface,LPMSG lpmsg) +static HRESULT WINAPI IShellView_fnTranslateAccelerator(IShellView2 * iface,LPMSG lpmsg) { #if 0 IShellViewImpl *This = (IShellViewImpl *)iface; @@ -1799,7 +1799,7 @@ static HRESULT WINAPI IShellView_fnTranslateAccelerator(IShellView * iface,LPMSG return S_FALSE; /* not handled */ } -static HRESULT WINAPI IShellView_fnEnableModeless(IShellView * iface,BOOL fEnable) +static HRESULT WINAPI IShellView_fnEnableModeless(IShellView2 * iface,BOOL fEnable) { IShellViewImpl *This = (IShellViewImpl *)iface; @@ -1808,7 +1808,7 @@ static HRESULT WINAPI IShellView_fnEnableModeless(IShellView * iface,BOOL fEnabl return E_NOTIMPL; } -static HRESULT WINAPI IShellView_fnUIActivate(IShellView * iface,UINT uState) +static HRESULT WINAPI IShellView_fnUIActivate(IShellView2 * iface,UINT uState) { IShellViewImpl *This = (IShellViewImpl *)iface; @@ -1851,7 +1851,7 @@ static HRESULT WINAPI IShellView_fnUIActivate(IShellView * iface,UINT uState) return S_OK; } -static HRESULT WINAPI IShellView_fnRefresh(IShellView * iface) +static HRESULT WINAPI IShellView_fnRefresh(IShellView2 * iface) { IShellViewImpl *This = (IShellViewImpl *)iface; @@ -1864,7 +1864,7 @@ static HRESULT WINAPI IShellView_fnRefresh(IShellView * iface) } static HRESULT WINAPI IShellView_fnCreateViewWindow( - IShellView * iface, + IShellView2 * iface, IShellView *lpPrevView, LPCFOLDERSETTINGS lpfs, IShellBrowser * psb, @@ -1938,7 +1938,7 @@ static HRESULT WINAPI IShellView_fnCreateViewWindow( return S_OK; } -static HRESULT WINAPI IShellView_fnDestroyViewWindow(IShellView * iface) +static HRESULT WINAPI IShellView_fnDestroyViewWindow(IShellView2 * iface) { IShellViewImpl *This = (IShellViewImpl *)iface; @@ -1960,7 +1960,7 @@ static HRESULT WINAPI IShellView_fnDestroyViewWindow(IShellView * iface) return S_OK; } -static HRESULT WINAPI IShellView_fnGetCurrentInfo(IShellView * iface, LPFOLDERSETTINGS lpfs) +static HRESULT WINAPI IShellView_fnGetCurrentInfo(IShellView2 * iface, LPFOLDERSETTINGS lpfs) { IShellViewImpl *This = (IShellViewImpl *)iface; @@ -1973,7 +1973,7 @@ static HRESULT WINAPI IShellView_fnGetCurrentInfo(IShellView * iface, LPFOLDERSE return NOERROR; } -static HRESULT WINAPI IShellView_fnAddPropertySheetPages(IShellView * iface, DWORD dwReserved,LPFNADDPROPSHEETPAGE lpfn, LPARAM lparam) +static HRESULT WINAPI IShellView_fnAddPropertySheetPages(IShellView2 * iface, DWORD dwReserved,LPFNADDPROPSHEETPAGE lpfn, LPARAM lparam) { IShellViewImpl *This = (IShellViewImpl *)iface; @@ -1982,7 +1982,7 @@ static HRESULT WINAPI IShellView_fnAddPropertySheetPages(IShellView * iface, DWO return E_NOTIMPL; } -static HRESULT WINAPI IShellView_fnSaveViewState(IShellView * iface) +static HRESULT WINAPI IShellView_fnSaveViewState(IShellView2 * iface) { IShellViewImpl *This = (IShellViewImpl *)iface; @@ -1992,7 +1992,7 @@ static HRESULT WINAPI IShellView_fnSaveViewState(IShellView * iface) } static HRESULT WINAPI IShellView_fnSelectItem( - IShellView * iface, + IShellView2 * iface, LPCITEMIDLIST pidl, UINT uFlags) { @@ -2044,7 +2044,7 @@ static HRESULT WINAPI IShellView_fnSelectItem( return S_OK; } -static HRESULT WINAPI IShellView_fnGetItemObject(IShellView * iface, UINT uItem, REFIID riid, LPVOID *ppvOut) +static HRESULT WINAPI IShellView_fnGetItemObject(IShellView2 * iface, UINT uItem, REFIID riid, LPVOID *ppvOut) { IShellViewImpl *This = (IShellViewImpl *)iface; @@ -2070,7 +2070,31 @@ static HRESULT WINAPI IShellView_fnGetItemObject(IShellView * iface, UINT uItem, return S_OK; } -static const IShellViewVtbl svvt = +static HRESULT WINAPI IShellView2_fnGetView(IShellView2* iface, SHELLVIEWID *view_guid, ULONG view_type) +{ + FIXME("(%p)->(view_guid %s, view_type %#x) stub!\n", iface, debugstr_guid(view_guid), view_type); + return E_NOTIMPL; +} + +static HRESULT WINAPI IShellView2_fnCreateViewWindow2(IShellView2* iface, LPSV2CVW2_PARAMS view_params) +{ + FIXME("(%p)->(view_params %p) stub!\n", iface, view_params); + return E_NOTIMPL; +} + +static HRESULT WINAPI IShellView2_fnHandleRename(IShellView2* iface, LPCITEMIDLIST new_pidl) +{ + FIXME("(%p)->(new_pidl %p) stub!\n", iface, new_pidl); + return E_NOTIMPL; +} + +static HRESULT WINAPI IShellView2_fnSelectAndPositionItem(IShellView2* iface, LPCITEMIDLIST item, UINT flags, POINT *point) +{ + FIXME("(%p)->(item %p, flags %#x, point %p) stub!\n", iface, item, flags, point); + return E_NOTIMPL; +} + +static const IShellView2Vtbl svvt = { IShellView_fnQueryInterface, IShellView_fnAddRef, @@ -2087,7 +2111,11 @@ static const IShellViewVtbl svvt = IShellView_fnAddPropertySheetPages, IShellView_fnSaveViewState, IShellView_fnSelectItem, - IShellView_fnGetItemObject + IShellView_fnGetItemObject, + IShellView2_fnGetView, + IShellView2_fnCreateViewWindow2, + IShellView2_fnHandleRename, + IShellView2_fnSelectAndPositionItem, };

1 0

Henri Verbeet : shell32: Add the IShellView2 interface.
by Alexandre Julliard Oct. 14, 2008

Oct. 14, 2008

Module: wine Branch: master Commit: 6176cf4e9734eef0eed26ad6c1e156806517527e URL: http://source.winehq.org/git/wine.git/?a=commit;h=6176cf4e9734eef0eed26ad6c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Oct 14 09:01:08 2008 +0200 shell32: Add the IShellView2 interface. --- include/shlobj.h | 2 -- include/shobjidl.idl | 38 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 38 insertions(+), 2 deletions(-) diff --git a/include/shlobj.h b/include/shlobj.h index 5ed4978..6480023 100644 --- a/include/shlobj.h +++ b/include/shlobj.h @@ -277,8 +277,6 @@ typedef struct * IShellView interface */ -typedef GUID SHELLVIEWID; - #define FCIDM_SHVIEWFIRST 0x0000 /* undocumented */ #define FCIDM_SHVIEW_ARRANGE 0x7001 diff --git a/include/shobjidl.idl b/include/shobjidl.idl index 95e532c..156d146 100644 --- a/include/shobjidl.idl +++ b/include/shobjidl.idl @@ -461,6 +461,44 @@ interface IShellView : IOleWindow [out, iid_is(riid)] void **ppv); } +[ + object, + uuid(88e39e80-3578-11cf-ae69-08002b2e1262), + pointer_default(unique) +] +interface IShellView2 : IShellView +{ + typedef GUID SHELLVIEWID; +cpp_quote("#include <pshpack8.h>") + typedef struct _SV2CVW2_PARAMS + { + DWORD cbSize; + IShellView *psvPrev; + LPCFOLDERSETTINGS pfs; + IShellBrowser *psbOwner; + RECT *prcView; + SHELLVIEWID const *pvid; + HWND hwndView; + } SV2CVW2_PARAMS, *LPSV2CVW2_PARAMS; +cpp_quote("#include <poppack.h>") + + HRESULT GetView( + [in, out] SHELLVIEWID *view_guid, + [in] ULONG view_type + ); + HRESULT CreateViewWindow2( + [in] LPSV2CVW2_PARAMS view_params + ); + HRESULT HandleRename( + [in] LPCITEMIDLIST new_pidl + ); + HRESULT SelectAndPositionItem( + [in] LPCITEMIDLIST item, + [in] UINT flags, + [in] POINT *point + ); +} + /***************************************************************************** * IShellBrowser interface

1 0

Lei Zhang : version: Prevent infinite looping in VersionInfo32_FindChild.
by Alexandre Julliard Oct. 14, 2008

Oct. 14, 2008

Module: wine Branch: master Commit: 69871bedf1d787f25fe31df6075bf168d871cc3b URL: http://source.winehq.org/git/wine.git/?a=commit;h=69871bedf1d787f25fe31df60… Author: Lei Zhang <thestig(a)google.com> Date: Mon Oct 13 14:29:32 2008 -0700 version: Prevent infinite looping in VersionInfo32_FindChild. --- dlls/version/info.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/version/info.c b/dlls/version/info.c index 395895b..51e25b3 100644 --- a/dlls/version/info.c +++ b/dlls/version/info.c @@ -664,6 +664,7 @@ static const VS_VERSION_INFO_STRUCT32 *VersionInfo32_FindChild( const VS_VERSION if (!strncmpiW( child->szKey, szKey, cbKey ) && !child->szKey[cbKey]) return child; + if (!(child->wLength)) return NULL; child = VersionInfo32_Next( child ); }

1 0

Marcus Meissner : oleview: RegEnumKey gets always sizes, not -1.
by Alexandre Julliard Oct. 14, 2008

Oct. 14, 2008

Module: wine Branch: master Commit: 1b9507630821590c15708e05bd67bd1cf2a7ef38 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1b9507630821590c15708e05b… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Tue Oct 14 08:34:57 2008 +0200 oleview: RegEnumKey gets always sizes, not -1. --- programs/oleview/tree.c | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/programs/oleview/tree.c b/programs/oleview/tree.c index a5ba112..70391d7 100644 --- a/programs/oleview/tree.c +++ b/programs/oleview/tree.c @@ -271,7 +271,7 @@ static void AddCOMandAll(void) { i++; - if(RegEnumKey(hKey, i, valName, -1) != ERROR_SUCCESS) break; + if(RegEnumKey(hKey, i, valName, sizeof(valName)/sizeof(valName[0])) != ERROR_SUCCESS) break; if(RegOpenKey(hKey, valName, &hCurKey) != ERROR_SUCCESS) continue; @@ -300,7 +300,7 @@ static void AddCOMandAll(void) if(RegOpenKey(hCurKey, wszImplementedCategories, &hInfo) == ERROR_SUCCESS) { - if(RegEnumKey(hInfo, 0, wszComp, -1) != ERROR_SUCCESS) break; + if(RegEnumKey(hInfo, 0, wszComp, sizeof(wszComp)/sizeof(wszComp[0])) != ERROR_SUCCESS) break; RegCloseKey(hInfo); @@ -355,7 +355,7 @@ static void AddApplicationID(void) { i++; - if(RegEnumKey(hKey, i, valName, -1) != ERROR_SUCCESS) break; + if(RegEnumKey(hKey, i, valName, sizeof(valName)/sizeof(valName[0])) != ERROR_SUCCESS) break; if(RegOpenKey(hKey, valName, &hCurKey) != ERROR_SUCCESS) continue; @@ -400,7 +400,7 @@ static void AddTypeLib(void) { i++; - if(RegEnumKey(hKey, i, valParent, -1) != ERROR_SUCCESS) break; + if(RegEnumKey(hKey, i, valParent, sizeof(valParent)/sizeof(valParent[0])) != ERROR_SUCCESS) break; if(RegOpenKey(hKey, valParent, &hCurKey) != ERROR_SUCCESS) continue; @@ -409,7 +409,7 @@ static void AddTypeLib(void) { j++; - if(RegEnumKey(hCurKey, j, valName, -1) != ERROR_SUCCESS) break; + if(RegEnumKey(hCurKey, j, valName, sizeof(valName)/sizeof(valName[0])) != ERROR_SUCCESS) break; if(RegOpenKey(hCurKey, valName, &hInfoKey) != ERROR_SUCCESS) continue; @@ -466,7 +466,7 @@ static void AddInterfaces(void) { i++; - if(RegEnumKey(hKey, i, valName, -1) != ERROR_SUCCESS) break; + if(RegEnumKey(hKey, i, valName, sizeof(valName)/sizeof(valName[0])) != ERROR_SUCCESS) break; if(RegOpenKey(hKey, valName, &hCurKey) != ERROR_SUCCESS) continue; @@ -511,7 +511,7 @@ static void AddComponentCategories(void) { i++; - if(RegEnumKey(hKey, i, valName, -1) != ERROR_SUCCESS) break; + if(RegEnumKey(hKey, i, valName, sizeof(valName)/sizeof(valName[0])) != ERROR_SUCCESS) break; if(RegOpenKey(hKey, valName, &hCurKey) != ERROR_SUCCESS) continue;

1 0

Dylan Smith : wordpad: Added option to disable word wrap.
by Alexandre Julliard Oct. 14, 2008

Oct. 14, 2008

Module: wine Branch: master Commit: f124a586d496f49a71a3aa90cf78df0d35e62008 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f124a586d496f49a71a3aa90c… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Mon Oct 13 18:48:41 2008 -0400 wordpad: Added option to disable word wrap. --- programs/wordpad/Da.rc | 5 +++-- programs/wordpad/De.rc | 5 +++-- programs/wordpad/En.rc | 5 +++-- programs/wordpad/Fr.rc | 5 +++-- programs/wordpad/Hu.rc | 5 +++-- programs/wordpad/Ja.rc | 5 +++-- programs/wordpad/Ko.rc | 5 +++-- programs/wordpad/Nl.rc | 5 +++-- programs/wordpad/No.rc | 5 +++-- programs/wordpad/Pl.rc | 5 +++-- programs/wordpad/Ru.rc | 5 +++-- programs/wordpad/Si.rc | 5 +++-- programs/wordpad/Tr.rc | 5 +++-- programs/wordpad/Zh.rc | 5 +++-- programs/wordpad/print.c | 30 ++++++++++++++++++++---------- programs/wordpad/registry.c | 2 +- programs/wordpad/wordpad.c | 15 ++++++++++----- programs/wordpad/wordpad.h | 7 ++++--- 18 files changed, 77 insertions(+), 47 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f124a586d496f49a71a3a…

1 0

Rob Shearman : wnaspi32: Protect the inclusion of dirent.h in aspi.c.
by Alexandre Julliard Oct. 14, 2008

Oct. 14, 2008

Module: wine Branch: master Commit: 8ef9d20f9697f99130a22e960a2cb9a2acf9af6f URL: http://source.winehq.org/git/wine.git/?a=commit;h=8ef9d20f9697f99130a22e960… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Mon Oct 13 23:37:25 2008 +0100 wnaspi32: Protect the inclusion of dirent.h in aspi.c. This allows the file to be compiled on platforms that don't have the header file, such as MSVC. --- dlls/wnaspi32/aspi.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/wnaspi32/aspi.c b/dlls/wnaspi32/aspi.c index 196b968..c511524 100644 --- a/dlls/wnaspi32/aspi.c +++ b/dlls/wnaspi32/aspi.c @@ -40,7 +40,9 @@ #include <sys/ioctl.h> #endif #include <fcntl.h> -#include <dirent.h> +#ifdef HAVE_DIRENT_H +# include <dirent.h> +#endif #ifdef HAVE_UNISTD_H # include <unistd.h> #endif

1 0

Detlef Riekenberg : gdi32/tests: Fix tests to not depend on 96 dpi.
by Alexandre Julliard Oct. 14, 2008

Oct. 14, 2008

Module: wine Branch: master Commit: 57a5a60ca36e51509cdcc181bdb3b039204d65b3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=57a5a60ca36e51509cdcc181b… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Tue Oct 14 01:01:51 2008 +0200 gdi32/tests: Fix tests to not depend on 96 dpi. --- dlls/gdi32/tests/mapping.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/gdi32/tests/mapping.c b/dlls/gdi32/tests/mapping.c index 210f783..7e85ca9 100644 --- a/dlls/gdi32/tests/mapping.c +++ b/dlls/gdi32/tests/mapping.c @@ -101,7 +101,7 @@ static void test_world_transform(void) if (is_win9x) { - expect_viewport_ext(hdc, 96, 96); + expect_viewport_ext(hdc, GetDeviceCaps(hdc, LOGPIXELSX), GetDeviceCaps(hdc, LOGPIXELSY)); expect_window_ext(hdc, 254, -254); } else

1 0

Rob Shearman : rpcrt4: The type referred to by the wire_marshal attribute in server. idl must be a pointer.
by Alexandre Julliard Oct. 14, 2008

Oct. 14, 2008

Module: wine Branch: master Commit: b919443a581610ee1877945bb2caf39b96afd9c3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b919443a581610ee1877945bb… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Mon Oct 13 23:36:17 2008 +0100 rpcrt4: The type referred to by the wire_marshal attribute in server.idl must be a pointer. Therefore, declare the structure as user_bstr_t and make wire_bstr_t be a typedef to a pointer of this type. --- dlls/rpcrt4/tests/server.c | 10 +++++----- dlls/rpcrt4/tests/server.idl | 3 ++- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/dlls/rpcrt4/tests/server.c b/dlls/rpcrt4/tests/server.c index 78a8bff..a2d72de 100644 --- a/dlls/rpcrt4/tests/server.c +++ b/dlls/rpcrt4/tests/server.c @@ -990,27 +990,27 @@ us_t_UserFree(ULONG *flags, us_t *pus) ULONG __RPC_USER bstr_t_UserSize(ULONG *flags, ULONG start, bstr_t *b) { - return start + FIELD_OFFSET(wire_bstr_t, data[(*b)[-1]]); + return start + FIELD_OFFSET(user_bstr_t, data[(*b)[-1]]); } unsigned char * __RPC_USER bstr_t_UserMarshal(ULONG *flags, unsigned char *buffer, bstr_t *b) { - wire_bstr_t *wb = (wire_bstr_t *) buffer; + wire_bstr_t wb = (wire_bstr_t) buffer; wb->n = (*b)[-1]; memcpy(&wb->data, *b, wb->n * sizeof wb->data[0]); - return buffer + FIELD_OFFSET(wire_bstr_t, data[wb->n]); + return buffer + FIELD_OFFSET(user_bstr_t, data[wb->n]); } unsigned char * __RPC_USER bstr_t_UserUnmarshal(ULONG *flags, unsigned char *buffer, bstr_t *b) { - wire_bstr_t *wb = (wire_bstr_t *) buffer; + wire_bstr_t wb = (wire_bstr_t) buffer; short *data = HeapAlloc(GetProcessHeap(), 0, (wb->n + 1) * sizeof *data); data[0] = wb->n; memcpy(&data[1], wb->data, wb->n * sizeof data[1]); *b = &data[1]; - return buffer + FIELD_OFFSET(wire_bstr_t, data[wb->n]); + return buffer + FIELD_OFFSET(user_bstr_t, data[wb->n]); } void __RPC_USER diff --git a/dlls/rpcrt4/tests/server.idl b/dlls/rpcrt4/tests/server.idl index 26d3373..53ec016 100644 --- a/dlls/rpcrt4/tests/server.idl +++ b/dlls/rpcrt4/tests/server.idl @@ -299,8 +299,9 @@ cpp_quote("#endif") { short n; [size_is(n)] short data[]; - } wire_bstr_t; + } user_bstr_t; + typedef [unique] user_bstr_t *wire_bstr_t; typedef [wire_marshal(wire_bstr_t)] short *bstr_t; unsigned hash_bstr(bstr_t s);

1 0