?
In the past couple years they created a cross platform multi-vendor open standard for GPU computing, they took a big risk by launching the iPhone without support for flash and have continued to be basically the only major company giving adobe any pressure to improve its shit-tastic platform, they have (granted extremely slowly) improved their iPhone development program from basically non-existant to acceptable in a sadistic way (and if the trend continues it might actually be good within a year or two), they mostly got rid of DRM from iTunes, and most recently they opened up their SDK for making the iTunes LP things (which will likely be of importance when (if ever) the iTablet/iSlate comes out).
The only two (somewhat related) things Apple does that I would classify as vendor lock-in are 1: XCode, and therefore OS X, is required for iPhone development, and 2: You need a Mac to run OS X. I would consider these to be more of an issue if Apple preemptively put a stop to #2 through activation checks or some WGA-esque program, but they don't. As long as you aren't going around selling preinstalled copies of OS X on non-Apple hardware, Apple could seemingly care less.
Microsoft in recent history hasn't been bad either, they still have WGA, and there was the whole OOXML thing, but other than those two things I can't think of anything they have done that has caused an e-uproar. Personally I would put the two (Apple and MS) roughly equal to each other in terms of Evil.