summaryrefslogtreecommitdiff
path: root/src/lib/ecore_win32
diff options
context:
space:
mode:
authorAdrien Nader <adrien@notk.org>2015-04-18 17:24:53 +0200
committerCedric BAIL <cedric@osg.samsung.com>2015-04-18 17:24:53 +0200
commit7b3332ddf40e388901ef145cfbdafb265b44b103 (patch)
tree491e2d9ce897eb6f40382c52fcc9558239ee81df /src/lib/ecore_win32
parent963fe509ca1acc5bef1585bb65e8264a5036697a (diff)
ecore_win32: don't fail if OleInitialize() had been called before.
Diffstat (limited to 'src/lib/ecore_win32')
-rwxr-xr-xsrc/lib/ecore_win32/ecore_win32_dnd.c14
1 files changed, 10 insertions, 4 deletions
diff --git a/src/lib/ecore_win32/ecore_win32_dnd.c b/src/lib/ecore_win32/ecore_win32_dnd.c
index 6c5253ae20..a99d26c524 100755
--- a/src/lib/ecore_win32/ecore_win32_dnd.c
+++ b/src/lib/ecore_win32/ecore_win32_dnd.c
@@ -61,14 +61,20 @@ static HANDLE DataToHandle(const char *data, int size)
61EAPI int 61EAPI int
62ecore_win32_dnd_init() 62ecore_win32_dnd_init()
63{ 63{
64 HRESULT res;
65
64 if (_ecore_win32_dnd_init_count > 0) 66 if (_ecore_win32_dnd_init_count > 0)
65 { 67 {
66 _ecore_win32_dnd_init_count++; 68 _ecore_win32_dnd_init_count++;
67 return _ecore_win32_dnd_init_count; 69 return _ecore_win32_dnd_init_count;
68 } 70 }
69 71
70 if (OleInitialize(NULL) != S_OK) 72 res = OleInitialize(NULL);
71 return 0; 73 if ((res != S_OK) && (res != S_FALSE))
74 {
75 EINA_LOG_ERR("OleInitialize(NULL) returned %ld.", (long) res);
76 return 0;
77 }
72 78
73 _ecore_win32_dnd_init_count++; 79 _ecore_win32_dnd_init_count++;
74 80