The Sinbad Chronicles: Sailing to Atlantis

Cynthia Lee Mariner is an ace windsurfer, who meets the geni, who appears out of a strange bottle.

Her first wish is to sail the seven seas; in her subsequent travels with the geni, she meets a grumpy magic carpet, and is invited to visit Atlantis.