diff options
| author |  bungeman@google.com <bungeman@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2011-09-16 15:37:20 +0000 |
|---|---|---|
| committer | bungeman@google.com <bungeman@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2011-09-16 15:37:20 +0000 |
| commit | 2e2f3f58b5b0599c776f20bb55845d3e6005a01c (patch) | |
| tree | d58e01b53acf144c01a11680f627afc192a8aa3c /src/utils/win | |
| parent | e5a438b8d7400bf43c1d6d98fdb6df42d1a3b479 (diff) | |
Update SkCoInitialize to better match spec.
http://codereview.appspot.com/5036044/
git-svn-id: http://skia.googlecode.com/svn/trunk@2274 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'src/utils/win')
| -rw-r--r-- | src/utils/win/SkAutoCoInitialize.cpp | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/utils/win/SkAutoCoInitialize.cpp b/src/utils/win/SkAutoCoInitialize.cpp index 460606bb1d..dd6e9368d6 100644 --- a/src/utils/win/SkAutoCoInitialize.cpp +++ b/src/utils/win/SkAutoCoInitialize.cpp @@ -12,16 +12,18 @@ #include <ole2.h> #include "SkAutoCoInitialize.h" -AutoCoInitialize::AutoCoInitialize() : +SkAutoCoInitialize::SkAutoCoInitialize() : fHR( CoInitializeEx(NULL, COINIT_APARTMENTTHREADED | COINIT_DISABLE_OLE1DDE) ) { } -AutoCoInitialize::~AutoCoInitialize() { +SkAutoCoInitialize::~SkAutoCoInitialize() { if (SUCCEEDED(this->fHR)) { CoUninitialize(); } } -HRESULT AutoCoInitialize::getHR() { return this->fHR; } +bool SkAutoCoInitialize::succeeded() { + return SUCCEEDED(this->fHR) || RPC_E_CHANGED_MODE == this->fHR; +} |