Yu's post was correct

You just need to show both your Canadian passport and Chinese passport with the original H-1 visa and I 797 (a must). Then they will issue you a new I-94 at the airport according to the expire time on your orignal I797 when you come back to US. Of course the old I-94 on your Chinese passport will be taken away when you leave US. I had the same experience last year.