ext/win32ole/win32ole_variant.c: use typed data.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@48218 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

2 files changed, 30 insertions, 12 deletions

diff --git a/ChangeLog b/ChangeLog
index ce86c23fb3..2d5ad77724 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Sat Nov  1 06:31:41 2014  Masaki Suketa <masaki.suketa@nifty.ne.jp>
+
+	* ext/win32ole/win32ole_variant.c: use typed data.
+
 Fri Oct 31 13:55:28 2014  Aaron Patterson <aaron@tenderlovemaking.com>
 
 	* ext/dl/*: remove DL as it is replaced by Fiddle.
diff --git a/ext/win32ole/win32ole_variant.c b/ext/win32ole/win32ole_variant.c
index 308e555e4e..c357f9c8e1 100644
--- a/ext/win32ole/win32ole_variant.c
+++ b/ext/win32ole/win32ole_variant.c
@@ -5,7 +5,8 @@ struct olevariantdata {
     VARIANT var;
 };
 
-static void  olevariant_free(struct olevariantdata *pvar);
+static void  olevariant_free(void *ptr);
+static size_t  olevariant_size(const void *ptr);
 static void ole_val2olevariantdata(VALUE val, VARTYPE vt, struct olevariantdata *pvar);
 static void ole_val2variant_err(VALUE val, VARIANT *var);
 static void ole_set_byref(VARIANT *realvar, VARIANT *var,  VARTYPE vt);
@@ -22,14 +23,27 @@ static VALUE folevariant_value(VALUE self);
 static VALUE folevariant_vartype(VALUE self);
 static VALUE folevariant_set_value(VALUE self, VALUE val);
 
+static const rb_data_type_t olevariant_datatype = {
+    "win32ole_variant",
+    {NULL, olevariant_free, olevariant_size,},
+    NULL, NULL, RUBY_TYPED_FREE_IMMEDIATELY
+};
+
 static void
-olevariant_free(struct olevariantdata *pvar)
+olevariant_free(void *ptr)
 {
+    struct olevariantdata *pvar = ptr;
     VariantClear(&(pvar->realvar));
     VariantClear(&(pvar->var));
     free(pvar);
 }
 
+static size_t
+olevariant_size(const void *ptr)
+{
+    return ptr ? sizeof(struct olevariantdata) : 0;
+}
+
 static void
 ole_val2olevariantdata(VALUE val, VARTYPE vt, struct olevariantdata *pvar)
 {
@@ -245,7 +259,7 @@ folevariant_s_allocate(VALUE klass)
     struct olevariantdata *pvar;
     VALUE obj;
     ole_initialize();
-    obj = Data_Make_Struct(klass,struct olevariantdata,0,olevariant_free,pvar);
+    obj = TypedData_Make_Struct(klass, struct olevariantdata, &olevariant_datatype, pvar);
     VariantInit(&(pvar->var));
     VariantInit(&(pvar->realvar));
     return obj;
@@ -285,7 +299,7 @@ folevariant_s_array(VALUE klass, VALUE elems, VALUE vvt)
     Check_Type(elems, T_ARRAY);
     obj = folevariant_s_allocate(klass);
 
-    Data_Get_Struct(obj, struct olevariantdata, pvar);
+    TypedData_Get_Struct(obj, struct olevariantdata, &olevariant_datatype, pvar);
     dim = RARRAY_LEN(elems);
 
     psab = ALLOC_N(SAFEARRAYBOUND, dim);
@@ -403,7 +417,7 @@ folevariant_initialize(VALUE self, VALUE args)
 
     check_type_val2variant(val);
 
-    Data_Get_Struct(self, struct olevariantdata, pvar);
+    TypedData_Get_Struct(self, struct olevariantdata, &olevariant_datatype, pvar);
     if (len == 1) {
         ole_val2variant(val, &(pvar->var));
     } else {
@@ -423,7 +437,7 @@ get_locked_safe_array(VALUE val)
     struct olevariantdata *pvar;
     SAFEARRAY *psa = NULL;
     HRESULT hr;
-    Data_Get_Struct(val, struct olevariantdata, pvar);
+    TypedData_Get_Struct(val, struct olevariantdata, &olevariant_datatype, pvar);
     if (!(V_VT(&(pvar->var)) & VT_ARRAY)) {
         rb_raise(rb_eTypeError, "variant type is not VT_ARRAY.");
     }
@@ -498,7 +512,7 @@ folevariant_ary_aref(int argc, VALUE *argv, VALUE self)
     LONG *pid;
     HRESULT hr;
 
-    Data_Get_Struct(self, struct olevariantdata, pvar);
+    TypedData_Get_Struct(self, struct olevariantdata, &olevariant_datatype, pvar);
     if (!V_ISARRAY(&(pvar->var))) {
         rb_raise(eWIN32OLERuntimeError,
                  "`[]' is not available for this variant type object");
@@ -555,7 +569,7 @@ folevariant_ary_aset(int argc, VALUE *argv, VALUE self)
     HRESULT hr;
     VOID *p = NULL;
 
-    Data_Get_Struct(self, struct olevariantdata, pvar);
+    TypedData_Get_Struct(self, struct olevariantdata, &olevariant_datatype, pvar);
     if (!V_ISARRAY(&(pvar->var))) {
         rb_raise(eWIN32OLERuntimeError,
                  "`[]' is not available for this variant type object");
@@ -601,7 +615,7 @@ folevariant_value(VALUE self)
     VARTYPE vt;
     int dim;
     SAFEARRAY *psa;
-    Data_Get_Struct(self, struct olevariantdata, pvar);
+    TypedData_Get_Struct(self, struct olevariantdata, &olevariant_datatype, pvar);
 
     val = ole_variant2val(&(pvar->var));
     vt = V_VT(&(pvar->var));
@@ -636,7 +650,7 @@ static VALUE
 folevariant_vartype(VALUE self)
 {
     struct olevariantdata *pvar;
-    Data_Get_Struct(self, struct olevariantdata, pvar);
+    TypedData_Get_Struct(self, struct olevariantdata, &olevariant_datatype, pvar);
     return INT2FIX(V_VT(&pvar->var));
 }
 
@@ -659,7 +673,7 @@ folevariant_set_value(VALUE self, VALUE val)
 {
     struct olevariantdata *pvar;
     VARTYPE vt;
-    Data_Get_Struct(self, struct olevariantdata, pvar);
+    TypedData_Get_Struct(self, struct olevariantdata, &olevariant_datatype, pvar);
     vt = V_VT(&(pvar->var));
     if (V_ISARRAY(&(pvar->var)) && ((vt & ~VT_BYREF) != (VT_UI1|VT_ARRAY) || !RB_TYPE_P(val, T_STRING))) {
         rb_raise(eWIN32OLERuntimeError,
@@ -673,7 +687,7 @@ void
 ole_variant2variant(VALUE val, VARIANT *var)
 {
     struct olevariantdata *pvar;
-    Data_Get_Struct(val, struct olevariantdata, pvar);
+    TypedData_Get_Struct(val, struct olevariantdata, &olevariant_datatype, pvar);
     VariantCopy(var, &(pvar->var));
 }