jeena/telldus
1
0
Fork 0
Code Issues Pull requests Projects Packages Wiki Activity Actions

Added TelldusSettings::getStringSetting() and TelldusSettings::setStringSetting() in TelldusSettingsWinRegistry.

Browse source 
With this the Windows and Linux port can reuse most of the logic.
This commit is contained in:
Micke Prag 2008-03-02 17:33:33 +00:00
parent 858c772c12
commit e6e6eaaaf3
5 changed files with 107 additions and 249 deletions
Download patch file Download diff file Expand all files Collapse all files

10
driver/TellUsbD101/TellUsbD101.cpp
View file

@ -218,9 +218,9 @@ bool WINAPI devSetModel(int intDeviceId, char* strNewModel){
return blnSuccess; return blnSuccess;
} }
/*bool WINAPI devSetArguments(int intDeviceId, char* strArguments){ bool WINAPI devSetArguments(int intDeviceId, char* strArguments){
return false;
vector <int> vArguments; /* vector <int> vArguments;
//int intArguments[] = new int[]; //bort? //int intArguments[] = new int[]; //bort?
try{ try{
char* strTemp = strtok(strArguments, ","); char* strTemp = strtok(strArguments, ",");
@ -235,8 +235,8 @@ bool WINAPI devSetModel(int intDeviceId, char* strNewModel){
catch(exception e){ catch(exception e){
handleException(e); handleException(e);
return false; return false;
} }*/
}*/ }
int WINAPI devGetArgument(int intDeviceId, int intArgumentIndex){ int WINAPI devGetArgument(int intDeviceId, int intArgumentIndex){
int intReturn; int intReturn;

2
driver/TellUsbD101/TellUsbD101.def
View file

@ -12,7 +12,7 @@ EXPORTS
devSetName @8 devSetName @8
devSetVendor @9 devSetVendor @9
devSetModel @10 devSetModel @10
; devSetArguments @11 devSetArguments @11
devAddDevice @12 devAddDevice @12
devRemoveDevice @13 devRemoveDevice @13

43
driver/TellUsbD101/settings/TelldusSettings.cpp
View file

@ -34,3 +34,46 @@ Device* TelldusSettings::getDevice(int intDeviceId, int intDongleIndex){
} }
return dev; return dev;
} }
/*
* Get the name of the device
*/
char* TelldusSettings::getName(int intDeviceId){
return getStringSetting(intDeviceId, "name");
}
/*
* Set the name of the device
*/
bool TelldusSettings::setName(int intDeviceId, char* strNewName){
return setStringSetting(intDeviceId, "name", strNewName);
}
/*
* Get the device vendor
*/
char* TelldusSettings::getVendor(int intDeviceId){
return getStringSetting(intDeviceId, "vendor");
}
/*
* Set the device vendor
*/
bool TelldusSettings::setVendor(int intDeviceId, char* strVendor){
return setStringSetting(intDeviceId, "vendor", strVendor);
}
/*
* Get the device model
*/
char* TelldusSettings::getModel(int intDeviceId){
return getStringSetting(intDeviceId, "model");
}
/*
* Set the device model
*/
bool TelldusSettings::setModel(int intDeviceId, char* strModel){
return setStringSetting(intDeviceId, "model", strModel);
}

47
driver/TellUsbD101/settings/TelldusSettingsConfuse.cpp
View file

@ -60,53 +60,6 @@ Device* TelldusSettings::getDevice(int intDeviceId){
return NULL; return NULL;
} }
/*
* Get the name of the device
*/
char* TelldusSettings::getName(int intDeviceId){
return getStringSetting(intDeviceId, "name");
}
/*
* Set the name of the device
*/
bool TelldusSettings::setName(int intDeviceId, char* strNewName){
bool blnSuccess = true;
setStringSetting(intDeviceId, "name", strNewName);
return blnSuccess;
}
/*
* Get the device vendor
*/
char* TelldusSettings::getVendor(int intDeviceId){
return getStringSetting(intDeviceId, "vendor");
}
/*
* Set the device vendor
*/
bool TelldusSettings::setVendor(int intDeviceId, char* strVendor){
bool blnSuccess = true;
setStringSetting(intDeviceId, "vendor", strVendor);
return blnSuccess;
}
/*
* Get the device model
*/
char* TelldusSettings::getModel(int intDeviceId){
return getStringSetting(intDeviceId, "model");
}
/*
* Set the device model
*/
bool TelldusSettings::setModel(int intDeviceId, char* strVendor){
bool blnSuccess = true;
setStringSetting(intDeviceId, "model", strVendor);
return blnSuccess;
}
int TelldusSettings::getDeviceId(int intDeviceIndex){ int TelldusSettings::getDeviceId(int intDeviceIndex){
if (intDeviceIndex >= getNumberOfDevices()) { //Out of bounds if (intDeviceIndex >= getNumberOfDevices()) { //Out of bounds

254
driver/TellUsbD101/settings/TelldusSettingsWinRegistry.cpp
View file

@ -90,202 +90,6 @@ Device* TelldusSettings::getDevice(int intDeviceId){
} }
} }
/*
* Get the name of the device
*/
char* TelldusSettings::getName(int intDeviceId){
char* strReturn = "";
try{
std::ostringstream ssRegPath;
ssRegPath << d->strRegPathDevice << intDeviceId;
string strCompleteRegPath = ssRegPath.str();
long lnExists = RegOpenKeyEx(HKEY_CURRENT_USER, strCompleteRegPath.c_str(), 0, KEY_QUERY_VALUE, &d->hk);
if(lnExists == ERROR_SUCCESS){
DWORD dwLength;
char* Buff = new char[d->intMaxRegValueLength];
long lngStatus = RegQueryValueEx(d->hk, "Name", NULL, NULL, (LPBYTE)Buff, &dwLength);
if(lngStatus == ERROR_MORE_DATA){
Buff = new char[dwLength];
lngStatus = RegQueryValueEx(d->hk, "Name", NULL, NULL, (LPBYTE)Buff, &dwLength);
}
strReturn = Buff;
}
else{
throw exception(); //couldn't open reg key
}
RegCloseKey(d->hk);
}
catch(...){
strReturn = "";
}
return strReturn;
}
/*
* Set the name of the device
*/
bool TelldusSettings::setName(int intDeviceId, char* strNewName){
bool blnSuccess = true;
try{
std::ostringstream ssRegPath;
ssRegPath << d->strRegPathDevice << intDeviceId;
string strCompleteRegPath = ssRegPath.str();
long lnExists = RegOpenKeyEx(HKEY_CURRENT_USER, strCompleteRegPath.c_str(), 0, KEY_WRITE, &d->hk);
if(lnExists == ERROR_SUCCESS){
d->intMaxRegValueLength = (int)strlen(strNewName);
RegSetValueEx(d->hk, "Name", 0, REG_SZ, (LPBYTE)strNewName, d->intMaxRegValueLength);
}
else{
throw exception(); //couldn't open reg key
}
RegCloseKey(d->hk);
}
catch(...){
blnSuccess = false;
}
return blnSuccess;
}
/*
* Get the device vendor
*/
char* TelldusSettings::getVendor(int intDeviceId){
char* strReturn = "";
try{
std::ostringstream ssRegPath;
ssRegPath << d->strRegPathDevice << intDeviceId;
string strCompleteRegPath = ssRegPath.str();
long lnExists = RegOpenKeyEx(HKEY_CURRENT_USER, (LPCSTR)strCompleteRegPath.c_str(), 0, KEY_QUERY_VALUE, &d->hk);
if(lnExists == ERROR_SUCCESS){
DWORD dwLength;
char* Buff = new char[d->intMaxRegValueLength];
long lngStatus = RegQueryValueEx(d->hk, (LPCSTR)"Vendor", NULL, NULL, (LPBYTE)Buff, &dwLength);
if(lngStatus == ERROR_MORE_DATA){
Buff = new char[dwLength];
lngStatus = RegQueryValueEx(d->hk, (LPCSTR)"Vendor", NULL, NULL, (LPBYTE)Buff, &dwLength);
}
strReturn = Buff;
}
else{
throw exception(); //couldn't open reg key
}
RegCloseKey(d->hk);
}
catch(exception e){
strReturn = "";
ofstream errorfile("c:\\errorlog.txt", ios::app);
if(errorfile){
errorfile << e.what() << endl;
errorfile.close();
}
}
return strReturn;
}
/*
* Set the device vendor
*/
bool TelldusSettings::setVendor(int intDeviceId, char* strVendor){
bool blnSuccess = true;
try{
std::ostringstream ssRegPath;
ssRegPath << d->strRegPathDevice << intDeviceId;
string strCompleteRegPath = ssRegPath.str();
long lnExists = RegOpenKeyEx(HKEY_CURRENT_USER, strCompleteRegPath.c_str(), 0, KEY_WRITE, &d->hk);
if(lnExists == ERROR_SUCCESS){
d->intMaxRegValueLength = (int)strlen(strVendor);
RegSetValueEx(d->hk, "Vendor", 0, REG_SZ, (LPBYTE)strVendor, d->intMaxRegValueLength);
}
else{
throw exception(); //couldn't open reg key
}
RegCloseKey(d->hk);
}
catch(...){
blnSuccess = false;
}
return blnSuccess;
}
/*
* Get the device model
*/
char* TelldusSettings::getModel(int intDeviceId){
char* strReturn = "";
try{
std::ostringstream ssRegPath;
ssRegPath << d->strRegPathDevice << intDeviceId;
string strCompleteRegPath = ssRegPath.str();
long lnExists = RegOpenKeyEx(HKEY_CURRENT_USER, strCompleteRegPath.c_str(), 0, KEY_QUERY_VALUE, &d->hk);
if(lnExists == ERROR_SUCCESS){
DWORD dwLength;
char* Buff = new char[d->intMaxRegValueLength];
long lngStatus = RegQueryValueEx(d->hk, "Model", NULL, NULL, (LPBYTE)Buff, &dwLength);
if(lngStatus == ERROR_MORE_DATA){
Buff = new char[dwLength];
lngStatus = RegQueryValueEx(d->hk, "Model", NULL, NULL, (LPBYTE)Buff, &dwLength);
}
strReturn = Buff;
}
else{
throw exception(); //couldn't open reg key
}
RegCloseKey(d->hk);
}
catch(...){
strReturn = "";
}
return strReturn;
}
/*
* Set the device model
*/
bool TelldusSettings::setModel(int intDeviceId, char* strVendor){
bool blnSuccess = true;
try{
std::ostringstream ssRegPath;
ssRegPath << d->strRegPathDevice << intDeviceId;
string strCompleteRegPath = ssRegPath.str();
long lnExists = RegOpenKeyEx(HKEY_CURRENT_USER, strCompleteRegPath.c_str(), 0, KEY_WRITE, &d->hk);
if(lnExists == ERROR_SUCCESS){
d->intMaxRegValueLength = (int)strlen(strVendor);
RegSetValueEx(d->hk, "Model", 0, REG_SZ, (LPBYTE)strVendor, d->intMaxRegValueLength);
}
else{
throw exception(); //couldn't open reg key
}
RegCloseKey(d->hk);
}
catch(...){
blnSuccess = false;
}
return blnSuccess;
}
int TelldusSettings::getDeviceId(int intDeviceIndex){ int TelldusSettings::getDeviceId(int intDeviceIndex){
int intReturn = -1; int intReturn = -1;
@ -586,6 +390,64 @@ bool TelldusSettings::removeDevice(int intDeviceId){
return blnSuccess; return blnSuccess;
} }
char *TelldusSettings::getStringSetting(int intDeviceId, const char* name) {
char* strReturn = "";
try{
std::ostringstream ssRegPath;
ssRegPath << d->strRegPathDevice << intDeviceId;
string strCompleteRegPath = ssRegPath.str();
long lnExists = RegOpenKeyEx(HKEY_CURRENT_USER, strCompleteRegPath.c_str(), 0, KEY_QUERY_VALUE, &d->hk);
if(lnExists == ERROR_SUCCESS){
DWORD dwLength;
char* Buff = new char[d->intMaxRegValueLength];
long lngStatus = RegQueryValueEx(d->hk, name, NULL, NULL, (LPBYTE)Buff, &dwLength);
if(lngStatus == ERROR_MORE_DATA){
Buff = new char[dwLength];
lngStatus = RegQueryValueEx(d->hk, name, NULL, NULL, (LPBYTE)Buff, &dwLength);
}
strReturn = Buff;
}
else{
throw exception(); //couldn't open reg key
}
RegCloseKey(d->hk);
}
catch(...){
strReturn = "";
}
return strReturn;
}
bool TelldusSettings::setStringSetting(int intDeviceId, const char* name, const char *value) {
bool blnSuccess = true;
try{
std::ostringstream ssRegPath;
ssRegPath << d->strRegPathDevice << intDeviceId;
string strCompleteRegPath = ssRegPath.str();
long lnExists = RegOpenKeyEx(HKEY_CURRENT_USER, strCompleteRegPath.c_str(), 0, KEY_WRITE, &d->hk);
if(lnExists == ERROR_SUCCESS){
d->intMaxRegValueLength = (int)strlen(value);
RegSetValueEx(d->hk, name, 0, REG_SZ, (LPBYTE)value, d->intMaxRegValueLength);
}
else{
throw exception(); //couldn't open reg key
}
RegCloseKey(d->hk);
}
catch(...){
blnSuccess = false;
}
return blnSuccess;
}
//only for debug reasons //only for debug reasons
void TelldusSettings::debugLog(char* debugstring){ void TelldusSettings::debugLog(char* debugstring){
ofstream debugfile("c:\\telldusdebug.txt", ios::app); ofstream debugfile("c:\\telldusdebug.txt", ios::app);