From 5d97d4546df3c45641722c5e6117b629d92eb80f Mon Sep 17 00:00:00 2001 From: David Anderson Date: Mon, 19 Mar 2007 23:00:46 +0000 Subject: [PATCH] *** empty log message *** svn path=/trunk/boinc/; revision=12248 --- checkin_notes | 8 ++++++++ client/hostinfo_win.C | 9 ++++++--- win_build/boinc_cli_curl.vcproj | 26 +------------------------- 3 files changed, 15 insertions(+), 28 deletions(-) diff --git a/checkin_notes b/checkin_notes index 420e91309f..77c0f1fc59 100755 --- a/checkin_notes +++ b/checkin_notes @@ -2648,3 +2648,11 @@ David 19 Mar 2007 lib/ boinc_cmd.C prefs.C,h + +David 19 Mar 2007 + - compile fixes + + client/ + hostinfo_win.C + win_build/ + boinc_cli_curl.vcproj diff --git a/client/hostinfo_win.C b/client/hostinfo_win.C index 99a4d40095..4147a6c9ba 100644 --- a/client/hostinfo_win.C +++ b/client/hostinfo_win.C @@ -461,7 +461,8 @@ BOOL is_processor_feature_supported(DWORD feature) { // the processor, use the Linux CPU processor feature descriptions. // int get_processor_info( - char* p_vendor, int p_vendor_size, char* p_model, int p_model_size + char* p_vendor, int p_vendor_size, char* p_model, int p_model_size, + char* p_features, int p_features_size ) { char vendorName[256], processorName[256], identifierName[256], capabilities[256], temp_model[256]; @@ -564,7 +565,7 @@ int get_processor_info( // Merge all the seperate pieces of information into one. snprintf(p_model, p_model_size, "%s [%s] [%s]", temp_model, identifierName); p_model[p_model_size-1] = 0; - strlcpy(p_features, sizeof(p_features), capabilities); + strlcpy(p_features, capabilities, p_features_size); RegCloseKey(hKey); @@ -641,7 +642,9 @@ int HOST_INFO::get_host_info() { // Detect proccessor make and model. get_processor_info( - p_vendor, sizeof(p_vendor), p_model, sizeof(p_model) + p_vendor, sizeof(p_vendor), + p_model, sizeof(p_model), + p_features, sizeof(p_features) ); // Detect the number of CPUs diff --git a/win_build/boinc_cli_curl.vcproj b/win_build/boinc_cli_curl.vcproj index 1cdc0a36c4..aaa2032428 100644 --- a/win_build/boinc_cli_curl.vcproj +++ b/win_build/boinc_cli_curl.vcproj @@ -667,32 +667,8 @@ > - - - - - -