winmerge-svn Mailing List for WinMerge (Page 7)

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 422-6466

Revision: 7444
          http://winmerge.svn.sourceforge.net/winmerge/?rev=7444&view=rev
Author:   gerundt
Date:     2010-11-24 07:18:55 +0000 (Wed, 24 Nov 2010)

Log Message:
-----------
PATCH: [ 3116422 ] Drop dirtools.[cpp|h]

Removed Paths:
-------------
    trunk/Src/Common/dirtools.cpp
    trunk/Src/Common/dirtools.h

Deleted: trunk/Src/Common/dirtools.cpp
===================================================================

--- trunk/Src/Common/dirtools.cpp	2010-11-22 13:06:28 UTC (rev 7443)
+++ trunk/Src/Common/dirtools.cpp	2010-11-24 07:18:55 UTC (rev 7444)
@@ -1,367 +0,0 @@
-/* dirtools.cpp : implementation of the ::SHBrowseForFolder function
-
-PROTOTYPES:
-	ChooseFile
-	GetUNCPath
-	ChooseFolderFromMyComputer
-	ChooseFolderBelowCurrentFolder
-	ChooseFolderStartCurrentFolder 
-	ChooseFolderBelowProgramsFolder
-
-DEPENDENCIES:
-	mpr.lib
-*/
-
-#include "StdAfx.h"
-#include "dirtools.h"
-
-#ifdef _DEBUG
-#define new DEBUG_NEW
-#undef THIS_FILE
-static char THIS_FILE[] = __FILE__;
-#endif
-
-BOOL ChooseFile( CString& strResult, 
-				 LPCTSTR szStartPath /* = NULL */, 
-				 LPCTSTR szCaption /* = "Open" */, 
-				 LPCTSTR szFilter /* = "All Files (*.*)|*.*||" */, 
-				 BOOL bOpenDlg /* = TRUE */) 
-// displays a shell file selector
-{
-	CFileDialog dlg(bOpenDlg, NULL, NULL, 
-				    OFN_OVERWRITEPROMPT | OFN_HIDEREADONLY | OFN_PATHMUSTEXIST | (bOpenDlg? OFN_FILEMUSTEXIST:0) , szFilter);
-	dlg.m_ofn.lpstrTitle = (LPTSTR)szCaption;
-	dlg.m_ofn.lpstrInitialDir = (LPTSTR)szStartPath;
-	if (dlg.DoModal()==IDOK)
-	{
-	 	strResult = dlg.GetPathName(); 
-		return TRUE;
-	}
-	strResult = _T("");
-	return FALSE;	   
-}
-
-
-BOOL GetUNCPath(LPCTSTR szDrivePath, LPTSTR szUNC)
-// converts a filename from x:\... style to \\computer\share... style
-{
-	TCHAR pBuf[MAX_PATH];
-	DWORD dwSize = sizeof(pBuf);
-
-	switch (WNetGetUniversalName(szDrivePath, UNIVERSAL_NAME_INFO_LEVEL, pBuf, &dwSize))
-	{
-    case  NO_ERROR:
-		_tcscpy(szUNC, ((UNIVERSAL_NAME_INFO*)pBuf)->lpUniversalName);
-		TRACE(_T("UNC name = %s\n"),  ((UNIVERSAL_NAME_INFO*)pBuf)->lpUniversalName);
-		break;
-    case ERROR_NOT_CONNECTED: // Local
-		TRACE(_T("GetUNCPath: Path is not redirected\n"));
-		*szUNC = _T('\0');
-		break;
-    default:
-		TRACE(_T("GetUNCPath: Error\n"));
-		*szUNC = _T('\0');
-		break;
-	}
-	return (*szUNC != _T('\0'));
-}
-
-
-
-
-int CALLBACK BrowseCallback(HWND hWnd, UINT uMsg, LPARAM /*lParam*/, LPARAM lpData)
-{
-    if (uMsg == BFFM_INITIALIZED)
-    {
-        SendMessage(hWnd, BFFM_SETSELECTION, TRUE, lpData);
-    }
-    return 0;
-}
-
-
-
-////////////////////////////////////////////////
-// basic browse from Listing A in article
-////////////////////////////////////////////////
-BOOL ChooseFolderFromMyComputer(LPTSTR szBuf, LPCTSTR szTitle /*=NULL*/) 
-{
-    // Retrieve the task memory allocator.
-    LPMALLOC pIMalloc;
-    if (!SUCCEEDED(::SHGetMalloc(&pIMalloc)))
-	{
-		TRACE(_T("SHGetMalloc failed.\n"));
-		return FALSE;
-	}
-
-    // Initialize a BROWSEINFO structure,
-    BROWSEINFO brInfo;
-    ::ZeroMemory(&brInfo, sizeof(brInfo));
-
-    brInfo.hwndOwner =
-                  AfxGetMainWnd()->GetSafeHwnd();
-    brInfo.pidlRoot = NULL;
-    brInfo.pszDisplayName = szBuf;
-    brInfo.lpszTitle = szTitle;
-	
-	// only want folders (no printers, etc.)
-    brInfo.ulFlags = BIF_RETURNONLYFSDIRS;
-
-    // Display the browser.
-    ITEMIDLIST* browseList = NULL;
-    browseList = ::SHBrowseForFolder(&brInfo);
-
-    // if the user selected a folder . . .
-    if (browseList)
-    {
-        // Convert the item ID to a pathname, 
-        //char szBuf[MAX_PATH];
-        if(::SHGetPathFromIDList(browseList, 
-                                 szBuf))
-        {
-            //AfxMessageBox(szBuf);
-            TRACE1("You chose==>%s\n",szBuf);
-
-        }
-
-        // Free the PIDL
-        pIMalloc->Free(browseList);
-    }
-    else
-    {
-		*szBuf=_T('\0');
-        //AfxMessageBox("Canceled browse.");
-    }
-
-    // Decrement ref count on the allocator
-    pIMalloc->Release();
-	return (*szBuf != _T('\0')); 
-}
-
-
-
-////////////////////////////////////////////////
-// allow user to browse only the current folder 
-// and those below it
-////////////////////////////////////////////////
-BOOL ChooseFolderBelowCurrentFolder(LPTSTR szBuf, LPCTSTR szTitle /*=NULL*/) 
-{
-    // Retrieve the task memory allocator.
-    LPMALLOC pIMalloc;
-    if (!SUCCEEDED(::SHGetMalloc(&pIMalloc)))
-	{
-		TRACE(_T("SHGetMalloc failed.\n"));
-		return FALSE;
-	}
-
-    // Initialize a BROWSEINFO structure,
-    BROWSEINFO brInfo;
-    ::ZeroMemory(&brInfo, sizeof(brInfo));
-
-    brInfo.hwndOwner = 
-                  AfxGetMainWnd()->GetSafeHwnd();
-    brInfo.pidlRoot = NULL;
-    brInfo.pszDisplayName = szBuf;
-    brInfo.lpszTitle = szTitle;
-    brInfo.ulFlags = BIF_RETURNONLYFSDIRS;
-
-    // Prepare to create a PIDL 
-    LPSHELLFOLDER pIShell;
-    TCHAR    szPath[MAX_PATH];
-    OLECHAR szOlePath[MAX_PATH];
-
-    // get dir & convert to unicode
-    ::GetCurrentDirectory(MAX_PATH, szPath);
-#ifndef _UNICODE
-    MultiByteToWideChar(CP_ACP, MB_PRECOMPOSED,
-                        szPath, -1, 
-                        szOlePath, MAX_PATH);
-#else
-	_tcscpy(szOlePath, szPath);
-#endif
-
-    // Get Desktop's IShellFolder interface
-    if(FAILED(::SHGetDesktopFolder(&pIShell)))
-    {
-        TRACE0("Can't get desktop folder\n");
-        return FALSE;
-    }
-    
-    LPITEMIDLIST  pidlRoot=NULL;
-    ULONG         pchEaten;
-    ULONG         dwAttr;
-
-    // convert the path to an item id list & browse
-    if(SUCCEEDED(::SHGetMalloc(&pIMalloc)))
-    {
-        if(SUCCEEDED(pIShell->ParseDisplayName(
-                            AfxGetMainWnd()->GetSafeHwnd(),
-                            NULL,
-                            szOlePath,
-                            &pchEaten,
-                            &pidlRoot,
-                            &dwAttr)))
-        {
-            brInfo.pidlRoot = pidlRoot;  
-        }
-    }
-
-    // Display the browser.
-    ITEMIDLIST* browseList = NULL;
-    browseList = ::SHBrowseForFolder(&brInfo);
-
-    // if the user selected a folder . . .
-    if (browseList)
-    {
-        // Convert the item ID to a pathname, 
-        //char szBuf[MAX_PATH];
-        if(::SHGetPathFromIDList(browseList, 
-                                 szBuf))
-        {
-            //AfxMessageBox(szBuf);
-            TRACE1("You chose==>%s\n",szBuf);
-        }
-
-        // Free the PIDL
-        pIMalloc->Free(browseList);
-    }
-    else
-    {
-		*szBuf=_T('\0');
-        //AfxMessageBox("Canceled browse.");
-    }
-    
-	pIMalloc->Free(pidlRoot);
-    pIShell->Release();
-    pIMalloc->Release();
-	return (*szBuf != _T('\0'));
-}
-
-
-// start the browse in the current directory
-// but allow user to browse entire namespace
-BOOL ChooseFolderStartCurrentFolder(LPTSTR szBuf, LPCTSTR szTitle /*=NULL*/)  
-{
-    // Retrieve the task memory allocator.
-    LPMALLOC pIMalloc;
-    if (!SUCCEEDED(::SHGetMalloc(&pIMalloc)))
-	{
-		TRACE(_T("SHGetMalloc failed.\n"));
-		return FALSE;
-	}
-
-    // Initialize a BROWSEINFO structure,
-    BROWSEINFO brInfo;
-    ::ZeroMemory(&brInfo, sizeof(brInfo));
-
-    brInfo.hwndOwner = AfxGetMainWnd()->GetSafeHwnd();
-    brInfo.pidlRoot = NULL;
-    brInfo.pszDisplayName = szBuf;
-    brInfo.lpszTitle = szTitle;
-    brInfo.ulFlags = BIF_RETURNONLYFSDIRS;
-
-    // get current dir
-    TCHAR lpszHere[MAX_PATH];
-    ::GetCurrentDirectory(MAX_PATH, lpszHere);
-    brInfo.lParam = (LPARAM)lpszHere;
-
-    // set callback address
-    brInfo.lpfn = BrowseCallback;
-
-    // Display the browser.
-    ITEMIDLIST* browseList = NULL;
-    browseList = ::SHBrowseForFolder(&brInfo);
-
-    // if the user selected a folder . . .
-    if (browseList)
-    {
-        // Convert the item ID to a pathname, 
-        //char szBuf[MAX_PATH];
-        if(::SHGetPathFromIDList(browseList, 
-                                 szBuf))
-        {
-            //AfxMessageBox(szBuf);
-            TRACE1("You chose==>%s\n",szBuf);
-        }
-
-        // Free the PIDL
-        pIMalloc->Free(browseList);
-    }
-    else
-    {
-		*szBuf=_T('\0');
-        //AfxMessageBox("Canceled browse.");
-    }
-    pIMalloc->Release();
-	return (*szBuf != _T('\0')); 
-}
-
-
-
-////////////////////////////////////////////////
-//  Browse a system folder. 
-//  Not discussed in article
-////////////////////////////////////////////////
-BOOL ChooseBelowSpecialFolder(LPTSTR szBuf, int idFolder, LPCTSTR szTitle /*=NULL*/)
-// common values for idFolder are CSIDL_DRIVES, CSIDL_NETWORK, CSIDL_PERSONAL
-{
-    LPMALLOC pIMalloc;
-    if(!SUCCEEDED(::SHGetMalloc(&pIMalloc)))
-    {
-		TRACE(_T("SHGetMalloc failed.\n"));
-		return FALSE;
-	}
-
-    // Initialize a BROWSEINFO structure,
-    BROWSEINFO brInfo;
-    ::ZeroMemory(&brInfo, sizeof(brInfo));
-
-    brInfo.hwndOwner = AfxGetMainWnd()->GetSafeHwnd();
-    brInfo.pidlRoot = NULL;
-    brInfo.pszDisplayName = szBuf;
-    brInfo.lpszTitle = szTitle;
-    brInfo.ulFlags = BIF_RETURNONLYFSDIRS;
-
-    // build a pidl for a system folder
-    LPITEMIDLIST pidlRoot;
-	if(!SUCCEEDED(SHGetSpecialFolderLocation(
-           AfxGetMainWnd()->GetSafeHwnd(),
-           idFolder,
-           &pidlRoot)))
-	{
-		TRACE(_T("SHGetSpecialFolderLocation failed.\n"));
-		pIMalloc->Release();
-		return FALSE;
-	}
-    brInfo.pidlRoot = pidlRoot;
-
-	    // Display the browser.
-    ITEMIDLIST* browseList = NULL;
-    browseList = ::SHBrowseForFolder(&brInfo);
-
-    // if the user selected a folder . . .
-    if (browseList)
-    {
-        // Convert the item ID to a pathname, 
-        //char szBuf[MAX_PATH];
-        if(::SHGetPathFromIDList(browseList, 
-                                 szBuf))
-        {
-            //AfxMessageBox(szBuf);
-            TRACE1("You chose==>%s\n",szBuf);
-        }
-
-        // Free the PIDL
-        pIMalloc->Free(browseList);
-    }
-    else
-    {
-		*szBuf=_T('\0');
-        //AfxMessageBox("Canceled browse.");
-    }
-
-    pIMalloc->Free(pidlRoot);
-    pIMalloc->Release();
-	return (*szBuf != _T('\0')); 
-}
-
-

Deleted: trunk/Src/Common/dirtools.h
===================================================================
--- trunk/Src/Common/dirtools.h	2010-11-22 13:06:28 UTC (rev 7443)
+++ trunk/Src/Common/dirtools.h	2010-11-24 07:18:55 UTC (rev 7444)
@@ -1,23 +0,0 @@
-// dirtools.h : 
-//
-/////////////////////////////////////////////////////////////////////////////
-#ifndef DIRTOOLS_H
-#define DIRTOOLS_H
-#include <shlobj.h>
-
-BOOL ChooseFile( CString& strResult, 
-				 LPCTSTR szStartPath = NULL, 
-				 LPCTSTR szCaption = _T("Open"), 
-				 LPCTSTR szFilter = _T("All Files (*.*)|*.*||"), 
-				 BOOL bOpenDlg = TRUE);
-
-BOOL GetUNCPath(LPCTSTR szDrivePath, LPTSTR szUNC);
-
-BOOL ChooseFolderFromMyComputer(LPTSTR szBuf, LPCTSTR szTitle =NULL);
-BOOL ChooseFolderBelowCurrentFolder(LPTSTR szBuf, LPCTSTR szTitle =NULL); 
-BOOL ChooseFolderStartCurrentFolder(LPTSTR szBuf, LPCTSTR szTitle =NULL);  
-BOOL ChooseBelowSpecialFolder(LPTSTR szBuf, int idFolder, LPCTSTR szTitle =NULL);
-
-#endif
-
-/////////////////////////////////////////////////////////////////////////////


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.




2006	Jan	Feb	Mar	Apr	May	Jun	Jul	Aug	Sep (148)	Oct (84)	Nov (130)	Dec (121)
2007	Jan (89)	Feb (50)	Mar (81)	Apr (45)	May (42)	Jun (46)	Jul (40)	Aug (98)	Sep (80)	Oct (101)	Nov (128)	Dec (46)
2008	Jan (132)	Feb (117)	Mar (118)	Apr (112)	May (69)	Jun (140)	Jul (164)	Aug (159)	Sep (115)	Oct (65)	Nov (80)	Dec (128)
2009	Jan (145)	Feb (97)	Mar (118)	Apr (87)	May (96)	Jun (83)	Jul (50)	Aug (42)	Sep (18)	Oct (32)	Nov (12)	Dec (35)
2010	Jan (38)	Feb (8)	Mar (5)	Apr (19)	May (23)	Jun (39)	Jul (16)	Aug (4)	Sep (60)	Oct (100)	Nov (57)	Dec (43)
2011	Jan (25)	Feb (1)	Mar (3)	Apr	May (13)	Jun (19)	Jul	Aug (6)	Sep (5)	Oct (6)	Nov	Dec (1)
2012	Jan	Feb	Mar	Apr	May	Jun	Jul	Aug	Sep	Oct	Nov (2)	Dec
2013	Jan	Feb	Mar (19)	Apr	May	Jun	Jul	Aug	Sep	Oct	Nov	Dec
2016	Jan	Feb	Mar	Apr	May	Jun	Jul	Aug	Sep	Oct (1)	Nov	Dec
2018	Jan	Feb	Mar	Apr	May	Jun	Jul	Aug	Sep	Oct (1)	Nov	Dec
2019	Jan	Feb	Mar	Apr	May	Jun	Jul	Aug (1)	Sep	Oct	Nov	Dec

winmerge-svn Mailing List for WinMerge (Page 7)

Windows visual diff and merge for files and directories

winmerge-svn — Subscribe to this list if you wish to receive notifications from Subversion