Rooba
/
boinc
mirror of https://github.com/BOINC/boinc.git
1
0
Fork 0
Code Issues 1 Packages Projects Releases Wiki Activity

- client: fix bugs related to white space around code signing keys 

- win compile fixes

svn path=/trunk/boinc/; revision=24095
This commit is contained in:
David Anderson 2011-08-31 16:36:17 +00:00
parent 9bbbb3ea38
commit c0f977b19c
6 changed files with 25 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
api/boinc_opencl.cpp
View File

@ -184,7 +184,7 @@ int boinc_get_opencl_ids(
#ifdef _WIN32
try {
retval = boinc_get_opencl_ids_aux(type, device_num, &ref);
retval = boinc_get_opencl_ids_aux(type, device_num, device, platform);
}
catch (...) {
return ERR_SIGNAL_CATCH;

13
checkin_notes
View File

@ -5371,3 +5371,16 @@ David 31 Aug 2011
api/
boinc_opencl.cpp,h
David 31 Aug 2011
- client: fix bugs related to white space around code signing keys
- win compile fixes
api/
boinc_opencl.cpp
client/
client_types.cpp
cs_scheduler.cpp
scheduler_op.cpp
win_build/
libboincapi_staticrt.vcproj

2
client/client_types.cpp
View File

@ -515,7 +515,7 @@ int PROJECT::write_state(MIOFILE& out, bool gui_rpc) {
}
if (strlen(code_sign_key)) {
out.printf(
" <code_sign_key>\n%s</code_sign_key>\n", code_sign_key
" <code_sign_key>\n%s\n</code_sign_key>\n", code_sign_key
);
}
}

2
client/cs_scheduler.cpp
View File

@ -144,7 +144,7 @@ int CLIENT_STATE::make_scheduler_request(PROJECT* p) {
write_platforms(p, mf);
if (strlen(p->code_sign_key)) {
fprintf(f, " <code_sign_key>\n%s</code_sign_key>\n", p->code_sign_key);
fprintf(f, " <code_sign_key>\n%s\n</code_sign_key>\n", p->code_sign_key);
}
// send working prefs

2
client/scheduler_op.cpp
View File

@ -704,7 +704,6 @@ int SCHEDULER_REPLY::parse(FILE* in, PROJECT* project) {
return retval;
}
project->gui_urls = "<gui_urls>\n"+foo+"</gui_urls>\n";
continue;
} else if (xp.match_tag("code_sign_key")) {
retval = dup_element_contents(
xp.f->f,
@ -718,6 +717,7 @@ int SCHEDULER_REPLY::parse(FILE* in, PROJECT* project) {
);
return ERR_XML_PARSE;
}
strip_whitespace(code_sign_key);
} else if (xp.match_tag("code_sign_key_signature")) {
retval = dup_element_contents(
xp.f->f,

8
win_build/libboincapi_staticcrt.vcproj
View File

@ -358,6 +358,10 @@
/>
</FileConfiguration>
</File>
<File
RelativePath="..\api\boinc_opencl.cpp"
>
</File>
<File
RelativePath="..\lib\boinc_win.cpp"
>
@ -452,6 +456,10 @@
RelativePath="..\api\boinc_api.h"
>
</File>
<File
RelativePath="..\api\boinc_opencl.h"
>
</File>
</Filter>
</Files>
<Globals>