Menu
▾
▴
[Nbftools-cvs-logs] CellTrack stdafx.h,NONE,1.1 AboutDlg.h,1.1,1.2 CellDB.cpp,1.26,1.27 CellDB.h,1.12,1.13 CellTrack.cpp,1.17,1.18 CellTrack.vcp,1.28,1.29 Comms.h,1.3,1.4 DlgMain.cpp,1.45,1.46 EEDlg.h,1.1,1.2 LocalDB.cpp,1.10,1.11 Log.cpp,1.2,1.3 Log.h,1.2,1.3
|
From: Martin R. <zo...@us...> - 2005-10-25 16:53:14
|
Update of /cvsroot/nbftools/CellTrack In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32673 Modified Files: AboutDlg.h CellDB.cpp CellDB.h CellTrack.cpp CellTrack.vcp Comms.h DlgMain.cpp EEDlg.h LocalDB.cpp Log.cpp Log.h Added Files: stdafx.h Log Message: Now using WTL (it gives us some nice string manipulation classes, etc). Cleaned up some code, and fixed a few bugs. Index: CellDB.cpp =================================================================== RCS file: /cvsroot/nbftools/CellTrack/CellDB.cpp,v retrieving revision 1.26 retrieving revision 1.27 diff -u -d -r1.26 -r1.27 --- CellDB.cpp 28 Sep 2005 15:49:50 -0000 1.26 +++ CellDB.cpp 25 Oct 2005 16:53:02 -0000 1.27 @@ -4,13 +4,15 @@ #include "CellDB.h" #include "Settings.h" +#include "stdafx.h" +#include "log.h" #include "LocalDB.h" #ifdef _WIN32_WCE - #include <objbase.h> - #include <initguid.h> - #include <connmgr.h> +#include <objbase.h> +#include <initguid.h> +#include <connmgr.h> #endif extern CSettings *g_pSettings; @@ -18,6 +20,7 @@ // pointer to LocalDB extern CLocalDB *g_pLocalDB; +extern CLog *g_pLog; // callback hook CCellDB *pCellDB; @@ -25,12 +28,12 @@ DWORD WINAPI l_CDBThread(LPVOID lpParam) { DWORD dwRet = -1; - + if (pCellDB) { dwRet = pCellDB->CDBThread(lpParam); } - + return (dwRet); } @@ -41,23 +44,23 @@ CCellDB::CCellDB(CCellGet *pMasterCellGet) { - + pCellGet = pMasterCellGet; - + m_dwThreadId = NULL; m_hThread = NULL; m_pTCPSocket = NULL; m_pszStatus = NULL; phWebConnection = NULL; - + // setup thread call back stuff pCellDB = this; - + // Set up the itial state for the state machine CellDBState = STATE_UNKNOWN; - - + + } CCellDB::~CCellDB() @@ -75,13 +78,13 @@ Sleep(15000); SetStatus(_T("Timed Out")); Sleep(700); - + InternetCloseHandle(*(HINTERNET*) lpParam); return 0; } //-------------------------------------------------------------------------- -bool CCellDB::UploadDataToServer(TCHAR *szData, T_CELLINFO *pCellInfo) +bool CCellDB::UploadDataToServer(const TCHAR *sztData, T_CELLINFO *pCellInfo) { bool bRet = false; HINTERNET hURL; @@ -94,28 +97,30 @@ char *pTmp; int i; TCHAR sztLine[255]; - + // sort the headers out for the communication to the internet wsprintf(sztHeaders, L"X-WAP-PROFILE: \"http://wap.sonyericsson.com/UAprof/P800R102.xml\""); - + //If proxy support is enabled, try connecting via proxy, and if it fails, go direct. //If proxy support is disabled, use a direct connection straight away. if (!g_pSettings->GetUseProxy()) { SetStatus(_T("Querying...")); - + hInternet = InternetOpen(TEXT("Mozilla/4.0 (compatible; MSIE 4.01; Windows CE; Smartphone; SDA/1.0 Profile/MIDP-2.0 Configuration/CLDC-1.1)"), INTERNET_OPEN_TYPE_DIRECT, NULL, NULL, 0); } else { SetStatus(_T("Querying (Proxy)...")); - + hInternet = InternetOpen(TEXT("Mozilla/4.0 (compatible; MSIE 4.01; Windows CE; Smartphone; SDA/1.0 Profile/MIDP-2.0 Configuration/CLDC-1.1)"), INTERNET_OPEN_TYPE_PRECONFIG, NULL, NULL, 0); } - + + g_pLog->Log(LOG_DEBUG, CString(L"Querying URL: ") + sztData); + // open a connection to the server via a URL request - hURL = InternetOpenUrl(hInternet, szData, sztHeaders, -1L, INTERNET_FLAG_RAW_DATA, 0); + hURL = InternetOpenUrl(hInternet, sztData, sztHeaders, -1L, INTERNET_FLAG_RAW_DATA, 0); if(hURL == NULL) { @@ -126,16 +131,17 @@ else { SetStatus(_T("HTTP OK")); - + Sleep(500); + // Read reply from server nRet = InternetReadFile( hURL, sTmp, sizeof(sTmp), &nRxLen ); - + if (nRet) { // parse the reply pTmp = sTmp; i=0; - + while(*pTmp) { if(*pTmp != '\r') @@ -145,25 +151,25 @@ else if(*pTmp == '\n') { sztLine[i-1] = 0; - + /*if(_tcsstr(sztLine, _T("SubmitOK"))) { //Submit OK - DWORD dwTemp = 0; - CCellGet::CellStructToIDString(ctLast, sztTmp); - CRegistry::SaveSetting(HKEY_CURRENT_USER, TEXT("SOFTWARE\\SPV-Developers\\CellTrack\\ToSubmit_Cells"), - sztTmp, REG_DWORD, (LPBYTE) &dwTemp); - SetStatus(L"Cell Submitted"); - Sleep(1000); + DWORD dwTemp = 0; + CCellGet::CellStructToIDString(ctLast, sztTmp); + CRegistry::SaveSetting(HKEY_CURRENT_USER, TEXT("SOFTWARE\\SPV-Developers\\CellTrack\\ToSubmit_Cells"), + sztTmp, REG_DWORD, (LPBYTE) &dwTemp); + SetStatus(L"Cell Submitted"); + Sleep(1000); } - - if(_tcsstr(sztLine, _T("SubmitGroupOK"))) { //Submit Group OK - DWORD dwTemp = 0; - CCellGet::CellStructToIDString(ctLast, sztTmp); - CRegistry::SaveSetting(HKEY_CURRENT_USER, TEXT("SOFTWARE\\SPV-Developers\\CellTrack\\ToSubmit_Groups"), - sztTmp, REG_DWORD, (LPBYTE) &dwTemp); - SetStatus(L"Group Submitted"); - Sleep(1000); - }*/ - + + if(_tcsstr(sztLine, _T("SubmitGroupOK"))) { //Submit Group OK + DWORD dwTemp = 0; + CCellGet::CellStructToIDString(ctLast, sztTmp); + CRegistry::SaveSetting(HKEY_CURRENT_USER, TEXT("SOFTWARE\\SPV-Developers\\CellTrack\\ToSubmit_Groups"), + sztTmp, REG_DWORD, (LPBYTE) &dwTemp); + SetStatus(L"Group Submitted"); + Sleep(1000); + }*/ + if(_tcsstr(sztLine, _T("OK"))) { bRet = true; // no data returned @@ -176,9 +182,9 @@ { //Cell Friendly/Group Name TCHAR szGroupName[CT_GROUPNAME_LEN]; BYTE bGroupID; - + _stprintf(szGroupName, TEXT("%s"), sztLine+8); - + // Check to see if group exitst bGroupID = g_pLocalDB->FindGroupID(szGroupName); @@ -196,26 +202,16 @@ SetStatus(sztLine); Sleep(1000); } - + i=0; } - + pTmp++; } - + InternetCloseHandle(hURL); InternetCloseHandle(hInternet); - - SetStatus(_T("Disconnect...")); - - if(phWebConnection) - { - ConnMgrReleaseConnection(phWebConnection, false); - phWebConnection = NULL; - SetStatus(_T("HangedUp")); - Sleep(1000); - } - + bRet = true; } else @@ -228,7 +224,7 @@ if (err != 0) // i.e there was an error { TCHAR szTmp[255]; - + _stprintf(szTmp, TEXT("E %08lx"), err); SetStatus(szTmp); Sleep(2000); @@ -245,7 +241,7 @@ SetStatus(_T("Query Fail")); } } - + return (bRet); } @@ -259,75 +255,82 @@ HRESULT hr = S_OK; TCHAR tcTmp[20]; CRegistry Registry; - - TCHAR sztLine[255]; - + CURLEncode URLEncode; TCHAR sztU[CT_USERNAME_LEN] = TEXT(""); TCHAR sztP[CT_PASSWORD_LEN] = TEXT(""); - - unsigned long ulCount; - + SetStatus(_T("Dialing...")); EstablishConnection(tcTmp); SetStatus(tcTmp); Sleep(1000); - + SetStatus(TEXT("Syncing Database")); // Get the CellDB username and password g_pSettings->GetCellDBUserName(sztU); g_pSettings->GetCellDBPassword(sztP); - + + // URLEncode the username and password + URLEncode.URLEncode(sztU, sztU); + URLEncode.URLEncode(sztP, sztP); + // cells g_pLocalDB->ResetFindUnsavedCells(); - for (ulCount = 0; ulCount < g_pLocalDB->GetNumberOfUnsavedCells(); ulCount ++) + while( g_pLocalDB->GetNumberOfUnsavedCells() ) { + CString strTemp; unsigned long ulUSCellID; T_CELLINFO CellInfo; TCHAR sztID[CT_CELLID_LEN] = TEXT(""); TCHAR sztLocName[CT_LOCNAME_LEN] = TEXT(""); TCHAR sztGroupName[CT_GROUPNAME_LEN] = TEXT(""); - + // find the next unsaved cell ulUSCellID = g_pLocalDB->FindUnsavedCell(); + strTemp.Format(TEXT("Uploading Unsaved Cell: %d"), ulUSCellID); + g_pLog->Log(LOG_DEBUG, strTemp); + g_pLocalDB->GetCellInfo(ulUSCellID, &CellInfo); - + // Get Cell and Group Info _stprintf(sztLocName, TEXT("%s"), CellInfo.szLocName ); _stprintf(sztID, TEXT("%s"), CellInfo.szCellID); - + if (CellInfo.bGroupNameID) { T_GROUPINFO GroupInfo; - + // get the group name g_pLocalDB->GetGroupInfo(CellInfo.bGroupNameID, &GroupInfo); - + _stprintf(sztGroupName, TEXT("%s"), GroupInfo.szGroupName); } - + // encode the info ready to go - URLEncode.URLEncode(sztU, sztU); - URLEncode.URLEncode(sztP, sztP); - URLEncode.URLEncode(sztLocName, sztLocName); - URLEncode.URLEncode(sztGroupName, sztGroupName); - - wsprintf(sztLine, L"http://celltrack.spv-developers.com/celldb2.php?CELL=%s&u=%s&p=%s&ver=6", sztID, sztU, sztP); - wsprintf(sztLine, L"%s&cn=%s", sztLine, sztLocName); - -// if(dwToSubmitGroup) -// wsprintf(sztLine, L"%s&cg=%s", sztLine, sztGroupName); - - if (UploadDataToServer(sztLine, &CellInfo)) + //URLEncode.URLEncode(sztLocName, sztLocName); + //URLEncode.URLEncode(sztGroupName, sztGroupName); + + CString strURL = L"http://celltrack.spv-developers.com/celldb2.php"; + + strTemp.Format(L"?CELL=%s&u=%s&p=%s&ver=8", sztID, sztU, sztP); + strURL += strTemp; + + // if(dwToSubmitCell) + // wsprintf(sztLine, L"%s&cn=%s", sztLine, sztLocName); + + // if(dwToSubmitGroup) + // wsprintf(sztLine, L"%s&cg=%s", sztLine, sztGroupName); + + if (UploadDataToServer(strURL, &CellInfo)) { // do we want the server overwritting the local DB if (g_pSettings->GetCellDBOveride()) { g_pLocalDB->AddCellInfo(&CellInfo, true); } - + // mark cell as saved g_pLocalDB->MarkCellAsSaved(ulUSCellID); } @@ -337,10 +340,21 @@ break; } } - + + SetStatus(_T("Disconnect...")); + Sleep(500); + + if(phWebConnection) + { + ConnMgrReleaseConnection(phWebConnection, false); + phWebConnection = NULL; + SetStatus(_T("HangedUp")); + Sleep(1000); + } + SetStatus(TEXT("Sync Complete")); Sleep(500); - + return (hr); } @@ -352,21 +366,21 @@ DWORD WINAPI CCellDB::CDBThread(LPVOID lpParam) { CellTowerStruct ctLast; - + SYSTEMTIME tOldTime; - + unsigned int uiRetry; - + // Clear the CellTower Struct memset(&ctLast, 0, sizeof(CellTowerStruct)); - + // clear the time memset(&tOldTime, 0, sizeof(SYSTEMTIME)); - + while (CellDBState != STATE_TERMINATE) { Sleep(1000); // sleep for 1 seconds - + if (CellDBState != STATE_DISABLED) { if (CellDBState == STATE_UNKNOWN) @@ -380,13 +394,13 @@ else { CellDBState = STATE_FORCE_CONNECT; // we need to connect now - as we have just been re-enabled - + // Reset the timeout uiRetry = 0; GetSystemTime(&tOldTime); } } - + // Check to see if we are upto date if (!g_pSettings->GetIgnoreCellID()) { @@ -394,96 +408,96 @@ { // we are not uptodate - we need to update oursleves CellDBState = STATE_FORCE_CONNECT; - + // remeber the cell ID ctLast.cellid = pCellGet->GetCurrentCell().cellid; } } - + switch (CellDBState) { - case STATE_WAITING: - SYSTEMTIME tNewTime; - unsigned long ulNewMinutes; - unsigned long ulOldMinutes; - - // Get the current time - GetSystemTime(&tNewTime); - - ulNewMinutes = (tNewTime.wHour * 60) + tNewTime.wMinute; - ulOldMinutes = (tOldTime.wHour * 60) + tOldTime.wMinute; + case STATE_WAITING: + SYSTEMTIME tNewTime; + unsigned long ulNewMinutes; + unsigned long ulOldMinutes; + + // Get the current time + GetSystemTime(&tNewTime); + + ulNewMinutes = (tNewTime.wHour * 60) + tNewTime.wMinute; + ulOldMinutes = (tOldTime.wHour * 60) + tOldTime.wMinute; + + + if ( (tNewTime.wDay != tOldTime.wDay) || (ulNewMinutes >= (ulOldMinutes + g_pSettings->GetConnectTimeout())) ) + { + // save the time + memcpy(&tOldTime, &tNewTime, sizeof(SYSTEMTIME)); + uiRetry = 0; + // connect next time round + CellDBState = STATE_FORCE_CONNECT; + } + else + { + TCHAR szMsg[20]; - if ( (tNewTime.wDay != tOldTime.wDay) || (ulNewMinutes >= (ulOldMinutes + g_pSettings->GetConnectTimeout())) ) - { - // save the time - memcpy(&tOldTime, &tNewTime, sizeof(SYSTEMTIME)); - uiRetry = 0; - - // connect next time round - CellDBState = STATE_FORCE_CONNECT; - } - else - { - TCHAR szMsg[20]; - - _stprintf(szMsg, TEXT("Reconnect in %d mins."), g_pSettings->GetConnectTimeout() - (ulNewMinutes - ulOldMinutes)); - SetStatus(szMsg); - } - break; - - case STATE_FORCE_CONNECT: + _stprintf(szMsg, TEXT("Reconnect in %d mins."), g_pSettings->GetConnectTimeout() - (ulNewMinutes - ulOldMinutes)); + SetStatus(szMsg); + } + break; + + case STATE_FORCE_CONNECT: + { + HRESULT hr = S_OK; + + if (g_pSettings->GetUseCellDB()) { - HRESULT hr = S_OK; - - if (g_pSettings->GetUseCellDB()) - { - // only connect to the online CellDB if - // we are allowed to - hr = UpdateCellDB(); + // only connect to the online CellDB if + // we are allowed to + hr = UpdateCellDB(); - - if (hr == S_OK) + + if (hr == S_OK) + { + CellDBState = STATE_WAITING; + + GetSystemTime(&tOldTime); + uiRetry = 0; + + SetStatus(TEXT("Waiting...")); + } + else + { + CellDBState = STATE_FORCE_CONNECT; + uiRetry ++; + + if (uiRetry > 5) { + // we have not been able to connect that last 5 times + // wait the default period CellDBState = STATE_WAITING; - - GetSystemTime(&tOldTime); + + // Reset the timeout uiRetry = 0; - - SetStatus(TEXT("Waiting...")); - } - else - { - CellDBState = STATE_FORCE_CONNECT; - uiRetry ++; - - if (uiRetry > 5) - { - // we have not been able to connect that last 5 times - // wait the default period - CellDBState = STATE_WAITING; - - // Reset the timeout - uiRetry = 0; - GetSystemTime(&tOldTime); - } + GetSystemTime(&tOldTime); } } - else - { - // we are not allowed to connect - // get the system to see if we are disable - CellDBState = STATE_UNKNOWN; - } } - break; - - default: - break; + else + { + // we are not allowed to connect + // get the system to see if we are disable + CellDBState = STATE_UNKNOWN; + } + } + break; + + default: + break; } } } - + return (0); } @@ -497,7 +511,7 @@ m_pTCPSocket = new CTCPSocket; CellDBState = STATE_UNKNOWN; - + m_hThread = CreateThread(NULL, 0, l_CDBThread, NULL, 0, &m_dwThreadId); } @@ -507,7 +521,7 @@ // Shut down the thread CellDBState = STATE_TERMINATE; TerminateThread(m_hThread, 0); - + delete[] m_pszStatus; delete m_pTCPSocket; } @@ -516,6 +530,7 @@ void CCellDB::SetStatus(const TCHAR *sts) { _tcscpy(m_pszStatus, sts); + g_pLog->Log(LOG_DEBUG, sts); Sleep(300); } //----------------------------------------------------------------------------- @@ -585,7 +600,7 @@ // The next line is just for debugging. You will have // to decide what you want to do if this call fails DWORD a=GetLastError(); - + a=GetLastError(); // Here comes the main code: Index: AboutDlg.h =================================================================== RCS file: /cvsroot/nbftools/CellTrack/AboutDlg.h,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- AboutDlg.h 14 Jul 2005 16:57:23 -0000 1.1 +++ AboutDlg.h 25 Oct 2005 16:53:02 -0000 1.2 @@ -2,12 +2,8 @@ // ////////////////////////////////////////////////////////////////////// -#if !defined(AFX_ABOUTDLG_H__4D3D2E4F_54D2_4936_A47D_01CEF671D01F__INCLUDED_) -#define AFX_ABOUTDLG_H__4D3D2E4F_54D2_4936_A47D_01CEF671D01F__INCLUDED_ - -#if _MSC_VER > 1000 -#pragma once -#endif // _MSC_VER > 1000 +#ifndef __ABOUTDLG__ +#define __ABOUTDLG__ #include "DialogWindow.h" @@ -20,4 +16,4 @@ }; -#endif // !defined(AFX_ABOUTDLG_H__4D3D2E4F_54D2_4936_A47D_01CEF671D01F__INCLUDED_) +#endif \ No newline at end of file Index: Log.cpp =================================================================== RCS file: /cvsroot/nbftools/CellTrack/Log.cpp,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- Log.cpp 3 Oct 2005 12:26:29 -0000 1.2 +++ Log.cpp 25 Oct 2005 16:53:02 -0000 1.3 @@ -31,8 +31,8 @@ } else { - // default to Errors only - dwLogLevel = LOG_ERROR; + // default to Debug logging + dwLogLevel = LOG_DEBUG; } @@ -84,8 +84,11 @@ //------------------------------------------------------------------ -void CLog::Log(LogLevel lLevel, TCHAR *szText) +void CLog::Log(LogLevel lLevel, const TCHAR *szText) { + if(lLevel > this->dwLogLevel) //Log level too vebrose + return; + if (bLoggingEnabled && szText) { FILE *pFile; Index: EEDlg.h =================================================================== RCS file: /cvsroot/nbftools/CellTrack/EEDlg.h,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- EEDlg.h 18 Jul 2005 16:11:23 -0000 1.1 +++ EEDlg.h 25 Oct 2005 16:53:02 -0000 1.2 @@ -2,8 +2,8 @@ // ////////////////////////////////////////////////////////////////////// -#if !defined(AFX_EEDLG_H__1B82CA0A_45E2_46A7_8402_6DDD495C0401__INCLUDED_) -#define AFX_EEDLG_H__1B82CA0A_45E2_46A7_8402_6DDD495C0401__INCLUDED_ +#ifndef __EEDLG__ +#define __EEDLG__ #if _MSC_VER > 1000 #pragma once @@ -20,4 +20,4 @@ virtual ~CEEDlg(); }; -#endif // !defined(AFX_EEDLG_H__1B82CA0A_45E2_46A7_8402_6DDD495C0401__INCLUDED_) +#endif \ No newline at end of file Index: CellDB.h =================================================================== RCS file: /cvsroot/nbftools/CellTrack/CellDB.h,v retrieving revision 1.12 retrieving revision 1.13 diff -u -d -r1.12 -r1.13 --- CellDB.h 20 Sep 2005 16:23:25 -0000 1.12 +++ CellDB.h 25 Oct 2005 16:53:02 -0000 1.13 @@ -50,7 +50,7 @@ private: HRESULT UpdateCellDB(void); - bool UploadDataToServer(TCHAR *szData, T_CELLINFO *pCellInfo); + bool UploadDataToServer(const TCHAR *szData, T_CELLINFO *pCellInfo); private: DWORD m_dwThreadId; Index: LocalDB.cpp =================================================================== RCS file: /cvsroot/nbftools/CellTrack/LocalDB.cpp,v retrieving revision 1.10 retrieving revision 1.11 diff -u -d -r1.10 -r1.11 --- LocalDB.cpp 20 Sep 2005 16:23:25 -0000 1.10 +++ LocalDB.cpp 25 Oct 2005 16:53:02 -0000 1.11 @@ -579,8 +579,7 @@ for (uiCount = 0; uiCount < uiLen; uiCount ++) { - lRet += (unsigned short) *pStr; - pStr ++; + lRet += (unsigned short) *pStr++; } } @@ -601,8 +600,7 @@ for (uiCount = 0; uiCount < uiLen; uiCount ++) { - lRet += (unsigned short) *pStr; - pStr ++; + lRet += (unsigned short) *pStr++; } bRet = (BYTE) lRet % 255; Index: DlgMain.cpp =================================================================== RCS file: /cvsroot/nbftools/CellTrack/DlgMain.cpp,v retrieving revision 1.45 retrieving revision 1.46 diff -u -d -r1.45 -r1.46 --- DlgMain.cpp 20 Sep 2005 16:23:25 -0000 1.45 +++ DlgMain.cpp 25 Oct 2005 16:53:02 -0000 1.46 @@ -686,7 +686,7 @@ } // now go to sleep for awhile - Sleep(300); + Sleep(1000); } return (0); Index: CellTrack.cpp =================================================================== RCS file: /cvsroot/nbftools/CellTrack/CellTrack.cpp,v retrieving revision 1.17 retrieving revision 1.18 diff -u -d -r1.17 -r1.18 --- CellTrack.cpp 3 Oct 2005 12:26:29 -0000 1.17 +++ CellTrack.cpp 25 Oct 2005 16:53:02 -0000 1.18 @@ -1,4 +1,4 @@ -// SmartLink.cpp : Defines the entry point for the application. +// CellTrack.cpp : Defines the entry point for the application. // #include <windows.h> @@ -22,6 +22,9 @@ #define ARRAYSIZE(a) (sizeof(a)/sizeof(*a)) +#include "stdafx.h" +CAppModule _Module; + // global bits :) T_GLOBAL Globals; CSettings *g_pSettings; --- NEW FILE: stdafx.h --- #include "wtl/atlbase.h" #include "wtl/atlapp.h" extern CAppModule _Module; #include "wtl/atlwin.h" #include "wtl/atlctrls.h" #include "wtl/atlmisc.h" #include "wtl/atlddx.h" Index: Log.h =================================================================== RCS file: /cvsroot/nbftools/CellTrack/Log.h,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- Log.h 3 Oct 2005 12:26:29 -0000 1.2 +++ Log.h 25 Oct 2005 16:53:02 -0000 1.3 @@ -2,12 +2,8 @@ // ////////////////////////////////////////////////////////////////////// -#if !defined(AFX_LOG_H__69F8C7BB_739B_46D3_ABCC_207E0D3692C2__INCLUDED_) -#define AFX_LOG_H__69F8C7BB_739B_46D3_ABCC_207E0D3692C2__INCLUDED_ - -#if _MSC_VER > 1000 -#pragma once -#endif // _MSC_VER > 1000 +#ifndef __LOG__ +#define __LOG__ #include "windows.h" #include "global.h" @@ -29,7 +25,7 @@ CLog(); virtual ~CLog(); - void Log(LogLevel lLevel, TCHAR *szText); + void Log(LogLevel lLevel, const TCHAR *szText); inline bool LoggingEnabled(void) { return (bLoggingEnabled); }; inline bool CellLookupEnabled(void) { return (bEnableCellLookup); }; @@ -40,4 +36,4 @@ bool bEnableCellLookup; }; -#endif // !defined(AFX_LOG_H__69F8C7BB_739B_46D3_ABCC_207E0D3692C2__INCLUDED_) +#endif \ No newline at end of file Index: Comms.h =================================================================== RCS file: /cvsroot/nbftools/CellTrack/Comms.h,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- Comms.h 28 Jul 2005 16:23:38 -0000 1.3 +++ Comms.h 25 Oct 2005 16:53:02 -0000 1.4 @@ -8,12 +8,8 @@ // version 1 protocol for phones that _require_ http to the net ////////////////////////////////////////////////////////////////////// -#if !defined(AFX_COMMS_H__C7B16EA3_7899_489D_A2D2_6A8038F797C0__INCLUDED_) -#define AFX_COMMS_H__C7B16EA3_7899_489D_A2D2_6A8038F797C0__INCLUDED_ - -#if _MSC_VER > 1000 -#pragma once -#endif // _MSC_VER > 1000 +#ifndef __COMMS__ +#define __COMMS__ #include <windows.h> @@ -43,4 +39,4 @@ void AddPort(TCHAR *pSrc); }; -#endif // !defined(AFX_COMMS_H__C7B16EA3_7899_489D_A2D2_6A8038F797C0__INCLUDED_) +#endif \ No newline at end of file Index: CellTrack.vcp =================================================================== RCS file: /cvsroot/nbftools/CellTrack/CellTrack.vcp,v retrieving revision 1.28 retrieving revision 1.29 diff -u -d -r1.28 -r1.29 --- CellTrack.vcp 28 Sep 2005 15:49:50 -0000 1.28 +++ CellTrack.vcp 25 Oct 2005 16:53:02 -0000 1.29 @@ -47,10 +47,10 @@ # PROP Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}" # PROP Ignore_Export_Lib 0 # PROP Sec_AlwaysSign 1 -# PROP Sec_CertificateHash "163935094add9fab6152e72692ab90cc1e837503" -# PROP Sec_ConfigureDevice 1 +# PROP Sec_CertificateHash "37ba90e7e44ca987897c4c3f97a7bb0bed40f1e2" +# PROP Sec_ConfigureDevice 0 # PROP Sec_PrivilegedType 1 -# PROP Sec_RootCertificateName "C:\Documents and Settings\Zone-MR\Microsoft\eVC\Zone-MR Default Development Root.cer" +# PROP Sec_RootCertificateName "C:\Documents and Settings\Zone-MR\Microsoft\eVC\Zone-MR Default Smartphone Privileged Development Root.cer" # PROP Target_Dir "" RSC=rc.exe # ADD BASE RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "NDEBUG" /d "$(CePlatform)" /d "_X86_" /d "x86" /d "_i386_" /r @@ -85,10 +85,10 @@ # PROP Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}" # PROP Ignore_Export_Lib 0 # PROP Sec_AlwaysSign 1 -# PROP Sec_CertificateHash "3165bc17b4cc4b427c0b391dee7a73ea3b2b9e64" -# PROP Sec_ConfigureDevice 1 +# PROP Sec_CertificateHash "37ba90e7e44ca987897c4c3f97a7bb0bed40f1e2" +# PROP Sec_ConfigureDevice 0 # PROP Sec_PrivilegedType 1 -# PROP Sec_RootCertificateName "D:\Documents and Settings\Logie Urquhart\Microsoft\eVC\Logie Urquhart Default Smartphone Privileged Development Root.cer" +# PROP Sec_RootCertificateName "C:\Documents and Settings\Zone-MR\Microsoft\eVC\Zone-MR Default Smartphone Privileged Development Root.cer" # PROP Target_Dir "" RSC=rc.exe # ADD BASE RSC /l 0x409 /d "$(CePlatform)" /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "DEBUG" /d "_X86_" /d "x86" /d "_i386_" /r @@ -123,8 +123,8 @@ # PROP Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}" # PROP Ignore_Export_Lib 0 # PROP Sec_AlwaysSign 1 -# PROP Sec_CertificateHash "163935094add9fab6152e72692ab90cc1e837503" -# PROP Sec_ConfigureDevice 1 +# PROP Sec_CertificateHash "37ba90e7e44ca987897c4c3f97a7bb0bed40f1e2" +# PROP Sec_ConfigureDevice 0 # PROP Sec_PrivilegedType 1 # PROP Sec_RootCertificateName "C:\Documents and Settings\Zone-MR\Microsoft\eVC\Zone-MR Default Smartphone Privileged Development Root.cer" # PROP Target_Dir "" @@ -161,10 +161,10 @@ # PROP Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}" # PROP Ignore_Export_Lib 0 # PROP Sec_AlwaysSign 1 -# PROP Sec_CertificateHash "163935094add9fab6152e72692ab90cc1e837503" -# PROP Sec_ConfigureDevice 1 +# PROP Sec_CertificateHash "37ba90e7e44ca987897c4c3f97a7bb0bed40f1e2" +# PROP Sec_ConfigureDevice 0 # PROP Sec_PrivilegedType 1 -# PROP Sec_RootCertificateName "C:\Documents and Settings\Zone-MR\Microsoft\eVC\Zone-MR Default Development Root.cer" +# PROP Sec_RootCertificateName "C:\Documents and Settings\Zone-MR\Microsoft\eVC\Zone-MR Default Smartphone Privileged Development Root.cer" # PROP Target_Dir "" RSC=rc.exe # ADD BASE RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "DEBUG" /d "UNICODE" /d "_UNICODE" /d "$(CePlatform)" /d "ARM" /d "_ARM_" /d "ARMV4" /r @@ -219,11 +219,13 @@ ".\DialogWindow.h"\ ".\Global.h"\ ".\Log.h"\ - {$(INCLUDE)}"aygshell.h"\ - {$(INCLUDE)}"sipapi.h"\ - {$(INCLUDE)}"tpcshell.h"\ - {$(INCLUDE)}"vibrate.h"\ - {$(INCLUDE)}"winuserm.h"\ + +NODEP_CPP_ABOUT=\ + ".\ibrate.h"\ + ".\inuserm.h"\ + ".\ipapi.h"\ + ".\pcshell.h"\ + ".\ygshell.h"\ !ELSEIF "$(CFG)" == "CellTrack - Win32 (WCE ARMV4) Release" @@ -232,13 +234,12 @@ ".\AboutDlg.h"\ ".\DialogWindow.h"\ ".\Global.h"\ - -NODEP_CPP_ABOUT=\ - ".\ibrate.h"\ - ".\inuserm.h"\ - ".\ipapi.h"\ - ".\pcshell.h"\ - ".\ygshell.h"\ + ".\Log.h"\ + {$(INCLUDE)}"aygshell.h"\ + {$(INCLUDE)}"sipapi.h"\ + {$(INCLUDE)}"tpcshell.h"\ + {$(INCLUDE)}"vibrate.h"\ + {$(INCLUDE)}"winuserm.h"\ !ELSEIF "$(CFG)" == "CellTrack - Win32 (WCE ARMV4) Debug" @@ -291,7 +292,9 @@ ".\Settings.h"\ ".\TcpSocket.h"\ ".\URLEncode.h"\ - {$(INCLUDE)}"connmgr.h"\ + +NODEP_CPP_CELLD=\ + ".\onnmgr.h"\ !ELSEIF "$(CFG)" == "CellTrack - Win32 (WCE ARMV4) Release" @@ -300,14 +303,13 @@ ".\CellDB.h"\ ".\CellGet.h"\ ".\Global.h"\ + ".\LocalDB.h"\ ".\PhoneID.h"\ ".\Registry.h"\ ".\Settings.h"\ ".\TcpSocket.h"\ ".\URLEncode.h"\ - -NODEP_CPP_CELLD=\ - ".\onnmgr.h"\ + {$(INCLUDE)}"connmgr.h"\ !ELSEIF "$(CFG)" == "CellTrack - Win32 (WCE ARMV4) Debug" @@ -357,6 +359,7 @@ ".\CellGet.h"\ ".\EmuTools.h"\ ".\Global.h"\ + ".\Log.h"\ ".\PhoneID.h"\ ".\Registry.h"\ @@ -433,11 +436,13 @@ ".\Settings.h"\ ".\TcpSocket.h"\ ".\URLEncode.h"\ - {$(INCLUDE)}"aygshell.h"\ - {$(INCLUDE)}"sipapi.h"\ - {$(INCLUDE)}"tpcshell.h"\ - {$(INCLUDE)}"vibrate.h"\ - {$(INCLUDE)}"winuserm.h"\ + +NODEP_CPP_CELLT=\ + ".\ibrate.h"\ + ".\inuserm.h"\ + ".\ipapi.h"\ + ".\pcshell.h"\ + ".\ygshell.h"\ !ELSEIF "$(CFG)" == "CellTrack - Win32 (WCE ARMV4) Release" @@ -460,19 +465,18 @@ ".\LocalDB.h"\ ".\LocalDBCellsDlg.h"\ ".\LocalDBGroupsDlg.h"\ + ".\Log.h"\ ".\PhoneID.h"\ ".\Registry.h"\ ".\SelectCellDlg.h"\ ".\Settings.h"\ ".\TcpSocket.h"\ ".\URLEncode.h"\ - -NODEP_CPP_CELLT=\ - ".\ibrate.h"\ - ".\inuserm.h"\ - ".\ipapi.h"\ - ".\pcshell.h"\ - ".\ygshell.h"\ + {$(INCLUDE)}"aygshell.h"\ + {$(INCLUDE)}"sipapi.h"\ + {$(INCLUDE)}"tpcshell.h"\ + {$(INCLUDE)}"vibrate.h"\ + {$(INCLUDE)}"winuserm.h"\ !ELSEIF "$(CFG)" == "CellTrack - Win32 (WCE ARMV4) Debug" @@ -573,7 +577,9 @@ ".\Global.h"\ ".\Log.h"\ ".\WindowTracker.h"\ - {$(INCLUDE)}"winuserm.h"\ + +NODEP_CPP_DIALO=\ + ".\inuserm.h"\ !ELSEIF "$(CFG)" == "CellTrack - Win32 (WCE ARMV4) Release" @@ -582,9 +588,7 @@ ".\DialogWindow.h"\ ".\Global.h"\ ".\WindowTracker.h"\ - -NODEP_CPP_DIALO=\ - ".\inuserm.h"\ + {$(INCLUDE)}"winuserm.h"\ !ELSEIF "$(CFG)" == "CellTrack - Win32 (WCE ARMV4) Debug" @@ -633,11 +637,13 @@ ".\Registry.h"\ ".\TcpSocket.h"\ ".\URLEncode.h"\ - {$(INCLUDE)}"aygshell.h"\ - {$(INCLUDE)}"sipapi.h"\ - {$(INCLUDE)}"tpcshell.h"\ - {$(INCLUDE)}"vibrate.h"\ - {$(INCLUDE)}"winuserm.h"\ + +NODEP_CPP_DLGED=\ + ".\ibrate.h"\ + ".\inuserm.h"\ + ".\ipapi.h"\ + ".\pcshell.h"\ + ".\ygshell.h"\ !ELSEIF "$(CFG)" == "CellTrack - Win32 (WCE ARMV4) Release" @@ -652,13 +658,11 @@ ".\Registry.h"\ ".\TcpSocket.h"\ ".\URLEncode.h"\ - -NODEP_CPP_DLGED=\ - ".\ibrate.h"\ - ".\inuserm.h"\ - ".\ipapi.h"\ - ".\pcshell.h"\ - ".\ygshell.h"\ + {$(INCLUDE)}"aygshell.h"\ + {$(INCLUDE)}"sipapi.h"\ + {$(INCLUDE)}"tpcshell.h"\ + {$(INCLUDE)}"vibrate.h"\ + {$(INCLUDE)}"winuserm.h"\ !ELSEIF "$(CFG)" == "CellTrack - Win32 (WCE ARMV4) Debug" @@ -743,11 +747,13 @@ ".\Settings.h"\ ".\TcpSocket.h"\ ".\URLEncode.h"\ - {$(INCLUDE)}"aygshell.h"\ - {$(INCLUDE)}"sipapi.h"\ - {$(INCLUDE)}"tpcshell.h"\ - {$(INCLUDE)}"vibrate.h"\ - {$(INCLUDE)}"winuserm.h"\ + +NODEP_CPP_DLGMA=\ + ".\ibrate.h"\ + ".\inuserm.h"\ + ".\ipapi.h"\ + ".\pcshell.h"\ + ".\ygshell.h"\ !ELSEIF "$(CFG)" == "CellTrack - Win32 (WCE ARMV4) Release" @@ -775,13 +781,11 @@ ".\Settings.h"\ ".\TcpSocket.h"\ ".\URLEncode.h"\ - -NODEP_CPP_DLGMA=\ - ".\ibrate.h"\ - ".\inuserm.h"\ - ".\ipapi.h"\ - ".\pcshell.h"\ - ".\ygshell.h"\ + {$(INCLUDE)}"aygshell.h"\ + {$(INCLUDE)}"sipapi.h"\ + {$(INCLUDE)}"tpcshell.h"\ + {$(INCLUDE)}"vibrate.h"\ + {$(INCLUDE)}"winuserm.h"\ !ELSEIF "$(CFG)" == "CellTrack - Win32 (WCE ARMV4) Debug" @@ -844,10 +848,12 @@ ".\Log.h"\ ".\PhoneID.h"\ ".\Registry.h"\ - {$(INCLUDE)}"aygshell.h"\ - {$(INCLUDE)}"sipapi.h"\ - {$(INCLUDE)}"vibrate.h"\ - {$(INCLUDE)}"winuserm.h"\ + +NODEP_CPP_DLGNE=\ + ".\ibrate.h"\ + ".\inuserm.h"\ + ".\ipapi.h"\ + ".\ygshell.h"\ !ELSEIF "$(CFG)" == "CellTrack - Win32 (WCE ARMV4) Release" @@ -859,12 +865,10 @@ ".\Global.h"\ ".\PhoneID.h"\ ".\Registry.h"\ - -NODEP_CPP_DLGNE=\ - ".\ibrate.h"\ - ".\inuserm.h"\ - ".\ipapi.h"\ - ".\ygshell.h"\ + {$(INCLUDE)}"aygshell.h"\ + {$(INCLUDE)}"sipapi.h"\ + {$(INCLUDE)}"vibrate.h"\ + {$(INCLUDE)}"winuserm.h"\ !ELSEIF "$(CFG)" == "CellTrack - Win32 (WCE ARMV4) Debug" @@ -919,11 +923,13 @@ ".\PhoneID.h"\ ".\Registry.h"\ ".\Settings.h"\ - {$(INCLUDE)}"aygshell.h"\ - {$(INCLUDE)}"sipapi.h"\ - {$(INCLUDE)}"tpcshell.h"\ - {$(INCLUDE)}"vibrate.h"\ - {$(INCLUDE)}"winuserm.h"\ + +NODEP_CPP_DLGSE=\ + ".\ibrate.h"\ + ".\inuserm.h"\ + ".\ipapi.h"\ + ".\pcshell.h"\ + ".\ygshell.h"\ !ELSEIF "$(CFG)" == "CellTrack - Win32 (WCE ARMV4) Release" @@ -936,13 +942,11 @@ ".\PhoneID.h"\ ".\Registry.h"\ ".\Settings.h"\ - -NODEP_CPP_DLGSE=\ - ".\ibrate.h"\ - ".\inuserm.h"\ - ".\ipapi.h"\ - ".\pcshell.h"\ - ".\ygshell.h"\ + {$(INCLUDE)}"aygshell.h"\ + {$(INCLUDE)}"sipapi.h"\ + {$(INCLUDE)}"tpcshell.h"\ + {$(INCLUDE)}"vibrate.h"\ + {$(INCLUDE)}"winuserm.h"\ !ELSEIF "$(CFG)" == "CellTrack - Win32 (WCE ARMV4) Debug" @@ -1004,11 +1008,13 @@ ".\Registry.h"\ ".\TcpSocket.h"\ ".\URLEncode.h"\ - {$(INCLUDE)}"aygshell.h"\ - {$(INCLUDE)}"sipapi.h"\ - {$(INCLUDE)}"tpcshell.h"\ - {$(INCLUDE)}"vibrate.h"\ - {$(INCLUDE)}"winuserm.h"\ + +NODEP_CPP_DLGSU=\ + ".\ibrate.h"\ + ".\inuserm.h"\ + ".\ipapi.h"\ + ".\pcshell.h"\ + ".\ygshell.h"\ !ELSEIF "$(CFG)" == "CellTrack - Win32 (WCE ARMV4) Release" @@ -1024,13 +1030,11 @@ ".\Registry.h"\ ".\TcpSocket.h"\ ".\URLEncode.h"\ - -NODEP_CPP_DLGSU=\ - ".\ibrate.h"\ - ".\inuserm.h"\ - ".\ipapi.h"\ - ".\pcshell.h"\ - ".\ygshell.h"\ + {$(INCLUDE)}"aygshell.h"\ + {$(INCLUDE)}"sipapi.h"\ + {$(INCLUDE)}"tpcshell.h"\ + {$(INCLUDE)}"vibrate.h"\ + {$(INCLUDE)}"winuserm.h"\ !ELSEIF "$(CFG)" == "CellTrack - Win32 (WCE ARMV4) Debug" @@ -1082,11 +1086,13 @@ ".\EEDlg.h"\ ".\Global.h"\ ".\Log.h"\ - {$(INCLUDE)}"aygshell.h"\ - {$(INCLUDE)}"sipapi.h"\ - {$(INCLUDE)}"tpcshell.h"\ - {$(INCLUDE)}"vibrate.h"\ - {$(INCLUDE)}"winuserm.h"\ + +NODEP_CPP_EEDLG=\ + ".\ibrate.h"\ + ".\inuserm.h"\ + ".\ipapi.h"\ + ".\pcshell.h"\ + ".\ygshell.h"\ !ELSEIF "$(CFG)" == "CellTrack - Win32 (WCE ARMV4) Release" @@ -1095,13 +1101,11 @@ ".\DialogWindow.h"\ ".\EEDlg.h"\ ".\Global.h"\ - -NODEP_CPP_EEDLG=\ - ".\ibrate.h"\ - ".\inuserm.h"\ - ".\ipapi.h"\ - ".\pcshell.h"\ - ".\ygshell.h"\ + {$(INCLUDE)}"aygshell.h"\ + {$(INCLUDE)}"sipapi.h"\ + {$(INCLUDE)}"tpcshell.h"\ + {$(INCLUDE)}"vibrate.h"\ + {$(INCLUDE)}"winuserm.h"\ !ELSEIF "$(CFG)" == "CellTrack - Win32 (WCE ARMV4) Debug" @@ -1231,11 +1235,13 @@ ".\PhoneID.h"\ ".\Registry.h"\ ".\Settings.h"\ - {$(INCLUDE)}"aygshell.h"\ - {$(INCLUDE)}"sipapi.h"\ - {$(INCLUDE)}"tpcshell.h"\ - {$(INCLUDE)}"vibrate.h"\ - {$(INCLUDE)}"winuserm.h"\ + +NODEP_CPP_EXTSE=\ + ".\ibrate.h"\ + ".\inuserm.h"\ + ".\ipapi.h"\ + ".\pcshell.h"\ + ".\ygshell.h"\ !ELSEIF "$(CFG)" == "CellTrack - Win32 (WCE ARMV4) Release" @@ -1248,13 +1254,11 @@ ".\PhoneID.h"\ ".\Registry.h"\ ".\Settings.h"\ - -NODEP_CPP_EXTSE=\ - ".\ibrate.h"\ - ".\inuserm.h"\ - ".\ipapi.h"\ - ".\pcshell.h"\ - ".\ygshell.h"\ + {$(INCLUDE)}"aygshell.h"\ + {$(INCLUDE)}"sipapi.h"\ + {$(INCLUDE)}"tpcshell.h"\ + {$(INCLUDE)}"vibrate.h"\ + {$(INCLUDE)}"winuserm.h"\ !ELSEIF "$(CFG)" == "CellTrack - Win32 (WCE ARMV4) Debug" @@ -1339,11 +1343,13 @@ ".\Log.h"\ ".\Registry.h"\ ".\Settings.h"\ - {$(INCLUDE)}"aygshell.h"\ - {$(INCLUDE)}"sipapi.h"\ - {$(INCLUDE)}"tpcshell.h"\ - {$(INCLUDE)}"vibrate.h"\ - {$(INCLUDE)}"winuserm.h"\ + +NODEP_CPP_GPSSE=\ + ".\ibrate.h"\ + ".\inuserm.h"\ + ".\ipapi.h"\ + ".\pcshell.h"\ + ".\ygshell.h"\ !ELSEIF "$(CFG)" == "CellTrack - Win32 (WCE ARMV4) Release" @@ -1355,13 +1361,11 @@ ".\GPSSettingsDlg.h"\ ".\Registry.h"\ ".\Settings.h"\ - -NODEP_CPP_GPSSE=\ - ".\ibrate.h"\ - ".\inuserm.h"\ - ".\ipapi.h"\ - ".\pcshell.h"\ - ".\ygshell.h"\ + {$(INCLUDE)}"aygshell.h"\ + {$(INCLUDE)}"sipapi.h"\ + {$(INCLUDE)}"tpcshell.h"\ + {$(INCLUDE)}"vibrate.h"\ + {$(INCLUDE)}"winuserm.h"\ !ELSEIF "$(CFG)" == "CellTrack - Win32 (WCE ARMV4) Debug" @@ -1454,11 +1458,13 @@ ".\LocalDB.h"\ ".\LocalDBCellsDlg.h"\ ".\Log.h"\ - {$(INCLUDE)}"aygshell.h"\ - {$(INCLUDE)}"sipapi.h"\ - {$(INCLUDE)}"tpcshell.h"\ - {$(INCLUDE)}"vibrate.h"\ - {$(INCLUDE)}"winuserm.h"\ + +NODEP_CPP_LOCALD=\ + ".\ibrate.h"\ + ".\inuserm.h"\ + ".\ipapi.h"\ + ".\pcshell.h"\ + ".\ygshell.h"\ !ELSEIF "$(CFG)" == "CellTrack - Win32 (WCE ARMV4) Release" @@ -1468,13 +1474,11 @@ ".\Global.h"\ ".\LocalDB.h"\ ".\LocalDBCellsDlg.h"\ - -NODEP_CPP_LOCALD=\ - ".\ibrate.h"\ - ".\inuserm.h"\ - ".\ipapi.h"\ - ".\pcshell.h"\ - ".\ygshell.h"\ + {$(INCLUDE)}"aygshell.h"\ + {$(INCLUDE)}"sipapi.h"\ + {$(INCLUDE)}"tpcshell.h"\ + {$(INCLUDE)}"vibrate.h"\ + {$(INCLUDE)}"winuserm.h"\ !ELSEIF "$(CFG)" == "CellTrack - Win32 (WCE ARMV4) Debug" @@ -1515,11 +1519,13 @@ ".\LocalDBGroupsDlg.h"\ ".\Log.h"\ ".\SelectCellDlg.h"\ - {$(INCLUDE)}"aygshell.h"\ - {$(INCLUDE)}"sipapi.h"\ - {$(INCLUDE)}"tpcshell.h"\ - {$(INCLUDE)}"vibrate.h"\ - {$(INCLUDE)}"winuserm.h"\ + +NODEP_CPP_LOCALDB=\ + ".\ibrate.h"\ + ".\inuserm.h"\ + ".\ipapi.h"\ + ".\pcshell.h"\ + ".\ygshell.h"\ !ELSEIF "$(CFG)" == "CellTrack - Win32 (WCE ARMV4) Release" @@ -1530,13 +1536,11 @@ ".\LocalDB.h"\ ".\LocalDBGroupsDlg.h"\ ".\SelectCellDlg.h"\ - -NODEP_CPP_LOCALDB=\ - ".\ibrate.h"\ - ".\inuserm.h"\ - ".\ipapi.h"\ - ".\pcshell.h"\ - ".\ygshell.h"\ + {$(INCLUDE)}"aygshell.h"\ + {$(INCLUDE)}"sipapi.h"\ + {$(INCLUDE)}"tpcshell.h"\ + {$(INCLUDE)}"vibrate.h"\ + {$(INCLUDE)}"winuserm.h"\ !ELSEIF "$(CFG)" == "CellTrack - Win32 (WCE ARMV4) Debug" @@ -1618,7 +1622,9 @@ !ELSEIF "$(CFG)" == "CellTrack - Win32 (WCE ARMV4) Release" DEP_CPP_LOG_C=\ + ".\Global.h"\ ".\Log.h"\ + ".\Registry.h"\ !ELSEIF "$(CFG)" == "CellTrack - Win32 (WCE ARMV4) Debug" @@ -1655,6 +1661,7 @@ DEP_CPP_PHONE=\ ".\Global.h"\ + ".\Log.h"\ ".\PhoneID.h"\ ".\Registry.h"\ @@ -1720,11 +1727,13 @@ ".\LocalDB.h"\ ".\Log.h"\ ".\SelectCellDlg.h"\ - {$(INCLUDE)}"aygshell.h"\ - {$(INCLUDE)}"sipapi.h"\ - {$(INCLUDE)}"tpcshell.h"\ - {$(INCLUDE)}"vibrate.h"\ - {$(INCLUDE)}"winuserm.h"\ + +NODEP_CPP_SELEC=\ + ".\ibrate.h"\ + ".\inuserm.h"\ + ".\ipapi.h"\ + ".\pcshell.h"\ + ".\ygshell.h"\ !ELSEIF "$(CFG)" == "CellTrack - Win32 (WCE ARMV4) Release" @@ -1734,13 +1743,11 @@ ".\Global.h"\ ".\LocalDB.h"\ ".\SelectCellDlg.h"\ - -NODEP_CPP_SELEC=\ - ".\ibrate.h"\ - ".\inuserm.h"\ - ".\ipapi.h"\ - ".\pcshell.h"\ - ".\ygshell.h"\ + {$(INCLUDE)}"aygshell.h"\ + {$(INCLUDE)}"sipapi.h"\ + {$(INCLUDE)}"tpcshell.h"\ + {$(INCLUDE)}"vibrate.h"\ + {$(INCLUDE)}"winuserm.h"\ !ELSEIF "$(CFG)" == "CellTrack - Win32 (WCE ARMV4) Debug" |
