Emmanuel Macron has said a peace deal with Russia "must not mean a surrender of Ukraine" - as Donald Trump claimed Vladimir Putin's forces "want to end this war".