It was slightly different from the book in both of those instances but not as different as many other scenes were.
By modern western feminist standards, both scenes would be rape even in the book though.
In the books; Daenerys cried before having sex and did not even want to be married to Drogo. Like in the books; in the show Daenerys was never happy with sex until she crawled on top.
The biggest difference between the books and show in the "sex on Joffrey's funeral" is that in the book this was when Jaime had just returned home from being a prisoner rather than in the show where he'd been home for a while and even at the wedding (which he wasn't in the books). In the book Cersei resisted and told him "no" up until he laid her out and started doing it to her. Then she gave in.
Regardless, let's not act like slave-rape isn't a common occurrence in the books. When people talk about how filthy and porno-like the show is, I tell them it's nothing compared to the books.