Vortex matter in mesoscopic superconducting disks and rings