diff --git a/source/Registry.h b/source/Registry.h index a9f2b990..62defc4d 100644 --- a/source/Registry.h +++ b/source/Registry.h @@ -7,3 +7,5 @@ BOOL RegLoadString (LPCTSTR,LPCTSTR,BOOL,LPTSTR,DWORD); BOOL RegLoadValue (LPCTSTR,LPCTSTR,BOOL,DWORD *); void RegSaveString (LPCTSTR,LPCTSTR,BOOL,LPCTSTR); void RegSaveValue (LPCTSTR,LPCTSTR,BOOL,DWORD); + +BOOL RegLoadValue (LPCTSTR,LPCTSTR,BOOL,BOOL *); diff --git a/source/linux/configuration.cpp b/source/linux/configuration.cpp index 5403d62d..85ed96b7 100644 --- a/source/linux/configuration.cpp +++ b/source/linux/configuration.cpp @@ -68,13 +68,13 @@ BOOL RegLoadString (LPCTSTR section, LPCTSTR key, BOOL peruser, strncpy(buffer, s.c_str(), chars); buffer[chars - 1] = 0; result = TRUE; + LogFileOutput("RegLoadString: %s - %s = %s\n", section, key, buffer); } catch (const std::exception & e) { result = FALSE; + LogFileOutput("RegLoadString: %s - %s = ??\n", section, key); } - - LogFileOutput("RegLoadString: %s - %s = %s\n", section, key, buffer); return result; } @@ -85,13 +85,30 @@ BOOL RegLoadValue (LPCTSTR section, LPCTSTR key, BOOL peruser, DWORD *value) { *value = Configuration::instance->getValue(section, key); result = TRUE; + LogFileOutput("RegLoadValue: %s - %s = %d\n", section, key, *value); } catch (const std::exception & e) { result = FALSE; + LogFileOutput("RegLoadValue: %s - %s = ??\n", section, key); } + return result; +} - LogFileOutput("RegLoadValue: %s - %s = %d\n", section, key, *value); +BOOL RegLoadValue (LPCTSTR section, LPCTSTR key, BOOL peruser, BOOL *value) +{ + BOOL result; + try + { + *value = Configuration::instance->getValue(section, key); + result = TRUE; + LogFileOutput("RegLoadValue: %s - %s = %d\n", section, key, *value); + } + catch (const std::exception & e) + { + result = FALSE; + LogFileOutput("RegLoadValue: %s - %s = ??\n", section, key); + } return result; } diff --git a/source/linux/data.cpp b/source/linux/data.cpp index 40fcb363..a8153bdb 100644 --- a/source/linux/data.cpp +++ b/source/linux/data.cpp @@ -182,19 +182,18 @@ void LoadConfiguration(void) #endif REGLOAD(TEXT(REGVALUE_EMULATION_SPEED) ,&g_dwSpeed); - DWORD dwTmp; - REGLOAD(TEXT(REGVALUE_ENHANCE_DISK_SPEED), &dwTmp); - enhancedisk = dwTmp; + REGLOAD(TEXT(REGVALUE_ENHANCE_DISK_SPEED), &enhancedisk); #if 0 Config_Load_Video(); - REGLOAD(TEXT("Uthernet Active"), &dwTmp); - tfe_enabled = dwTmp; + REGLOAD(TEXT("Uthernet Active"), &tfe_enabled); #endif SetCurrentCLK6502(); // + DWORD dwTmp; + #if 0 if(REGLOAD(TEXT(REGVALUE_THE_FREEZES_F8_ROM), &dwTmp)) sg_PropertySheet.SetTheFreezesF8Rom(dwTmp);