The Giants are expected to announce a two-year contract with shortstop Edgar Renteria on Thursday. A deal appears to be done after Renteria underwent a Giants' physical Wednesday.