You are correct.
Homologous structures can be of different structure but same ancestral origin. For example, bat wings, whale fins, and the human hand all have similar skeletal structure, a result of having the same vertebrate ancestor. Chimpanzee hands and human hands look pretty similar and they come from the same ancestor, so these are homologous structures too.
Analogous structures are ones that are similar but of different ancestral origin. For example, bat and butterfly wings are similar in that they are very large and are used for flight; however, they are clearly not the same in origin and arised at different times during evolution. Analogous structures are examples of convergent evolution.