OSDN Git Service
(root)
/
winmerge-jp
/
winmerge-jp.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
3826ff8
)
Fix to properly initialize OLE for Crystal Edit drag and drop
author
Dennis Lim
<dlkj@users.sourceforge.net>
Wed, 9 May 2001 12:48:53 +0000
(12:48 +0000)
committer
Dennis Lim
<dlkj@users.sourceforge.net>
Wed, 9 May 2001 12:48:53 +0000
(12:48 +0000)
Src/Merge.cpp
patch
|
blob
|
history
diff --git
a/Src/Merge.cpp
b/Src/Merge.cpp
index
d387e4a
..
4aad870
100644
(file)
--- a/
Src/Merge.cpp
+++ b/
Src/Merge.cpp
@@
-90,7
+90,11
@@
BOOL CMergeApp::InitInstance()
SillyTestCrap();
#endif
- ::CoInitialize(NULL);
+ // CCrystalEdit Drag and Drop functionality needs AfxOleInit.
+ if(!AfxOleInit())
+ {
+ TRACE(_T("AfxOleInitFailed. OLE functionality disabled"));
+ }
// CG: The following block was added by the Splash Screen component.
{