kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

* ext/win32ole/win32ole.c: use typed data for com_hash.

Browse source 
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@48685 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
suke 2014-12-02 12:34:52 +00:00
parent 56891028bd
commit f9dcfb2bca
2 changed files with 36 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
ChangeLog
View file

@ -1,3 +1,7 @@
Tue Dec 2 21:33:56 2014 Masaki Suketa <masaki.suketa@nifty.ne.jp>
* ext/win32ole/win32ole.c: use typed data for com_hash.
Tue Dec 2 15:30:30 2014 Martin Duerst <duerst@it.aoyama.ac.jp> Tue Dec 2 15:30:30 2014 Martin Duerst <duerst@it.aoyama.ac.jp>
* array.c (rb_ary_plus): in documentation, added note about * array.c (rb_ary_plus): in documentation, added note about

34
ext/win32ole/win32ole.c
View file

@ -169,12 +169,22 @@ static VALUE fole_activex_initialize(VALUE self);
static void init_enc2cp(void); static void init_enc2cp(void);
static void free_enc2cp(void); static void free_enc2cp(void);
static void com_hash_free(void *ptr);
static void com_hash_mark(void *ptr);
static size_t com_hash_size(const void *ptr);
static const rb_data_type_t ole_datatype = { static const rb_data_type_t ole_datatype = {
"win32ole", "win32ole",
{NULL, ole_free, ole_size,}, {NULL, ole_free, ole_size,},
0, 0, RUBY_TYPED_FREE_IMMEDIATELY 0, 0, RUBY_TYPED_FREE_IMMEDIATELY
}; };
static const rb_data_type_t com_hash_datatype = {
"com_hash",
{com_hash_mark, com_hash_free, com_hash_size,},
0, 0, RUBY_TYPED_FREE_IMMEDIATELY
};
static HRESULT (STDMETHODCALLTYPE mf_QueryInterface)( static HRESULT (STDMETHODCALLTYPE mf_QueryInterface)(
IMessageFilter __RPC_FAR * This, IMessageFilter __RPC_FAR * This,
/* [in] */ REFIID riid, /* [in] */ REFIID riid,
@ -393,7 +403,6 @@ val2dispatch(VALUE val)
struct st_table *tbl = DATA_PTR(com_hash); struct st_table *tbl = DATA_PTR(com_hash);
Win32OLEIDispatch* pdisp; Win32OLEIDispatch* pdisp;
st_data_t data; st_data_t data;
if (st_lookup(tbl, val, &data)) { if (st_lookup(tbl, val, &data)) {
pdisp = (Win32OLEIDispatch *)(data & ~FIXNUM_FLAG); pdisp = (Win32OLEIDispatch *)(data & ~FIXNUM_FLAG);
pdisp->refcount++; pdisp->refcount++;
@ -3866,6 +3875,27 @@ free_enc2cp(void)
st_free_table(enc2cp_table); st_free_table(enc2cp_table);
} }
static void
com_hash_free(void *ptr)
{
st_table *tbl = ptr;
st_free_table(tbl);
}
static void
com_hash_mark(void *ptr)
{
st_table *tbl = ptr;
rb_mark_hash(tbl);
}
static size_t
com_hash_size(const void *ptr)
{
const st_table *tbl = ptr;
return tbl ? st_memsize(tbl) : 0;
}
void void
Init_win32ole(void) Init_win32ole(void)
{ {
@ -3887,7 +3917,7 @@ Init_win32ole(void)
message_filter.RetryRejectedCall = mf_RetryRejectedCall; message_filter.RetryRejectedCall = mf_RetryRejectedCall;
message_filter.MessagePending = mf_MessagePending; message_filter.MessagePending = mf_MessagePending;
com_hash = Data_Wrap_Struct(rb_cData, rb_mark_hash, st_free_table, st_init_numtable()); com_hash = TypedData_Wrap_Struct(rb_cData, &com_hash_datatype, st_init_numtable());
rb_gc_register_mark_object(com_hash); rb_gc_register_mark_object(com_hash);
cWIN32OLE = rb_define_class("WIN32OLE", rb_cObject); cWIN32OLE = rb_define_class("WIN32OLE", rb_cObject);