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

Browse source 
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@47822 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
suke 2014-10-06 14:35:43 +00:00
parent 0ca714fa1a
commit a60c5a1945
2 changed files with 32 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
ChangeLog
View file

@ -1,3 +1,7 @@
Mon Oct 6 23:34:42 2014 Masaki Suketa <masaki.suketa@nifty.ne.jp>
* ext/win32ole/win32ole_param.c: use typed data.
Mon Oct 6 22:37:09 2014 Nobuyoshi Nakada <nobu@ruby-lang.org> Mon Oct 6 22:37:09 2014 Nobuyoshi Nakada <nobu@ruby-lang.org>
* symbol.h (struct RSymbol): move from internal.h. * symbol.h (struct RSymbol): move from internal.h.

42
ext/win32ole/win32ole_param.c
View file

@ -8,7 +8,8 @@ struct oleparamdata {
UINT index; UINT index;
}; };
static void oleparam_free(struct oleparamdata *pole); static void oleparam_free(void *ptr);
static size_t oleparam_size(const void *ptr);
static VALUE foleparam_s_allocate(VALUE klass); static VALUE foleparam_s_allocate(VALUE klass);
static VALUE oleparam_ole_param_from_index(VALUE self, ITypeInfo *pTypeInfo, UINT method_index, int param_index); static VALUE oleparam_ole_param_from_index(VALUE self, ITypeInfo *pTypeInfo, UINT method_index, int param_index);
static VALUE oleparam_ole_param(VALUE self, VALUE olemethod, int n); static VALUE oleparam_ole_param(VALUE self, VALUE olemethod, int n);
@ -27,19 +28,32 @@ static VALUE ole_param_default(ITypeInfo *pTypeInfo, UINT method_index, UINT ind
static VALUE foleparam_default(VALUE self); static VALUE foleparam_default(VALUE self);
static VALUE foleparam_inspect(VALUE self); static VALUE foleparam_inspect(VALUE self);
static const rb_data_type_t oleparam_datatype = {
"win32ole_param",
{NULL, oleparam_free, oleparam_size,},
NULL, NULL, RUBY_TYPED_FREE_IMMEDIATELY
};
static void static void
oleparam_free(struct oleparamdata *pole) oleparam_free(void *ptr)
{ {
struct oleparamdata *pole = ptr;
OLE_FREE(pole->pTypeInfo); OLE_FREE(pole->pTypeInfo);
free(pole); free(pole);
} }
static size_t
oleparam_size(const void *ptr)
{
return ptr ? sizeof(struct oleparamdata) : 0;
}
VALUE VALUE
create_win32ole_param(ITypeInfo *pTypeInfo, UINT method_index, UINT index, VALUE name) create_win32ole_param(ITypeInfo *pTypeInfo, UINT method_index, UINT index, VALUE name)
{ {
struct oleparamdata *pparam; struct oleparamdata *pparam;
VALUE obj = foleparam_s_allocate(cWIN32OLE_PARAM); VALUE obj = foleparam_s_allocate(cWIN32OLE_PARAM);
Data_Get_Struct(obj, struct oleparamdata, pparam); TypedData_Get_Struct(obj, struct oleparamdata, &oleparam_datatype, pparam);
pparam->pTypeInfo = pTypeInfo; pparam->pTypeInfo = pTypeInfo;
OLE_ADDREF(pTypeInfo); OLE_ADDREF(pTypeInfo);
@ -60,9 +74,9 @@ foleparam_s_allocate(VALUE klass)
{ {
struct oleparamdata *pparam; struct oleparamdata *pparam;
VALUE obj; VALUE obj;
obj = Data_Make_Struct(klass, obj = TypedData_Make_Struct(klass,
struct oleparamdata, struct oleparamdata,
0, oleparam_free, pparam); &oleparam_datatype, pparam);
pparam->pTypeInfo = NULL; pparam->pTypeInfo = NULL;
pparam->method_index = 0; pparam->method_index = 0;
pparam->index = 0; pparam->index = 0;
@ -97,7 +111,7 @@ oleparam_ole_param_from_index(VALUE self, ITypeInfo *pTypeInfo, UINT method_inde
rb_raise(rb_eIndexError, "index of param must be in 1..%d", len); rb_raise(rb_eIndexError, "index of param must be in 1..%d", len);
} }
Data_Get_Struct(self, struct oleparamdata, pparam); TypedData_Get_Struct(self, struct oleparamdata, &oleparam_datatype, pparam);
pparam->pTypeInfo = pTypeInfo; pparam->pTypeInfo = pTypeInfo;
OLE_ADDREF(pTypeInfo); OLE_ADDREF(pTypeInfo);
pparam->method_index = method_index; pparam->method_index = method_index;
@ -183,7 +197,7 @@ static VALUE
foleparam_ole_type(VALUE self) foleparam_ole_type(VALUE self)
{ {
struct oleparamdata *pparam; struct oleparamdata *pparam;
Data_Get_Struct(self, struct oleparamdata, pparam); TypedData_Get_Struct(self, struct oleparamdata, &oleparam_datatype, pparam);
return ole_param_ole_type(pparam->pTypeInfo, pparam->method_index, return ole_param_ole_type(pparam->pTypeInfo, pparam->method_index,
pparam->index); pparam->index);
} }
@ -217,7 +231,7 @@ static VALUE
foleparam_ole_type_detail(VALUE self) foleparam_ole_type_detail(VALUE self)
{ {
struct oleparamdata *pparam; struct oleparamdata *pparam;
Data_Get_Struct(self, struct oleparamdata, pparam); TypedData_Get_Struct(self, struct oleparamdata, &oleparam_datatype, pparam);
return ole_param_ole_type_detail(pparam->pTypeInfo, pparam->method_index, return ole_param_ole_type_detail(pparam->pTypeInfo, pparam->method_index,
pparam->index); pparam->index);
} }
@ -250,7 +264,7 @@ ole_param_flag_mask(ITypeInfo *pTypeInfo, UINT method_index, UINT index, USHORT
static VALUE foleparam_input(VALUE self) static VALUE foleparam_input(VALUE self)
{ {
struct oleparamdata *pparam; struct oleparamdata *pparam;
Data_Get_Struct(self, struct oleparamdata, pparam); TypedData_Get_Struct(self, struct oleparamdata, &oleparam_datatype, pparam);
return ole_param_flag_mask(pparam->pTypeInfo, pparam->method_index, return ole_param_flag_mask(pparam->pTypeInfo, pparam->method_index,
pparam->index, PARAMFLAG_FIN); pparam->index, PARAMFLAG_FIN);
} }
@ -277,7 +291,7 @@ static VALUE foleparam_input(VALUE self)
static VALUE foleparam_output(VALUE self) static VALUE foleparam_output(VALUE self)
{ {
struct oleparamdata *pparam; struct oleparamdata *pparam;
Data_Get_Struct(self, struct oleparamdata, pparam); TypedData_Get_Struct(self, struct oleparamdata, &oleparam_datatype, pparam);
return ole_param_flag_mask(pparam->pTypeInfo, pparam->method_index, return ole_param_flag_mask(pparam->pTypeInfo, pparam->method_index,
pparam->index, PARAMFLAG_FOUT); pparam->index, PARAMFLAG_FOUT);
} }
@ -295,7 +309,7 @@ static VALUE foleparam_output(VALUE self)
static VALUE foleparam_optional(VALUE self) static VALUE foleparam_optional(VALUE self)
{ {
struct oleparamdata *pparam; struct oleparamdata *pparam;
Data_Get_Struct(self, struct oleparamdata, pparam); TypedData_Get_Struct(self, struct oleparamdata, &oleparam_datatype, pparam);
return ole_param_flag_mask(pparam->pTypeInfo, pparam->method_index, return ole_param_flag_mask(pparam->pTypeInfo, pparam->method_index,
pparam->index, PARAMFLAG_FOPT); pparam->index, PARAMFLAG_FOPT);
} }
@ -314,7 +328,7 @@ static VALUE foleparam_optional(VALUE self)
static VALUE foleparam_retval(VALUE self) static VALUE foleparam_retval(VALUE self)
{ {
struct oleparamdata *pparam; struct oleparamdata *pparam;
Data_Get_Struct(self, struct oleparamdata, pparam); TypedData_Get_Struct(self, struct oleparamdata, &oleparam_datatype, pparam);
return ole_param_flag_mask(pparam->pTypeInfo, pparam->method_index, return ole_param_flag_mask(pparam->pTypeInfo, pparam->method_index,
pparam->index, PARAMFLAG_FRETVAL); pparam->index, PARAMFLAG_FRETVAL);
} }
@ -374,7 +388,7 @@ ole_param_default(ITypeInfo *pTypeInfo, UINT method_index, UINT index)
static VALUE foleparam_default(VALUE self) static VALUE foleparam_default(VALUE self)
{ {
struct oleparamdata *pparam; struct oleparamdata *pparam;
Data_Get_Struct(self, struct oleparamdata, pparam); TypedData_Get_Struct(self, struct oleparamdata, &oleparam_datatype, pparam);
return ole_param_default(pparam->pTypeInfo, pparam->method_index, return ole_param_default(pparam->pTypeInfo, pparam->method_index,
pparam->index); pparam->index);
} }