dimmus
/
efl
forked from enlightenment/efl
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ecore_win32: don't fail if OleInitialize() had been called before.

This commit is contained in:
Adrien Nader 2015-04-18 17:24:53 +02:00 committed by Cedric BAIL
parent 963fe509ca
commit 7b3332ddf4
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/lib/ecore_win32/ecore_win32_dnd.c
View File

@ -61,14 +61,20 @@ static HANDLE DataToHandle(const char *data, int size)
EAPI int EAPI int
ecore_win32_dnd_init() ecore_win32_dnd_init()
{ {
HRESULT res;
if (_ecore_win32_dnd_init_count > 0) if (_ecore_win32_dnd_init_count > 0)
{ {
_ecore_win32_dnd_init_count++; _ecore_win32_dnd_init_count++;
return _ecore_win32_dnd_init_count; return _ecore_win32_dnd_init_count;
} }
if (OleInitialize(NULL) != S_OK) res = OleInitialize(NULL);
return 0; if ((res != S_OK) && (res != S_FALSE))
{
EINA_LOG_ERR("OleInitialize(NULL) returned %ld.", (long) res);
return 0;
}
_ecore_win32_dnd_init_count++; _ecore_win32_dnd_init_count++;