[sword-svn] r64 - in trunk: installer_src src/gui src/simplegui
bdrake at www.crosswire.org
bdrake at www.crosswire.org
Thu Dec 20 09:33:00 MST 2007
Author: bdrake
Date: 2007-12-20 09:33:00 -0700 (Thu, 20 Dec 2007)
New Revision: 64
Removed:
trunk/installer_src/copyMods.cpp
trunk/installer_src/copyMods.dsp
trunk/installer_src/copyMods.dsw
trunk/installer_src/copyMods.sln
trunk/installer_src/copyMods.suo
trunk/installer_src/copyMods.vcproj
trunk/installer_src/mssccprj.scc
trunk/installer_src/readme.txt
trunk/installer_src/vssver.scc
trunk/src/gui/BibleReader.aps
trunk/src/simplegui/simplegui.aps
Log:
Deleted: trunk/installer_src/copyMods.cpp
===================================================================
--- trunk/installer_src/copyMods.cpp 2007-12-20 16:20:53 UTC (rev 63)
+++ trunk/installer_src/copyMods.cpp 2007-12-20 16:33:00 UTC (rev 64)
@@ -1,143 +0,0 @@
-//*******************************************************************************************
-//
-// Filename : copyMods.cpp
-//
-// Based on ptree and pget examples of use of rapi library from Microsoft.
-//
-//*******************************************************************************************
-
-#include <stdio.h>
-#include <tchar.h>
-#include <rapi.h>
-
-const char *stristr(const char *haystack, const char *needle){
-if ( !*needle )
- return haystack;
-for ( ; *haystack; ++haystack ){
- if ( toupper(*haystack) == toupper(*needle) ){
- const char *h, *n;
- for ( h = haystack, n = needle; *h && *n; ++h, ++n ){
- if ( toupper(*h) != toupper(*n) )break;
- }
- if ( !*n )
- return haystack; /* return the start of the match */
- }
- }
-return 0;
-}
-
-char *wstrtostr(const wchar_t *str) {
- static char *c, *buffer = 0;
- if (buffer)
- delete [] buffer;
- buffer = c = new char[ wcslen(str) + 1 ];
- while (*str)
- *c++ = (char)*str++;
- *c = 0;
- return buffer;
-}
-
-void PrintDirectory(LPWSTR Path, UINT Indent){ // recurse through device from root
- DWORD foundCount;
- LPCE_FIND_DATA findDataArray;
- TCHAR wszSrcFile[MAX_PATH];
- WCHAR tszDestFile[MAX_PATH];
- WCHAR searchPath[MAX_PATH];
- HANDLE hSrc, hDest;
- BYTE Buffer[4096];
- DWORD dwNumRead, dwNumWritten;
-
- wcscpy(searchPath, Path);
- wcscat(searchPath, L"*");
-
- if(!CeFindAllFiles(searchPath, FAF_ATTRIBUTES | FAF_NAME, &foundCount, &findDataArray)) {
- _tprintf( TEXT("*** CeFindAllFiles failed. ***\n"));
- return;
- }
- if(!foundCount) return;
- for(UINT i = 0; i < foundCount; i++) {
- if(findDataArray[i].dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) { // directory found
- WCHAR newPath[MAX_PATH];
- wcscpy(newPath, Path);
- wcscat(newPath, findDataArray[i].cFileName);
- wcscat(newPath, L"\\");
- PrintDirectory(newPath, Indent + 1);
- }
- // don't want to do anything with files except in MODS.D
- else if ((stristr(wstrtostr(Path), "MODS.D"))){ // not directory - this is a file
- // 'Path' at this point should be your sword home directory, so save it
- // I have assumed that mods.d occurs only once!!! Possible other instance ....
- // note: have not checked for more than one installation: it is possible for someone
- // to have installed into two different locations - really!
-
- wprintf( TEXT("%s%s\n"),Path, findDataArray[i].cFileName); // for debugging
-
- // copy the file from Ce device to Pc
- wcscpy(wszSrcFile, Path);
- wcscat(wszSrcFile, findDataArray[i].cFileName);
- _tcscpy( tszDestFile, TEXT("mods.d\\"));
- wcscat( tszDestFile, findDataArray[i].cFileName);
- hSrc = CeCreateFile(wszSrcFile, GENERIC_READ, FILE_SHARE_READ,
- NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL);
- if (INVALID_HANDLE_VALUE == hSrc) {
- _tprintf( TEXT("Unable to open Windows CE file"));
- return;
- }
- hDest = CreateFile(tszDestFile, GENERIC_WRITE, FILE_SHARE_READ,
- NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL);
- if (INVALID_HANDLE_VALUE == hDest) {
- // there has to be an existing 'mods.d' directory on the host
- _tprintf( TEXT("Unable to open host/destination file "));
- _tprintf(tszDestFile);
- return;
- }
- if (CeReadFile(hSrc, &Buffer, sizeof(Buffer), &dwNumRead, NULL)) {
- if (!WriteFile(hDest, &Buffer, dwNumRead, &dwNumWritten, NULL))
- _tprintf( TEXT("Error !!! Writing hostfile"));
- }
- else _tprintf( TEXT("Error !!! Reading Windows CE file"));
- } // else if ((stristr(wstrtostr ......
- // no longer pointing to a mods.d directory, so close file handles
- if (hSrc){
- CeCloseHandle( hSrc);
- hSrc = NULL;
- }
- if (hDest){
- CloseHandle (hDest);
- hDest = NULL;
- }
- } // for(UINT i = 0; ........
- if (findDataArray)
- RapiFreeBuffer(findDataArray);
-}
-
-void main(){
- HRESULT hRapiResult;
- _tprintf( TEXT("Connecting to Windows CE..."));
- hRapiResult = CeRapiInit();
- if (FAILED(hRapiResult)) {
- _tprintf( TEXT("Failed\n"));
- return;
- }
- _tprintf( TEXT("Success\n\n\n"));
- PrintDirectory( L"\\", 0);
- CeRapiUninit();
- STARTUPINFO si;
- PROCESS_INFORMATION pi;
- ZeroMemory( &si, sizeof(si) );
- si.cb = sizeof(si);
- ZeroMemory( &pi, sizeof(pi) );
- // Start the child process - InstallManager.
- printf ("starting InstallManager,exe\n\n");
- if( !CreateProcess( TEXT("InstallManager.exe"), TEXT("InstallManager.exe"), // Command line.
- NULL, NULL, FALSE, 0, NULL, NULL, &si, &pi ))
- printf( "CreateProcess failed. Could not start InstallManager\n\n\n" );
- printf ("At end of InstallManager CreateProcess - waiting for InstallManager to end.\n\n");
- // Wait until InstallManager exits.
- WaitForSingleObject( pi.hProcess, INFINITE );
- // Close process and thread handles.
- CloseHandle( pi.hProcess );
- CloseHandle( pi.hThread );
- printf ("Finished with InstallMangager - now do the install\n\n\n");
-}
-
Deleted: trunk/installer_src/copyMods.dsp
===================================================================
--- trunk/installer_src/copyMods.dsp 2007-12-20 16:20:53 UTC (rev 63)
+++ trunk/installer_src/copyMods.dsp 2007-12-20 16:33:00 UTC (rev 64)
@@ -1,101 +0,0 @@
-# Microsoft Developer Studio Project File - Name="ptree" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
-
-CFG=ptree - Win32 Release
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE
-!MESSAGE NMAKE /f "Ptree.mak".
-!MESSAGE
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE
-!MESSAGE NMAKE /f "Ptree.mak" CFG="ptree - Win32 Release"
-!MESSAGE
-!MESSAGE Possible choices for configuration are:
-!MESSAGE
-!MESSAGE "ptree - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "ptree - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-# PROP WCE_FormatVersion ""
-CPP=cl.exe
-RSC=rc.exe
-
-!IF "$(CFG)" == "ptree - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir ".\Release"
-# PROP BASE Intermediate_Dir ".\Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir ".\Release"
-# PROP Intermediate_Dir ".\Release"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /W3 /GX /O2 /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "_UNICODE" /D "UNICODE" /D "_UNICODE_" /YX /FD /c
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 rapi.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /machine:I386
-
-!ELSEIF "$(CFG)" == "ptree - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir ".\Debug"
-# PROP BASE Intermediate_Dir ".\Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir ".\Debug"
-# PROP Intermediate_Dir ".\Debug"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "_UNICODE" /D "UNICODE" /D "_UNICODE_" /YX /FD /c
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:I386
-# ADD LINK32 rapi.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:I386
-
-!ENDIF
-
-# Begin Target
-
-# Name "ptree - Win32 Release"
-# Name "ptree - Win32 Debug"
-# Begin Group "Source Files"
-
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"
-# Begin Source File
-
-SOURCE=.\Ptree.cpp
-# End Source File
-# End Group
-# Begin Group "Header Files"
-
-# PROP Default_Filter "h;hpp;hxx;fi;fd"
-# End Group
-# Begin Group "Resource Files"
-
-# PROP Default_Filter "ico;cur;bmp;rc2;cnt;rtf;rct"
-# End Group
-# End Target
-# End Project
Deleted: trunk/installer_src/copyMods.dsw
===================================================================
--- trunk/installer_src/copyMods.dsw 2007-12-20 16:20:53 UTC (rev 63)
+++ trunk/installer_src/copyMods.dsw 2007-12-20 16:33:00 UTC (rev 64)
@@ -1,29 +0,0 @@
-Microsoft Developer Studio Workspace File, Format Version 6.00
-# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
-
-###############################################################################
-
-Project: "ptree"=.\Ptree.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Global:
-
-Package=<5>
-{{{
-}}}
-
-Package=<3>
-{{{
-}}}
-
-###############################################################################
-
Deleted: trunk/installer_src/copyMods.sln
===================================================================
--- trunk/installer_src/copyMods.sln 2007-12-20 16:20:53 UTC (rev 63)
+++ trunk/installer_src/copyMods.sln 2007-12-20 16:33:00 UTC (rev 64)
@@ -1,20 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 10.00
-# Visual C++ Express 2008
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "copyMods", "copyMods.vcproj", "{24D269E7-CEFC-46D7-A66E-B7A2BC6172ED}"
-EndProject
-Global
- GlobalSection(SolutionConfigurationPlatforms) = preSolution
- Debug|Win32 = Debug|Win32
- Release|Win32 = Release|Win32
- EndGlobalSection
- GlobalSection(ProjectConfigurationPlatforms) = postSolution
- {24D269E7-CEFC-46D7-A66E-B7A2BC6172ED}.Debug|Win32.ActiveCfg = Debug|Win32
- {24D269E7-CEFC-46D7-A66E-B7A2BC6172ED}.Debug|Win32.Build.0 = Debug|Win32
- {24D269E7-CEFC-46D7-A66E-B7A2BC6172ED}.Release|Win32.ActiveCfg = Release|Win32
- {24D269E7-CEFC-46D7-A66E-B7A2BC6172ED}.Release|Win32.Build.0 = Release|Win32
- EndGlobalSection
- GlobalSection(SolutionProperties) = preSolution
- HideSolutionNode = FALSE
- EndGlobalSection
-EndGlobal
Deleted: trunk/installer_src/copyMods.suo
===================================================================
(Binary files differ)
Deleted: trunk/installer_src/copyMods.vcproj
===================================================================
--- trunk/installer_src/copyMods.vcproj 2007-12-20 16:20:53 UTC (rev 63)
+++ trunk/installer_src/copyMods.vcproj 2007-12-20 16:33:00 UTC (rev 64)
@@ -1,223 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
- ProjectType="Visual C++"
- Version="9.00"
- Name="copyMods"
- ProjectGUID="{24D269E7-CEFC-46D7-A66E-B7A2BC6172ED}"
- TargetFrameworkVersion="0"
- >
- <Platforms>
- <Platform
- Name="Win32"
- />
- </Platforms>
- <ToolFiles>
- </ToolFiles>
- <Configurations>
- <Configuration
- Name="Release|Win32"
- OutputDirectory=".\Release"
- IntermediateDirectory=".\Release"
- ConfigurationType="1"
- InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
- UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
- CharacterSet="1"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- TypeLibraryName=".\Release/Ptree.tlb"
- HeaderFileName=""
- />
- <Tool
- Name="VCCLCompilerTool"
- Optimization="2"
- InlineFunctionExpansion="1"
- PreprocessorDefinitions="NDEBUG;WIN32;_CONSOLE;UNICODE;_UNICODE_"
- StringPooling="true"
- RuntimeLibrary="0"
- EnableFunctionLevelLinking="true"
- PrecompiledHeaderFile=".\Release/Ptree.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="rapi.lib"
- OutputFile=".\Release/Ptree.exe"
- LinkIncremental="1"
- SuppressStartupBanner="true"
- ProgramDatabaseFile=".\Release/Ptree.pdb"
- SubSystem="1"
- RandomizedBaseAddress="1"
- DataExecutionPrevention="0"
- TargetMachine="1"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- SuppressStartupBanner="true"
- OutputFile=".\Release/Ptree.bsc"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- <Configuration
- Name="Debug|Win32"
- OutputDirectory=".\Debug"
- IntermediateDirectory=".\Debug"
- ConfigurationType="1"
- InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
- UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
- CharacterSet="1"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- TypeLibraryName=".\Debug/Ptree.tlb"
- HeaderFileName=""
- />
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories="C:\Program Files\Windows CE Tools\wce420\POCKET PC 2003\ActiveSync\inc;C:\Program Files\Microsoft eMbedded Tools\include"
- PreprocessorDefinitions="_DEBUG;WIN32;_CONSOLE;UNICODE;_UNICODE_"
- MinimalRebuild="true"
- RuntimeLibrary="1"
- PrecompiledHeaderFile=".\Debug/copyMods.pch"
- AssemblerListingLocation=".\Debug/"
- ObjectFile=".\Debug/"
- ProgramDataBaseFileName=".\Debug/"
- WarningLevel="3"
- SuppressStartupBanner="true"
- DebugInformationFormat="4"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="_DEBUG"
- Culture="1033"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- AdditionalDependencies="rapi.lib"
- OutputFile=".\Debug/copyMods.exe"
- LinkIncremental="2"
- SuppressStartupBanner="true"
- AdditionalLibraryDirectories="C:\Program Files\Windows CE Tools\wce420\POCKET PC 2003\Activesync\Lib"
- GenerateDebugInformation="true"
- ProgramDatabaseFile=".\Debug/copyMods.pdb"
- SubSystem="1"
- RandomizedBaseAddress="1"
- DataExecutionPrevention="0"
- TargetMachine="1"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- SuppressStartupBanner="true"
- OutputFile=".\Debug/Ptree.bsc"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- </Configurations>
- <References>
- </References>
- <Files>
- <Filter
- Name="Source Files"
- Filter="cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"
- >
- <File
- RelativePath=".\copyMods.cpp"
- >
- </File>
- </Filter>
- <Filter
- Name="Header Files"
- Filter="h;hpp;hxx;fi;fd"
- >
- </Filter>
- <Filter
- Name="Resource Files"
- Filter="ico;cur;bmp;rc2;cnt;rtf;rct"
- >
- </Filter>
- </Files>
- <Globals>
- </Globals>
-</VisualStudioProject>
Deleted: trunk/installer_src/mssccprj.scc
===================================================================
--- trunk/installer_src/mssccprj.scc 2007-12-20 16:20:53 UTC (rev 63)
+++ trunk/installer_src/mssccprj.scc 2007-12-20 16:33:00 UTC (rev 64)
@@ -1,5 +0,0 @@
-SCC = This is a Source Code Control file
-
-[ptree.dsp]
-SCC_Aux_Path = "X:\LdaFwApps\Ss2006"
-SCC_Project_Name = "$/InVerse/Ppc/rapi/ptree", CAPAAAAA
Deleted: trunk/installer_src/readme.txt
===================================================================
--- trunk/installer_src/readme.txt 2007-12-20 16:20:53 UTC (rev 63)
+++ trunk/installer_src/readme.txt 2007-12-20 16:33:00 UTC (rev 64)
@@ -1,28 +0,0 @@
-
-This application is used to list all the files and directories on a CE device.
-To get the list, just type "Ptree".
-
-
-
-This is the desktop side application. You need Visual C++ 6.0 and eMbedded Visual C++ 3.0
-to compile it.
-
-1. Open the project file (DSP file) by using Visual C++ 6.0 (Not by eMbedded Visual C++ 3.0,
-because eMbedded Visual C++ 3.0 doesn't support x86).
-
-2. Go to "Tools" -> "Options", press "Directories" tab.
-
-3. Choose "Include files" for "Show directories for:" listbox.
-
-4. Add a directory "wce300\MS Pocket PC\support\ActiveSync\inc". If you accepted the defaults when
- installing eMbedded Visual Tools, then the new directory will be
- "C:\Windows CE Tools\wce300\MS Pocket PC\support\ActiveSync\inc".
-
-5. Choose "Library files" for "Show directories for:" listbox.
-
-6. Add a directory "wce300\MS Pocket PC\support\ActiveSync\lib". If you accepted the defaults when
- installing eMbedded Visual Tools, then the new directory will be
- "C:\Windows CE Tools\wce300\MS Pocket PC\support\ActiveSync\lib".
-
-7. Go to "Build" -> "ReBuild All" to compile the executable file.
-
Deleted: trunk/installer_src/vssver.scc
===================================================================
(Binary files differ)
Deleted: trunk/src/gui/BibleReader.aps
===================================================================
(Binary files differ)
Deleted: trunk/src/simplegui/simplegui.aps
===================================================================
(Binary files differ)
More information about the sword-cvs
mailing list