French President Emmanuel Macron says his country will be fighting the virus until at least the middle of next year as cases there surged past a million.