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_record.c: use typed data.

Browse source 
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@47915 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
suke 2014-10-14 10:16:17 +00:00
parent 65075dfe3a
commit fb06f0802e
2 changed files with 37 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

4
ChangeLog
View file

@ -1,3 +1,7 @@
Tue Oct 14 19:15:31 2014 Masaki Suketa <masaki.suketa@nifty.ne.jp>
* ext/win32ole/win32ole_record.c: use typed data.
Tue Oct 14 16:23:12 2014 Nobuyoshi Nakada <nobu@ruby-lang.org> Tue Oct 14 16:23:12 2014 Nobuyoshi Nakada <nobu@ruby-lang.org>
* symbol.c (global_symbols): make ids two-dimensional array of * symbol.c (global_symbols): make ids two-dimensional array of

39
ext/win32ole/win32ole_record.c
View file

@ -7,7 +7,8 @@ struct olerecorddata {
static HRESULT recordinfo_from_itypelib(ITypeLib *pTypeLib, VALUE name, IRecordInfo **ppri); static HRESULT recordinfo_from_itypelib(ITypeLib *pTypeLib, VALUE name, IRecordInfo **ppri);
static int hash2olerec(VALUE key, VALUE val, VALUE rec); static int hash2olerec(VALUE key, VALUE val, VALUE rec);
static void olerecord_free(struct olerecorddata *pvar); static void olerecord_free(void *pvar);
static size_t olerecord_size(const void *ptr);
static VALUE folerecord_s_allocate(VALUE klass); static VALUE folerecord_s_allocate(VALUE klass);
static VALUE folerecord_initialize(VALUE self, VALUE typename, VALUE oleobj); static VALUE folerecord_initialize(VALUE self, VALUE typename, VALUE oleobj);
static VALUE folerecord_to_h(VALUE self); static VALUE folerecord_to_h(VALUE self);
@ -19,6 +20,12 @@ static VALUE folerecord_ole_instance_variable_get(VALUE self, VALUE name);
static VALUE folerecord_ole_instance_variable_set(VALUE self, VALUE name, VALUE val); static VALUE folerecord_ole_instance_variable_set(VALUE self, VALUE name, VALUE val);
static VALUE folerecord_inspect(VALUE self); static VALUE folerecord_inspect(VALUE self);
static const rb_data_type_t olerecord_datatype = {
"win32ole_record",
{NULL, olerecord_free, olerecord_size,},
NULL, NULL, RUBY_TYPED_FREE_IMMEDIATELY
};
static HRESULT static HRESULT
recordinfo_from_itypelib(ITypeLib *pTypeLib, VALUE name, IRecordInfo **ppri) recordinfo_from_itypelib(ITypeLib *pTypeLib, VALUE name, IRecordInfo **ppri)
{ {
@ -61,7 +68,7 @@ hash2olerec(VALUE key, VALUE val, VALUE rec)
HRESULT hr; HRESULT hr;
if (val != Qnil) { if (val != Qnil) {
Data_Get_Struct(rec, struct olerecorddata, prec); TypedData_Get_Struct(rec, struct olerecorddata, &olerecord_datatype, prec);
pri = prec->pri; pri = prec->pri;
VariantInit(&var); VariantInit(&var);
ole_val2variant(val, &var); ole_val2variant(val, &var);
@ -84,7 +91,7 @@ ole_rec2variant(VALUE rec, VARIANT *var)
IRecordInfo *pri; IRecordInfo *pri;
HRESULT hr; HRESULT hr;
VALUE fields; VALUE fields;
Data_Get_Struct(rec, struct olerecorddata, prec); TypedData_Get_Struct(rec, struct olerecorddata, &olerecord_datatype, prec);
pri = prec->pri; pri = prec->pri;
if (pri) { if (pri) {
hr = pri->lpVtbl->GetSize(pri, &size); hr = pri->lpVtbl->GetSize(pri, &size);
@ -126,7 +133,7 @@ olerecord_set_ivar(VALUE obj, IRecordInfo *pri, void *prec)
void *pdata = NULL; void *pdata = NULL;
struct olerecorddata *pvar; struct olerecorddata *pvar;
Data_Get_Struct(obj, struct olerecorddata, pvar); TypedData_Get_Struct(obj, struct olerecorddata, &olerecord_datatype, pvar);
OLE_ADDREF(pri); OLE_ADDREF(pri);
OLE_RELEASE(pvar->pri); OLE_RELEASE(pvar->pri);
pvar->pri = pri; pvar->pri = pri;
@ -206,7 +213,8 @@ create_win32ole_record(IRecordInfo *pri, void *prec)
*/ */
static void static void
olerecord_free(struct olerecorddata *pvar) { olerecord_free(void *ptr) {
struct olerecorddata *pvar = ptr;
OLE_FREE(pvar->pri); OLE_FREE(pvar->pri);
if (pvar->pdata) { if (pvar->pdata) {
free(pvar->pdata); free(pvar->pdata);
@ -214,11 +222,30 @@ olerecord_free(struct olerecorddata *pvar) {
free(pvar); free(pvar);
} }
static size_t
olerecord_size(const void *ptr)
{
const struct olerecorddata *pvar = ptr;
size_t s = 0;
ULONG size = 0;
HRESULT hr;
if (ptr) {
s += sizeof(struct olerecorddata);
if (pvar->pri) {
hr = pvar->pri->lpVtbl->GetSize(pvar->pri, &size);
if (SUCCEEDED(hr)) {
s += size;
}
}
}
return s;
}
static VALUE static VALUE
folerecord_s_allocate(VALUE klass) { folerecord_s_allocate(VALUE klass) {
VALUE obj = Qnil; VALUE obj = Qnil;
struct olerecorddata *pvar; struct olerecorddata *pvar;
obj = Data_Make_Struct(klass, struct olerecorddata, 0, olerecord_free, pvar); obj = TypedData_Make_Struct(klass, struct olerecorddata, &olerecord_datatype, pvar);
pvar->pri = NULL; pvar->pri = NULL;
pvar->pdata = NULL; pvar->pdata = NULL;
return obj; return obj;