summaryrefslogtreecommitdiff
path: root/ext/win32ole/win32ole_event.c
diff options
context:
space:
mode:
authorsuke <suke@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2014-12-01 11:03:13 +0000
committersuke <suke@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2014-12-01 11:03:13 +0000
commit7f411d6ed4b77c6ce60beae84573e9fb4dca912a (patch)
tree99d60abe485f0c84adfc29552465c0cda705fcac /ext/win32ole/win32ole_event.c
parent15cfc9553a1ff1e4a84c40360ed3285b27edaf60 (diff)
* ext/win32ole/win32ole.c: use typed data for WIN32OLE.
* ext/win32ole/win32ole.h: ditto. * ext/win32ole/win32ole_event.c: ditto. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@48665 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ext/win32ole/win32ole_event.c')
-rw-r--r--ext/win32ole/win32ole_event.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/ext/win32ole/win32ole_event.c b/ext/win32ole/win32ole_event.c
index 4443585..105308a 100644
--- a/ext/win32ole/win32ole_event.c
+++ b/ext/win32ole/win32ole_event.c
@@ -485,7 +485,7 @@ find_iid(VALUE ole, char *pitf, IID *piid, ITypeInfo **ppTypeInfo)
ITypeInfo *pImplTypeInfo;
TYPEATTR *pImplTypeAttr;
- struct oledata *pole;
+ struct oledata *pole = NULL;
unsigned int index;
unsigned int count;
int type;
@@ -495,7 +495,7 @@ find_iid(VALUE ole, char *pitf, IID *piid, ITypeInfo **ppTypeInfo)
BOOL is_found = FALSE;
LCID lcid = cWIN32OLE_lcid;
- OLEData_Get_Struct(ole, pole);
+ pole = oledata_get_struct(ole);
pDispatch = pole->pDispatch;
@@ -709,9 +709,9 @@ find_default_source(VALUE ole, IID *piid, ITypeInfo **ppTypeInfo)
TYPEATTR *pTypeAttr;
TYPEATTR *pTypeAttr2 = NULL;
- struct oledata *pole;
+ struct oledata *pole = NULL;
- OLEData_Get_Struct(ole, pole);
+ pole = oledata_get_struct(ole);
pDispatch = pole->pDispatch;
hr = pDispatch->lpVtbl->QueryInterface(pDispatch,
&IID_IProvideClassInfo2,
@@ -896,7 +896,7 @@ ev_advise(int argc, VALUE *argv, VALUE self)
{
VALUE ole, itf;
- struct oledata *pole;
+ struct oledata *pole = NULL;
char *pitf;
HRESULT hr;
IID iid;
@@ -930,7 +930,7 @@ ev_advise(int argc, VALUE *argv, VALUE self)
ole_raise(hr, rb_eRuntimeError, "interface not found");
}
- OLEData_Get_Struct(ole, pole);
+ pole = oledata_get_struct(ole);
pDispatch = pole->pDispatch;
hr = pDispatch->lpVtbl->QueryInterface(pDispatch,
&IID_IConnectionPointContainer,