ecos: host/tools/Utils/common/Properties.cpp annotate

annotate host/tools/Utils/common/Properties.cpp @ 3283:355bcd2cec54

* common/Subprocess.cpp: Silence signed/unsigned compiler warning with recent GCC. [ Bugzilla 1001955 ]

author	jld
date	Thu, 13 Mar 2014 15:31:34 +0000
parents	74dbf4c3f2e1
children

rev	line source
2729 74dbf4c3f2e1 Update all copyright banners to reflect FSF ownership; fix and improve licence text. jlarmour parents: 515 diff changeset	1 // ####ECOSHOSTGPLCOPYRIGHTBEGIN####
74dbf4c3f2e1 Update all copyright banners to reflect FSF ownership; fix and improve licence text. jlarmour parents: 515 diff changeset	2 // -------------------------------------------
74dbf4c3f2e1 Update all copyright banners to reflect FSF ownership; fix and improve licence text. jlarmour parents: 515 diff changeset	3 // This file is part of the eCos host tools.
74dbf4c3f2e1 Update all copyright banners to reflect FSF ownership; fix and improve licence text. jlarmour parents: 515 diff changeset	4 // Copyright (C) 1998, 1999, 2000 Free Software Foundation, Inc.
76 435cced73e2f eCos v1.3.1 merged from eCos master repository on 2000-03-27-23:22:51-BST jlarmour parents: diff changeset	5 //
2729 74dbf4c3f2e1 Update all copyright banners to reflect FSF ownership; fix and improve licence text. jlarmour parents: 515 diff changeset	6 // This program is free software; you can redistribute it and/or modify
74dbf4c3f2e1 Update all copyright banners to reflect FSF ownership; fix and improve licence text. jlarmour parents: 515 diff changeset	7 // it under the terms of the GNU General Public License as published by
74dbf4c3f2e1 Update all copyright banners to reflect FSF ownership; fix and improve licence text. jlarmour parents: 515 diff changeset	8 // the Free Software Foundation; either version 2 or (at your option) any
74dbf4c3f2e1 Update all copyright banners to reflect FSF ownership; fix and improve licence text. jlarmour parents: 515 diff changeset	9 // later version.
76 435cced73e2f eCos v1.3.1 merged from eCos master repository on 2000-03-27-23:22:51-BST jlarmour parents: diff changeset	10 //
2729 74dbf4c3f2e1 Update all copyright banners to reflect FSF ownership; fix and improve licence text. jlarmour parents: 515 diff changeset	11 // This program is distributed in the hope that it will be useful, but
74dbf4c3f2e1 Update all copyright banners to reflect FSF ownership; fix and improve licence text. jlarmour parents: 515 diff changeset	12 // WITHOUT ANY WARRANTY; without even the implied warranty of
74dbf4c3f2e1 Update all copyright banners to reflect FSF ownership; fix and improve licence text. jlarmour parents: 515 diff changeset	13 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
74dbf4c3f2e1 Update all copyright banners to reflect FSF ownership; fix and improve licence text. jlarmour parents: 515 diff changeset	14 // General Public License for more details.
76 435cced73e2f eCos v1.3.1 merged from eCos master repository on 2000-03-27-23:22:51-BST jlarmour parents: diff changeset	15 //
2729 74dbf4c3f2e1 Update all copyright banners to reflect FSF ownership; fix and improve licence text. jlarmour parents: 515 diff changeset	16 // You should have received a copy of the GNU General Public License
74dbf4c3f2e1 Update all copyright banners to reflect FSF ownership; fix and improve licence text. jlarmour parents: 515 diff changeset	17 // along with this program; if not, write to the
74dbf4c3f2e1 Update all copyright banners to reflect FSF ownership; fix and improve licence text. jlarmour parents: 515 diff changeset	18 // Free Software Foundation, Inc., 51 Franklin Street,
74dbf4c3f2e1 Update all copyright banners to reflect FSF ownership; fix and improve licence text. jlarmour parents: 515 diff changeset	19 // Fifth Floor, Boston, MA 02110-1301, USA.
74dbf4c3f2e1 Update all copyright banners to reflect FSF ownership; fix and improve licence text. jlarmour parents: 515 diff changeset	20 // -------------------------------------------
74dbf4c3f2e1 Update all copyright banners to reflect FSF ownership; fix and improve licence text. jlarmour parents: 515 diff changeset	21 // ####ECOSHOSTGPLCOPYRIGHTEND####
76 435cced73e2f eCos v1.3.1 merged from eCos master repository on 2000-03-27-23:22:51-BST jlarmour parents: diff changeset	22 // Properties.cpp: implementation of the CProperties class.
435cced73e2f eCos v1.3.1 merged from eCos master repository on 2000-03-27-23:22:51-BST jlarmour parents: diff changeset	23 //
435cced73e2f eCos v1.3.1 merged from eCos master repository on 2000-03-27-23:22:51-BST jlarmour parents: diff changeset	24 //////////////////////////////////////////////////////////////////////
435cced73e2f eCos v1.3.1 merged from eCos master repository on 2000-03-27-23:22:51-BST jlarmour parents: diff changeset	25 #include "Properties.h"
82 6736c52df507 Merge from eCos master repository on 2000-04-14-13:35:46-BST jlarmour parents: 76 diff changeset	26 #include "eCosTrace.h"
76 435cced73e2f eCos v1.3.1 merged from eCos master repository on 2000-03-27-23:22:51-BST jlarmour parents: diff changeset	27 //////////////////////////////////////////////////////////////////////
435cced73e2f eCos v1.3.1 merged from eCos master repository on 2000-03-27-23:22:51-BST jlarmour parents: diff changeset	28 // Construction/Destruction
435cced73e2f eCos v1.3.1 merged from eCos master repository on 2000-03-27-23:22:51-BST jlarmour parents: diff changeset	29 //////////////////////////////////////////////////////////////////////
435cced73e2f eCos v1.3.1 merged from eCos master repository on 2000-03-27-23:22:51-BST jlarmour parents: diff changeset	30
82 6736c52df507 Merge from eCos master repository on 2000-04-14-13:35:46-BST jlarmour parents: 76 diff changeset	31 CProperties::CProperties()
76 435cced73e2f eCos v1.3.1 merged from eCos master repository on 2000-03-27-23:22:51-BST jlarmour parents: diff changeset	32 {
435cced73e2f eCos v1.3.1 merged from eCos master repository on 2000-03-27-23:22:51-BST jlarmour parents: diff changeset	33 }
435cced73e2f eCos v1.3.1 merged from eCos master repository on 2000-03-27-23:22:51-BST jlarmour parents: diff changeset	34
435cced73e2f eCos v1.3.1 merged from eCos master repository on 2000-03-27-23:22:51-BST jlarmour parents: diff changeset	35 CProperties::~CProperties()
435cced73e2f eCos v1.3.1 merged from eCos master repository on 2000-03-27-23:22:51-BST jlarmour parents: diff changeset	36 {
435cced73e2f eCos v1.3.1 merged from eCos master repository on 2000-03-27-23:22:51-BST jlarmour parents: diff changeset	37 }
435cced73e2f eCos v1.3.1 merged from eCos master repository on 2000-03-27-23:22:51-BST jlarmour parents: diff changeset	38
435cced73e2f eCos v1.3.1 merged from eCos master repository on 2000-03-27-23:22:51-BST jlarmour parents: diff changeset	39 #ifdef _WIN32
82 6736c52df507 Merge from eCos master repository on 2000-04-14-13:35:46-BST jlarmour parents: 76 diff changeset	40 bool CProperties::LoadFromRegistry(HKEY hTopKey,LPCTSTR szRegKey)
76 435cced73e2f eCos v1.3.1 merged from eCos master repository on 2000-03-27-23:22:51-BST jlarmour parents: diff changeset	41 {
435cced73e2f eCos v1.3.1 merged from eCos master repository on 2000-03-27-23:22:51-BST jlarmour parents: diff changeset	42 HKEY hKey;
435cced73e2f eCos v1.3.1 merged from eCos master repository on 2000-03-27-23:22:51-BST jlarmour parents: diff changeset	43 LONG l=RegOpenKeyEx (hTopKey, szRegKey, 0L, KEY_QUERY_VALUE, &hKey);
435cced73e2f eCos v1.3.1 merged from eCos master repository on 2000-03-27-23:22:51-BST jlarmour parents: diff changeset	44 bool rc=(ERROR_SUCCESS==l);
435cced73e2f eCos v1.3.1 merged from eCos master repository on 2000-03-27-23:22:51-BST jlarmour parents: diff changeset	45 if(rc){
435cced73e2f eCos v1.3.1 merged from eCos master repository on 2000-03-27-23:22:51-BST jlarmour parents: diff changeset	46 TCHAR szName[256];
435cced73e2f eCos v1.3.1 merged from eCos master repository on 2000-03-27-23:22:51-BST jlarmour parents: diff changeset	47 DWORD dwSizeName=sizeof szName;
435cced73e2f eCos v1.3.1 merged from eCos master repository on 2000-03-27-23:22:51-BST jlarmour parents: diff changeset	48 DWORD dwMaxDatalen;
435cced73e2f eCos v1.3.1 merged from eCos master repository on 2000-03-27-23:22:51-BST jlarmour parents: diff changeset	49 DWORD dwType;
435cced73e2f eCos v1.3.1 merged from eCos master repository on 2000-03-27-23:22:51-BST jlarmour parents: diff changeset	50 if(ERROR_SUCCESS==RegQueryInfoKey(hKey,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,&dwMaxDatalen,NULL,NULL)){
435cced73e2f eCos v1.3.1 merged from eCos master repository on 2000-03-27-23:22:51-BST jlarmour parents: diff changeset	51 char *Data=new char[dwMaxDatalen];
435cced73e2f eCos v1.3.1 merged from eCos master repository on 2000-03-27-23:22:51-BST jlarmour parents: diff changeset	52 DWORD dwDatalen=dwMaxDatalen;
435cced73e2f eCos v1.3.1 merged from eCos master repository on 2000-03-27-23:22:51-BST jlarmour parents: diff changeset	53 for(DWORD dwIndex=0;ERROR_SUCCESS==RegEnumValue(hKey, dwIndex, szName, &dwSizeName, NULL, &dwType, (LPBYTE)Data, &dwDatalen);dwIndex++){
435cced73e2f eCos v1.3.1 merged from eCos master repository on 2000-03-27-23:22:51-BST jlarmour parents: diff changeset	54
82 6736c52df507 Merge from eCos master repository on 2000-04-14-13:35:46-BST jlarmour parents: 76 diff changeset	55 CProperties::CProperty *p=Lookup(szName);
76 435cced73e2f eCos v1.3.1 merged from eCos master repository on 2000-03-27-23:22:51-BST jlarmour parents: diff changeset	56 if(p){
435cced73e2f eCos v1.3.1 merged from eCos master repository on 2000-03-27-23:22:51-BST jlarmour parents: diff changeset	57 switch(p->Type){
82 6736c52df507 Merge from eCos master repository on 2000-04-14-13:35:46-BST jlarmour parents: 76 diff changeset	58 case CProperty::Integer:
6736c52df507 Merge from eCos master repository on 2000-04-14-13:35:46-BST jlarmour parents: 76 diff changeset	59 if(REG_DWORD==dwType){
6736c52df507 Merge from eCos master repository on 2000-04-14-13:35:46-BST jlarmour parents: 76 diff changeset	60 p->SetValue((int )Data);
6736c52df507 Merge from eCos master repository on 2000-04-14-13:35:46-BST jlarmour parents: 76 diff changeset	61 } else {
6736c52df507 Merge from eCos master repository on 2000-04-14-13:35:46-BST jlarmour parents: 76 diff changeset	62 TRACE(_T("Type mismatch - %s: expected REG_DWORD, got %d\n"),(LPCTSTR)p->strName,dwType);
6736c52df507 Merge from eCos master repository on 2000-04-14-13:35:46-BST jlarmour parents: 76 diff changeset	63 rc=false;
6736c52df507 Merge from eCos master repository on 2000-04-14-13:35:46-BST jlarmour parents: 76 diff changeset	64 }
6736c52df507 Merge from eCos master repository on 2000-04-14-13:35:46-BST jlarmour parents: 76 diff changeset	65 break;
6736c52df507 Merge from eCos master repository on 2000-04-14-13:35:46-BST jlarmour parents: 76 diff changeset	66 case CProperty::Bool:
6736c52df507 Merge from eCos master repository on 2000-04-14-13:35:46-BST jlarmour parents: 76 diff changeset	67 if(REG_DWORD==dwType){
6736c52df507 Merge from eCos master repository on 2000-04-14-13:35:46-BST jlarmour parents: 76 diff changeset	68 p->SetValue((bool)0!=(int )Data);
6736c52df507 Merge from eCos master repository on 2000-04-14-13:35:46-BST jlarmour parents: 76 diff changeset	69 } else {
6736c52df507 Merge from eCos master repository on 2000-04-14-13:35:46-BST jlarmour parents: 76 diff changeset	70 TRACE(_T("Type mismatch - %s: expected REG_DWORD, got %d\n"),(LPCTSTR)p->strName,dwType);
6736c52df507 Merge from eCos master repository on 2000-04-14-13:35:46-BST jlarmour parents: 76 diff changeset	71 rc=false;
6736c52df507 Merge from eCos master repository on 2000-04-14-13:35:46-BST jlarmour parents: 76 diff changeset	72 }
6736c52df507 Merge from eCos master repository on 2000-04-14-13:35:46-BST jlarmour parents: 76 diff changeset	73 break;
6736c52df507 Merge from eCos master repository on 2000-04-14-13:35:46-BST jlarmour parents: 76 diff changeset	74 case CProperty::Char:
6736c52df507 Merge from eCos master repository on 2000-04-14-13:35:46-BST jlarmour parents: 76 diff changeset	75 if(REG_DWORD==dwType){
6736c52df507 Merge from eCos master repository on 2000-04-14-13:35:46-BST jlarmour parents: 76 diff changeset	76 p->SetValue((char )Data);
6736c52df507 Merge from eCos master repository on 2000-04-14-13:35:46-BST jlarmour parents: 76 diff changeset	77 } else {
6736c52df507 Merge from eCos master repository on 2000-04-14-13:35:46-BST jlarmour parents: 76 diff changeset	78 TRACE(_T("Type mismatch - %s: expected REG_DWORD, got %d\n"),(LPCTSTR)p->strName,dwType);
6736c52df507 Merge from eCos master repository on 2000-04-14-13:35:46-BST jlarmour parents: 76 diff changeset	79 rc=false;
6736c52df507 Merge from eCos master repository on 2000-04-14-13:35:46-BST jlarmour parents: 76 diff changeset	80 }
6736c52df507 Merge from eCos master repository on 2000-04-14-13:35:46-BST jlarmour parents: 76 diff changeset	81 break;
6736c52df507 Merge from eCos master repository on 2000-04-14-13:35:46-BST jlarmour parents: 76 diff changeset	82 case CProperty::Short:
6736c52df507 Merge from eCos master repository on 2000-04-14-13:35:46-BST jlarmour parents: 76 diff changeset	83 if(REG_DWORD==dwType){
6736c52df507 Merge from eCos master repository on 2000-04-14-13:35:46-BST jlarmour parents: 76 diff changeset	84 p->SetValue((short )Data);
6736c52df507 Merge from eCos master repository on 2000-04-14-13:35:46-BST jlarmour parents: 76 diff changeset	85 } else {
6736c52df507 Merge from eCos master repository on 2000-04-14-13:35:46-BST jlarmour parents: 76 diff changeset	86 TRACE(_T("Type mismatch - %s: expected REG_DWORD, got %d\n"),(LPCTSTR)p->strName,dwType);
6736c52df507 Merge from eCos master repository on 2000-04-14-13:35:46-BST jlarmour parents: 76 diff changeset	87 rc=false;
6736c52df507 Merge from eCos master repository on 2000-04-14-13:35:46-BST jlarmour parents: 76 diff changeset	88 }
6736c52df507 Merge from eCos master repository on 2000-04-14-13:35:46-BST jlarmour parents: 76 diff changeset	89 break;
6736c52df507 Merge from eCos master repository on 2000-04-14-13:35:46-BST jlarmour parents: 76 diff changeset	90 case CProperty::Float:
6736c52df507 Merge from eCos master repository on 2000-04-14-13:35:46-BST jlarmour parents: 76 diff changeset	91 case CProperty::Double:
6736c52df507 Merge from eCos master repository on 2000-04-14-13:35:46-BST jlarmour parents: 76 diff changeset	92 case CProperty::szString:
6736c52df507 Merge from eCos master repository on 2000-04-14-13:35:46-BST jlarmour parents: 76 diff changeset	93 if(REG_SZ==dwType){
6736c52df507 Merge from eCos master repository on 2000-04-14-13:35:46-BST jlarmour parents: 76 diff changeset	94 rc&=p->SetValue((LPCTSTR)Data);
6736c52df507 Merge from eCos master repository on 2000-04-14-13:35:46-BST jlarmour parents: 76 diff changeset	95 } else {
6736c52df507 Merge from eCos master repository on 2000-04-14-13:35:46-BST jlarmour parents: 76 diff changeset	96 TRACE(_T("Type mismatch - %s: expected REG_SZ, got %d\n"),(LPCTSTR)p->strName,dwType);
6736c52df507 Merge from eCos master repository on 2000-04-14-13:35:46-BST jlarmour parents: 76 diff changeset	97 rc=false;
6736c52df507 Merge from eCos master repository on 2000-04-14-13:35:46-BST jlarmour parents: 76 diff changeset	98 }
6736c52df507 Merge from eCos master repository on 2000-04-14-13:35:46-BST jlarmour parents: 76 diff changeset	99 break;
6736c52df507 Merge from eCos master repository on 2000-04-14-13:35:46-BST jlarmour parents: 76 diff changeset	100 case CProperty::Void:
6736c52df507 Merge from eCos master repository on 2000-04-14-13:35:46-BST jlarmour parents: 76 diff changeset	101 if(REG_BINARY==dwType){
515 9589be2cc5c9 * common/eCosStd.h: #include winsock2.h and process.h for Cygwin builds. jld parents: 208 diff changeset	102 memcpy(p->pData,Data,MIN(dwDatalen,p->nLength));
82 6736c52df507 Merge from eCos master repository on 2000-04-14-13:35:46-BST jlarmour parents: 76 diff changeset	103 } else {
6736c52df507 Merge from eCos master repository on 2000-04-14-13:35:46-BST jlarmour parents: 76 diff changeset	104 TRACE(_T("Type mismatch - %s: expected REG_BINARY, got %d\n"),(LPCTSTR)p->strName,dwType);
6736c52df507 Merge from eCos master repository on 2000-04-14-13:35:46-BST jlarmour parents: 76 diff changeset	105 rc=false;
6736c52df507 Merge from eCos master repository on 2000-04-14-13:35:46-BST jlarmour parents: 76 diff changeset	106 }
6736c52df507 Merge from eCos master repository on 2000-04-14-13:35:46-BST jlarmour parents: 76 diff changeset	107 break;
76 435cced73e2f eCos v1.3.1 merged from eCos master repository on 2000-03-27-23:22:51-BST jlarmour parents: diff changeset	108 }
435cced73e2f eCos v1.3.1 merged from eCos master repository on 2000-03-27-23:22:51-BST jlarmour parents: diff changeset	109 } else {
82 6736c52df507 Merge from eCos master repository on 2000-04-14-13:35:46-BST jlarmour parents: 76 diff changeset	110 TRACE(_T("CProperties::LoadFromRegistry - unrecognized value %s in key %s\n"),szName,szRegKey);
76 435cced73e2f eCos v1.3.1 merged from eCos master repository on 2000-03-27-23:22:51-BST jlarmour parents: diff changeset	111 rc=false;
435cced73e2f eCos v1.3.1 merged from eCos master repository on 2000-03-27-23:22:51-BST jlarmour parents: diff changeset	112 }
435cced73e2f eCos v1.3.1 merged from eCos master repository on 2000-03-27-23:22:51-BST jlarmour parents: diff changeset	113 dwSizeName=sizeof szName;
435cced73e2f eCos v1.3.1 merged from eCos master repository on 2000-03-27-23:22:51-BST jlarmour parents: diff changeset	114 dwDatalen=dwMaxDatalen;
435cced73e2f eCos v1.3.1 merged from eCos master repository on 2000-03-27-23:22:51-BST jlarmour parents: diff changeset	115 }
435cced73e2f eCos v1.3.1 merged from eCos master repository on 2000-03-27-23:22:51-BST jlarmour parents: diff changeset	116 delete [] Data;
435cced73e2f eCos v1.3.1 merged from eCos master repository on 2000-03-27-23:22:51-BST jlarmour parents: diff changeset	117 dwSizeName=sizeof szName;
435cced73e2f eCos v1.3.1 merged from eCos master repository on 2000-03-27-23:22:51-BST jlarmour parents: diff changeset	118 }
435cced73e2f eCos v1.3.1 merged from eCos master repository on 2000-03-27-23:22:51-BST jlarmour parents: diff changeset	119 RegCloseKey(hKey);
435cced73e2f eCos v1.3.1 merged from eCos master repository on 2000-03-27-23:22:51-BST jlarmour parents: diff changeset	120 } else {
82 6736c52df507 Merge from eCos master repository on 2000-04-14-13:35:46-BST jlarmour parents: 76 diff changeset	121 TRACE(_T("Failed to open %s\n"),szRegKey);
76 435cced73e2f eCos v1.3.1 merged from eCos master repository on 2000-03-27-23:22:51-BST jlarmour parents: diff changeset	122 }
435cced73e2f eCos v1.3.1 merged from eCos master repository on 2000-03-27-23:22:51-BST jlarmour parents: diff changeset	123
435cced73e2f eCos v1.3.1 merged from eCos master repository on 2000-03-27-23:22:51-BST jlarmour parents: diff changeset	124 return rc;
435cced73e2f eCos v1.3.1 merged from eCos master repository on 2000-03-27-23:22:51-BST jlarmour parents: diff changeset	125 }
435cced73e2f eCos v1.3.1 merged from eCos master repository on 2000-03-27-23:22:51-BST jlarmour parents: diff changeset	126
82 6736c52df507 Merge from eCos master repository on 2000-04-14-13:35:46-BST jlarmour parents: 76 diff changeset	127 bool CProperties::SaveToRegistry(HKEY hTopKey,LPCTSTR szRegKey) const
76 435cced73e2f eCos v1.3.1 merged from eCos master repository on 2000-03-27-23:22:51-BST jlarmour parents: diff changeset	128 {
435cced73e2f eCos v1.3.1 merged from eCos master repository on 2000-03-27-23:22:51-BST jlarmour parents: diff changeset	129 HKEY hKey;
435cced73e2f eCos v1.3.1 merged from eCos master repository on 2000-03-27-23:22:51-BST jlarmour parents: diff changeset	130 CreateKey(szRegKey);
435cced73e2f eCos v1.3.1 merged from eCos master repository on 2000-03-27-23:22:51-BST jlarmour parents: diff changeset	131 bool rc=(ERROR_SUCCESS==RegOpenKeyEx (hTopKey, szRegKey, 0L, KEY_SET_VALUE, &hKey));
435cced73e2f eCos v1.3.1 merged from eCos master repository on 2000-03-27-23:22:51-BST jlarmour parents: diff changeset	132 if(rc){
435cced73e2f eCos v1.3.1 merged from eCos master repository on 2000-03-27-23:22:51-BST jlarmour parents: diff changeset	133 for(int i=ar.size()-1;i>=0;--i){
435cced73e2f eCos v1.3.1 merged from eCos master repository on 2000-03-27-23:22:51-BST jlarmour parents: diff changeset	134 // Initializations are simply to avoid compiler warnings.
435cced73e2f eCos v1.3.1 merged from eCos master repository on 2000-03-27-23:22:51-BST jlarmour parents: diff changeset	135 DWORD dwDatalen=0;
435cced73e2f eCos v1.3.1 merged from eCos master repository on 2000-03-27-23:22:51-BST jlarmour parents: diff changeset	136 DWORD dwType=REG_DWORD;
435cced73e2f eCos v1.3.1 merged from eCos master repository on 2000-03-27-23:22:51-BST jlarmour parents: diff changeset	137 BYTE *Data=0;
435cced73e2f eCos v1.3.1 merged from eCos master repository on 2000-03-27-23:22:51-BST jlarmour parents: diff changeset	138 // strValue and dw must be in scope for RegSetValueEx below.
435cced73e2f eCos v1.3.1 merged from eCos master repository on 2000-03-27-23:22:51-BST jlarmour parents: diff changeset	139 DWORD dw;
435cced73e2f eCos v1.3.1 merged from eCos master repository on 2000-03-27-23:22:51-BST jlarmour parents: diff changeset	140 String strValue;
82 6736c52df507 Merge from eCos master repository on 2000-04-14-13:35:46-BST jlarmour parents: 76 diff changeset	141 const CProperty &p=ar[i];
6736c52df507 Merge from eCos master repository on 2000-04-14-13:35:46-BST jlarmour parents: 76 diff changeset	142 switch(p.Type){
76 435cced73e2f eCos v1.3.1 merged from eCos master repository on 2000-03-27-23:22:51-BST jlarmour parents: diff changeset	143 case CProperties::CProperty::Integer:
435cced73e2f eCos v1.3.1 merged from eCos master repository on 2000-03-27-23:22:51-BST jlarmour parents: diff changeset	144 case CProperties::CProperty::Bool:
435cced73e2f eCos v1.3.1 merged from eCos master repository on 2000-03-27-23:22:51-BST jlarmour parents: diff changeset	145 case CProperties::CProperty::Char:
435cced73e2f eCos v1.3.1 merged from eCos master repository on 2000-03-27-23:22:51-BST jlarmour parents: diff changeset	146 case CProperties::CProperty::Short:
435cced73e2f eCos v1.3.1 merged from eCos master repository on 2000-03-27-23:22:51-BST jlarmour parents: diff changeset	147 dwType=REG_DWORD;
435cced73e2f eCos v1.3.1 merged from eCos master repository on 2000-03-27-23:22:51-BST jlarmour parents: diff changeset	148 dwDatalen=sizeof(DWORD);
82 6736c52df507 Merge from eCos master repository on 2000-04-14-13:35:46-BST jlarmour parents: 76 diff changeset	149 dw=p.GetValue();
76 435cced73e2f eCos v1.3.1 merged from eCos master repository on 2000-03-27-23:22:51-BST jlarmour parents: diff changeset	150 Data=(BYTE *)&dw;
435cced73e2f eCos v1.3.1 merged from eCos master repository on 2000-03-27-23:22:51-BST jlarmour parents: diff changeset	151 break;
435cced73e2f eCos v1.3.1 merged from eCos master repository on 2000-03-27-23:22:51-BST jlarmour parents: diff changeset	152 case CProperties::CProperty::Float:
435cced73e2f eCos v1.3.1 merged from eCos master repository on 2000-03-27-23:22:51-BST jlarmour parents: diff changeset	153 case CProperties::CProperty::Double:
435cced73e2f eCos v1.3.1 merged from eCos master repository on 2000-03-27-23:22:51-BST jlarmour parents: diff changeset	154 case CProperties::CProperty::szString:
82 6736c52df507 Merge from eCos master repository on 2000-04-14-13:35:46-BST jlarmour parents: 76 diff changeset	155 strValue=p.GetStringValue();
76 435cced73e2f eCos v1.3.1 merged from eCos master repository on 2000-03-27-23:22:51-BST jlarmour parents: diff changeset	156 Data=(BYTE *)(LPCTSTR)strValue;
435cced73e2f eCos v1.3.1 merged from eCos master repository on 2000-03-27-23:22:51-BST jlarmour parents: diff changeset	157 dwType=REG_SZ;
82 6736c52df507 Merge from eCos master repository on 2000-04-14-13:35:46-BST jlarmour parents: 76 diff changeset	158 dwDatalen=(1+strValue.size())*sizeof(_TCHAR);
76 435cced73e2f eCos v1.3.1 merged from eCos master repository on 2000-03-27-23:22:51-BST jlarmour parents: diff changeset	159 break;
435cced73e2f eCos v1.3.1 merged from eCos master repository on 2000-03-27-23:22:51-BST jlarmour parents: diff changeset	160 case CProperties::CProperty::Void:
82 6736c52df507 Merge from eCos master repository on 2000-04-14-13:35:46-BST jlarmour parents: 76 diff changeset	161 Data=(BYTE *)p.pData;
76 435cced73e2f eCos v1.3.1 merged from eCos master repository on 2000-03-27-23:22:51-BST jlarmour parents: diff changeset	162 dwType=REG_BINARY;
82 6736c52df507 Merge from eCos master repository on 2000-04-14-13:35:46-BST jlarmour parents: 76 diff changeset	163 dwDatalen=p.nLength;
76 435cced73e2f eCos v1.3.1 merged from eCos master repository on 2000-03-27-23:22:51-BST jlarmour parents: diff changeset	164 break;
435cced73e2f eCos v1.3.1 merged from eCos master repository on 2000-03-27-23:22:51-BST jlarmour parents: diff changeset	165 default:
435cced73e2f eCos v1.3.1 merged from eCos master repository on 2000-03-27-23:22:51-BST jlarmour parents: diff changeset	166 assert(false);
435cced73e2f eCos v1.3.1 merged from eCos master repository on 2000-03-27-23:22:51-BST jlarmour parents: diff changeset	167 break;
435cced73e2f eCos v1.3.1 merged from eCos master repository on 2000-03-27-23:22:51-BST jlarmour parents: diff changeset	168 }
82 6736c52df507 Merge from eCos master repository on 2000-04-14-13:35:46-BST jlarmour parents: 76 diff changeset	169 rc&=(ERROR_SUCCESS==RegSetValueEx(hKey,p.strName,0,dwType,Data,dwDatalen));
76 435cced73e2f eCos v1.3.1 merged from eCos master repository on 2000-03-27-23:22:51-BST jlarmour parents: diff changeset	170 }
435cced73e2f eCos v1.3.1 merged from eCos master repository on 2000-03-27-23:22:51-BST jlarmour parents: diff changeset	171 }
435cced73e2f eCos v1.3.1 merged from eCos master repository on 2000-03-27-23:22:51-BST jlarmour parents: diff changeset	172 RegCloseKey(hKey);
435cced73e2f eCos v1.3.1 merged from eCos master repository on 2000-03-27-23:22:51-BST jlarmour parents: diff changeset	173 return rc;
435cced73e2f eCos v1.3.1 merged from eCos master repository on 2000-03-27-23:22:51-BST jlarmour parents: diff changeset	174 }
435cced73e2f eCos v1.3.1 merged from eCos master repository on 2000-03-27-23:22:51-BST jlarmour parents: diff changeset	175
435cced73e2f eCos v1.3.1 merged from eCos master repository on 2000-03-27-23:22:51-BST jlarmour parents: diff changeset	176 // Create all keys down to the one specified
435cced73e2f eCos v1.3.1 merged from eCos master repository on 2000-03-27-23:22:51-BST jlarmour parents: diff changeset	177 bool CProperties::CreateKey(LPCTSTR pszKey,HKEY hKey/=HKEY_CURRENT_USER/)
435cced73e2f eCos v1.3.1 merged from eCos master repository on 2000-03-27-23:22:51-BST jlarmour parents: diff changeset	178 {
82 6736c52df507 Merge from eCos master repository on 2000-04-14-13:35:46-BST jlarmour parents: 76 diff changeset	179 bool rc=true;
6736c52df507 Merge from eCos master repository on 2000-04-14-13:35:46-BST jlarmour parents: 76 diff changeset	180 LPCTSTR pcStart=pszKey;
6736c52df507 Merge from eCos master repository on 2000-04-14-13:35:46-BST jlarmour parents: 76 diff changeset	181 LPCTSTR pcEnd;
6736c52df507 Merge from eCos master repository on 2000-04-14-13:35:46-BST jlarmour parents: 76 diff changeset	182 do {
6736c52df507 Merge from eCos master repository on 2000-04-14-13:35:46-BST jlarmour parents: 76 diff changeset	183 HKEY hKey2;
6736c52df507 Merge from eCos master repository on 2000-04-14-13:35:46-BST jlarmour parents: 76 diff changeset	184 pcEnd=_tcschr(pcStart,_TCHAR('\\'));
6736c52df507 Merge from eCos master repository on 2000-04-14-13:35:46-BST jlarmour parents: 76 diff changeset	185 if(NULL==pcEnd){
6736c52df507 Merge from eCos master repository on 2000-04-14-13:35:46-BST jlarmour parents: 76 diff changeset	186 pcEnd=pcStart+_tcslen(pcStart);
6736c52df507 Merge from eCos master repository on 2000-04-14-13:35:46-BST jlarmour parents: 76 diff changeset	187 }
6736c52df507 Merge from eCos master repository on 2000-04-14-13:35:46-BST jlarmour parents: 76 diff changeset	188 String strKey(pcStart,pcEnd-pcStart);
6736c52df507 Merge from eCos master repository on 2000-04-14-13:35:46-BST jlarmour parents: 76 diff changeset	189 if(ERROR_SUCCESS!=RegCreateKeyEx(hKey, // handle to an open key
6736c52df507 Merge from eCos master repository on 2000-04-14-13:35:46-BST jlarmour parents: 76 diff changeset	190 strKey, // address of subkey name
6736c52df507 Merge from eCos master repository on 2000-04-14-13:35:46-BST jlarmour parents: 76 diff changeset	191 0, // reserved
6736c52df507 Merge from eCos master repository on 2000-04-14-13:35:46-BST jlarmour parents: 76 diff changeset	192 0, // address of class string
6736c52df507 Merge from eCos master repository on 2000-04-14-13:35:46-BST jlarmour parents: 76 diff changeset	193 REG_OPTION_NON_VOLATILE, // special options flag
6736c52df507 Merge from eCos master repository on 2000-04-14-13:35:46-BST jlarmour parents: 76 diff changeset	194 KEY_ALL_ACCESS, // desired security access
6736c52df507 Merge from eCos master repository on 2000-04-14-13:35:46-BST jlarmour parents: 76 diff changeset	195 NULL,
6736c52df507 Merge from eCos master repository on 2000-04-14-13:35:46-BST jlarmour parents: 76 diff changeset	196 // address of key security structure
6736c52df507 Merge from eCos master repository on 2000-04-14-13:35:46-BST jlarmour parents: 76 diff changeset	197 &hKey2, // address of buffer for opened handle
6736c52df507 Merge from eCos master repository on 2000-04-14-13:35:46-BST jlarmour parents: 76 diff changeset	198 NULL// address of disposition value buffer);
6736c52df507 Merge from eCos master repository on 2000-04-14-13:35:46-BST jlarmour parents: 76 diff changeset	199 )){
6736c52df507 Merge from eCos master repository on 2000-04-14-13:35:46-BST jlarmour parents: 76 diff changeset	200 rc=false;
6736c52df507 Merge from eCos master repository on 2000-04-14-13:35:46-BST jlarmour parents: 76 diff changeset	201 break;
6736c52df507 Merge from eCos master repository on 2000-04-14-13:35:46-BST jlarmour parents: 76 diff changeset	202 }
76 435cced73e2f eCos v1.3.1 merged from eCos master repository on 2000-03-27-23:22:51-BST jlarmour parents: diff changeset	203 RegCloseKey(hKey);
82 6736c52df507 Merge from eCos master repository on 2000-04-14-13:35:46-BST jlarmour parents: 76 diff changeset	204 hKey=hKey2;
6736c52df507 Merge from eCos master repository on 2000-04-14-13:35:46-BST jlarmour parents: 76 diff changeset	205 pcStart=pcEnd+1;
6736c52df507 Merge from eCos master repository on 2000-04-14-13:35:46-BST jlarmour parents: 76 diff changeset	206 } while (_TCHAR('\0')!=*pcEnd);
6736c52df507 Merge from eCos master repository on 2000-04-14-13:35:46-BST jlarmour parents: 76 diff changeset	207 RegCloseKey(hKey);
6736c52df507 Merge from eCos master repository on 2000-04-14-13:35:46-BST jlarmour parents: 76 diff changeset	208 return rc;
76 435cced73e2f eCos v1.3.1 merged from eCos master repository on 2000-03-27-23:22:51-BST jlarmour parents: diff changeset	209 }
435cced73e2f eCos v1.3.1 merged from eCos master repository on 2000-03-27-23:22:51-BST jlarmour parents: diff changeset	210
435cced73e2f eCos v1.3.1 merged from eCos master repository on 2000-03-27-23:22:51-BST jlarmour parents: diff changeset	211 #endif
435cced73e2f eCos v1.3.1 merged from eCos master repository on 2000-03-27-23:22:51-BST jlarmour parents: diff changeset	212
82 6736c52df507 Merge from eCos master repository on 2000-04-14-13:35:46-BST jlarmour parents: 76 diff changeset	213 bool CProperties::LoadFromCommandString(LPCTSTR psz)
76 435cced73e2f eCos v1.3.1 merged from eCos master repository on 2000-03-27-23:22:51-BST jlarmour parents: diff changeset	214 {
435cced73e2f eCos v1.3.1 merged from eCos master repository on 2000-03-27-23:22:51-BST jlarmour parents: diff changeset	215 bool rc=true;
435cced73e2f eCos v1.3.1 merged from eCos master repository on 2000-03-27-23:22:51-BST jlarmour parents: diff changeset	216 const TCHAR *cNext;
82 6736c52df507 Merge from eCos master repository on 2000-04-14-13:35:46-BST jlarmour parents: 76 diff changeset	217 for(LPCTSTR c=_tcschr(psz,_TCHAR('-'));c;c=_tcschr(cNext,_TCHAR('-'))){
6736c52df507 Merge from eCos master repository on 2000-04-14-13:35:46-BST jlarmour parents: 76 diff changeset	218 c++;
76 435cced73e2f eCos v1.3.1 merged from eCos master repository on 2000-03-27-23:22:51-BST jlarmour parents: diff changeset	219 const TCHAR *pEq=_tcschr(c,_TCHAR('='));
435cced73e2f eCos v1.3.1 merged from eCos master repository on 2000-03-27-23:22:51-BST jlarmour parents: diff changeset	220 if(NULL==pEq){
82 6736c52df507 Merge from eCos master repository on 2000-04-14-13:35:46-BST jlarmour parents: 76 diff changeset	221 TRACE(_T("Failed to find '=' after %s\n"),c);
76 435cced73e2f eCos v1.3.1 merged from eCos master repository on 2000-03-27-23:22:51-BST jlarmour parents: diff changeset	222 rc=false;
435cced73e2f eCos v1.3.1 merged from eCos master repository on 2000-03-27-23:22:51-BST jlarmour parents: diff changeset	223 break;
435cced73e2f eCos v1.3.1 merged from eCos master repository on 2000-03-27-23:22:51-BST jlarmour parents: diff changeset	224 }
435cced73e2f eCos v1.3.1 merged from eCos master repository on 2000-03-27-23:22:51-BST jlarmour parents: diff changeset	225 String strName(c,pEq-c);
435cced73e2f eCos v1.3.1 merged from eCos master repository on 2000-03-27-23:22:51-BST jlarmour parents: diff changeset	226 CProperties::CProperty *p=Lookup(strName);
435cced73e2f eCos v1.3.1 merged from eCos master repository on 2000-03-27-23:22:51-BST jlarmour parents: diff changeset	227 c=pEq+1;
435cced73e2f eCos v1.3.1 merged from eCos master repository on 2000-03-27-23:22:51-BST jlarmour parents: diff changeset	228 String str;
435cced73e2f eCos v1.3.1 merged from eCos master repository on 2000-03-27-23:22:51-BST jlarmour parents: diff changeset	229 if(_TCHAR('"')==*c){
435cced73e2f eCos v1.3.1 merged from eCos master repository on 2000-03-27-23:22:51-BST jlarmour parents: diff changeset	230 // Value is a quoted string
435cced73e2f eCos v1.3.1 merged from eCos master repository on 2000-03-27-23:22:51-BST jlarmour parents: diff changeset	231 for(cNext=c+1;_TCHAR('"')!=*cNext;cNext++){
435cced73e2f eCos v1.3.1 merged from eCos master repository on 2000-03-27-23:22:51-BST jlarmour parents: diff changeset	232 if(_TCHAR('\\')==*cNext){
435cced73e2f eCos v1.3.1 merged from eCos master repository on 2000-03-27-23:22:51-BST jlarmour parents: diff changeset	233 cNext++;
435cced73e2f eCos v1.3.1 merged from eCos master repository on 2000-03-27-23:22:51-BST jlarmour parents: diff changeset	234 }
435cced73e2f eCos v1.3.1 merged from eCos master repository on 2000-03-27-23:22:51-BST jlarmour parents: diff changeset	235 str+=*cNext;
435cced73e2f eCos v1.3.1 merged from eCos master repository on 2000-03-27-23:22:51-BST jlarmour parents: diff changeset	236 }
435cced73e2f eCos v1.3.1 merged from eCos master repository on 2000-03-27-23:22:51-BST jlarmour parents: diff changeset	237 } else {
435cced73e2f eCos v1.3.1 merged from eCos master repository on 2000-03-27-23:22:51-BST jlarmour parents: diff changeset	238 // Value is simply terminated by whitespace
435cced73e2f eCos v1.3.1 merged from eCos master repository on 2000-03-27-23:22:51-BST jlarmour parents: diff changeset	239 for(cNext=c;_TCHAR('\0')!=cNext && !_istspace(cNext);cNext++);
435cced73e2f eCos v1.3.1 merged from eCos master repository on 2000-03-27-23:22:51-BST jlarmour parents: diff changeset	240 str=String(c,cNext-c);
435cced73e2f eCos v1.3.1 merged from eCos master repository on 2000-03-27-23:22:51-BST jlarmour parents: diff changeset	241 }
435cced73e2f eCos v1.3.1 merged from eCos master repository on 2000-03-27-23:22:51-BST jlarmour parents: diff changeset	242 if(p){
435cced73e2f eCos v1.3.1 merged from eCos master repository on 2000-03-27-23:22:51-BST jlarmour parents: diff changeset	243 rc&=p->SetValue(str);
435cced73e2f eCos v1.3.1 merged from eCos master repository on 2000-03-27-23:22:51-BST jlarmour parents: diff changeset	244 } else {
82 6736c52df507 Merge from eCos master repository on 2000-04-14-13:35:46-BST jlarmour parents: 76 diff changeset	245 TRACE(_T("Properties: unrecognized attribute %s in command string\n"),(LPCTSTR)strName);
76 435cced73e2f eCos v1.3.1 merged from eCos master repository on 2000-03-27-23:22:51-BST jlarmour parents: diff changeset	246 rc=false;
435cced73e2f eCos v1.3.1 merged from eCos master repository on 2000-03-27-23:22:51-BST jlarmour parents: diff changeset	247 }
82 6736c52df507 Merge from eCos master repository on 2000-04-14-13:35:46-BST jlarmour parents: 76 diff changeset	248 c=cNext;
76 435cced73e2f eCos v1.3.1 merged from eCos master repository on 2000-03-27-23:22:51-BST jlarmour parents: diff changeset	249 }
435cced73e2f eCos v1.3.1 merged from eCos master repository on 2000-03-27-23:22:51-BST jlarmour parents: diff changeset	250 return rc;
435cced73e2f eCos v1.3.1 merged from eCos master repository on 2000-03-27-23:22:51-BST jlarmour parents: diff changeset	251 }
435cced73e2f eCos v1.3.1 merged from eCos master repository on 2000-03-27-23:22:51-BST jlarmour parents: diff changeset	252
435cced73e2f eCos v1.3.1 merged from eCos master repository on 2000-03-27-23:22:51-BST jlarmour parents: diff changeset	253 CProperties::CProperty * CProperties::Lookup(LPCTSTR pszName)
435cced73e2f eCos v1.3.1 merged from eCos master repository on 2000-03-27-23:22:51-BST jlarmour parents: diff changeset	254 {
82 6736c52df507 Merge from eCos master repository on 2000-04-14-13:35:46-BST jlarmour parents: 76 diff changeset	255 for(int i=ar.size()-1;i>=0;--i){
6736c52df507 Merge from eCos master repository on 2000-04-14-13:35:46-BST jlarmour parents: 76 diff changeset	256 CProperties::CProperty &p=ar[i];
6736c52df507 Merge from eCos master repository on 2000-04-14-13:35:46-BST jlarmour parents: 76 diff changeset	257 if(0==_tcsicmp(p.strName,pszName)){
6736c52df507 Merge from eCos master repository on 2000-04-14-13:35:46-BST jlarmour parents: 76 diff changeset	258 return &p;
76 435cced73e2f eCos v1.3.1 merged from eCos master repository on 2000-03-27-23:22:51-BST jlarmour parents: diff changeset	259 }
82 6736c52df507 Merge from eCos master repository on 2000-04-14-13:35:46-BST jlarmour parents: 76 diff changeset	260 }
6736c52df507 Merge from eCos master repository on 2000-04-14-13:35:46-BST jlarmour parents: 76 diff changeset	261 return NULL;
76 435cced73e2f eCos v1.3.1 merged from eCos master repository on 2000-03-27-23:22:51-BST jlarmour parents: diff changeset	262 }
435cced73e2f eCos v1.3.1 merged from eCos master repository on 2000-03-27-23:22:51-BST jlarmour parents: diff changeset	263
82 6736c52df507 Merge from eCos master repository on 2000-04-14-13:35:46-BST jlarmour parents: 76 diff changeset	264 String CProperties::MakeCommandString() const
76 435cced73e2f eCos v1.3.1 merged from eCos master repository on 2000-03-27-23:22:51-BST jlarmour parents: diff changeset	265 {
435cced73e2f eCos v1.3.1 merged from eCos master repository on 2000-03-27-23:22:51-BST jlarmour parents: diff changeset	266 String strResult;
435cced73e2f eCos v1.3.1 merged from eCos master repository on 2000-03-27-23:22:51-BST jlarmour parents: diff changeset	267 bool bFirst=true;
435cced73e2f eCos v1.3.1 merged from eCos master repository on 2000-03-27-23:22:51-BST jlarmour parents: diff changeset	268 for(int i=ar.size()-1;i>=0;--i){
435cced73e2f eCos v1.3.1 merged from eCos master repository on 2000-03-27-23:22:51-BST jlarmour parents: diff changeset	269 String str;
82 6736c52df507 Merge from eCos master repository on 2000-04-14-13:35:46-BST jlarmour parents: 76 diff changeset	270 const CProperty &p=ar[i];
6736c52df507 Merge from eCos master repository on 2000-04-14-13:35:46-BST jlarmour parents: 76 diff changeset	271 switch(p.Type){
6736c52df507 Merge from eCos master repository on 2000-04-14-13:35:46-BST jlarmour parents: 76 diff changeset	272 case CProperties::CProperty::Integer:
6736c52df507 Merge from eCos master repository on 2000-04-14-13:35:46-BST jlarmour parents: 76 diff changeset	273 case CProperties::CProperty::Bool:
6736c52df507 Merge from eCos master repository on 2000-04-14-13:35:46-BST jlarmour parents: 76 diff changeset	274 case CProperties::CProperty::Char:
6736c52df507 Merge from eCos master repository on 2000-04-14-13:35:46-BST jlarmour parents: 76 diff changeset	275 case CProperties::CProperty::Short:
6736c52df507 Merge from eCos master repository on 2000-04-14-13:35:46-BST jlarmour parents: 76 diff changeset	276 str.Format(_T("-%s=%u"),(LPCTSTR)p.strName,p.GetValue());
6736c52df507 Merge from eCos master repository on 2000-04-14-13:35:46-BST jlarmour parents: 76 diff changeset	277 break;
6736c52df507 Merge from eCos master repository on 2000-04-14-13:35:46-BST jlarmour parents: 76 diff changeset	278 case CProperties::CProperty::szString:
6736c52df507 Merge from eCos master repository on 2000-04-14-13:35:46-BST jlarmour parents: 76 diff changeset	279 {
6736c52df507 Merge from eCos master repository on 2000-04-14-13:35:46-BST jlarmour parents: 76 diff changeset	280 // Quote the string, escaping existing quotes as necessary
6736c52df507 Merge from eCos master repository on 2000-04-14-13:35:46-BST jlarmour parents: 76 diff changeset	281 str.Format(_T("-%s=\""),(LPCTSTR)p.strName);
6736c52df507 Merge from eCos master repository on 2000-04-14-13:35:46-BST jlarmour parents: 76 diff changeset	282 for(LPCTSTR c=p.GetStringValue();*c;c++){
6736c52df507 Merge from eCos master repository on 2000-04-14-13:35:46-BST jlarmour parents: 76 diff changeset	283 if(_TCHAR('"')==*c){
6736c52df507 Merge from eCos master repository on 2000-04-14-13:35:46-BST jlarmour parents: 76 diff changeset	284 str+=_TCHAR('\\');
6736c52df507 Merge from eCos master repository on 2000-04-14-13:35:46-BST jlarmour parents: 76 diff changeset	285 }
6736c52df507 Merge from eCos master repository on 2000-04-14-13:35:46-BST jlarmour parents: 76 diff changeset	286 str+=*c;
6736c52df507 Merge from eCos master repository on 2000-04-14-13:35:46-BST jlarmour parents: 76 diff changeset	287 }
6736c52df507 Merge from eCos master repository on 2000-04-14-13:35:46-BST jlarmour parents: 76 diff changeset	288 str+=_TCHAR('"');
6736c52df507 Merge from eCos master repository on 2000-04-14-13:35:46-BST jlarmour parents: 76 diff changeset	289 }
6736c52df507 Merge from eCos master repository on 2000-04-14-13:35:46-BST jlarmour parents: 76 diff changeset	290 break;
6736c52df507 Merge from eCos master repository on 2000-04-14-13:35:46-BST jlarmour parents: 76 diff changeset	291 case CProperties::CProperty::Float:
6736c52df507 Merge from eCos master repository on 2000-04-14-13:35:46-BST jlarmour parents: 76 diff changeset	292 case CProperties::CProperty::Double:
6736c52df507 Merge from eCos master repository on 2000-04-14-13:35:46-BST jlarmour parents: 76 diff changeset	293 case CProperties::CProperty::Void:
6736c52df507 Merge from eCos master repository on 2000-04-14-13:35:46-BST jlarmour parents: 76 diff changeset	294 str.Format(_T("-%s=%s"),(LPCTSTR)p.GetStringValue());
6736c52df507 Merge from eCos master repository on 2000-04-14-13:35:46-BST jlarmour parents: 76 diff changeset	295 break;
76 435cced73e2f eCos v1.3.1 merged from eCos master repository on 2000-03-27-23:22:51-BST jlarmour parents: diff changeset	296 }
435cced73e2f eCos v1.3.1 merged from eCos master repository on 2000-03-27-23:22:51-BST jlarmour parents: diff changeset	297 if(!bFirst){
435cced73e2f eCos v1.3.1 merged from eCos master repository on 2000-03-27-23:22:51-BST jlarmour parents: diff changeset	298 strResult+=_TCHAR(' ');
435cced73e2f eCos v1.3.1 merged from eCos master repository on 2000-03-27-23:22:51-BST jlarmour parents: diff changeset	299 }
435cced73e2f eCos v1.3.1 merged from eCos master repository on 2000-03-27-23:22:51-BST jlarmour parents: diff changeset	300 bFirst=false;
435cced73e2f eCos v1.3.1 merged from eCos master repository on 2000-03-27-23:22:51-BST jlarmour parents: diff changeset	301 strResult+=str;
435cced73e2f eCos v1.3.1 merged from eCos master repository on 2000-03-27-23:22:51-BST jlarmour parents: diff changeset	302 }
435cced73e2f eCos v1.3.1 merged from eCos master repository on 2000-03-27-23:22:51-BST jlarmour parents: diff changeset	303 return strResult;
435cced73e2f eCos v1.3.1 merged from eCos master repository on 2000-03-27-23:22:51-BST jlarmour parents: diff changeset	304 }
435cced73e2f eCos v1.3.1 merged from eCos master repository on 2000-03-27-23:22:51-BST jlarmour parents: diff changeset	305
435cced73e2f eCos v1.3.1 merged from eCos master repository on 2000-03-27-23:22:51-BST jlarmour parents: diff changeset	306 bool CProperties::CreatePathToFile(LPCTSTR pszDir)
435cced73e2f eCos v1.3.1 merged from eCos master repository on 2000-03-27-23:22:51-BST jlarmour parents: diff changeset	307 {
82 6736c52df507 Merge from eCos master repository on 2000-04-14-13:35:46-BST jlarmour parents: 76 diff changeset	308 // Create intermediate directories
6736c52df507 Merge from eCos master repository on 2000-04-14-13:35:46-BST jlarmour parents: 76 diff changeset	309 #ifdef _WIN32
6736c52df507 Merge from eCos master repository on 2000-04-14-13:35:46-BST jlarmour parents: 76 diff changeset	310 const TCHAR cSep='\\';
6736c52df507 Merge from eCos master repository on 2000-04-14-13:35:46-BST jlarmour parents: 76 diff changeset	311 #else // UNIX
6736c52df507 Merge from eCos master repository on 2000-04-14-13:35:46-BST jlarmour parents: 76 diff changeset	312 const TCHAR cSep='/';
6736c52df507 Merge from eCos master repository on 2000-04-14-13:35:46-BST jlarmour parents: 76 diff changeset	313 #endif
6736c52df507 Merge from eCos master repository on 2000-04-14-13:35:46-BST jlarmour parents: 76 diff changeset	314 for(LPCTSTR c=_tcschr(pszDir,cSep);c;c=_tcschr(c+1,cSep)){
6736c52df507 Merge from eCos master repository on 2000-04-14-13:35:46-BST jlarmour parents: 76 diff changeset	315 #ifdef _WIN32
6736c52df507 Merge from eCos master repository on 2000-04-14-13:35:46-BST jlarmour parents: 76 diff changeset	316 if(c==pszDir+2 && _istalpha(pszDir[0]) && _TCHAR(':')==pszDir[1]){
6736c52df507 Merge from eCos master repository on 2000-04-14-13:35:46-BST jlarmour parents: 76 diff changeset	317 continue; // don't attempt to create "C:"
76 435cced73e2f eCos v1.3.1 merged from eCos master repository on 2000-03-27-23:22:51-BST jlarmour parents: diff changeset	318 }
82 6736c52df507 Merge from eCos master repository on 2000-04-14-13:35:46-BST jlarmour parents: 76 diff changeset	319 #endif
6736c52df507 Merge from eCos master repository on 2000-04-14-13:35:46-BST jlarmour parents: 76 diff changeset	320 String strDir(pszDir,c-pszDir);
6736c52df507 Merge from eCos master repository on 2000-04-14-13:35:46-BST jlarmour parents: 76 diff changeset	321 struct _stat buf;
6736c52df507 Merge from eCos master repository on 2000-04-14-13:35:46-BST jlarmour parents: 76 diff changeset	322 if(!(0==_tstat(strDir,&buf) && (S_IFDIR&buf.st_mode))){
6736c52df507 Merge from eCos master repository on 2000-04-14-13:35:46-BST jlarmour parents: 76 diff changeset	323 // Need to create directory
6736c52df507 Merge from eCos master repository on 2000-04-14-13:35:46-BST jlarmour parents: 76 diff changeset	324 bool b=(0==_tmkdir(strDir));
6736c52df507 Merge from eCos master repository on 2000-04-14-13:35:46-BST jlarmour parents: 76 diff changeset	325 TRACE(_T("Create directory %s rc=%d\n"),(LPCTSTR)strDir,b);
6736c52df507 Merge from eCos master repository on 2000-04-14-13:35:46-BST jlarmour parents: 76 diff changeset	326 if(!b){
6736c52df507 Merge from eCos master repository on 2000-04-14-13:35:46-BST jlarmour parents: 76 diff changeset	327 return false;
6736c52df507 Merge from eCos master repository on 2000-04-14-13:35:46-BST jlarmour parents: 76 diff changeset	328 }
6736c52df507 Merge from eCos master repository on 2000-04-14-13:35:46-BST jlarmour parents: 76 diff changeset	329 }
6736c52df507 Merge from eCos master repository on 2000-04-14-13:35:46-BST jlarmour parents: 76 diff changeset	330 }
6736c52df507 Merge from eCos master repository on 2000-04-14-13:35:46-BST jlarmour parents: 76 diff changeset	331 return true;
76 435cced73e2f eCos v1.3.1 merged from eCos master repository on 2000-03-27-23:22:51-BST jlarmour parents: diff changeset	332 }
435cced73e2f eCos v1.3.1 merged from eCos master repository on 2000-03-27-23:22:51-BST jlarmour parents: diff changeset	333
82 6736c52df507 Merge from eCos master repository on 2000-04-14-13:35:46-BST jlarmour parents: 76 diff changeset	334 bool CProperties::SaveToFile(LPCTSTR pszFileName) const
76 435cced73e2f eCos v1.3.1 merged from eCos master repository on 2000-03-27-23:22:51-BST jlarmour parents: diff changeset	335 {
435cced73e2f eCos v1.3.1 merged from eCos master repository on 2000-03-27-23:22:51-BST jlarmour parents: diff changeset	336 CreatePathToFile(pszFileName);
82 6736c52df507 Merge from eCos master repository on 2000-04-14-13:35:46-BST jlarmour parents: 76 diff changeset	337 FILE *f=_tfopen(pszFileName,_T("w") MODE_TEXT);
76 435cced73e2f eCos v1.3.1 merged from eCos master repository on 2000-03-27-23:22:51-BST jlarmour parents: diff changeset	338 if(f){
435cced73e2f eCos v1.3.1 merged from eCos master repository on 2000-03-27-23:22:51-BST jlarmour parents: diff changeset	339 for(int i=ar.size()-1;i>=0;--i){
82 6736c52df507 Merge from eCos master repository on 2000-04-14-13:35:46-BST jlarmour parents: 76 diff changeset	340 const CProperty &p=ar[i];
6736c52df507 Merge from eCos master repository on 2000-04-14-13:35:46-BST jlarmour parents: 76 diff changeset	341 String str(p.strName);
76 435cced73e2f eCos v1.3.1 merged from eCos master repository on 2000-03-27-23:22:51-BST jlarmour parents: diff changeset	342 str+=_TCHAR('=');
82 6736c52df507 Merge from eCos master repository on 2000-04-14-13:35:46-BST jlarmour parents: 76 diff changeset	343 switch(p.Type){
76 435cced73e2f eCos v1.3.1 merged from eCos master repository on 2000-03-27-23:22:51-BST jlarmour parents: diff changeset	344 case CProperties::CProperty::Integer:
435cced73e2f eCos v1.3.1 merged from eCos master repository on 2000-03-27-23:22:51-BST jlarmour parents: diff changeset	345 case CProperties::CProperty::Bool:
435cced73e2f eCos v1.3.1 merged from eCos master repository on 2000-03-27-23:22:51-BST jlarmour parents: diff changeset	346 case CProperties::CProperty::Char:
435cced73e2f eCos v1.3.1 merged from eCos master repository on 2000-03-27-23:22:51-BST jlarmour parents: diff changeset	347 case CProperties::CProperty::Short:
82 6736c52df507 Merge from eCos master repository on 2000-04-14-13:35:46-BST jlarmour parents: 76 diff changeset	348 str+=String::SFormat(_T("%u"),p.GetValue());
76 435cced73e2f eCos v1.3.1 merged from eCos master repository on 2000-03-27-23:22:51-BST jlarmour parents: diff changeset	349 break;
435cced73e2f eCos v1.3.1 merged from eCos master repository on 2000-03-27-23:22:51-BST jlarmour parents: diff changeset	350 case CProperties::CProperty::Float:
435cced73e2f eCos v1.3.1 merged from eCos master repository on 2000-03-27-23:22:51-BST jlarmour parents: diff changeset	351 case CProperties::CProperty::Double:
435cced73e2f eCos v1.3.1 merged from eCos master repository on 2000-03-27-23:22:51-BST jlarmour parents: diff changeset	352 case CProperties::CProperty::szString:
435cced73e2f eCos v1.3.1 merged from eCos master repository on 2000-03-27-23:22:51-BST jlarmour parents: diff changeset	353 case CProperties::CProperty::Void:
82 6736c52df507 Merge from eCos master repository on 2000-04-14-13:35:46-BST jlarmour parents: 76 diff changeset	354 str+=p.GetStringValue();
76 435cced73e2f eCos v1.3.1 merged from eCos master repository on 2000-03-27-23:22:51-BST jlarmour parents: diff changeset	355 break;
435cced73e2f eCos v1.3.1 merged from eCos master repository on 2000-03-27-23:22:51-BST jlarmour parents: diff changeset	356 }
435cced73e2f eCos v1.3.1 merged from eCos master repository on 2000-03-27-23:22:51-BST jlarmour parents: diff changeset	357 str+=_TCHAR('\n');
435cced73e2f eCos v1.3.1 merged from eCos master repository on 2000-03-27-23:22:51-BST jlarmour parents: diff changeset	358 _fputts(str,f);
435cced73e2f eCos v1.3.1 merged from eCos master repository on 2000-03-27-23:22:51-BST jlarmour parents: diff changeset	359 }
435cced73e2f eCos v1.3.1 merged from eCos master repository on 2000-03-27-23:22:51-BST jlarmour parents: diff changeset	360 fclose(f);
435cced73e2f eCos v1.3.1 merged from eCos master repository on 2000-03-27-23:22:51-BST jlarmour parents: diff changeset	361 }
435cced73e2f eCos v1.3.1 merged from eCos master repository on 2000-03-27-23:22:51-BST jlarmour parents: diff changeset	362 return (0!=f);
435cced73e2f eCos v1.3.1 merged from eCos master repository on 2000-03-27-23:22:51-BST jlarmour parents: diff changeset	363 }
435cced73e2f eCos v1.3.1 merged from eCos master repository on 2000-03-27-23:22:51-BST jlarmour parents: diff changeset	364
82 6736c52df507 Merge from eCos master repository on 2000-04-14-13:35:46-BST jlarmour parents: 76 diff changeset	365 bool CProperties::LoadFromFile(LPCTSTR pszFileName)
76 435cced73e2f eCos v1.3.1 merged from eCos master repository on 2000-03-27-23:22:51-BST jlarmour parents: diff changeset	366 {
82 6736c52df507 Merge from eCos master repository on 2000-04-14-13:35:46-BST jlarmour parents: 76 diff changeset	367 FILE *f=_tfopen(pszFileName,_T("r") MODE_TEXT);
76 435cced73e2f eCos v1.3.1 merged from eCos master repository on 2000-03-27-23:22:51-BST jlarmour parents: diff changeset	368 bool rc=(0!=f);
435cced73e2f eCos v1.3.1 merged from eCos master repository on 2000-03-27-23:22:51-BST jlarmour parents: diff changeset	369 if(rc){
82 6736c52df507 Merge from eCos master repository on 2000-04-14-13:35:46-BST jlarmour parents: 76 diff changeset	370 TCHAR buf[4096];
6736c52df507 Merge from eCos master repository on 2000-04-14-13:35:46-BST jlarmour parents: 76 diff changeset	371 int nLine=0;
6736c52df507 Merge from eCos master repository on 2000-04-14-13:35:46-BST jlarmour parents: 76 diff changeset	372 String str;
6736c52df507 Merge from eCos master repository on 2000-04-14-13:35:46-BST jlarmour parents: 76 diff changeset	373 while(_fgetts(buf,sizeof(buf)-1,f)){
6736c52df507 Merge from eCos master repository on 2000-04-14-13:35:46-BST jlarmour parents: 76 diff changeset	374
6736c52df507 Merge from eCos master repository on 2000-04-14-13:35:46-BST jlarmour parents: 76 diff changeset	375 nLine++;
6736c52df507 Merge from eCos master repository on 2000-04-14-13:35:46-BST jlarmour parents: 76 diff changeset	376 int nLen=_tcslen(buf);
6736c52df507 Merge from eCos master repository on 2000-04-14-13:35:46-BST jlarmour parents: 76 diff changeset	377 if(nLen>0){
6736c52df507 Merge from eCos master repository on 2000-04-14-13:35:46-BST jlarmour parents: 76 diff changeset	378 // Remove trailing '\n'
6736c52df507 Merge from eCos master repository on 2000-04-14-13:35:46-BST jlarmour parents: 76 diff changeset	379 if(_TCHAR('\n')==buf[nLen-1]){
6736c52df507 Merge from eCos master repository on 2000-04-14-13:35:46-BST jlarmour parents: 76 diff changeset	380 buf[--nLen]=_TCHAR('\0');
6736c52df507 Merge from eCos master repository on 2000-04-14-13:35:46-BST jlarmour parents: 76 diff changeset	381 }
208 e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 82 diff changeset	382 // Remove trailing '\r'
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 82 diff changeset	383 if(_TCHAR('\r')==buf[nLen-1]){
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 82 diff changeset	384 buf[--nLen]=_TCHAR('\0');
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 82 diff changeset	385 }
82 6736c52df507 Merge from eCos master repository on 2000-04-14-13:35:46-BST jlarmour parents: 76 diff changeset	386
6736c52df507 Merge from eCos master repository on 2000-04-14-13:35:46-BST jlarmour parents: 76 diff changeset	387 // Check for continuation lines
6736c52df507 Merge from eCos master repository on 2000-04-14-13:35:46-BST jlarmour parents: 76 diff changeset	388 if(_TCHAR('\\')==buf[nLen-1]){
6736c52df507 Merge from eCos master repository on 2000-04-14-13:35:46-BST jlarmour parents: 76 diff changeset	389 buf[--nLen]=_TCHAR('\0');
6736c52df507 Merge from eCos master repository on 2000-04-14-13:35:46-BST jlarmour parents: 76 diff changeset	390 str+=buf;
6736c52df507 Merge from eCos master repository on 2000-04-14-13:35:46-BST jlarmour parents: 76 diff changeset	391 } else {
6736c52df507 Merge from eCos master repository on 2000-04-14-13:35:46-BST jlarmour parents: 76 diff changeset	392 str+=buf;
6736c52df507 Merge from eCos master repository on 2000-04-14-13:35:46-BST jlarmour parents: 76 diff changeset	393 LPCTSTR c=(LPCTSTR)str;
6736c52df507 Merge from eCos master repository on 2000-04-14-13:35:46-BST jlarmour parents: 76 diff changeset	394 const TCHAR *pEq=_tcschr(c,_TCHAR('='));
6736c52df507 Merge from eCos master repository on 2000-04-14-13:35:46-BST jlarmour parents: 76 diff changeset	395 if(pEq){
6736c52df507 Merge from eCos master repository on 2000-04-14-13:35:46-BST jlarmour parents: 76 diff changeset	396 const String strName(c,pEq-c);
6736c52df507 Merge from eCos master repository on 2000-04-14-13:35:46-BST jlarmour parents: 76 diff changeset	397 CProperties::CProperty *p=Lookup(strName);
6736c52df507 Merge from eCos master repository on 2000-04-14-13:35:46-BST jlarmour parents: 76 diff changeset	398 if(p){
6736c52df507 Merge from eCos master repository on 2000-04-14-13:35:46-BST jlarmour parents: 76 diff changeset	399 pEq++;
6736c52df507 Merge from eCos master repository on 2000-04-14-13:35:46-BST jlarmour parents: 76 diff changeset	400 rc&=p->SetValue(pEq);
6736c52df507 Merge from eCos master repository on 2000-04-14-13:35:46-BST jlarmour parents: 76 diff changeset	401 } else {
6736c52df507 Merge from eCos master repository on 2000-04-14-13:35:46-BST jlarmour parents: 76 diff changeset	402 ERROR(_T("Unknown attribute %s found in %s line %d\n"),(LPCTSTR)strName,pszFileName,nLine);
6736c52df507 Merge from eCos master repository on 2000-04-14-13:35:46-BST jlarmour parents: 76 diff changeset	403 rc=false;
6736c52df507 Merge from eCos master repository on 2000-04-14-13:35:46-BST jlarmour parents: 76 diff changeset	404 }
76 435cced73e2f eCos v1.3.1 merged from eCos master repository on 2000-03-27-23:22:51-BST jlarmour parents: diff changeset	405 }
82 6736c52df507 Merge from eCos master repository on 2000-04-14-13:35:46-BST jlarmour parents: 76 diff changeset	406 str=_T("");
76 435cced73e2f eCos v1.3.1 merged from eCos master repository on 2000-03-27-23:22:51-BST jlarmour parents: diff changeset	407 }
435cced73e2f eCos v1.3.1 merged from eCos master repository on 2000-03-27-23:22:51-BST jlarmour parents: diff changeset	408 }
435cced73e2f eCos v1.3.1 merged from eCos master repository on 2000-03-27-23:22:51-BST jlarmour parents: diff changeset	409 }
435cced73e2f eCos v1.3.1 merged from eCos master repository on 2000-03-27-23:22:51-BST jlarmour parents: diff changeset	410 fclose(f);
435cced73e2f eCos v1.3.1 merged from eCos master repository on 2000-03-27-23:22:51-BST jlarmour parents: diff changeset	411 }
435cced73e2f eCos v1.3.1 merged from eCos master repository on 2000-03-27-23:22:51-BST jlarmour parents: diff changeset	412 return rc;
435cced73e2f eCos v1.3.1 merged from eCos master repository on 2000-03-27-23:22:51-BST jlarmour parents: diff changeset	413 }
435cced73e2f eCos v1.3.1 merged from eCos master repository on 2000-03-27-23:22:51-BST jlarmour parents: diff changeset	414
435cced73e2f eCos v1.3.1 merged from eCos master repository on 2000-03-27-23:22:51-BST jlarmour parents: diff changeset	415 CProperties::CProperty::CProperty(LPCTSTR pszName,Typetype type,void *_pData):
435cced73e2f eCos v1.3.1 merged from eCos master repository on 2000-03-27-23:22:51-BST jlarmour parents: diff changeset	416 strName(pszName),
435cced73e2f eCos v1.3.1 merged from eCos master repository on 2000-03-27-23:22:51-BST jlarmour parents: diff changeset	417 Type(type),
435cced73e2f eCos v1.3.1 merged from eCos master repository on 2000-03-27-23:22:51-BST jlarmour parents: diff changeset	418 pData(_pData)
435cced73e2f eCos v1.3.1 merged from eCos master repository on 2000-03-27-23:22:51-BST jlarmour parents: diff changeset	419 {
435cced73e2f eCos v1.3.1 merged from eCos master repository on 2000-03-27-23:22:51-BST jlarmour parents: diff changeset	420 }
435cced73e2f eCos v1.3.1 merged from eCos master repository on 2000-03-27-23:22:51-BST jlarmour parents: diff changeset	421
435cced73e2f eCos v1.3.1 merged from eCos master repository on 2000-03-27-23:22:51-BST jlarmour parents: diff changeset	422 CProperties::CProperty::~CProperty()
435cced73e2f eCos v1.3.1 merged from eCos master repository on 2000-03-27-23:22:51-BST jlarmour parents: diff changeset	423 {
435cced73e2f eCos v1.3.1 merged from eCos master repository on 2000-03-27-23:22:51-BST jlarmour parents: diff changeset	424 }
435cced73e2f eCos v1.3.1 merged from eCos master repository on 2000-03-27-23:22:51-BST jlarmour parents: diff changeset	425
82 6736c52df507 Merge from eCos master repository on 2000-04-14-13:35:46-BST jlarmour parents: 76 diff changeset	426 void CProperties::Add(LPCTSTR pszName,int &n)
76 435cced73e2f eCos v1.3.1 merged from eCos master repository on 2000-03-27-23:22:51-BST jlarmour parents: diff changeset	427 {
82 6736c52df507 Merge from eCos master repository on 2000-04-14-13:35:46-BST jlarmour parents: 76 diff changeset	428 CProperty p(pszName,CProperty::Integer,&n);
6736c52df507 Merge from eCos master repository on 2000-04-14-13:35:46-BST jlarmour parents: 76 diff changeset	429 ar.push_back(p);
76 435cced73e2f eCos v1.3.1 merged from eCos master repository on 2000-03-27-23:22:51-BST jlarmour parents: diff changeset	430 }
435cced73e2f eCos v1.3.1 merged from eCos master repository on 2000-03-27-23:22:51-BST jlarmour parents: diff changeset	431
82 6736c52df507 Merge from eCos master repository on 2000-04-14-13:35:46-BST jlarmour parents: 76 diff changeset	432 void CProperties::Add(LPCTSTR pszName,unsigned int &n)
76 435cced73e2f eCos v1.3.1 merged from eCos master repository on 2000-03-27-23:22:51-BST jlarmour parents: diff changeset	433 {
82 6736c52df507 Merge from eCos master repository on 2000-04-14-13:35:46-BST jlarmour parents: 76 diff changeset	434 CProperty p(pszName,CProperty::Integer,&n);
6736c52df507 Merge from eCos master repository on 2000-04-14-13:35:46-BST jlarmour parents: 76 diff changeset	435 ar.push_back(p);
76 435cced73e2f eCos v1.3.1 merged from eCos master repository on 2000-03-27-23:22:51-BST jlarmour parents: diff changeset	436 }
435cced73e2f eCos v1.3.1 merged from eCos master repository on 2000-03-27-23:22:51-BST jlarmour parents: diff changeset	437
82 6736c52df507 Merge from eCos master repository on 2000-04-14-13:35:46-BST jlarmour parents: 76 diff changeset	438 void CProperties::Add(LPCTSTR pszName,bool &b)
76 435cced73e2f eCos v1.3.1 merged from eCos master repository on 2000-03-27-23:22:51-BST jlarmour parents: diff changeset	439 {
82 6736c52df507 Merge from eCos master repository on 2000-04-14-13:35:46-BST jlarmour parents: 76 diff changeset	440 CProperty p(pszName,CProperty::Bool,&b);
6736c52df507 Merge from eCos master repository on 2000-04-14-13:35:46-BST jlarmour parents: 76 diff changeset	441 ar.push_back(p);
76 435cced73e2f eCos v1.3.1 merged from eCos master repository on 2000-03-27-23:22:51-BST jlarmour parents: diff changeset	442 }
435cced73e2f eCos v1.3.1 merged from eCos master repository on 2000-03-27-23:22:51-BST jlarmour parents: diff changeset	443
82 6736c52df507 Merge from eCos master repository on 2000-04-14-13:35:46-BST jlarmour parents: 76 diff changeset	444 void CProperties::Add(LPCTSTR pszName,char &c)
76 435cced73e2f eCos v1.3.1 merged from eCos master repository on 2000-03-27-23:22:51-BST jlarmour parents: diff changeset	445 {
82 6736c52df507 Merge from eCos master repository on 2000-04-14-13:35:46-BST jlarmour parents: 76 diff changeset	446 CProperty p(pszName,CProperty::Char,&c);
6736c52df507 Merge from eCos master repository on 2000-04-14-13:35:46-BST jlarmour parents: 76 diff changeset	447 ar.push_back(p);
76 435cced73e2f eCos v1.3.1 merged from eCos master repository on 2000-03-27-23:22:51-BST jlarmour parents: diff changeset	448 }
435cced73e2f eCos v1.3.1 merged from eCos master repository on 2000-03-27-23:22:51-BST jlarmour parents: diff changeset	449
82 6736c52df507 Merge from eCos master repository on 2000-04-14-13:35:46-BST jlarmour parents: 76 diff changeset	450 void CProperties::Add(LPCTSTR pszName,unsigned char &c)
76 435cced73e2f eCos v1.3.1 merged from eCos master repository on 2000-03-27-23:22:51-BST jlarmour parents: diff changeset	451 {
82 6736c52df507 Merge from eCos master repository on 2000-04-14-13:35:46-BST jlarmour parents: 76 diff changeset	452 CProperty p(pszName,CProperty::Char,&c);
6736c52df507 Merge from eCos master repository on 2000-04-14-13:35:46-BST jlarmour parents: 76 diff changeset	453 ar.push_back(p);
76 435cced73e2f eCos v1.3.1 merged from eCos master repository on 2000-03-27-23:22:51-BST jlarmour parents: diff changeset	454 }
435cced73e2f eCos v1.3.1 merged from eCos master repository on 2000-03-27-23:22:51-BST jlarmour parents: diff changeset	455
82 6736c52df507 Merge from eCos master repository on 2000-04-14-13:35:46-BST jlarmour parents: 76 diff changeset	456 void CProperties::Add(LPCTSTR pszName,short &s)
76 435cced73e2f eCos v1.3.1 merged from eCos master repository on 2000-03-27-23:22:51-BST jlarmour parents: diff changeset	457 {
82 6736c52df507 Merge from eCos master repository on 2000-04-14-13:35:46-BST jlarmour parents: 76 diff changeset	458 CProperty p(pszName,CProperty::Short,&s);
6736c52df507 Merge from eCos master repository on 2000-04-14-13:35:46-BST jlarmour parents: 76 diff changeset	459 ar.push_back(p);
76 435cced73e2f eCos v1.3.1 merged from eCos master repository on 2000-03-27-23:22:51-BST jlarmour parents: diff changeset	460 }
435cced73e2f eCos v1.3.1 merged from eCos master repository on 2000-03-27-23:22:51-BST jlarmour parents: diff changeset	461
82 6736c52df507 Merge from eCos master repository on 2000-04-14-13:35:46-BST jlarmour parents: 76 diff changeset	462 void CProperties::Add(LPCTSTR pszName,unsigned short &s)
76 435cced73e2f eCos v1.3.1 merged from eCos master repository on 2000-03-27-23:22:51-BST jlarmour parents: diff changeset	463 {
82 6736c52df507 Merge from eCos master repository on 2000-04-14-13:35:46-BST jlarmour parents: 76 diff changeset	464 CProperty p(pszName,CProperty::Short,&s);
6736c52df507 Merge from eCos master repository on 2000-04-14-13:35:46-BST jlarmour parents: 76 diff changeset	465 ar.push_back(p);
76 435cced73e2f eCos v1.3.1 merged from eCos master repository on 2000-03-27-23:22:51-BST jlarmour parents: diff changeset	466 }
435cced73e2f eCos v1.3.1 merged from eCos master repository on 2000-03-27-23:22:51-BST jlarmour parents: diff changeset	467
82 6736c52df507 Merge from eCos master repository on 2000-04-14-13:35:46-BST jlarmour parents: 76 diff changeset	468 void CProperties::Add(LPCTSTR pszName,float &f)
76 435cced73e2f eCos v1.3.1 merged from eCos master repository on 2000-03-27-23:22:51-BST jlarmour parents: diff changeset	469 {
82 6736c52df507 Merge from eCos master repository on 2000-04-14-13:35:46-BST jlarmour parents: 76 diff changeset	470 CProperty p(pszName,CProperty::Float,&f);
6736c52df507 Merge from eCos master repository on 2000-04-14-13:35:46-BST jlarmour parents: 76 diff changeset	471 ar.push_back(p);
76 435cced73e2f eCos v1.3.1 merged from eCos master repository on 2000-03-27-23:22:51-BST jlarmour parents: diff changeset	472 }
435cced73e2f eCos v1.3.1 merged from eCos master repository on 2000-03-27-23:22:51-BST jlarmour parents: diff changeset	473
82 6736c52df507 Merge from eCos master repository on 2000-04-14-13:35:46-BST jlarmour parents: 76 diff changeset	474 void CProperties::Add(LPCTSTR pszName,double &f)
76 435cced73e2f eCos v1.3.1 merged from eCos master repository on 2000-03-27-23:22:51-BST jlarmour parents: diff changeset	475 {
82 6736c52df507 Merge from eCos master repository on 2000-04-14-13:35:46-BST jlarmour parents: 76 diff changeset	476 CProperty p(pszName,CProperty::Double,&f);
6736c52df507 Merge from eCos master repository on 2000-04-14-13:35:46-BST jlarmour parents: 76 diff changeset	477 ar.push_back(p);
76 435cced73e2f eCos v1.3.1 merged from eCos master repository on 2000-03-27-23:22:51-BST jlarmour parents: diff changeset	478 }
435cced73e2f eCos v1.3.1 merged from eCos master repository on 2000-03-27-23:22:51-BST jlarmour parents: diff changeset	479
82 6736c52df507 Merge from eCos master repository on 2000-04-14-13:35:46-BST jlarmour parents: 76 diff changeset	480 void CProperties::Add(LPCTSTR pszName,void *pv,unsigned int _nLength)
76 435cced73e2f eCos v1.3.1 merged from eCos master repository on 2000-03-27-23:22:51-BST jlarmour parents: diff changeset	481 {
82 6736c52df507 Merge from eCos master repository on 2000-04-14-13:35:46-BST jlarmour parents: 76 diff changeset	482 CProperty p(pszName,CProperty::Void,pv);
6736c52df507 Merge from eCos master repository on 2000-04-14-13:35:46-BST jlarmour parents: 76 diff changeset	483 p.nLength=_nLength;
6736c52df507 Merge from eCos master repository on 2000-04-14-13:35:46-BST jlarmour parents: 76 diff changeset	484 ar.push_back(p);
76 435cced73e2f eCos v1.3.1 merged from eCos master repository on 2000-03-27-23:22:51-BST jlarmour parents: diff changeset	485 }
435cced73e2f eCos v1.3.1 merged from eCos master repository on 2000-03-27-23:22:51-BST jlarmour parents: diff changeset	486
82 6736c52df507 Merge from eCos master repository on 2000-04-14-13:35:46-BST jlarmour parents: 76 diff changeset	487 void CProperties::Add(LPCTSTR pszName,String &s)
76 435cced73e2f eCos v1.3.1 merged from eCos master repository on 2000-03-27-23:22:51-BST jlarmour parents: diff changeset	488 {
82 6736c52df507 Merge from eCos master repository on 2000-04-14-13:35:46-BST jlarmour parents: 76 diff changeset	489 CProperty p(pszName,CProperty::szString,(void *)&s);
6736c52df507 Merge from eCos master repository on 2000-04-14-13:35:46-BST jlarmour parents: 76 diff changeset	490 ar.push_back(p);
76 435cced73e2f eCos v1.3.1 merged from eCos master repository on 2000-03-27-23:22:51-BST jlarmour parents: diff changeset	491 }
435cced73e2f eCos v1.3.1 merged from eCos master repository on 2000-03-27-23:22:51-BST jlarmour parents: diff changeset	492
435cced73e2f eCos v1.3.1 merged from eCos master repository on 2000-03-27-23:22:51-BST jlarmour parents: diff changeset	493 unsigned long CProperties::CProperty::GetValue() const
435cced73e2f eCos v1.3.1 merged from eCos master repository on 2000-03-27-23:22:51-BST jlarmour parents: diff changeset	494 {
82 6736c52df507 Merge from eCos master repository on 2000-04-14-13:35:46-BST jlarmour parents: 76 diff changeset	495 unsigned long dw;
6736c52df507 Merge from eCos master repository on 2000-04-14-13:35:46-BST jlarmour parents: 76 diff changeset	496 switch(Type){
6736c52df507 Merge from eCos master repository on 2000-04-14-13:35:46-BST jlarmour parents: 76 diff changeset	497 case Integer:
6736c52df507 Merge from eCos master repository on 2000-04-14-13:35:46-BST jlarmour parents: 76 diff changeset	498 dw=(int )pData;
6736c52df507 Merge from eCos master repository on 2000-04-14-13:35:46-BST jlarmour parents: 76 diff changeset	499 break;
6736c52df507 Merge from eCos master repository on 2000-04-14-13:35:46-BST jlarmour parents: 76 diff changeset	500 case Bool:
6736c52df507 Merge from eCos master repository on 2000-04-14-13:35:46-BST jlarmour parents: 76 diff changeset	501 dw=(bool )pData;
6736c52df507 Merge from eCos master repository on 2000-04-14-13:35:46-BST jlarmour parents: 76 diff changeset	502 break;
6736c52df507 Merge from eCos master repository on 2000-04-14-13:35:46-BST jlarmour parents: 76 diff changeset	503 case Char:
6736c52df507 Merge from eCos master repository on 2000-04-14-13:35:46-BST jlarmour parents: 76 diff changeset	504 dw=(char )pData;
6736c52df507 Merge from eCos master repository on 2000-04-14-13:35:46-BST jlarmour parents: 76 diff changeset	505 break;
6736c52df507 Merge from eCos master repository on 2000-04-14-13:35:46-BST jlarmour parents: 76 diff changeset	506 case Short:
6736c52df507 Merge from eCos master repository on 2000-04-14-13:35:46-BST jlarmour parents: 76 diff changeset	507 dw=(short )pData;
6736c52df507 Merge from eCos master repository on 2000-04-14-13:35:46-BST jlarmour parents: 76 diff changeset	508 break;
6736c52df507 Merge from eCos master repository on 2000-04-14-13:35:46-BST jlarmour parents: 76 diff changeset	509 default:
6736c52df507 Merge from eCos master repository on 2000-04-14-13:35:46-BST jlarmour parents: 76 diff changeset	510 dw=0;
6736c52df507 Merge from eCos master repository on 2000-04-14-13:35:46-BST jlarmour parents: 76 diff changeset	511 assert(false);
6736c52df507 Merge from eCos master repository on 2000-04-14-13:35:46-BST jlarmour parents: 76 diff changeset	512 }
6736c52df507 Merge from eCos master repository on 2000-04-14-13:35:46-BST jlarmour parents: 76 diff changeset	513 return dw;
76 435cced73e2f eCos v1.3.1 merged from eCos master repository on 2000-03-27-23:22:51-BST jlarmour parents: diff changeset	514 }
435cced73e2f eCos v1.3.1 merged from eCos master repository on 2000-03-27-23:22:51-BST jlarmour parents: diff changeset	515
435cced73e2f eCos v1.3.1 merged from eCos master repository on 2000-03-27-23:22:51-BST jlarmour parents: diff changeset	516 const String CProperties::CProperty::GetStringValue() const
435cced73e2f eCos v1.3.1 merged from eCos master repository on 2000-03-27-23:22:51-BST jlarmour parents: diff changeset	517 {
82 6736c52df507 Merge from eCos master repository on 2000-04-14-13:35:46-BST jlarmour parents: 76 diff changeset	518 String str;
6736c52df507 Merge from eCos master repository on 2000-04-14-13:35:46-BST jlarmour parents: 76 diff changeset	519 switch(Type){
6736c52df507 Merge from eCos master repository on 2000-04-14-13:35:46-BST jlarmour parents: 76 diff changeset	520 case szString:
6736c52df507 Merge from eCos master repository on 2000-04-14-13:35:46-BST jlarmour parents: 76 diff changeset	521 str=(String )pData;
6736c52df507 Merge from eCos master repository on 2000-04-14-13:35:46-BST jlarmour parents: 76 diff changeset	522 break;
6736c52df507 Merge from eCos master repository on 2000-04-14-13:35:46-BST jlarmour parents: 76 diff changeset	523 case CProperties::CProperty::Integer:
6736c52df507 Merge from eCos master repository on 2000-04-14-13:35:46-BST jlarmour parents: 76 diff changeset	524 case CProperties::CProperty::Bool:
6736c52df507 Merge from eCos master repository on 2000-04-14-13:35:46-BST jlarmour parents: 76 diff changeset	525 case CProperties::CProperty::Char:
6736c52df507 Merge from eCos master repository on 2000-04-14-13:35:46-BST jlarmour parents: 76 diff changeset	526 case CProperties::CProperty::Short:
6736c52df507 Merge from eCos master repository on 2000-04-14-13:35:46-BST jlarmour parents: 76 diff changeset	527 str.Format(_T("%u"),GetValue());
6736c52df507 Merge from eCos master repository on 2000-04-14-13:35:46-BST jlarmour parents: 76 diff changeset	528 break;
6736c52df507 Merge from eCos master repository on 2000-04-14-13:35:46-BST jlarmour parents: 76 diff changeset	529 case CProperties::CProperty::Float:
6736c52df507 Merge from eCos master repository on 2000-04-14-13:35:46-BST jlarmour parents: 76 diff changeset	530 str.Format(_T("%e"),(float )(pData));
6736c52df507 Merge from eCos master repository on 2000-04-14-13:35:46-BST jlarmour parents: 76 diff changeset	531 break;
6736c52df507 Merge from eCos master repository on 2000-04-14-13:35:46-BST jlarmour parents: 76 diff changeset	532 case CProperties::CProperty::Double:
6736c52df507 Merge from eCos master repository on 2000-04-14-13:35:46-BST jlarmour parents: 76 diff changeset	533 str.Format(_T("%e"),(double )(pData));
6736c52df507 Merge from eCos master repository on 2000-04-14-13:35:46-BST jlarmour parents: 76 diff changeset	534 break;
6736c52df507 Merge from eCos master repository on 2000-04-14-13:35:46-BST jlarmour parents: 76 diff changeset	535 case CProperties::CProperty::Void:
6736c52df507 Merge from eCos master repository on 2000-04-14-13:35:46-BST jlarmour parents: 76 diff changeset	536 {
6736c52df507 Merge from eCos master repository on 2000-04-14-13:35:46-BST jlarmour parents: 76 diff changeset	537 unsigned char c=(unsigned char )pData;
6736c52df507 Merge from eCos master repository on 2000-04-14-13:35:46-BST jlarmour parents: 76 diff changeset	538 for(unsigned int i=0;i<nLength;i++){
6736c52df507 Merge from eCos master repository on 2000-04-14-13:35:46-BST jlarmour parents: 76 diff changeset	539 TCHAR buf[3];
6736c52df507 Merge from eCos master repository on 2000-04-14-13:35:46-BST jlarmour parents: 76 diff changeset	540 _tprintf(buf,_T("%02x"),c[i]);
6736c52df507 Merge from eCos master repository on 2000-04-14-13:35:46-BST jlarmour parents: 76 diff changeset	541 str+=buf;
6736c52df507 Merge from eCos master repository on 2000-04-14-13:35:46-BST jlarmour parents: 76 diff changeset	542 }
6736c52df507 Merge from eCos master repository on 2000-04-14-13:35:46-BST jlarmour parents: 76 diff changeset	543 }
6736c52df507 Merge from eCos master repository on 2000-04-14-13:35:46-BST jlarmour parents: 76 diff changeset	544 break;
6736c52df507 Merge from eCos master repository on 2000-04-14-13:35:46-BST jlarmour parents: 76 diff changeset	545 default:
6736c52df507 Merge from eCos master repository on 2000-04-14-13:35:46-BST jlarmour parents: 76 diff changeset	546 break;
6736c52df507 Merge from eCos master repository on 2000-04-14-13:35:46-BST jlarmour parents: 76 diff changeset	547 }
6736c52df507 Merge from eCos master repository on 2000-04-14-13:35:46-BST jlarmour parents: 76 diff changeset	548 return str;
76 435cced73e2f eCos v1.3.1 merged from eCos master repository on 2000-03-27-23:22:51-BST jlarmour parents: diff changeset	549 }
435cced73e2f eCos v1.3.1 merged from eCos master repository on 2000-03-27-23:22:51-BST jlarmour parents: diff changeset	550
435cced73e2f eCos v1.3.1 merged from eCos master repository on 2000-03-27-23:22:51-BST jlarmour parents: diff changeset	551 bool CProperties::CProperty::SetValue(int n)
435cced73e2f eCos v1.3.1 merged from eCos master repository on 2000-03-27-23:22:51-BST jlarmour parents: diff changeset	552 {
82 6736c52df507 Merge from eCos master repository on 2000-04-14-13:35:46-BST jlarmour parents: 76 diff changeset	553 bool rc=true;
6736c52df507 Merge from eCos master repository on 2000-04-14-13:35:46-BST jlarmour parents: 76 diff changeset	554 switch(Type){
6736c52df507 Merge from eCos master repository on 2000-04-14-13:35:46-BST jlarmour parents: 76 diff changeset	555 case Integer:
6736c52df507 Merge from eCos master repository on 2000-04-14-13:35:46-BST jlarmour parents: 76 diff changeset	556 (int )(pData)=n;
6736c52df507 Merge from eCos master repository on 2000-04-14-13:35:46-BST jlarmour parents: 76 diff changeset	557 break;
6736c52df507 Merge from eCos master repository on 2000-04-14-13:35:46-BST jlarmour parents: 76 diff changeset	558 case Bool:
6736c52df507 Merge from eCos master repository on 2000-04-14-13:35:46-BST jlarmour parents: 76 diff changeset	559 (bool )(pData)=(0!=n);
6736c52df507 Merge from eCos master repository on 2000-04-14-13:35:46-BST jlarmour parents: 76 diff changeset	560 break;
6736c52df507 Merge from eCos master repository on 2000-04-14-13:35:46-BST jlarmour parents: 76 diff changeset	561 case Char:
6736c52df507 Merge from eCos master repository on 2000-04-14-13:35:46-BST jlarmour parents: 76 diff changeset	562 (char )(pData)=(char)n; //FIXME: range checks
6736c52df507 Merge from eCos master repository on 2000-04-14-13:35:46-BST jlarmour parents: 76 diff changeset	563 break;
6736c52df507 Merge from eCos master repository on 2000-04-14-13:35:46-BST jlarmour parents: 76 diff changeset	564 case Short:
6736c52df507 Merge from eCos master repository on 2000-04-14-13:35:46-BST jlarmour parents: 76 diff changeset	565 (short )(pData)=(short)n;//FIXME: range checks
6736c52df507 Merge from eCos master repository on 2000-04-14-13:35:46-BST jlarmour parents: 76 diff changeset	566 break;
6736c52df507 Merge from eCos master repository on 2000-04-14-13:35:46-BST jlarmour parents: 76 diff changeset	567 default:
6736c52df507 Merge from eCos master repository on 2000-04-14-13:35:46-BST jlarmour parents: 76 diff changeset	568 TRACE(_T("Failed to set '%s' to integer value '%d'\n"),(LPCTSTR)strName,n);
6736c52df507 Merge from eCos master repository on 2000-04-14-13:35:46-BST jlarmour parents: 76 diff changeset	569 break;
6736c52df507 Merge from eCos master repository on 2000-04-14-13:35:46-BST jlarmour parents: 76 diff changeset	570 }
6736c52df507 Merge from eCos master repository on 2000-04-14-13:35:46-BST jlarmour parents: 76 diff changeset	571 return rc;
76 435cced73e2f eCos v1.3.1 merged from eCos master repository on 2000-03-27-23:22:51-BST jlarmour parents: diff changeset	572 }
435cced73e2f eCos v1.3.1 merged from eCos master repository on 2000-03-27-23:22:51-BST jlarmour parents: diff changeset	573
435cced73e2f eCos v1.3.1 merged from eCos master repository on 2000-03-27-23:22:51-BST jlarmour parents: diff changeset	574 bool CProperties::CProperty::SetValue(double n)
435cced73e2f eCos v1.3.1 merged from eCos master repository on 2000-03-27-23:22:51-BST jlarmour parents: diff changeset	575 {
82 6736c52df507 Merge from eCos master repository on 2000-04-14-13:35:46-BST jlarmour parents: 76 diff changeset	576 bool rc=true;
6736c52df507 Merge from eCos master repository on 2000-04-14-13:35:46-BST jlarmour parents: 76 diff changeset	577 switch(Type){
6736c52df507 Merge from eCos master repository on 2000-04-14-13:35:46-BST jlarmour parents: 76 diff changeset	578 case Double:
6736c52df507 Merge from eCos master repository on 2000-04-14-13:35:46-BST jlarmour parents: 76 diff changeset	579 (float )(pData)=(float)n;//FIXME: range checks?
6736c52df507 Merge from eCos master repository on 2000-04-14-13:35:46-BST jlarmour parents: 76 diff changeset	580 break;
6736c52df507 Merge from eCos master repository on 2000-04-14-13:35:46-BST jlarmour parents: 76 diff changeset	581 case Float:
6736c52df507 Merge from eCos master repository on 2000-04-14-13:35:46-BST jlarmour parents: 76 diff changeset	582 (double )(pData)=n;
6736c52df507 Merge from eCos master repository on 2000-04-14-13:35:46-BST jlarmour parents: 76 diff changeset	583 break;
6736c52df507 Merge from eCos master repository on 2000-04-14-13:35:46-BST jlarmour parents: 76 diff changeset	584 default:
6736c52df507 Merge from eCos master repository on 2000-04-14-13:35:46-BST jlarmour parents: 76 diff changeset	585 TRACE(_T("Failed to set '%s' to double value '%f'\n"),(LPCTSTR)strName,n);
6736c52df507 Merge from eCos master repository on 2000-04-14-13:35:46-BST jlarmour parents: 76 diff changeset	586 rc=false;
6736c52df507 Merge from eCos master repository on 2000-04-14-13:35:46-BST jlarmour parents: 76 diff changeset	587 break;
6736c52df507 Merge from eCos master repository on 2000-04-14-13:35:46-BST jlarmour parents: 76 diff changeset	588 }
6736c52df507 Merge from eCos master repository on 2000-04-14-13:35:46-BST jlarmour parents: 76 diff changeset	589
6736c52df507 Merge from eCos master repository on 2000-04-14-13:35:46-BST jlarmour parents: 76 diff changeset	590 return rc;
76 435cced73e2f eCos v1.3.1 merged from eCos master repository on 2000-03-27-23:22:51-BST jlarmour parents: diff changeset	591 }
435cced73e2f eCos v1.3.1 merged from eCos master repository on 2000-03-27-23:22:51-BST jlarmour parents: diff changeset	592
435cced73e2f eCos v1.3.1 merged from eCos master repository on 2000-03-27-23:22:51-BST jlarmour parents: diff changeset	593 bool CProperties::CProperty::SetValue(LPCTSTR psz)
435cced73e2f eCos v1.3.1 merged from eCos master repository on 2000-03-27-23:22:51-BST jlarmour parents: diff changeset	594 {
82 6736c52df507 Merge from eCos master repository on 2000-04-14-13:35:46-BST jlarmour parents: 76 diff changeset	595 bool rc=false;
6736c52df507 Merge from eCos master repository on 2000-04-14-13:35:46-BST jlarmour parents: 76 diff changeset	596 TCHAR *pEnd;
6736c52df507 Merge from eCos master repository on 2000-04-14-13:35:46-BST jlarmour parents: 76 diff changeset	597 double d=0.0;
6736c52df507 Merge from eCos master repository on 2000-04-14-13:35:46-BST jlarmour parents: 76 diff changeset	598 long l=0;
6736c52df507 Merge from eCos master repository on 2000-04-14-13:35:46-BST jlarmour parents: 76 diff changeset	599 switch(Type){
6736c52df507 Merge from eCos master repository on 2000-04-14-13:35:46-BST jlarmour parents: 76 diff changeset	600 case szString:
6736c52df507 Merge from eCos master repository on 2000-04-14-13:35:46-BST jlarmour parents: 76 diff changeset	601 (String )pData=psz;
6736c52df507 Merge from eCos master repository on 2000-04-14-13:35:46-BST jlarmour parents: 76 diff changeset	602 rc=true;
6736c52df507 Merge from eCos master repository on 2000-04-14-13:35:46-BST jlarmour parents: 76 diff changeset	603 break;
6736c52df507 Merge from eCos master repository on 2000-04-14-13:35:46-BST jlarmour parents: 76 diff changeset	604 case Float:
6736c52df507 Merge from eCos master repository on 2000-04-14-13:35:46-BST jlarmour parents: 76 diff changeset	605 d=_tcstod(psz,&pEnd);
6736c52df507 Merge from eCos master repository on 2000-04-14-13:35:46-BST jlarmour parents: 76 diff changeset	606 rc=(_TCHAR('\0')==*pEnd);
6736c52df507 Merge from eCos master repository on 2000-04-14-13:35:46-BST jlarmour parents: 76 diff changeset	607 if(rc){
6736c52df507 Merge from eCos master repository on 2000-04-14-13:35:46-BST jlarmour parents: 76 diff changeset	608 SetValue((float)d);
6736c52df507 Merge from eCos master repository on 2000-04-14-13:35:46-BST jlarmour parents: 76 diff changeset	609 }
6736c52df507 Merge from eCos master repository on 2000-04-14-13:35:46-BST jlarmour parents: 76 diff changeset	610 break;
6736c52df507 Merge from eCos master repository on 2000-04-14-13:35:46-BST jlarmour parents: 76 diff changeset	611 case Double:
6736c52df507 Merge from eCos master repository on 2000-04-14-13:35:46-BST jlarmour parents: 76 diff changeset	612 d=_tcstod(psz,&pEnd);
6736c52df507 Merge from eCos master repository on 2000-04-14-13:35:46-BST jlarmour parents: 76 diff changeset	613 rc=(_TCHAR('\0')==*pEnd);
6736c52df507 Merge from eCos master repository on 2000-04-14-13:35:46-BST jlarmour parents: 76 diff changeset	614 if(rc){
6736c52df507 Merge from eCos master repository on 2000-04-14-13:35:46-BST jlarmour parents: 76 diff changeset	615 SetValue(d);
6736c52df507 Merge from eCos master repository on 2000-04-14-13:35:46-BST jlarmour parents: 76 diff changeset	616 }
6736c52df507 Merge from eCos master repository on 2000-04-14-13:35:46-BST jlarmour parents: 76 diff changeset	617 break;
6736c52df507 Merge from eCos master repository on 2000-04-14-13:35:46-BST jlarmour parents: 76 diff changeset	618 case Integer:
6736c52df507 Merge from eCos master repository on 2000-04-14-13:35:46-BST jlarmour parents: 76 diff changeset	619 case Bool:
6736c52df507 Merge from eCos master repository on 2000-04-14-13:35:46-BST jlarmour parents: 76 diff changeset	620 case Char:
6736c52df507 Merge from eCos master repository on 2000-04-14-13:35:46-BST jlarmour parents: 76 diff changeset	621 case Short:
6736c52df507 Merge from eCos master repository on 2000-04-14-13:35:46-BST jlarmour parents: 76 diff changeset	622 l=_tcstol(psz,&pEnd,10);
6736c52df507 Merge from eCos master repository on 2000-04-14-13:35:46-BST jlarmour parents: 76 diff changeset	623 rc=(_TCHAR('\0')==*pEnd);
6736c52df507 Merge from eCos master repository on 2000-04-14-13:35:46-BST jlarmour parents: 76 diff changeset	624 if(rc){
6736c52df507 Merge from eCos master repository on 2000-04-14-13:35:46-BST jlarmour parents: 76 diff changeset	625 SetValue((int)l);
6736c52df507 Merge from eCos master repository on 2000-04-14-13:35:46-BST jlarmour parents: 76 diff changeset	626 }
6736c52df507 Merge from eCos master repository on 2000-04-14-13:35:46-BST jlarmour parents: 76 diff changeset	627 break;
6736c52df507 Merge from eCos master repository on 2000-04-14-13:35:46-BST jlarmour parents: 76 diff changeset	628 default:
6736c52df507 Merge from eCos master repository on 2000-04-14-13:35:46-BST jlarmour parents: 76 diff changeset	629 TRACE(_T("Failed to set '%s' to string value '%s'\n"),(LPCTSTR)strName,psz);
6736c52df507 Merge from eCos master repository on 2000-04-14-13:35:46-BST jlarmour parents: 76 diff changeset	630 break;
6736c52df507 Merge from eCos master repository on 2000-04-14-13:35:46-BST jlarmour parents: 76 diff changeset	631 }
6736c52df507 Merge from eCos master repository on 2000-04-14-13:35:46-BST jlarmour parents: 76 diff changeset	632 return rc;
76 435cced73e2f eCos v1.3.1 merged from eCos master repository on 2000-03-27-23:22:51-BST jlarmour parents: diff changeset	633 }
435cced73e2f eCos v1.3.1 merged from eCos master repository on 2000-03-27-23:22:51-BST jlarmour parents: diff changeset	634

Mercurial > ecos

annotate host/tools/Utils/common/Properties.cpp @ 3283:355bcd2cec54