ApfelTeeSaft/reactos
1
0
Fork 0
mirror of https://github.com/ApfelTeeSaft/reactos.git synced 2026-09-02 04:13:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

[SHELL32]

Browse Source 
* Another partial sync of brsfolder.c with Wine 1.7.27.
CORE-8540

svn path=/branches/shell-experiments/; revision=65298
This commit is contained in:
Amine Khaldi
2014-11-06 19:14:58 +00:00
parent 1bf6f2b179
commit 2060ee5d9c
1 changed files with 24 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
dll/win32/shell32/wine/brsfolder.c
+24 -6
View File
@@ -18,9 +18,7 @@
* FIXME:
* - many memory leaks
* - many flags unimplemented
* - implement new dialog style "make new folder" button
* - implement editbox
* - implement new dialog style resizing
*/
#define WIN32_NO_STATUS
@@ -387,7 +385,9 @@ static HTREEITEM InsertTreeViewItem( browse_info *info, IShellFolder * lpsf,
tvi.lParam = (LPARAM)lptvid;
IShellFolder_AddRef(lpsf);
IEnumIDList_AddRef(pEnumIL);
#ifdef __REACTOS__
IEnumIDList_AddRef(pEnumIL);
#endif
lptvid->lpsfParent = lpsf;
lptvid->lpi = ILClone(pidl);
lptvid->lpifq = pidlParent ? ILCombine(pidlParent, pidl) : ILClone(pidl);
@@ -543,7 +543,8 @@ static LRESULT BrsFolder_Treeview_Expand( browse_info *info, NMTREEVIEWW *pnmtv
&IID_IShellFolder, (void**)&lpsf2 );
} else {
lpsf2 = lptvid->lpsfParent;
r = IShellFolder_AddRef(lpsf2);
IShellFolder_AddRef(lpsf2);
r = S_OK;
}
if (SUCCEEDED(r))
@@ -831,8 +832,10 @@ static BOOL BrsFolder_OnCommand( browse_info *info, UINT id )
switch (id)
{
case IDOK:
#ifdef __REACTOS__
/* The original pidl is owned by the treeview and will be free'd. */
info->pidlRet = ILClone(info->pidlRet);
#endif
if (info->pidlRet == NULL) /* A null pidl would mean a cancel */
info->pidlRet = _ILCreateDesktop();
pdump( info->pidlRet );
@@ -1054,8 +1057,12 @@ static INT_PTR CALLBACK BrsFolderDlgProc( HWND hWnd, UINT msg, WPARAM wParam,
return FALSE;
}
#ifndef __REACTOS__
static const WCHAR swBrowseTemplateName[] = {
'S','H','B','R','S','F','O','R','F','O','L','D','E','R','_','M','S','G','B','O','X',0};
static const WCHAR swNewBrowseTemplateName[] = {
'S','H','N','E','W','B','R','S','F','O','R','F','O','L','D','E','R','_','M','S','G','B','O','X',0};
#endif
/*************************************************************************
* SHBrowseForFolderA [SHELL32.@]
@@ -1115,13 +1122,24 @@ LPITEMIDLIST WINAPI SHBrowseForFolderW (LPBROWSEINFOW lpbi)
browse_info info;
DWORD r;
HRESULT hr;
#ifdef __REACTOS__
WORD wDlgId;
#else
const WCHAR * templateName;
INITCOMMONCONTROLSEX icex;
#endif
info.hWnd = 0;
info.pidlRet = NULL;
info.lpBrowseInfo = lpbi;
info.hwndTreeView = NULL;
#ifndef __REACTOS__
icex.dwSize = sizeof( icex );
icex.dwICC = ICC_TREEVIEW_CLASSES;
InitCommonControlsEx( &icex );
#endif
hr = OleInitialize(NULL);
if (lpbi->ulFlags & BIF_NEWDIALOGSTYLE)