ViewVC Help

View File | Revision Log | Show Annotations | Download File | View Changeset | Root Listing

root/proj/trunk/VTBFileUtil2/ScanUtility.cxx

Comparing trunk/VTBFileUtil2/ScanUtility.cxx (file contents):
Revision 290 by douglas, 2003-09-04T18:57:00-07:00 vs.
Revision 295 by douglas, 2003-09-11T21:26:54-07:00

#	Line 2 | Line 2
2		//
3		// Douglas Thrift
4		//
5	<	// $Id: ScanUtility.cxx,v 1.15 2003/09/05 01:57:00 douglas Exp $
5	>	// $Id: ScanUtility.cxx,v 1.18 2003/09/12 04:26:54 douglas Exp $
6
7		#include "ScanUtility.h"
8
#	Line 193 | Line 193 | void ScanUtility::saveDirs(void)
193		{
194		HKEY key;
195
196	<	if (RegCreateKeyEx(HKEY_CURRENT_USER,
196	>	if (LONG code = RegCreateKeyEx(HKEY_CURRENT_USER,
197		"Software\\DouglasThrift\\VTBFileUtil2", 0, NULL,
198		REG_OPTION_NON_VOLATILE, KEY_QUERY_VALUE | KEY_SET_VALUE, NULL, &key,
199		NULL) == ERROR_SUCCESS)
#	Line 218 | Line 218 | void ScanUtility::saveDirs(void)
218		LPBYTE(scanDir.c_str()), scanDir.length() + 1) !=
219		ERROR_SUCCESS)
220		{
221	<	error();
221	>	error(NULL, code);
222		}
223		}
224
#	Line 240 | Line 240 | void ScanUtility::saveDirs(void)
240		LPBYTE(saveDir.c_str()), saveDir.length() + 1) !=
241		ERROR_SUCCESS)
242		{
243	<	error();
243	>	error(NULL, code);
244		}
245		}
246
#	Line 248 | Line 248 | void ScanUtility::saveDirs(void)
248		}
249		else
250		{
251	<	error();
251	>	error(NULL, code);
252		}
253		}
254
255		void ScanUtility::setScanDir(HWND parent)
256		{
257	+	char buffer[MAX_PATH];
258	+
259	+	SHGetFolderPath(parent, CSIDL_FLAG_CREATE | CSIDL_DESKTOPDIRECTORY, NULL,
260	+	0, buffer);
261	+
262		BROWSEINFO info;
263
264		info.hwndOwner = parent;
#	Line 308 | Line 313 | void ScanUtility::setScanDir(HWND parent
313
314		void ScanUtility::setSaveDir(HWND parent)
315		{
316	+	char buffer[MAX_PATH];
317	+
318	+	SHGetFolderPath(parent, CSIDL_FLAG_CREATE | CSIDL_DESKTOPDIRECTORY, NULL,
319	+	0, buffer);
320	+
321		BROWSEINFO info;
322
323		info.hwndOwner = parent;
#	Line 413 | Line 423 | void ScanUtility::populate(HWND parent)
423
424		char scan[MAX_PATH];
425
426	<	sprintf(scan, "%s", (*itor).c_str());
426	>	StringCchPrintf(scan, MAX_PATH, "%s", (*itor).c_str());
427
428		LVITEM item;
429
#	Line 470 | Line 480 | int ScanUtility::browse(HWND dialog, UIN
480		data->saveDir.length()) + 1];
481		LPITEMIDLIST id;
482
483	<	wsprintfW(path, toWide(HIWORD(d) ? data->scanDir :
483	>	StringCchPrintfW(path, (HIWORD(d) ? data->scanDir.length() :
484	>	data->saveDir.length()) + 1, toWide(HIWORD(d) ? data->scanDir :
485		data->saveDir).c_str());
486
487		if (debug) cerr << "path = " << toAnsi(path) << "\n";
#	Line 875 | Line 886 | INT_PTR ScanUtility::enter(HWND dialog,
886		<< "}\n";
887		}
888
889	<	data->save = data->saveDir + '\\' + data->client.getFile();
889	>	data->save = data->saveDir + data->client.getFile();
890
891		if (debug) cerr << "save = " << data->save << "\n";
892

Diff Legend

–	Removed lines
+	Added lines
<	Changed lines
>	Changed lines