advapi32: add HKCU\Software\Classes and HKLM\Software\Classes merge tests (try 3)

[testbot at testbot.winehq.org]

Hi,

While running your changed tests on Windows, I think I found new failures.
Being a bot and all I'm not very good at pattern recognition, so I might be
wrong, but could you please double-check?
Full results can be found at
http://testbot.winehq.org/JobDetails.pl?Key=2512

Your paranoid android.


=== W2KPROSP4 (32 bit registry) ===
No test summary line found

=== WXPPROSP3 (32 bit registry) ===
Timeout