so many special cases...

in-depth testing and fixing... expect more (e.g. CVWidgtMS still not
solved properly)

Signed-off-by:  <st9fan@gmail.com>