/* connect to server */
if (connect(sockfd, ipaddr->get_sockaddr(), ipaddr->get_sockaddr_len()) < 0) {
save_errno = errno;
- close(sockfd);
+ socketClose(sockfd);
continue;
}
*fatal = 0;
void *operator new(size_t s, const char *fname, int line)
{
- void *p = sm_malloc(fname, line, s > sizeof(int) ? s : sizeof(int));
+ void *p = sm_malloc(fname, line, s > sizeof(int) ? (unsigned int)s : sizeof(int));
return p;
}
void *operator new[](size_t s, const char *fname, int line)
{
- void *p = sm_malloc(fname, line, s > sizeof(int) ? s : sizeof(int));
+ void *p = sm_malloc(fname, line, s > sizeof(int) ? (unsigned int)s : sizeof(int));
return p;
}
void operator delete(void *ptr)
install-debug
winbacula.nsi
Makefile
+bacula.ncb
+bacula.suo
\ No newline at end of file
--- /dev/null
+Instructions to build Bacula with Microsoft Visual C++ 2005 Express Edition (free).
+---
+
--- /dev/null
+
+Microsoft Visual Studio Solution File, Format Version 9.00
+# Visual C++ Express 2005
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wx-console", "wx-console\wx-console.vcproj", "{9BA8E10D-0D82-4B25-8543-DE34641FBC10}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "baculafd", "baculafd\baculafd.vcproj", "{6A435DBB-4D3D-4DAE-8CB3-E0AF169A240B}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "console", "console\console.vcproj", "{A0F65E06-9F18-40AC-81F6-A080852F1104}"
+EndProject
+Global
+ GlobalSection(SolutionConfigurationPlatforms) = preSolution
+ Debug|Win32 = Debug|Win32
+ Release|Win32 = Release|Win32
+ EndGlobalSection
+ GlobalSection(ProjectConfigurationPlatforms) = postSolution
+ {9BA8E10D-0D82-4B25-8543-DE34641FBC10}.Debug|Win32.ActiveCfg = Debug|Win32
+ {9BA8E10D-0D82-4B25-8543-DE34641FBC10}.Debug|Win32.Build.0 = Debug|Win32
+ {9BA8E10D-0D82-4B25-8543-DE34641FBC10}.Release|Win32.ActiveCfg = Release|Win32
+ {9BA8E10D-0D82-4B25-8543-DE34641FBC10}.Release|Win32.Build.0 = Release|Win32
+ {6A435DBB-4D3D-4DAE-8CB3-E0AF169A240B}.Debug|Win32.ActiveCfg = Debug|Win32
+ {6A435DBB-4D3D-4DAE-8CB3-E0AF169A240B}.Debug|Win32.Build.0 = Debug|Win32
+ {6A435DBB-4D3D-4DAE-8CB3-E0AF169A240B}.Release|Win32.ActiveCfg = Release|Win32
+ {6A435DBB-4D3D-4DAE-8CB3-E0AF169A240B}.Release|Win32.Build.0 = Release|Win32
+ {A0F65E06-9F18-40AC-81F6-A080852F1104}.Debug|Win32.ActiveCfg = Debug|Win32
+ {A0F65E06-9F18-40AC-81F6-A080852F1104}.Debug|Win32.Build.0 = Debug|Win32
+ {A0F65E06-9F18-40AC-81F6-A080852F1104}.Release|Win32.ActiveCfg = Release|Win32
+ {A0F65E06-9F18-40AC-81F6-A080852F1104}.Release|Win32.Build.0 = Release|Win32
+ EndGlobalSection
+ GlobalSection(SolutionProperties) = preSolution
+ HideSolutionNode = FALSE
+ EndGlobalSection
+EndGlobal
bacula-fd.conf
+Release
+Debug
+baculafd.vcproj.*
\ No newline at end of file
--- /dev/null
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+ ProjectType="Visual C++"
+ Version="8.00"
+ Name="baculafd"
+ ProjectGUID="{6A435DBB-4D3D-4DAE-8CB3-E0AF169A240B}"
+ Keyword="MFCProj"
+ >
+ <Platforms>
+ <Platform
+ Name="Win32"
+ />
+ </Platforms>
+ <ToolFiles>
+ </ToolFiles>
+ <Configurations>
+ <Configuration
+ Name="Release|Win32"
+ OutputDirectory=".\Release"
+ IntermediateDirectory=".\Release"
+ ConfigurationType="1"
+ InheritedPropertySheets="UpgradeFromVC60.vsprops"
+ UseOfMFC="1"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ TypeLibraryName=".\Release/baculafd.tlb"
+ HeaderFileName=""
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="2"
+ InlineFunctionExpansion="1"
+ AdditionalIncludeDirectories="../compat,../..,../../../../depkgs-win32/pthreads,../../../../depkgs-win32/zlib,."
+ PreprocessorDefinitions="NDEBUG;WIN32;_CONSOLE;HAVE_WIN32"
+ StringPooling="true"
+ RuntimeLibrary="0"
+ EnableFunctionLevelLinking="true"
+ PrecompiledHeaderFile=".\Release/baculafd.pch"
+ AssemblerListingLocation=".\Release/"
+ ObjectFile=".\Release/"
+ ProgramDataBaseFileName=".\Release/"
+ WarningLevel="3"
+ SuppressStartupBanner="true"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="NDEBUG"
+ Culture="1033"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies="wsock32.lib pthreadVCE.lib zlib.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib"
+ OutputFile="Release/bacula-fd.exe"
+ LinkIncremental="1"
+ SuppressStartupBanner="true"
+ AdditionalLibraryDirectories="../../../../depkgs-win32/pthreads,../../../../depkgs-win32/zlib"
+ IgnoreDefaultLibraryNames="MSVCRT.lib"
+ SubSystem="2"
+ TargetMachine="1"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ SuppressStartupBanner="true"
+ OutputFile=".\Release/baculafd.bsc"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCWebDeploymentTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Debug|Win32"
+ OutputDirectory=".\Debug"
+ IntermediateDirectory=".\Debug"
+ ConfigurationType="1"
+ InheritedPropertySheets="UpgradeFromVC60.vsprops"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ TypeLibraryName=".\Debug/baculafd.tlb"
+ HeaderFileName=""
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories="../compat,../..,../../../../depkgs-win32/pthreads,../../../../depkgs-win32/zlib,."
+ PreprocessorDefinitions="_DEBUG;_WINMAIN_;PTW32_BUILD;WIN32;_CONSOLE;HAVE_WIN32"
+ MinimalRebuild="true"
+ BasicRuntimeChecks="3"
+ RuntimeLibrary="1"
+ PrecompiledHeaderFile=".\Debug/baculafd.pch"
+ AssemblerListingLocation=".\Debug/"
+ ObjectFile=".\Debug/"
+ ProgramDataBaseFileName=".\Debug/"
+ BrowseInformation="1"
+ WarningLevel="3"
+ SuppressStartupBanner="true"
+ DebugInformationFormat="4"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG"
+ Culture="1033"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies="wsock32.lib pthreadVCE.lib zlib.lib"
+ OutputFile="Debug/bacula-fd.exe"
+ LinkIncremental="2"
+ SuppressStartupBanner="true"
+ AdditionalLibraryDirectories="../../../../depkgs-win32/pthreads,../../../../depkgs-win32/zlib"
+ IgnoreDefaultLibraryNames="MSVCRT.lib"
+ GenerateDebugInformation="true"
+ SubSystem="2"
+ TargetMachine="1"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ SuppressStartupBanner="true"
+ OutputFile=".\Debug/baculafd.bsc"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCWebDeploymentTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ </Configurations>
+ <References>
+ </References>
+ <Files>
+ <Filter
+ Name="Source Files"
+ Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+ >
+ <File
+ RelativePath="..\lib\address_conf.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\lib\alist.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\lib\alloc.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\lib\attr.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\findlib\attribs.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\filed\authenticate.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\filed\backup.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\lib\base64.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\lib\berrno.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\findlib\bfile.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\lib\bget_msg.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\lib\bnet.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\lib\bnet_server.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\lib\bshm.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\lib\bsys.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\lib\btime.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\lib\btimers.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\filed\chksum.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\compat\compat.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\lib\cram-md5.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\lib\crc32.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\findlib\create_file.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\lib\daemon.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\lib\dlist.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\lib\edit.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\findlib\enable_priv.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\filed\estimate.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\filed\filed.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\filed\filed_conf.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\findlib\find.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\findlib\find_one.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\lib\fnmatch.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\findlib\fstype.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\compat\getopt.c"
+ >
+ </File>
+ <File
+ RelativePath="..\filed\heartbeat.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\lib\hmac.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\lib\htable.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\lib\idcache.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\lib\jcr.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\filed\job.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\lib\lex.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\findlib\makepath.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\findlib\match.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\lib\md5.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\lib\mem_pool.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\lib\message.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\lib\parse_conf.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\compat\print.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\lib\pythonlib.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\lib\queue.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\lib\regex.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\lib\res.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\filed\restore.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\lib\rwlock.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\findlib\save-cwd.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\lib\scan.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\lib\semlock.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\lib\serial.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\lib\sha1.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\lib\signal.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\lib\smartall.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\filed\status.cpp"
+ >
+ </File>
+ <File
+ RelativePath=".\StdAfx.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\lib\tls.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\lib\tree.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\lib\util.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\lib\var.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\filed\verify.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\filed\verify_vol.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\lib\watchdog.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\..\filed\win32\winabout.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\lib\winapi.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\..\filed\win32\winevents.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\..\filed\win32\winmain.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\..\filed\win32\winres.rc"
+ >
+ <FileConfiguration
+ Name="Release|Win32"
+ >
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="NDEBUG;$(NoInherit)"
+ AdditionalIncludeDirectories="\Nicolas\bacula\src\filed\win32"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Debug|Win32"
+ >
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;$(NoInherit)"
+ AdditionalIncludeDirectories="\Nicolas\bacula\src\filed\win32"
+ />
+ </FileConfiguration>
+ </File>
+ <File
+ RelativePath="..\..\filed\win32\winservice.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\..\filed\win32\winstat.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\..\filed\win32\wintray.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\lib\workq.cpp"
+ >
+ </File>
+ </Filter>
+ <Filter
+ Name="Header Files"
+ Filter="h;hpp;hxx;hm;inl"
+ >
+ </Filter>
+ <Filter
+ Name="Resource Files"
+ Filter="ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
+ >
+ <File
+ RelativePath="..\..\src\filed\win32\bacula.bmp"
+ >
+ </File>
+ <File
+ RelativePath="..\..\src\filed\win32\bacula.ico"
+ >
+ </File>
+ <File
+ RelativePath="..\..\src\filed\win32\error.ico"
+ >
+ </File>
+ <File
+ RelativePath="..\..\src\filed\win32\idle.ico"
+ >
+ </File>
+ <File
+ RelativePath="..\..\src\filed\win32\running.ico"
+ >
+ </File>
+ <File
+ RelativePath="..\..\src\filed\win32\saving.ico"
+ >
+ </File>
+ </Filter>
+ <File
+ RelativePath="ReadMe.txt"
+ >
+ </File>
+ </Files>
+ <Globals>
+ </Globals>
+</VisualStudioProject>
//
// This program 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
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// the file LICENSE for additional details.
//
// Author : Christopher S. Hull
extern void d_msg(const char *file, int line, int level, const char *fmt,...);
extern DWORD g_platform_id;
-extern int enable_vss;
+extern int enable_vss;
// from MicroSoft SDK (KES) is the diff between Jan 1 1601 and Jan 1 1970
#ifdef HAVE_MINGW
can get longer because VSS will make something like
\\\\?\\GLOBALROOT\\Device\\HarddiskVolumeShadowCopy1\\bacula\\uninstall.exe
from c:\bacula\uninstall.exe
- */
+ */
if (g_pVSSClient && enable_vss && g_pVSSClient->IsInitialized()) {
POOLMEM *pszBuf = get_pool_memory (PM_FNAME);
pszBuf = check_pool_memory_size(pszBuf, dwSize);
#endif
}
-int
+int
wchar_2_UTF8(char *pszUTF, const WCHAR *pszUCS, int cchChar)
{
- /* the return value is the number of bytes written to the buffer.
+ /* the return value is the number of bytes written to the buffer.
The number includes the byte for the null terminator. */
if (p_WideCharToMultiByte) {
return NULL;
}
-int
+int
UTF8_2_wchar(POOLMEM **ppszUCS, const char *pszUTF)
{
/* the return value is the number of wide characters written to the buffer. */
/* convert null terminated string from utf-8 to ucs2, enlarge buffer if necessary */
if (p_MultiByteToWideChar) {
- /* strlen of UTF8 +1 is enough */
+ /* strlen of UTF8 +1 is enough */
DWORD cchSize = (strlen(pszUTF)+1);
*ppszUCS = check_pool_memory_size(*ppszUCS, cchSize*sizeof (WCHAR));
-
+
int nRet = p_MultiByteToWideChar(CP_UTF8, 0, pszUTF, -1, (LPWSTR) *ppszUCS,cchSize);
ASSERT (nRet > 0);
return nRet;
}
}
+#ifndef HAVE_VC8
int umask(int)
{
return 0;
}
+#endif
int chmod(const char *, mode_t)
{
// use unicode or ascii
if (p_FindFirstFileW) {
- POOLMEM* pwszBuf = get_pool_memory (PM_FNAME);
+ POOLMEM* pwszBuf = get_pool_memory (PM_FNAME);
UTF8_2_wchar(&pwszBuf, file);
-
+
h = p_FindFirstFileW((LPCWSTR) pwszBuf, &info_w);
free_pool_memory(pwszBuf);
if (p_GetFileAttributesW) {
POOLMEM* pwszBuf = get_pool_memory(PM_FNAME);
UTF8_2_wchar(&pwszBuf, tmpbuf);
-
+
attr = p_GetFileAttributesW((LPCWSTR) pwszBuf);
free_pool_memory(pwszBuf);
} else if (p_GetFileAttributesA) {
if (p_GetFileAttributesExW) {
/* dynamically allocate enough space for UCS2 filename */
- POOLMEM* pwszBuf = get_pool_memory (PM_FNAME);
+ POOLMEM* pwszBuf = get_pool_memory (PM_FNAME);
UTF8_2_wchar(&pwszBuf, file);
BOOL b = p_GetFileAttributesExW((LPCWSTR) pwszBuf, GetFileExInfoStandard, &data);
free_pool_memory(pwszBuf);
-
+
if (!b) {
return stat2(file, sb);
}
s1++;
s2++;
if (ch1 == 0 || tolower(ch1) != tolower(ch2)) break;
- }
+ }
return (ch1 - ch2);
}
if (p_FindFirstFileW) {
POOLMEM* pwcBuf = get_pool_memory(PM_FNAME);;
UTF8_2_wchar(&pwcBuf,rval->spec);
- rval->dirh = p_FindFirstFileW((LPCWSTR)pwcBuf, &rval->data_w);
+ rval->dirh = p_FindFirstFileW((LPCWSTR)pwcBuf, &rval->data_w);
free_pool_memory(pwcBuf);
rval->valid_w = 1;
} else if (p_FindFirstFileA) {
rval->dirh = p_FindFirstFileA(rval->spec, &rval->data_a);
-
+
if (rval->dirh != INVALID_HANDLE_VALUE)
rval->valid_a = 1;
} else goto err;
_dir *dp = (_dir *)dirp;
if (dp->valid_w || dp->valid_a) {
entry->d_off = dp->offset;
-
+
// copy unicode
if (dp->valid_w) {
char szBuf[MAX_PATH_UTF8];
} else if (dp->valid_a) { // copy ansi (only 1 will be valid)
dp->offset += copyin(*entry, dp->data_a.cFileName);
}
-
+
*result = entry; /* return entry address */
d_msg(__FILE__, __LINE__,
99, "readdir_r(%p, { d_name=\"%s\", d_reclen=%d, d_off=%d\n",
}
// get next file, try unicode first
- if (p_FindNextFileW)
+ if (p_FindNextFileW)
dp->valid_w = p_FindNextFileW(dp->dirh, &dp->data_w);
else if (p_FindNextFileA)
dp->valid_a = p_FindNextFileA(dp->dirh, &dp->data_a);
case _PC_NAME_MAX :
return 255;
}
- errno = ENOSYS;
+ errno = ENOSYS;
return -1;
}
}
}
else return -1;
-
+
return 0;
}
UTF8_2_wchar(&pwszBuf, dir);
int n=p_wmkdir((LPCWSTR)pwszBuf);
- free_pool_memory(pwszBuf);
+ free_pool_memory(pwszBuf);
return n;
}
- return _mkdir(dir);
+ return _mkdir(dir);
}
return buf;
}
-int
+int
win32_fputs(const char *string, FILE *stream)
{
/* we use WriteConsoleA / WriteConsoleA
so we can be sure that unicode support works on win32.
with fallback if something fails
- */
+ */
HANDLE hOut = GetStdHandle (STD_OUTPUT_HANDLE);
- if (hOut && (hOut != INVALID_HANDLE_VALUE) && p_WideCharToMultiByte &&
+ if (hOut && (hOut != INVALID_HANDLE_VALUE) && p_WideCharToMultiByte &&
p_MultiByteToWideChar && (stream == stdout)) {
-
+
POOLMEM* pwszBuf = get_pool_memory(PM_MESSAGE);
-
+
DWORD dwCharsWritten;
DWORD dwChars;
-
+
dwChars = UTF8_2_wchar(&pwszBuf, string);
/* try WriteConsoleW */
if (WriteConsoleW (hOut, pwszBuf, dwChars-1, &dwCharsWritten, NULL)) {
free_pool_memory(pwszBuf);
- return dwCharsWritten;
+ return dwCharsWritten;
}
-
- /* convert to local codepage and try WriteConsoleA */
- POOLMEM* pszBuf = get_pool_memory(PM_MESSAGE);
+
+ /* convert to local codepage and try WriteConsoleA */
+ POOLMEM* pszBuf = get_pool_memory(PM_MESSAGE);
pszBuf = check_pool_memory_size(pszBuf, dwChars+1);
- dwChars = p_WideCharToMultiByte(GetConsoleOutputCP(),0,(LPCWSTR) pwszBuf,-1,pszBuf,dwChars,NULL,NULL);
+ dwChars = p_WideCharToMultiByte(GetConsoleOutputCP(),0,(LPCWSTR) pwszBuf,-1,pszBuf,dwChars,NULL,NULL);
free_pool_memory(pwszBuf);
if (WriteConsoleA (hOut, pszBuf, dwChars-1, &dwCharsWritten, NULL)) {
free_pool_memory(pszBuf);
- return dwCharsWritten;
+ return dwCharsWritten;
}
}
from the win32 console and fallback if seomething fails */
HANDLE hIn = GetStdHandle (STD_INPUT_HANDLE);
- if (hIn && (hIn != INVALID_HANDLE_VALUE) && p_WideCharToMultiByte && p_MultiByteToWideChar) {
+ if (hIn && (hIn != INVALID_HANDLE_VALUE) && p_WideCharToMultiByte && p_MultiByteToWideChar) {
DWORD dwRead;
WCHAR wszBuf[1024];
- char szBuf[1024];
+ char szBuf[1024];
/* nt and unicode conversion */
if (ReadConsoleW (hIn, wszBuf, 1024, &dwRead, NULL)) {
- /* null terminate at end */
+ /* null terminate at end */
if (wszBuf[dwRead-1] == L'\n') {
wszBuf[dwRead-1] = L'\0';
dwRead --;
wszBuf[dwRead-1] = L'\0';
dwRead --;
}
-
+
wchar_2_UTF8(buffer, wszBuf, len);
return buffer;
- }
-
+ }
+
/* win 9x and unicode conversion */
if (ReadConsoleA (hIn, szBuf, 1024, &dwRead, NULL)) {
- /* null terminate at end */
+ /* null terminate at end */
if (szBuf[dwRead-1] == L'\n') {
szBuf[dwRead-1] = L'\0';
dwRead --;
p_MultiByteToWideChar(GetConsoleCP(), 0, szBuf, -1, wszBuf,1024);
/* convert from WCHAR to UTF-8 */
if (wchar_2_UTF8(buffer, wszBuf, len))
- return buffer;
+ return buffer;
}
}
/* fallback */
- if (fgets(buffer, len, stdin))
- return buffer;
+ if (fgets(buffer, len, stdin))
+ return buffer;
else
return NULL;
}
{
int nRetCode;
if (p_wunlink) {
- POOLMEM* pwszBuf = get_pool_memory(PM_FNAME);
+ POOLMEM* pwszBuf = get_pool_memory(PM_FNAME);
UTF8_2_wchar(&pwszBuf, filename);
nRetCode = _wunlink((LPCWSTR) pwszBuf);
-
- /* special case if file is readonly,
+
+ /* special case if file is readonly,
we retry but unset attribute before */
if (nRetCode == -1 && errno == EACCES && p_SetFileAttributesW && p_GetFileAttributesW) {
DWORD dwAttr = p_GetFileAttributesW((LPCWSTR)pwszBuf);
- if (dwAttr != INVALID_FILE_ATTRIBUTES) {
+ if (dwAttr != INVALID_FILE_ATTRIBUTES) {
if (p_SetFileAttributesW((LPCWSTR)pwszBuf, dwAttr & ~FILE_ATTRIBUTE_READONLY)) {
nRetCode = _wunlink((LPCWSTR) pwszBuf);
/* reset to original if it didn't help */
} else {
nRetCode = _unlink(filename);
- /* special case if file is readonly,
+ /* special case if file is readonly,
we retry but unset attribute before */
if (nRetCode == -1 && errno == EACCES && p_SetFileAttributesA && p_GetFileAttributesA) {
DWORD dwAttr = p_GetFileAttributesA(filename);
- if (dwAttr != INVALID_FILE_ATTRIBUTES) {
+ if (dwAttr != INVALID_FILE_ATTRIBUTES) {
if (p_SetFileAttributesA(filename, dwAttr & ~FILE_ATTRIBUTE_READONLY)) {
nRetCode = _unlink(filename);
/* reset to original if it didn't help */
}
}
}
- }
+ }
return nRetCode;
}
{
int inquote = 0;
- for (const char *cp = cmdline; *cp; cp++)
+ const char *cp;
+ for (cp = cmdline; *cp; cp++)
{
if (*cp == '"') {
inquote = !inquote;
break;
}
-
+
int len = cp - cmdline;
char *rval = (char *)malloc(len+1);
cp = cmdline;
char *rp = rval;
-
+
while (len--)
*rp++ = *cp++;
char exeFile[256];
const char *comspec = getenv("COMSPEC");
-
+
if (comspec == NULL) // should never happen
return INVALID_HANDLE_VALUE;
char *cmdLine = (char *)alloca(strlen(cmdline) + strlen(comspec) + 16);
-
+
strcpy(exeFile, comspec);
strcpy(cmdLine, comspec);
strcat(cmdLine, " /c ");
OPEN_EXISTING,
0,
NULL);
-
+
free_pool_memory(pwszBuf);
} else if (p_CreateFileA) {
h = p_CreateFileA(tmpbuf,
open(const char *file, int flags, int mode)
{
if (p_wopen) {
- POOLMEM* pwszBuf = get_pool_memory(PM_FNAME);
+ POOLMEM* pwszBuf = get_pool_memory(PM_FNAME);
UTF8_2_wchar(&pwszBuf, file);
int nRet = p_wopen((LPCWSTR) pwszBuf, flags|_O_BINARY, mode);
/*
* Note, this works only for a file. If you want
- * to close a socket, use closesocket().
+ * to close a socket, use closesocket().
* Bacula has been modified in src/lib/bnet.c
* to use closesocket().
*/
+#ifndef HAVE_VC8
int
close(int fd)
{
off_t
lseek(int fd, off_t offset, int whence)
{
- return _lseeki64(fd, offset, whence);
+ return (off_t)_lseeki64(fd, offset, whence);
}
int
{
return _dup2(fd1, fd2);
}
+#endif
#else
int
open(const char *file, int flags, int mode)
}
if (p_CreateFileW) {
- POOLMEM* pwszBuf = get_pool_memory(PM_FNAME);
+ POOLMEM* pwszBuf = get_pool_memory(PM_FNAME);
UTF8_2_wchar(pwszBuf, file);
foo = p_CreateFileW((LPCWSTR) pwszBuf, access, shareMode, NULL, create, msflags, NULL);
#ifndef __COMPAT_H_
#define __COMPAT_H_
-#ifndef HAVE_MINGW
-#ifndef HAVE_WXCONSOLE
+#if (defined _MSC_VER) && (_MSC_VER >= 1400) // VC8+
+#pragma warning(disable : 4996) // Either disable all deprecation warnings,
+// #define _CRT_SECURE_NO_DEPRECATE // Or just turn off warnings about the newly deprecated CRT functions.
+#define HAVE_VC8
+#endif // VC8+
+
+#if (!defined HAVE_MINGW) && (!defined HAVE_VC8) && (!defined HAVE_WXCONSOLE)
#define __STDC__ 1
#endif
-#endif
#include <stdio.h>
#include <basetsd.h>
typedef float float32_t;
typedef unsigned short uint16_t;
typedef signed short int16_t;
-typedef long time_t;
typedef signed char int8_t;
+#ifndef HAVE_VC8
+typedef long time_t;
+#endif
+
#if __STDC__
#ifndef HAVE_MINGW
typedef _dev_t dev_t;
typedef UINT32 uid_t;
typedef UINT32 gid_t;
typedef UINT32 mode_t;
+#ifndef _WX_DEFS_H_ /* ssize_t is defined in wx/defs.h */
typedef INT64 ssize_t;
+#endif
#endif //HAVE_MINGW
struct dirent {
#define iscsym __iscsym
#endif
-
+#ifndef HAVE_VC8
int umask(int);
+off_t lseek(int, off_t, int);
+int dup2(int, int);
+int close(int fd);
+#ifndef HAVE_WXCONSOLE
+ssize_t read(int fd, void *, ssize_t nbytes);
+ssize_t write(int fd, const void *, ssize_t nbytes);
+#endif
+#endif
int lchown(const char *, uid_t uid, gid_t gid);
int chown(const char *, uid_t uid, gid_t gid);
int chmod(const char *, mode_t mode);
-off_t lseek(int, off_t, int);
int inet_aton(const char *cp, struct in_addr *inp);
int kill(int pid, int signo);
int pipe(int []);
int fork();
-int dup2(int, int);
int waitpid(int, int *, int);
#ifndef HAVE_MINGW
#define sprintf __sprintf
int __sprintf(char *str, const char *fmt, ...);
-#ifndef HAVE_WXCONSOLE
-ssize_t read(int fd, void *, ssize_t nbytes);
-ssize_t write(int fd, const void *, ssize_t nbytes);
-#endif
-
-int close(int fd);
#endif //HAVE_MINGW
bconsole.conf
+Debug
+Release
+console.vcproj.*
\ No newline at end of file
--- /dev/null
+<?xml version="1.0" encoding="Windows-1252"?>\r
+<VisualStudioProject\r
+ ProjectType="Visual C++"\r
+ Version="8.00"\r
+ Name="console"\r
+ ProjectGUID="{A0F65E06-9F18-40AC-81F6-A080852F1104}"\r
+ Keyword="MFCProj"\r
+ >\r
+ <Platforms>\r
+ <Platform\r
+ Name="Win32"\r
+ />\r
+ </Platforms>\r
+ <ToolFiles>\r
+ </ToolFiles>\r
+ <Configurations>\r
+ <Configuration\r
+ Name="Debug|Win32"\r
+ OutputDirectory=".\Debug"\r
+ IntermediateDirectory=".\Debug"\r
+ ConfigurationType="1"\r
+ InheritedPropertySheets="UpgradeFromVC60.vsprops"\r
+ UseOfMFC="2"\r
+ ATLMinimizesCRunTimeLibraryUsage="false"\r
+ CharacterSet="2"\r
+ >\r
+ <Tool\r
+ Name="VCPreBuildEventTool"\r
+ />\r
+ <Tool\r
+ Name="VCCustomBuildTool"\r
+ />\r
+ <Tool\r
+ Name="VCXMLDataGeneratorTool"\r
+ />\r
+ <Tool\r
+ Name="VCWebServiceProxyGeneratorTool"\r
+ />\r
+ <Tool\r
+ Name="VCMIDLTool"\r
+ TypeLibraryName=".\Debug/console.tlb"\r
+ HeaderFileName=""\r
+ />\r
+ <Tool\r
+ Name="VCCLCompilerTool"\r
+ Optimization="0"\r
+ AdditionalIncludeDirectories="../compat;../..;../../../../depkgs-win32/pthreads"\r
+ PreprocessorDefinitions="_DEBUG;HAVE_CONSOLE;_WINMAIN_;PTW32_BUILD;WIN32;_CONSOLE;HAVE_WIN32"\r
+ MinimalRebuild="true"\r
+ BasicRuntimeChecks="3"\r
+ RuntimeLibrary="3"\r
+ PrecompiledHeaderFile=".\Debug/console.pch"\r
+ AssemblerListingLocation=".\Debug/"\r
+ ObjectFile=".\Debug/"\r
+ ProgramDataBaseFileName=".\Debug/"\r
+ WarningLevel="3"\r
+ SuppressStartupBanner="true"\r
+ DebugInformationFormat="4"\r
+ />\r
+ <Tool\r
+ Name="VCManagedResourceCompilerTool"\r
+ />\r
+ <Tool\r
+ Name="VCResourceCompilerTool"\r
+ PreprocessorDefinitions="_DEBUG"\r
+ Culture="1033"\r
+ />\r
+ <Tool\r
+ Name="VCPreLinkEventTool"\r
+ />\r
+ <Tool\r
+ Name="VCLinkerTool"\r
+ AdditionalDependencies="wsock32.lib pthreadVCE.lib"\r
+ OutputFile="Debug/bconsole.exe"\r
+ LinkIncremental="2"\r
+ SuppressStartupBanner="true"\r
+ AdditionalLibraryDirectories="../../../../depkgs-win32/pthreads"\r
+ GenerateDebugInformation="true"\r
+ SubSystem="1"\r
+ TargetMachine="1"\r
+ />\r
+ <Tool\r
+ Name="VCALinkTool"\r
+ />\r
+ <Tool\r
+ Name="VCManifestTool"\r
+ />\r
+ <Tool\r
+ Name="VCXDCMakeTool"\r
+ />\r
+ <Tool\r
+ Name="VCBscMakeTool"\r
+ SuppressStartupBanner="true"\r
+ OutputFile=".\Debug/console.bsc"\r
+ />\r
+ <Tool\r
+ Name="VCFxCopTool"\r
+ />\r
+ <Tool\r
+ Name="VCAppVerifierTool"\r
+ />\r
+ <Tool\r
+ Name="VCWebDeploymentTool"\r
+ />\r
+ <Tool\r
+ Name="VCPostBuildEventTool"\r
+ />\r
+ </Configuration>\r
+ <Configuration\r
+ Name="Release|Win32"\r
+ OutputDirectory=".\Release"\r
+ IntermediateDirectory=".\Release"\r
+ ConfigurationType="1"\r
+ InheritedPropertySheets="UpgradeFromVC60.vsprops"\r
+ UseOfMFC="2"\r
+ ATLMinimizesCRunTimeLibraryUsage="false"\r
+ CharacterSet="2"\r
+ >\r
+ <Tool\r
+ Name="VCPreBuildEventTool"\r
+ />\r
+ <Tool\r
+ Name="VCCustomBuildTool"\r
+ />\r
+ <Tool\r
+ Name="VCXMLDataGeneratorTool"\r
+ />\r
+ <Tool\r
+ Name="VCWebServiceProxyGeneratorTool"\r
+ />\r
+ <Tool\r
+ Name="VCMIDLTool"\r
+ TypeLibraryName=".\Release/console.tlb"\r
+ HeaderFileName=""\r
+ />\r
+ <Tool\r
+ Name="VCCLCompilerTool"\r
+ Optimization="4"\r
+ AdditionalIncludeDirectories="../compat,../..,../../../../depkgs-win32/pthreads,."\r
+ PreprocessorDefinitions="_DEBUG;HAVE_CONSOLE;_WINMAIN_;PTW32_BUILD;WIN32;_CONSOLE;HAVE_WIN32"\r
+ BasicRuntimeChecks="3"\r
+ RuntimeLibrary="2"\r
+ PrecompiledHeaderFile=".\Release/console.pch"\r
+ AssemblerListingLocation=".\Release/"\r
+ ObjectFile=".\Release/"\r
+ ProgramDataBaseFileName=".\Release/"\r
+ WarningLevel="3"\r
+ SuppressStartupBanner="true"\r
+ />\r
+ <Tool\r
+ Name="VCManagedResourceCompilerTool"\r
+ />\r
+ <Tool\r
+ Name="VCResourceCompilerTool"\r
+ PreprocessorDefinitions="NDEBUG"\r
+ Culture="1033"\r
+ />\r
+ <Tool\r
+ Name="VCPreLinkEventTool"\r
+ />\r
+ <Tool\r
+ Name="VCLinkerTool"\r
+ AdditionalDependencies="wsock32.lib pthreadVCE.lib"\r
+ OutputFile="Release/bconsole.exe"\r
+ LinkIncremental="1"\r
+ SuppressStartupBanner="true"\r
+ AdditionalLibraryDirectories="../../../../depkgs-win32/pthreads"\r
+ SubSystem="1"\r
+ TargetMachine="1"\r
+ />\r
+ <Tool\r
+ Name="VCALinkTool"\r
+ />\r
+ <Tool\r
+ Name="VCManifestTool"\r
+ />\r
+ <Tool\r
+ Name="VCXDCMakeTool"\r
+ />\r
+ <Tool\r
+ Name="VCBscMakeTool"\r
+ SuppressStartupBanner="true"\r
+ OutputFile=".\Release/console.bsc"\r
+ />\r
+ <Tool\r
+ Name="VCFxCopTool"\r
+ />\r
+ <Tool\r
+ Name="VCAppVerifierTool"\r
+ />\r
+ <Tool\r
+ Name="VCWebDeploymentTool"\r
+ />\r
+ <Tool\r
+ Name="VCPostBuildEventTool"\r
+ />\r
+ </Configuration>\r
+ </Configurations>\r
+ <References>\r
+ </References>\r
+ <Files>\r
+ <Filter\r
+ Name="Source Files"\r
+ Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"\r
+ >\r
+ <File\r
+ RelativePath="..\lib\address_conf.cpp"\r
+ >\r
+ </File>\r
+ <File\r
+ RelativePath="..\lib\alist.cpp"\r
+ >\r
+ <FileConfiguration\r
+ Name="Debug|Win32"\r
+ >\r
+ <Tool\r
+ Name="VCCLCompilerTool"\r
+ AdditionalIncludeDirectories=""\r
+ PreprocessorDefinitions="_DEBUG;HAVE_CONSOLE;_WINMAIN_;PTW32_BUILD;WIN32;_CONSOLE;_MBCS;HAVE_WIN32;_AFXDLL;$(NoInherit)"\r
+ />\r
+ </FileConfiguration>\r
+ <FileConfiguration\r
+ Name="Release|Win32"\r
+ >\r
+ <Tool\r
+ Name="VCCLCompilerTool"\r
+ AdditionalIncludeDirectories=""\r
+ PreprocessorDefinitions="_DEBUG;HAVE_CONSOLE;_WINMAIN_;PTW32_BUILD;WIN32;_CONSOLE;_MBCS;HAVE_WIN32;_AFXDLL;$(NoInherit)"\r
+ />\r
+ </FileConfiguration>\r
+ </File>\r
+ <File\r
+ RelativePath="authenticate.cpp"\r
+ >\r
+ <FileConfiguration\r
+ Name="Debug|Win32"\r
+ >\r
+ <Tool\r
+ Name="VCCLCompilerTool"\r
+ AdditionalIncludeDirectories=""\r
+ PreprocessorDefinitions="_DEBUG;HAVE_CONSOLE;_WINMAIN_;PTW32_BUILD;WIN32;_CONSOLE;_MBCS;HAVE_WIN32;_AFXDLL;$(NoInherit)"\r
+ />\r
+ </FileConfiguration>\r
+ <FileConfiguration\r
+ Name="Release|Win32"\r
+ >\r
+ <Tool\r
+ Name="VCCLCompilerTool"\r
+ AdditionalIncludeDirectories=""\r
+ PreprocessorDefinitions="_DEBUG;HAVE_CONSOLE;_WINMAIN_;PTW32_BUILD;WIN32;_CONSOLE;_MBCS;HAVE_WIN32;_AFXDLL;$(NoInherit)"\r
+ />\r
+ </FileConfiguration>\r
+ </File>\r
+ <File\r
+ RelativePath="..\lib\base64.cpp"\r
+ >\r
+ <FileConfiguration\r
+ Name="Debug|Win32"\r
+ >\r
+ <Tool\r
+ Name="VCCLCompilerTool"\r
+ AdditionalIncludeDirectories=""\r
+ PreprocessorDefinitions="_DEBUG;HAVE_CONSOLE;_WINMAIN_;PTW32_BUILD;WIN32;_CONSOLE;_MBCS;HAVE_WIN32;_AFXDLL;$(NoInherit)"\r
+ />\r
+ </FileConfiguration>\r
+ <FileConfiguration\r
+ Name="Release|Win32"\r
+ >\r
+ <Tool\r
+ Name="VCCLCompilerTool"\r
+ AdditionalIncludeDirectories=""\r
+ PreprocessorDefinitions="_DEBUG;HAVE_CONSOLE;_WINMAIN_;PTW32_BUILD;WIN32;_CONSOLE;_MBCS;HAVE_WIN32;_AFXDLL;$(NoInherit)"\r
+ />\r
+ </FileConfiguration>\r
+ </File>\r
+ <File\r
+ RelativePath="..\lib\berrno.cpp"\r
+ >\r
+ </File>\r
+ <File\r
+ RelativePath="..\lib\bnet.cpp"\r
+ >\r
+ <FileConfiguration\r
+ Name="Debug|Win32"\r
+ >\r
+ <Tool\r
+ Name="VCCLCompilerTool"\r
+ AdditionalIncludeDirectories=""\r
+ PreprocessorDefinitions="_DEBUG;HAVE_CONSOLE;_WINMAIN_;PTW32_BUILD;WIN32;_CONSOLE;_MBCS;HAVE_WIN32;_AFXDLL;$(NoInherit)"\r
+ />\r
+ </FileConfiguration>\r
+ <FileConfiguration\r
+ Name="Release|Win32"\r
+ >\r
+ <Tool\r
+ Name="VCCLCompilerTool"\r
+ AdditionalIncludeDirectories=""\r
+ PreprocessorDefinitions="_DEBUG;HAVE_CONSOLE;_WINMAIN_;PTW32_BUILD;WIN32;_CONSOLE;_MBCS;HAVE_WIN32;_AFXDLL;$(NoInherit)"\r
+ />\r
+ </FileConfiguration>\r
+ </File>\r
+ <File\r
+ RelativePath="..\lib\bsys.cpp"\r
+ >\r
+ <FileConfiguration\r
+ Name="Debug|Win32"\r
+ >\r
+ <Tool\r
+ Name="VCCLCompilerTool"\r
+ AdditionalIncludeDirectories=""\r
+ PreprocessorDefinitions="_DEBUG;HAVE_CONSOLE;_WINMAIN_;PTW32_BUILD;WIN32;_CONSOLE;_MBCS;HAVE_WIN32;_AFXDLL;$(NoInherit)"\r
+ />\r
+ </FileConfiguration>\r
+ <FileConfiguration\r
+ Name="Release|Win32"\r
+ >\r
+ <Tool\r
+ Name="VCCLCompilerTool"\r
+ AdditionalIncludeDirectories=""\r
+ PreprocessorDefinitions="_DEBUG;HAVE_CONSOLE;_WINMAIN_;PTW32_BUILD;WIN32;_CONSOLE;_MBCS;HAVE_WIN32;_AFXDLL;$(NoInherit)"\r
+ />\r
+ </FileConfiguration>\r
+ </File>\r
+ <File\r
+ RelativePath="..\lib\btime.cpp"\r
+ >\r
+ <FileConfiguration\r
+ Name="Debug|Win32"\r
+ >\r
+ <Tool\r
+ Name="VCCLCompilerTool"\r
+ AdditionalIncludeDirectories=""\r
+ PreprocessorDefinitions="_DEBUG;HAVE_CONSOLE;_WINMAIN_;PTW32_BUILD;WIN32;_CONSOLE;_MBCS;HAVE_WIN32;_AFXDLL;$(NoInherit)"\r
+ />\r
+ </FileConfiguration>\r
+ <FileConfiguration\r
+ Name="Release|Win32"\r
+ >\r
+ <Tool\r
+ Name="VCCLCompilerTool"\r
+ AdditionalIncludeDirectories=""\r
+ PreprocessorDefinitions="_DEBUG;HAVE_CONSOLE;_WINMAIN_;PTW32_BUILD;WIN32;_CONSOLE;_MBCS;HAVE_WIN32;_AFXDLL;$(NoInherit)"\r
+ />\r
+ </FileConfiguration>\r
+ </File>\r
+ <File\r
+ RelativePath="..\lib\btimers.cpp"\r
+ >\r
+ <FileConfiguration\r
+ Name="Debug|Win32"\r
+ >\r
+ <Tool\r
+ Name="VCCLCompilerTool"\r
+ AdditionalIncludeDirectories=""\r
+ PreprocessorDefinitions="_DEBUG;HAVE_CONSOLE;_WINMAIN_;PTW32_BUILD;WIN32;_CONSOLE;_MBCS;HAVE_WIN32;_AFXDLL;$(NoInherit)"\r
+ />\r
+ </FileConfiguration>\r
+ <FileConfiguration\r
+ Name="Release|Win32"\r
+ >\r
+ <Tool\r
+ Name="VCCLCompilerTool"\r
+ AdditionalIncludeDirectories=""\r
+ PreprocessorDefinitions="_DEBUG;HAVE_CONSOLE;_WINMAIN_;PTW32_BUILD;WIN32;_CONSOLE;_MBCS;HAVE_WIN32;_AFXDLL;$(NoInherit)"\r
+ />\r
+ </FileConfiguration>\r
+ </File>\r
+ <File\r
+ RelativePath="..\compat\compat.cpp"\r
+ >\r
+ <FileConfiguration\r
+ Name="Debug|Win32"\r
+ >\r
+ <Tool\r
+ Name="VCCLCompilerTool"\r
+ AdditionalIncludeDirectories=""\r
+ PreprocessorDefinitions="_DEBUG;HAVE_CONSOLE;_WINMAIN_;PTW32_BUILD;WIN32;_CONSOLE;_MBCS;HAVE_WIN32;_AFXDLL;$(NoInherit)"\r
+ />\r
+ </FileConfiguration>\r
+ <FileConfiguration\r
+ Name="Release|Win32"\r
+ >\r
+ <Tool\r
+ Name="VCCLCompilerTool"\r
+ AdditionalIncludeDirectories=""\r
+ PreprocessorDefinitions="_DEBUG;HAVE_CONSOLE;_WINMAIN_;PTW32_BUILD;WIN32;_CONSOLE;_MBCS;HAVE_WIN32;_AFXDLL;$(NoInherit)"\r
+ />\r
+ </FileConfiguration>\r
+ </File>\r
+ <File\r
+ RelativePath="console.cpp"\r
+ >\r
+ <FileConfiguration\r
+ Name="Debug|Win32"\r
+ >\r
+ <Tool\r
+ Name="VCCLCompilerTool"\r
+ AdditionalIncludeDirectories=""\r
+ PreprocessorDefinitions="_DEBUG;HAVE_CONSOLE;_WINMAIN_;PTW32_BUILD;WIN32;_CONSOLE;_MBCS;HAVE_WIN32;_AFXDLL;$(NoInherit)"\r
+ />\r
+ </FileConfiguration>\r
+ <FileConfiguration\r
+ Name="Release|Win32"\r
+ >\r
+ <Tool\r
+ Name="VCCLCompilerTool"\r
+ AdditionalIncludeDirectories=""\r
+ PreprocessorDefinitions="_DEBUG;HAVE_CONSOLE;_WINMAIN_;PTW32_BUILD;WIN32;_CONSOLE;_MBCS;HAVE_WIN32;_AFXDLL;$(NoInherit)"\r
+ />\r
+ </FileConfiguration>\r
+ </File>\r
+ <File\r
+ RelativePath="console_conf.cpp"\r
+ >\r
+ <FileConfiguration\r
+ Name="Debug|Win32"\r
+ >\r
+ <Tool\r
+ Name="VCCLCompilerTool"\r
+ AdditionalIncludeDirectories=""\r
+ PreprocessorDefinitions="_DEBUG;HAVE_CONSOLE;_WINMAIN_;PTW32_BUILD;WIN32;_CONSOLE;_MBCS;HAVE_WIN32;_AFXDLL;$(NoInherit)"\r
+ />\r
+ </FileConfiguration>\r
+ <FileConfiguration\r
+ Name="Release|Win32"\r
+ >\r
+ <Tool\r
+ Name="VCCLCompilerTool"\r
+ AdditionalIncludeDirectories=""\r
+ PreprocessorDefinitions="_DEBUG;HAVE_CONSOLE;_WINMAIN_;PTW32_BUILD;WIN32;_CONSOLE;_MBCS;HAVE_WIN32;_AFXDLL;$(NoInherit)"\r
+ />\r
+ </FileConfiguration>\r
+ </File>\r
+ <File\r
+ RelativePath="..\lib\cram-md5.cpp"\r
+ >\r
+ <FileConfiguration\r
+ Name="Debug|Win32"\r
+ >\r
+ <Tool\r
+ Name="VCCLCompilerTool"\r
+ AdditionalIncludeDirectories=""\r
+ PreprocessorDefinitions="_DEBUG;HAVE_CONSOLE;_WINMAIN_;PTW32_BUILD;WIN32;_CONSOLE;_MBCS;HAVE_WIN32;_AFXDLL;$(NoInherit)"\r
+ />\r
+ </FileConfiguration>\r
+ <FileConfiguration\r
+ Name="Release|Win32"\r
+ >\r
+ <Tool\r
+ Name="VCCLCompilerTool"\r
+ AdditionalIncludeDirectories=""\r
+ PreprocessorDefinitions="_DEBUG;HAVE_CONSOLE;_WINMAIN_;PTW32_BUILD;WIN32;_CONSOLE;_MBCS;HAVE_WIN32;_AFXDLL;$(NoInherit)"\r
+ />\r
+ </FileConfiguration>\r
+ </File>\r
+ <File\r
+ RelativePath="..\lib\crc32.cpp"\r
+ >\r
+ <FileConfiguration\r
+ Name="Debug|Win32"\r
+ >\r
+ <Tool\r
+ Name="VCCLCompilerTool"\r
+ AdditionalIncludeDirectories=""\r
+ PreprocessorDefinitions="_DEBUG;HAVE_CONSOLE;_WINMAIN_;PTW32_BUILD;WIN32;_CONSOLE;_MBCS;HAVE_WIN32;_AFXDLL;$(NoInherit)"\r
+ />\r
+ </FileConfiguration>\r
+ <FileConfiguration\r
+ Name="Release|Win32"\r
+ >\r
+ <Tool\r
+ Name="VCCLCompilerTool"\r
+ AdditionalIncludeDirectories=""\r
+ PreprocessorDefinitions="_DEBUG;HAVE_CONSOLE;_WINMAIN_;PTW32_BUILD;WIN32;_CONSOLE;_MBCS;HAVE_WIN32;_AFXDLL;$(NoInherit)"\r
+ />\r
+ </FileConfiguration>\r
+ </File>\r
+ <File\r
+ RelativePath="..\lib\dlist.cpp"\r
+ >\r
+ <FileConfiguration\r
+ Name="Debug|Win32"\r
+ >\r
+ <Tool\r
+ Name="VCCLCompilerTool"\r
+ AdditionalIncludeDirectories=""\r
+ PreprocessorDefinitions="_DEBUG;HAVE_CONSOLE;_WINMAIN_;PTW32_BUILD;WIN32;_CONSOLE;_MBCS;HAVE_WIN32;_AFXDLL;$(NoInherit)"\r
+ />\r
+ </FileConfiguration>\r
+ <FileConfiguration\r
+ Name="Release|Win32"\r
+ >\r
+ <Tool\r
+ Name="VCCLCompilerTool"\r
+ AdditionalIncludeDirectories=""\r
+ PreprocessorDefinitions="_DEBUG;HAVE_CONSOLE;_WINMAIN_;PTW32_BUILD;WIN32;_CONSOLE;_MBCS;HAVE_WIN32;_AFXDLL;$(NoInherit)"\r
+ />\r
+ </FileConfiguration>\r
+ </File>\r
+ <File\r
+ RelativePath="..\lib\edit.cpp"\r
+ >\r
+ <FileConfiguration\r
+ Name="Debug|Win32"\r
+ >\r
+ <Tool\r
+ Name="VCCLCompilerTool"\r
+ AdditionalIncludeDirectories=""\r
+ PreprocessorDefinitions="_DEBUG;HAVE_CONSOLE;_WINMAIN_;PTW32_BUILD;WIN32;_CONSOLE;_MBCS;HAVE_WIN32;_AFXDLL;$(NoInherit)"\r
+ />\r
+ </FileConfiguration>\r
+ <FileConfiguration\r
+ Name="Release|Win32"\r
+ >\r
+ <Tool\r
+ Name="VCCLCompilerTool"\r
+ AdditionalIncludeDirectories=""\r
+ PreprocessorDefinitions="_DEBUG;HAVE_CONSOLE;_WINMAIN_;PTW32_BUILD;WIN32;_CONSOLE;_MBCS;HAVE_WIN32;_AFXDLL;$(NoInherit)"\r
+ />\r
+ </FileConfiguration>\r
+ </File>\r
+ <File\r
+ RelativePath="..\compat\getopt.c"\r
+ >\r
+ <FileConfiguration\r
+ Name="Debug|Win32"\r
+ >\r
+ <Tool\r
+ Name="VCCLCompilerTool"\r
+ AdditionalIncludeDirectories=""\r
+ PreprocessorDefinitions="_DEBUG;HAVE_CONSOLE;_WINMAIN_;PTW32_BUILD;WIN32;_CONSOLE;_MBCS;HAVE_WIN32;_AFXDLL;$(NoInherit)"\r
+ />\r
+ </FileConfiguration>\r
+ <FileConfiguration\r
+ Name="Release|Win32"\r
+ >\r
+ <Tool\r
+ Name="VCCLCompilerTool"\r
+ AdditionalIncludeDirectories=""\r
+ PreprocessorDefinitions="_DEBUG;HAVE_CONSOLE;_WINMAIN_;PTW32_BUILD;WIN32;_CONSOLE;_MBCS;HAVE_WIN32;_AFXDLL;$(NoInherit)"\r
+ />\r
+ </FileConfiguration>\r
+ </File>\r
+ <File\r
+ RelativePath="..\lib\hmac.cpp"\r
+ >\r
+ <FileConfiguration\r
+ Name="Debug|Win32"\r
+ >\r
+ <Tool\r
+ Name="VCCLCompilerTool"\r
+ AdditionalIncludeDirectories=""\r
+ PreprocessorDefinitions="_DEBUG;HAVE_CONSOLE;_WINMAIN_;PTW32_BUILD;WIN32;_CONSOLE;_MBCS;HAVE_WIN32;_AFXDLL;$(NoInherit)"\r
+ />\r
+ </FileConfiguration>\r
+ <FileConfiguration\r
+ Name="Release|Win32"\r
+ >\r
+ <Tool\r
+ Name="VCCLCompilerTool"\r
+ AdditionalIncludeDirectories=""\r
+ PreprocessorDefinitions="_DEBUG;HAVE_CONSOLE;_WINMAIN_;PTW32_BUILD;WIN32;_CONSOLE;_MBCS;HAVE_WIN32;_AFXDLL;$(NoInherit)"\r
+ />\r
+ </FileConfiguration>\r
+ </File>\r
+ <File\r
+ RelativePath="..\lib\idcache.cpp"\r
+ >\r
+ <FileConfiguration\r
+ Name="Debug|Win32"\r
+ >\r
+ <Tool\r
+ Name="VCCLCompilerTool"\r
+ AdditionalIncludeDirectories=""\r
+ PreprocessorDefinitions="_DEBUG;HAVE_CONSOLE;_WINMAIN_;PTW32_BUILD;WIN32;_CONSOLE;_MBCS;HAVE_WIN32;_AFXDLL;$(NoInherit)"\r
+ />\r
+ </FileConfiguration>\r
+ <FileConfiguration\r
+ Name="Release|Win32"\r
+ >\r
+ <Tool\r
+ Name="VCCLCompilerTool"\r
+ AdditionalIncludeDirectories=""\r
+ PreprocessorDefinitions="_DEBUG;HAVE_CONSOLE;_WINMAIN_;PTW32_BUILD;WIN32;_CONSOLE;_MBCS;HAVE_WIN32;_AFXDLL;$(NoInherit)"\r
+ />\r
+ </FileConfiguration>\r
+ </File>\r
+ <File\r
+ RelativePath="..\lib\jcr.cpp"\r
+ >\r
+ <FileConfiguration\r
+ Name="Debug|Win32"\r
+ >\r
+ <Tool\r
+ Name="VCCLCompilerTool"\r
+ AdditionalIncludeDirectories=""\r
+ PreprocessorDefinitions="_DEBUG;HAVE_CONSOLE;_WINMAIN_;PTW32_BUILD;WIN32;_CONSOLE;_MBCS;HAVE_WIN32;_AFXDLL;$(NoInherit)"\r
+ />\r
+ </FileConfiguration>\r
+ <FileConfiguration\r
+ Name="Release|Win32"\r
+ >\r
+ <Tool\r
+ Name="VCCLCompilerTool"\r
+ AdditionalIncludeDirectories=""\r
+ PreprocessorDefinitions="_DEBUG;HAVE_CONSOLE;_WINMAIN_;PTW32_BUILD;WIN32;_CONSOLE;_MBCS;HAVE_WIN32;_AFXDLL;$(NoInherit)"\r
+ />\r
+ </FileConfiguration>\r
+ </File>\r
+ <File\r
+ RelativePath="..\lib\lex.cpp"\r
+ >\r
+ <FileConfiguration\r
+ Name="Debug|Win32"\r
+ >\r
+ <Tool\r
+ Name="VCCLCompilerTool"\r
+ AdditionalIncludeDirectories=""\r
+ PreprocessorDefinitions="_DEBUG;HAVE_CONSOLE;_WINMAIN_;PTW32_BUILD;WIN32;_CONSOLE;_MBCS;HAVE_WIN32;_AFXDLL;$(NoInherit)"\r
+ />\r
+ </FileConfiguration>\r
+ <FileConfiguration\r
+ Name="Release|Win32"\r
+ >\r
+ <Tool\r
+ Name="VCCLCompilerTool"\r
+ AdditionalIncludeDirectories=""\r
+ PreprocessorDefinitions="_DEBUG;HAVE_CONSOLE;_WINMAIN_;PTW32_BUILD;WIN32;_CONSOLE;_MBCS;HAVE_WIN32;_AFXDLL;$(NoInherit)"\r
+ />\r
+ </FileConfiguration>\r
+ </File>\r
+ <File\r
+ RelativePath="..\lib\md5.cpp"\r
+ >\r
+ <FileConfiguration\r
+ Name="Debug|Win32"\r
+ >\r
+ <Tool\r
+ Name="VCCLCompilerTool"\r
+ AdditionalIncludeDirectories=""\r
+ PreprocessorDefinitions="_DEBUG;HAVE_CONSOLE;_WINMAIN_;PTW32_BUILD;WIN32;_CONSOLE;_MBCS;HAVE_WIN32;_AFXDLL;$(NoInherit)"\r
+ />\r
+ </FileConfiguration>\r
+ <FileConfiguration\r
+ Name="Release|Win32"\r
+ >\r
+ <Tool\r
+ Name="VCCLCompilerTool"\r
+ AdditionalIncludeDirectories=""\r
+ PreprocessorDefinitions="_DEBUG;HAVE_CONSOLE;_WINMAIN_;PTW32_BUILD;WIN32;_CONSOLE;_MBCS;HAVE_WIN32;_AFXDLL;$(NoInherit)"\r
+ />\r
+ </FileConfiguration>\r
+ </File>\r
+ <File\r
+ RelativePath="..\lib\mem_pool.cpp"\r
+ >\r
+ <FileConfiguration\r
+ Name="Debug|Win32"\r
+ >\r
+ <Tool\r
+ Name="VCCLCompilerTool"\r
+ AdditionalIncludeDirectories=""\r
+ PreprocessorDefinitions="_DEBUG;HAVE_CONSOLE;_WINMAIN_;PTW32_BUILD;WIN32;_CONSOLE;_MBCS;HAVE_WIN32;_AFXDLL;$(NoInherit)"\r
+ />\r
+ </FileConfiguration>\r
+ <FileConfiguration\r
+ Name="Release|Win32"\r
+ >\r
+ <Tool\r
+ Name="VCCLCompilerTool"\r
+ AdditionalIncludeDirectories=""\r
+ PreprocessorDefinitions="_DEBUG;HAVE_CONSOLE;_WINMAIN_;PTW32_BUILD;WIN32;_CONSOLE;_MBCS;HAVE_WIN32;_AFXDLL;$(NoInherit)"\r
+ />\r
+ </FileConfiguration>\r
+ </File>\r
+ <File\r
+ RelativePath="..\lib\message.cpp"\r
+ >\r
+ <FileConfiguration\r
+ Name="Debug|Win32"\r
+ >\r
+ <Tool\r
+ Name="VCCLCompilerTool"\r
+ AdditionalIncludeDirectories=""\r
+ PreprocessorDefinitions="_DEBUG;HAVE_CONSOLE;_WINMAIN_;PTW32_BUILD;WIN32;_CONSOLE;_MBCS;HAVE_WIN32;_AFXDLL;$(NoInherit)"\r
+ />\r
+ </FileConfiguration>\r
+ <FileConfiguration\r
+ Name="Release|Win32"\r
+ >\r
+ <Tool\r
+ Name="VCCLCompilerTool"\r
+ AdditionalIncludeDirectories=""\r
+ PreprocessorDefinitions="_DEBUG;HAVE_CONSOLE;_WINMAIN_;PTW32_BUILD;WIN32;_CONSOLE;_MBCS;HAVE_WIN32;_AFXDLL;$(NoInherit)"\r
+ />\r
+ </FileConfiguration>\r
+ </File>\r
+ <File\r
+ RelativePath="..\lib\parse_conf.cpp"\r
+ >\r
+ <FileConfiguration\r
+ Name="Debug|Win32"\r
+ >\r
+ <Tool\r
+ Name="VCCLCompilerTool"\r
+ AdditionalIncludeDirectories=""\r
+ PreprocessorDefinitions="_DEBUG;HAVE_CONSOLE;_WINMAIN_;PTW32_BUILD;WIN32;_CONSOLE;_MBCS;HAVE_WIN32;_AFXDLL;$(NoInherit)"\r
+ />\r
+ </FileConfiguration>\r
+ <FileConfiguration\r
+ Name="Release|Win32"\r
+ >\r
+ <Tool\r
+ Name="VCCLCompilerTool"\r
+ AdditionalIncludeDirectories=""\r
+ PreprocessorDefinitions="_DEBUG;HAVE_CONSOLE;_WINMAIN_;PTW32_BUILD;WIN32;_CONSOLE;_MBCS;HAVE_WIN32;_AFXDLL;$(NoInherit)"\r
+ />\r
+ </FileConfiguration>\r
+ </File>\r
+ <File\r
+ RelativePath="..\compat\print.cpp"\r
+ >\r
+ <FileConfiguration\r
+ Name="Debug|Win32"\r
+ >\r
+ <Tool\r
+ Name="VCCLCompilerTool"\r
+ AdditionalIncludeDirectories=""\r
+ PreprocessorDefinitions="_DEBUG;HAVE_CONSOLE;_WINMAIN_;PTW32_BUILD;WIN32;_CONSOLE;_MBCS;HAVE_WIN32;_AFXDLL;$(NoInherit)"\r
+ />\r
+ </FileConfiguration>\r
+ <FileConfiguration\r
+ Name="Release|Win32"\r
+ >\r
+ <Tool\r
+ Name="VCCLCompilerTool"\r
+ AdditionalIncludeDirectories=""\r
+ PreprocessorDefinitions="_DEBUG;HAVE_CONSOLE;_WINMAIN_;PTW32_BUILD;WIN32;_CONSOLE;_MBCS;HAVE_WIN32;_AFXDLL;$(NoInherit)"\r
+ />\r
+ </FileConfiguration>\r
+ </File>\r
+ <File\r
+ RelativePath="..\lib\queue.cpp"\r
+ >\r
+ <FileConfiguration\r
+ Name="Debug|Win32"\r
+ >\r
+ <Tool\r
+ Name="VCCLCompilerTool"\r
+ AdditionalIncludeDirectories=""\r
+ PreprocessorDefinitions="_DEBUG;HAVE_CONSOLE;_WINMAIN_;PTW32_BUILD;WIN32;_CONSOLE;_MBCS;HAVE_WIN32;_AFXDLL;$(NoInherit)"\r
+ />\r
+ </FileConfiguration>\r
+ <FileConfiguration\r
+ Name="Release|Win32"\r
+ >\r
+ <Tool\r
+ Name="VCCLCompilerTool"\r
+ AdditionalIncludeDirectories=""\r
+ PreprocessorDefinitions="_DEBUG;HAVE_CONSOLE;_WINMAIN_;PTW32_BUILD;WIN32;_CONSOLE;_MBCS;HAVE_WIN32;_AFXDLL;$(NoInherit)"\r
+ />\r
+ </FileConfiguration>\r
+ </File>\r
+ <File\r
+ RelativePath="..\lib\res.cpp"\r
+ >\r
+ </File>\r
+ <File\r
+ RelativePath="..\lib\rwlock.cpp"\r
+ >\r
+ <FileConfiguration\r
+ Name="Debug|Win32"\r
+ >\r
+ <Tool\r
+ Name="VCCLCompilerTool"\r
+ AdditionalIncludeDirectories=""\r
+ PreprocessorDefinitions="_DEBUG;HAVE_CONSOLE;_WINMAIN_;PTW32_BUILD;WIN32;_CONSOLE;_MBCS;HAVE_WIN32;_AFXDLL;$(NoInherit)"\r
+ />\r
+ </FileConfiguration>\r
+ <FileConfiguration\r
+ Name="Release|Win32"\r
+ >\r
+ <Tool\r
+ Name="VCCLCompilerTool"\r
+ AdditionalIncludeDirectories=""\r
+ PreprocessorDefinitions="_DEBUG;HAVE_CONSOLE;_WINMAIN_;PTW32_BUILD;WIN32;_CONSOLE;_MBCS;HAVE_WIN32;_AFXDLL;$(NoInherit)"\r
+ />\r
+ </FileConfiguration>\r
+ </File>\r
+ <File\r
+ RelativePath="..\lib\scan.cpp"\r
+ >\r
+ <FileConfiguration\r
+ Name="Debug|Win32"\r
+ >\r
+ <Tool\r
+ Name="VCCLCompilerTool"\r
+ AdditionalIncludeDirectories=""\r
+ PreprocessorDefinitions="_DEBUG;HAVE_CONSOLE;_WINMAIN_;PTW32_BUILD;WIN32;_CONSOLE;_MBCS;HAVE_WIN32;_AFXDLL;$(NoInherit)"\r
+ />\r
+ </FileConfiguration>\r
+ <FileConfiguration\r
+ Name="Release|Win32"\r
+ >\r
+ <Tool\r
+ Name="VCCLCompilerTool"\r
+ AdditionalIncludeDirectories=""\r
+ PreprocessorDefinitions="_DEBUG;HAVE_CONSOLE;_WINMAIN_;PTW32_BUILD;WIN32;_CONSOLE;_MBCS;HAVE_WIN32;_AFXDLL;$(NoInherit)"\r
+ />\r
+ </FileConfiguration>\r
+ </File>\r
+ <File\r
+ RelativePath="..\lib\serial.cpp"\r
+ >\r
+ <FileConfiguration\r
+ Name="Debug|Win32"\r
+ >\r
+ <Tool\r
+ Name="VCCLCompilerTool"\r
+ AdditionalIncludeDirectories=""\r
+ PreprocessorDefinitions="_DEBUG;HAVE_CONSOLE;_WINMAIN_;PTW32_BUILD;WIN32;_CONSOLE;_MBCS;HAVE_WIN32;_AFXDLL;$(NoInherit)"\r
+ />\r
+ </FileConfiguration>\r
+ <FileConfiguration\r
+ Name="Release|Win32"\r
+ >\r
+ <Tool\r
+ Name="VCCLCompilerTool"\r
+ AdditionalIncludeDirectories=""\r
+ PreprocessorDefinitions="_DEBUG;HAVE_CONSOLE;_WINMAIN_;PTW32_BUILD;WIN32;_CONSOLE;_MBCS;HAVE_WIN32;_AFXDLL;$(NoInherit)"\r
+ />\r
+ </FileConfiguration>\r
+ </File>\r
+ <File\r
+ RelativePath="..\lib\sha1.cpp"\r
+ >\r
+ <FileConfiguration\r
+ Name="Debug|Win32"\r
+ >\r
+ <Tool\r
+ Name="VCCLCompilerTool"\r
+ AdditionalIncludeDirectories=""\r
+ PreprocessorDefinitions="_DEBUG;HAVE_CONSOLE;_WINMAIN_;PTW32_BUILD;WIN32;_CONSOLE;_MBCS;HAVE_WIN32;_AFXDLL;$(NoInherit)"\r
+ />\r
+ </FileConfiguration>\r
+ <FileConfiguration\r
+ Name="Release|Win32"\r
+ >\r
+ <Tool\r
+ Name="VCCLCompilerTool"\r
+ AdditionalIncludeDirectories=""\r
+ PreprocessorDefinitions="_DEBUG;HAVE_CONSOLE;_WINMAIN_;PTW32_BUILD;WIN32;_CONSOLE;_MBCS;HAVE_WIN32;_AFXDLL;$(NoInherit)"\r
+ />\r
+ </FileConfiguration>\r
+ </File>\r
+ <File\r
+ RelativePath="..\lib\smartall.cpp"\r
+ >\r
+ <FileConfiguration\r
+ Name="Debug|Win32"\r
+ >\r
+ <Tool\r
+ Name="VCCLCompilerTool"\r
+ AdditionalIncludeDirectories=""\r
+ PreprocessorDefinitions="_DEBUG;HAVE_CONSOLE;_WINMAIN_;PTW32_BUILD;WIN32;_CONSOLE;_MBCS;HAVE_WIN32;_AFXDLL;$(NoInherit)"\r
+ />\r
+ </FileConfiguration>\r
+ <FileConfiguration\r
+ Name="Release|Win32"\r
+ >\r
+ <Tool\r
+ Name="VCCLCompilerTool"\r
+ AdditionalIncludeDirectories=""\r
+ PreprocessorDefinitions="_DEBUG;HAVE_CONSOLE;_WINMAIN_;PTW32_BUILD;WIN32;_CONSOLE;_MBCS;HAVE_WIN32;_AFXDLL;$(NoInherit)"\r
+ />\r
+ </FileConfiguration>\r
+ </File>\r
+ <File\r
+ RelativePath="StdAfx.cpp"\r
+ >\r
+ <FileConfiguration\r
+ Name="Debug|Win32"\r
+ >\r
+ <Tool\r
+ Name="VCCLCompilerTool"\r
+ AdditionalIncludeDirectories=""\r
+ PreprocessorDefinitions="_DEBUG;HAVE_CONSOLE;_WINMAIN_;PTW32_BUILD;WIN32;_CONSOLE;_MBCS;HAVE_WIN32;_AFXDLL;$(NoInherit)"\r
+ UsePrecompiledHeader="1"\r
+ PrecompiledHeaderThrough="stdafx.h"\r
+ />\r
+ </FileConfiguration>\r
+ <FileConfiguration\r
+ Name="Release|Win32"\r
+ >\r
+ <Tool\r
+ Name="VCCLCompilerTool"\r
+ AdditionalIncludeDirectories=""\r
+ PreprocessorDefinitions="_DEBUG;HAVE_CONSOLE;_WINMAIN_;PTW32_BUILD;WIN32;_CONSOLE;_MBCS;HAVE_WIN32;_AFXDLL;$(NoInherit)"\r
+ UsePrecompiledHeader="1"\r
+ PrecompiledHeaderThrough="stdafx.h"\r
+ />\r
+ </FileConfiguration>\r
+ </File>\r
+ <File\r
+ RelativePath="..\lib\tls.cpp"\r
+ >\r
+ </File>\r
+ <File\r
+ RelativePath="..\lib\util.cpp"\r
+ >\r
+ <FileConfiguration\r
+ Name="Debug|Win32"\r
+ >\r
+ <Tool\r
+ Name="VCCLCompilerTool"\r
+ AdditionalIncludeDirectories=""\r
+ PreprocessorDefinitions="_DEBUG;HAVE_CONSOLE;_WINMAIN_;PTW32_BUILD;WIN32;_CONSOLE;_MBCS;HAVE_WIN32;_AFXDLL;$(NoInherit)"\r
+ />\r
+ </FileConfiguration>\r
+ <FileConfiguration\r
+ Name="Release|Win32"\r
+ >\r
+ <Tool\r
+ Name="VCCLCompilerTool"\r
+ AdditionalIncludeDirectories=""\r
+ PreprocessorDefinitions="_DEBUG;HAVE_CONSOLE;_WINMAIN_;PTW32_BUILD;WIN32;_CONSOLE;_MBCS;HAVE_WIN32;_AFXDLL;$(NoInherit)"\r
+ />\r
+ </FileConfiguration>\r
+ </File>\r
+ <File\r
+ RelativePath="..\lib\watchdog.cpp"\r
+ >\r
+ <FileConfiguration\r
+ Name="Debug|Win32"\r
+ >\r
+ <Tool\r
+ Name="VCCLCompilerTool"\r
+ AdditionalIncludeDirectories=""\r
+ PreprocessorDefinitions="_DEBUG;HAVE_CONSOLE;_WINMAIN_;PTW32_BUILD;WIN32;_CONSOLE;_MBCS;HAVE_WIN32;_AFXDLL;$(NoInherit)"\r
+ />\r
+ </FileConfiguration>\r
+ <FileConfiguration\r
+ Name="Release|Win32"\r
+ >\r
+ <Tool\r
+ Name="VCCLCompilerTool"\r
+ AdditionalIncludeDirectories=""\r
+ PreprocessorDefinitions="_DEBUG;HAVE_CONSOLE;_WINMAIN_;PTW32_BUILD;WIN32;_CONSOLE;_MBCS;HAVE_WIN32;_AFXDLL;$(NoInherit)"\r
+ />\r
+ </FileConfiguration>\r
+ </File>\r
+ <File\r
+ RelativePath="..\lib\winapi.cpp"\r
+ >\r
+ </File>\r
+ </Filter>\r
+ <Filter\r
+ Name="Header Files"\r
+ Filter="h;hpp;hxx;hm;inl"\r
+ >\r
+ <File\r
+ RelativePath="..\compat\alloca.h"\r
+ >\r
+ </File>\r
+ <File\r
+ RelativePath="..\compat\compat.h"\r
+ >\r
+ </File>\r
+ <File\r
+ RelativePath="..\compat\dirent.h"\r
+ >\r
+ </File>\r
+ <File\r
+ RelativePath="..\compat\getopt.h"\r
+ >\r
+ </File>\r
+ <File\r
+ RelativePath="..\compat\grp.h"\r
+ >\r
+ </File>\r
+ <File\r
+ RelativePath="..\compat\mswinver.h"\r
+ >\r
+ </File>\r
+ <File\r
+ RelativePath="..\compat\netdb.h"\r
+ >\r
+ </File>\r
+ <File\r
+ RelativePath="..\compat\pwd.h"\r
+ >\r
+ </File>\r
+ <File\r
+ RelativePath="..\compat\sched.h"\r
+ >\r
+ </File>\r
+ <File\r
+ RelativePath="StdAfx.h"\r
+ >\r
+ </File>\r
+ <File\r
+ RelativePath="..\compat\stdint.h"\r
+ >\r
+ </File>\r
+ <File\r
+ RelativePath="..\compat\strings.h"\r
+ >\r
+ </File>\r
+ <File\r
+ RelativePath="..\compat\syslog.h"\r
+ >\r
+ </File>\r
+ <File\r
+ RelativePath="..\compat\unistd.h"\r
+ >\r
+ </File>\r
+ <File\r
+ RelativePath="..\compat\winconfig.h"\r
+ >\r
+ </File>\r
+ <File\r
+ RelativePath="..\compat\winhost.h"\r
+ >\r
+ </File>\r
+ </Filter>\r
+ <Filter\r
+ Name="Resource Files"\r
+ Filter="ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"\r
+ >\r
+ </Filter>\r
+ </Files>\r
+ <Globals>\r
+ </Globals>\r
+</VisualStudioProject>\r
*.idb
wx-console.conf
+Debug
+Release
+wx-console.vcproj.*
--- /dev/null
+<?xml version="1.0" encoding="Windows-1252"?>\r
+<VisualStudioProject\r
+ ProjectType="Visual C++"\r
+ Version="8.00"\r
+ Name="wx-console"\r
+ ProjectGUID="{9BA8E10D-0D82-4B25-8543-DE34641FBC10}"\r
+ Keyword="Win32Proj"\r
+ SignManifests="true"\r
+ >\r
+ <Platforms>\r
+ <Platform\r
+ Name="Win32"\r
+ />\r
+ </Platforms>\r
+ <ToolFiles>\r
+ </ToolFiles>\r
+ <Configurations>\r
+ <Configuration\r
+ Name="Debug|Win32"\r
+ OutputDirectory="Debug"\r
+ IntermediateDirectory="Debug"\r
+ ConfigurationType="1"\r
+ >\r
+ <Tool\r
+ Name="VCPreBuildEventTool"\r
+ />\r
+ <Tool\r
+ Name="VCCustomBuildTool"\r
+ />\r
+ <Tool\r
+ Name="VCXMLDataGeneratorTool"\r
+ />\r
+ <Tool\r
+ Name="VCWebServiceProxyGeneratorTool"\r
+ />\r
+ <Tool\r
+ Name="VCMIDLTool"\r
+ />\r
+ <Tool\r
+ Name="VCCLCompilerTool"\r
+ Optimization="0"\r
+ AdditionalIncludeDirectories="../..;../compat;../../../../depkgs-win32/wx/include;../../../../depkgs-win32/pthreads;../../../../depkgs-win32/zlib;../../../../depkgs-win32/wx/lib/vc_lib/mswud"\r
+ PreprocessorDefinitions="UNICODE;WIN32;_DEBUG;_WINDOWS;__WXMSW__;_CONSOLE;_MBCS;HAVE_WIN32;HAVE_WXCONSOLE"\r
+ MinimalRebuild="true"\r
+ BasicRuntimeChecks="3"\r
+ RuntimeLibrary="3"\r
+ UsePrecompiledHeader="0"\r
+ WarningLevel="3"\r
+ Detect64BitPortabilityProblems="true"\r
+ DebugInformationFormat="4"\r
+ />\r
+ <Tool\r
+ Name="VCManagedResourceCompilerTool"\r
+ />\r
+ <Tool\r
+ Name="VCResourceCompilerTool"\r
+ />\r
+ <Tool\r
+ Name="VCPreLinkEventTool"\r
+ />\r
+ <Tool\r
+ Name="VCLinkerTool"\r
+ AdditionalDependencies="wxbase26ud.lib wxbase26ud_net.lib wxbase26ud_odbc.lib wxbase26ud_xml.lib wxexpatd.lib wxjpegd.lib wxmsw26ud_adv.lib wxmsw26ud_core.lib wxmsw26ud_dbgrid.lib wxmsw26ud_gl.lib wxmsw26ud_html.lib wxmsw26ud_media.lib wxmsw26ud_qa.lib wxmsw26ud_xrc.lib wxpngd.lib wxregexud.lib wxtiffd.lib wxzlibd.lib pthreadVCE.lib zlib.lib wsock32.lib comctl32.lib rpcrt4.lib"\r
+ LinkIncremental="2"\r
+ AdditionalLibraryDirectories="../../../../depkgs-win32/wx/lib/vc_lib;../../../../depkgs-win32/pthreads;../../../../depkgs-win32/zlib"\r
+ GenerateDebugInformation="true"\r
+ SubSystem="2"\r
+ TargetMachine="1"\r
+ />\r
+ <Tool\r
+ Name="VCALinkTool"\r
+ />\r
+ <Tool\r
+ Name="VCManifestTool"\r
+ />\r
+ <Tool\r
+ Name="VCXDCMakeTool"\r
+ />\r
+ <Tool\r
+ Name="VCBscMakeTool"\r
+ />\r
+ <Tool\r
+ Name="VCFxCopTool"\r
+ />\r
+ <Tool\r
+ Name="VCAppVerifierTool"\r
+ />\r
+ <Tool\r
+ Name="VCWebDeploymentTool"\r
+ />\r
+ <Tool\r
+ Name="VCPostBuildEventTool"\r
+ />\r
+ </Configuration>\r
+ <Configuration\r
+ Name="Release|Win32"\r
+ OutputDirectory="Release"\r
+ IntermediateDirectory="Release"\r
+ ConfigurationType="1"\r
+ >\r
+ <Tool\r
+ Name="VCPreBuildEventTool"\r
+ />\r
+ <Tool\r
+ Name="VCCustomBuildTool"\r
+ />\r
+ <Tool\r
+ Name="VCXMLDataGeneratorTool"\r
+ />\r
+ <Tool\r
+ Name="VCWebServiceProxyGeneratorTool"\r
+ />\r
+ <Tool\r
+ Name="VCMIDLTool"\r
+ />\r
+ <Tool\r
+ Name="VCCLCompilerTool"\r
+ AdditionalIncludeDirectories="../..;../compat;../../../../depkgs-win32/wx/include;../../../../depkgs-win32/pthreads;../../../../depkgs-win32/zlib;../../../../depkgs-win32/wx/lib/vc_lib/mswu"\r
+ PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;UNICODE;__WXMSW__;_CONSOLE;_MBCS;HAVE_WIN32;HAVE_WXCONSOLE"\r
+ RuntimeLibrary="2"\r
+ UsePrecompiledHeader="0"\r
+ WarningLevel="3"\r
+ Detect64BitPortabilityProblems="true"\r
+ DebugInformationFormat="3"\r
+ />\r
+ <Tool\r
+ Name="VCManagedResourceCompilerTool"\r
+ />\r
+ <Tool\r
+ Name="VCResourceCompilerTool"\r
+ />\r
+ <Tool\r
+ Name="VCPreLinkEventTool"\r
+ />\r
+ <Tool\r
+ Name="VCLinkerTool"\r
+ AdditionalDependencies="wxbase26u.lib wxbase26u_net.lib wxbase26u_odbc.lib wxbase26u_xml.lib wxexpat.lib wxjpeg.lib wxmsw26u_adv.lib wxmsw26u_core.lib wxmsw26u_dbgrid.lib wxmsw26u_gl.lib wxmsw26u_html.lib wxmsw26u_media.lib wxmsw26u_qa.lib wxmsw26u_xrc.lib wxpng.lib wxregexu.lib wxtiff.lib wxzlib.lib pthreadVCE.lib zlib.lib wsock32.lib comctl32.lib rpcrt4.lib"\r
+ LinkIncremental="2"\r
+ AdditionalLibraryDirectories="../../../../depkgs-win32/wx/lib/vc_lib;../../../../depkgs-win32/pthreads;../../../../depkgs-win32/zlib"\r
+ GenerateDebugInformation="true"\r
+ SubSystem="2"\r
+ OptimizeReferences="2"\r
+ EnableCOMDATFolding="2"\r
+ TargetMachine="1"\r
+ />\r
+ <Tool\r
+ Name="VCALinkTool"\r
+ />\r
+ <Tool\r
+ Name="VCManifestTool"\r
+ />\r
+ <Tool\r
+ Name="VCXDCMakeTool"\r
+ />\r
+ <Tool\r
+ Name="VCBscMakeTool"\r
+ />\r
+ <Tool\r
+ Name="VCFxCopTool"\r
+ />\r
+ <Tool\r
+ Name="VCAppVerifierTool"\r
+ />\r
+ <Tool\r
+ Name="VCWebDeploymentTool"\r
+ />\r
+ <Tool\r
+ Name="VCPostBuildEventTool"\r
+ />\r
+ </Configuration>\r
+ </Configurations>\r
+ <References>\r
+ </References>\r
+ <Files>\r
+ <Filter\r
+ Name="Header Files"\r
+ Filter="h;hpp;hxx;hm;inl;inc;xsd"\r
+ UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"\r
+ >\r
+ <File\r
+ RelativePath="..\compat\compat.h"\r
+ >\r
+ </File>\r
+ <File\r
+ RelativePath="..\..\wx-console\console_conf.h"\r
+ >\r
+ </File>\r
+ <File\r
+ RelativePath="..\..\wx-console\console_thread.h"\r
+ >\r
+ </File>\r
+ <File\r
+ RelativePath="..\..\wx-console\csprint.h"\r
+ >\r
+ </File>\r
+ <File\r
+ RelativePath=".\w32api.h"\r
+ >\r
+ </File>\r
+ <File\r
+ RelativePath="..\..\wx-console\wx-console_private.h"\r
+ >\r
+ </File>\r
+ <File\r
+ RelativePath="..\..\wx-console\wxbconfigfileeditor.h"\r
+ >\r
+ </File>\r
+ <File\r
+ RelativePath="..\..\wx-console\wxbconfigpanel.h"\r
+ >\r
+ </File>\r
+ <File\r
+ RelativePath="..\..\wx-console\wxbhistorytextctrl.h"\r
+ >\r
+ </File>\r
+ <File\r
+ RelativePath="..\..\wx-console\wxblistctrl.h"\r
+ >\r
+ </File>\r
+ <File\r
+ RelativePath="..\..\wx-console\wxbmainframe.h"\r
+ >\r
+ </File>\r
+ <File\r
+ RelativePath="..\..\wx-console\wxbrestorepanel.h"\r
+ >\r
+ </File>\r
+ <File\r
+ RelativePath="..\..\wx-console\wxbtableparser.h"\r
+ >\r
+ </File>\r
+ <File\r
+ RelativePath="..\..\wx-console\wxbtreectrl.h"\r
+ >\r
+ </File>\r
+ <File\r
+ RelativePath="..\..\wx-console\wxbutils.h"\r
+ >\r
+ </File>\r
+ </Filter>\r
+ <Filter\r
+ Name="Resource Files"\r
+ Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"\r
+ UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"\r
+ >\r
+ </Filter>\r
+ <Filter\r
+ Name="Source Files"\r
+ Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"\r
+ UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"\r
+ >\r
+ <File\r
+ RelativePath="..\lib\address_conf.cpp"\r
+ >\r
+ </File>\r
+ <File\r
+ RelativePath="..\lib\alist.cpp"\r
+ >\r
+ </File>\r
+ <File\r
+ RelativePath="..\lib\alloc.cpp"\r
+ >\r
+ </File>\r
+ <File\r
+ RelativePath="..\lib\attr.cpp"\r
+ >\r
+ </File>\r
+ <File\r
+ RelativePath=".\authenticate.cpp"\r
+ >\r
+ </File>\r
+ <File\r
+ RelativePath="..\lib\base64.cpp"\r
+ >\r
+ </File>\r
+ <File\r
+ RelativePath="..\lib\berrno.cpp"\r
+ >\r
+ </File>\r
+ <File\r
+ RelativePath="..\lib\bget_msg.cpp"\r
+ >\r
+ </File>\r
+ <File\r
+ RelativePath="..\lib\bnet.cpp"\r
+ >\r
+ </File>\r
+ <File\r
+ RelativePath="..\lib\bnet_pkt.cpp"\r
+ >\r
+ </File>\r
+ <File\r
+ RelativePath="..\lib\bnet_server.cpp"\r
+ >\r
+ </File>\r
+ <File\r
+ RelativePath="..\lib\bshm.cpp"\r
+ >\r
+ </File>\r
+ <File\r
+ RelativePath="..\lib\bsys.cpp"\r
+ >\r
+ </File>\r
+ <File\r
+ RelativePath="..\lib\btime.cpp"\r
+ >\r
+ </File>\r
+ <File\r
+ RelativePath="..\lib\btimers.cpp"\r
+ >\r
+ </File>\r
+ <File\r
+ RelativePath="..\compat\compat.cpp"\r
+ >\r
+ </File>\r
+ <File\r
+ RelativePath=".\console_conf.cpp"\r
+ >\r
+ </File>\r
+ <File\r
+ RelativePath="..\..\wx-console\console_thread.cpp"\r
+ >\r
+ </File>\r
+ <File\r
+ RelativePath="..\lib\cram-md5.cpp"\r
+ >\r
+ </File>\r
+ <File\r
+ RelativePath="..\lib\crc32.cpp"\r
+ >\r
+ </File>\r
+ <File\r
+ RelativePath="..\lib\daemon.cpp"\r
+ >\r
+ </File>\r
+ <File\r
+ RelativePath="..\lib\dlist.cpp"\r
+ >\r
+ </File>\r
+ <File\r
+ RelativePath="..\lib\edit.cpp"\r
+ >\r
+ </File>\r
+ <File\r
+ RelativePath="..\lib\fnmatch.cpp"\r
+ >\r
+ </File>\r
+ <File\r
+ RelativePath="..\lib\hmac.cpp"\r
+ >\r
+ </File>\r
+ <File\r
+ RelativePath="..\lib\htable.cpp"\r
+ >\r
+ </File>\r
+ <File\r
+ RelativePath="..\lib\idcache.cpp"\r
+ >\r
+ </File>\r
+ <File\r
+ RelativePath="..\lib\jcr.cpp"\r
+ >\r
+ </File>\r
+ <File\r
+ RelativePath="..\lib\lex.cpp"\r
+ >\r
+ </File>\r
+ <File\r
+ RelativePath="..\..\wx-console\main.cpp"\r
+ >\r
+ </File>\r
+ <File\r
+ RelativePath="..\lib\md5.cpp"\r
+ >\r
+ </File>\r
+ <File\r
+ RelativePath="..\lib\mem_pool.cpp"\r
+ >\r
+ </File>\r
+ <File\r
+ RelativePath="..\lib\message.cpp"\r
+ >\r
+ </File>\r
+ <File\r
+ RelativePath="..\lib\parse_conf.cpp"\r
+ >\r
+ </File>\r
+ <File\r
+ RelativePath="..\compat\print.cpp"\r
+ >\r
+ </File>\r
+ <File\r
+ RelativePath="..\lib\queue.cpp"\r
+ >\r
+ </File>\r
+ <File\r
+ RelativePath="..\lib\res.cpp"\r
+ >\r
+ </File>\r
+ <File\r
+ RelativePath="..\lib\rwlock.cpp"\r
+ >\r
+ </File>\r
+ <File\r
+ RelativePath="..\lib\scan.cpp"\r
+ >\r
+ </File>\r
+ <File\r
+ RelativePath="..\lib\semlock.cpp"\r
+ >\r
+ </File>\r
+ <File\r
+ RelativePath="..\lib\serial.cpp"\r
+ >\r
+ </File>\r
+ <File\r
+ RelativePath="..\lib\sha1.cpp"\r
+ >\r
+ </File>\r
+ <File\r
+ RelativePath="..\lib\signal.cpp"\r
+ >\r
+ </File>\r
+ <File\r
+ RelativePath="..\lib\smartall.cpp"\r
+ >\r
+ </File>\r
+ <File\r
+ RelativePath="..\lib\tls.cpp"\r
+ >\r
+ </File>\r
+ <File\r
+ RelativePath="..\lib\tree.cpp"\r
+ >\r
+ </File>\r
+ <File\r
+ RelativePath="..\lib\util.cpp"\r
+ >\r
+ </File>\r
+ <File\r
+ RelativePath="..\lib\var.cpp"\r
+ >\r
+ </File>\r
+ <File\r
+ RelativePath="..\lib\watchdog.cpp"\r
+ >\r
+ </File>\r
+ <File\r
+ RelativePath="..\lib\winapi.cpp"\r
+ >\r
+ </File>\r
+ <File\r
+ RelativePath="..\lib\workq.cpp"\r
+ >\r
+ </File>\r
+ <File\r
+ RelativePath="..\..\wx-console\wx-console_private.rc"\r
+ >\r
+ </File>\r
+ <File\r
+ RelativePath="..\..\wx-console\wxbconfigfileeditor.cpp"\r
+ >\r
+ </File>\r
+ <File\r
+ RelativePath="..\..\wx-console\wxbconfigpanel.cpp"\r
+ >\r
+ </File>\r
+ <File\r
+ RelativePath="..\..\wx-console\wxbhistorytextctrl.cpp"\r
+ >\r
+ </File>\r
+ <File\r
+ RelativePath="..\..\wx-console\wxblistctrl.cpp"\r
+ >\r
+ </File>\r
+ <File\r
+ RelativePath="..\..\wx-console\wxbmainframe.cpp"\r
+ >\r
+ </File>\r
+ <File\r
+ RelativePath="..\..\wx-console\wxbrestorepanel.cpp"\r
+ >\r
+ </File>\r
+ <File\r
+ RelativePath="..\..\wx-console\wxbtableparser.cpp"\r
+ >\r
+ </File>\r
+ <File\r
+ RelativePath="..\..\wx-console\wxbtreectrl.cpp"\r
+ >\r
+ </File>\r
+ <File\r
+ RelativePath="..\..\wx-console\wxbutils.cpp"\r
+ >\r
+ </File>\r
+ </Filter>\r
+ <File\r
+ RelativePath=".\debug\BuildLog.htm"\r
+ >\r
+ </File>\r
+ </Files>\r
+ <Globals>\r
+ </Globals>\r
+</VisualStudioProject>\r
}
init_msg(NULL, msgs);
- init_console_msg(console_thread::working_dir.mb_str(*wxConvCurrent));
+ //init_console_msg(console_thread::working_dir.mb_str(*wxConvCurrent));
errmsg = wxT("");
if (!parse_config(configfile.mb_str(*wxConvCurrent), &scan_err)) {
* Thread entry point
*/
void* console_thread::Entry() {
- /* It seems we must redefine the locale on each thread. */
+#ifndef HAVE_WIN32
+ /* It seems we must redefine the locale on each thread on wxGTK.
+ * On Win32 it makes wx-console crash. */
wxLocale m_locale;
m_locale.Init();
m_locale.AddCatalog(wxT("bacula"));
-#ifndef ENABLE_NLS
-#undef LOCALEDIR
-#define LOCALEDIR "."
-#endif
wxLocale::AddCatalogLookupPathPrefix(wxT(LOCALEDIR));
+#endif
DIRRES* dir;
if (!inited) {
void console_thread::Write(const char* str)
{
if (UA_sock) {
- UA_sock->msglen = strlen(str);
+ UA_sock->msglen = (int32_t)strlen(str);
pm_strcpy(&UA_sock->msg, str);
bnet_send(UA_sock);
} else if (choosingdirector) {
BEGIN_EVENT_TABLE(wxbConfigFileEditor, wxDialog)
EVT_BUTTON(Save, wxbConfigFileEditor::OnSave)
EVT_BUTTON(Quit, wxbConfigFileEditor::OnQuit)
+#ifdef HAVE_WIN32
+ EVT_PAINT ( wxbConfigFileEditor::OnPaint)
+#endif
END_EVENT_TABLE()
wxbConfigFileEditor::wxbConfigFileEditor(wxWindow* parent, wxString filename):
wxDEFAULT_DIALOG_STYLE | wxRESIZE_BORDER) {
this->filename = filename;
- textCtrl = new wxTextCtrl(this,-1,wxT(""),wxDefaultPosition, wxDefaultSize, wxTE_MULTILINE | wxTE_RICH | wxTE_DONTWRAP);
+ wxString strbuf;
+
+ wxFileName filen(filename);
+
+ if (!filen.FileExists()) {
+ strbuf << wxT("#\n");
+ strbuf << _("# Bacula wx-console Configuration File\n");
+ strbuf << wxT("#\n");
+ strbuf << wxT("\n");
+ strbuf << wxT("Director {\n");
+ strbuf << wxT(" Name = <hostname>-dir\n");
+ strbuf << wxT(" DIRport = 9101\n");
+ strbuf << wxT(" address = <hostname>\n");
+ strbuf << wxT(" Password = \"<dir_password>\"\n");
+ strbuf << wxT("}\n");
+ }
+ else {
+ wxFile file(filename);
+ char buffer[2049];
+ off_t len;
+ while ((len = file.Read(buffer, 2048)) > -1) {
+ buffer[len] = 0;
+ strbuf << wxString(buffer,wxConvUTF8);
+ if (file.Eof())
+ break;
+ }
+ file.Close();
+ }
+
+ textCtrl = new wxTextCtrl(this,-1,strbuf,wxDefaultPosition, wxDefaultSize, wxTE_MULTILINE | wxTE_RICH2 | wxTE_DONTWRAP);
wxFont font(10, wxMODERN, wxNORMAL, wxNORMAL);
#if defined __WXGTK12__ && !defined __WXGTK20__ // Fix for "chinese" fonts under gtk+ 1.2
font.SetDefaultEncoding(wxFONTENCODING_ISO8859_1);
#endif
textCtrl->SetDefaultStyle(wxTextAttr(*wxBLACK, wxNullColour, font));
+ textCtrl->SetStyle(0, textCtrl->GetLastPosition(), wxTextAttr(*wxBLACK, wxNullColour, font));
wxFlexGridSizer *mainSizer = new wxFlexGridSizer(2, 1, 0, 0);
mainSizer->AddGrowableCol(0);
mainSizer->Add(bottomsizer, 0, wxALIGN_CENTER_HORIZONTAL | wxALIGN_CENTER_VERTICAL);
this->SetSizer(mainSizer);
-
- wxFileName filen(filename);
-
- if (!filen.FileExists()) {
- (*textCtrl) << wxT("#\n");
- (*textCtrl) << _("# Bacula wx-console Configuration File\n");
- (*textCtrl) << wxT("#\n");
- (*textCtrl) << wxT("\n");
- (*textCtrl) << wxT("Director {\n");
- (*textCtrl) << wxT(" Name = <hostname>-dir\n");
- (*textCtrl) << wxT(" DIRport = 9101\n");
- (*textCtrl) << wxT(" address = <hostname>\n");
- (*textCtrl) << wxT(" Password = \"<dir_password>\"\n");
- (*textCtrl) << wxT("}\n");
- }
- else {
- wxFile file(filename);
- char buffer[2049];
- off_t len;
- while ((len = file.Read(buffer, 2048)) > -1) {
- buffer[len] = 0;
- (*textCtrl) << wxString(buffer,wxConvLocal);
- if (file.Eof())
- break;
- }
- file.Close();
- }
+
+ firstpaint = true;
}
wxbConfigFileEditor::~wxbConfigFileEditor() {
}
+/* Kludge for Win32, so the text control is not completely selected. */
+void wxbConfigFileEditor::OnPaint(wxPaintEvent& event) {
+ wxPaintDC dc(this);
+
+ if (firstpaint) {
+ firstpaint = false;
+ textCtrl->SetSelection(0, 0);
+ }
+}
+
void wxbConfigFileEditor::OnSave(wxCommandEvent& event) {
wxFile file(filename, wxFile::write);
if (!file.IsOpened()) {
wxTextCtrl* textCtrl;
+ bool firstpaint;
+
void OnSave(wxCommandEvent& event);
void OnQuit(wxCommandEvent& event);
+ void OnPaint(wxPaintEvent& event);
DECLARE_EVENT_TABLE()
};
consoleCtrl->AppendText(consoleBuffer);
consoleBuffer = wxT("");
SetStatusText(_("Console thread terminated."));
+#ifndef HAVE_WIN32
consoleCtrl->PageDown();
+#else
+ consoleCtrl->ScrollLines(1);
+#endif
ct = NULL;
DisablePanels();
int answer = wxMessageBox( _("Connection to the director lost. Quit program?"),
if (status == CS_DISCONNECTED) {
consoleCtrl->AppendText(consoleBuffer);
consoleBuffer = wxT("");
+#ifndef HAVE_WIN32
consoleCtrl->PageDown();
+#else
+ consoleCtrl->ScrollLines(1);
+#endif
SetStatusText(_("Disconnected of the director."));
DisablePanels();
return;
if (status == CS_DEBUG) {
consoleCtrl->AppendText(consoleBuffer);
consoleBuffer = wxT("");
+#ifndef HAVE_WIN32
consoleCtrl->PageDown();
+#else
+ consoleCtrl->ScrollLines(1);
+#endif
consoleCtrl->SetDefaultStyle(wxTextAttr(wxColour(0, 128, 0)));
}
else {
if ((status == CS_END) || (status == CS_PROMPT) || (str.Find(wxT("\n")) > -1)) {
consoleCtrl->AppendText(consoleBuffer);
consoleBuffer = wxT("");
-
+
+#ifndef HAVE_WIN32
consoleCtrl->PageDown();
+#else
+ consoleCtrl->ScrollLines(1);
+#endif
}
- // consoleCtrl->ShowPosition(consoleCtrl->GetLastPosition());
+ //consoleCtrl->ShowPosition(consoleCtrl->GetLastPosition());
/*if (status != CS_DEBUG) {
consoleCtrl->AppendText("@");
}*/
//consoleCtrl->SetInsertionPointEnd();
-
-/* if ((consoleCtrl->GetNumberOfLines()-1) > nlines) {
- nlines = consoleCtrl->GetNumberOfLines()-1;
- }
-
- if (status == CS_END) {
- consoleCtrl->ShowPosition(nlines);
- }*/
}
/*
typeCtrl->SetValue(wxT(""));
consoleCtrl->SetDefaultStyle(wxTextAttr(*wxRED));
consoleCtrl->AppendText(wxbUtils::ConvertToPrintable(str));
- consoleCtrl->PageDown();
+ //consoleCtrl->PageDown();
}
/* if ((consoleCtrl->GetNumberOfLines()-1) > nlines) {
projects / bacula / bacula / commitdiff