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

remove WIN32OLE::PROPERTY class.

Browse source 
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@11424 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
suke 2006-12-27 12:00:54 +00:00
parent 0aa4340d81
commit c6defdfa80
3 changed files with 15 additions and 72 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -1,3 +1,9 @@
Wed Dec 27 20:52:32 2006 Masaki Suketa <masaki.suketa@nifty.ne.jp>
* ext/win32ole/win32ole.c: remove WIN32OLE::PROPERTY class.
* ext/win32ole/tests/testWIN32OLE.rb: ditto.
Tue Dec 26 21:02:14 2006 Masaki Suketa <masaki.suketa@nifty.ne.jp>
* test/win32ole/test_folderitem2_invokeverb.rb: The argument

10
ext/win32ole/tests/testWIN32OLE.rb
View file

@ -321,10 +321,12 @@ class TestWin32OLE_WITH_MSI < Test::Unit::TestCase
@record.setproperty( "StringData", 1, 'dddd')
assert_equal('dddd', @record.StringData(1))
end
def test_bracket_equal_with_arg
@record.StringData[1] = 'ffff'
assert_equal('ffff', @record.StringData(1))
end
# Win32OLE does not support this style to set property.
# def test_bracket_equal_with_arg
# @record.StringData[1] = 'ffff'
# assert_equal('ffff', @record.StringData(1))
# end
def test__invoke
shell=WIN32OLE.new('Shell.Application')

71
ext/win32ole/win32ole.c
View file

@ -79,7 +79,7 @@
#define WC2VSTR(x) ole_wc2vstr((x), TRUE)
#define WIN32OLE_VERSION "0.8.0"
#define WIN32OLE_VERSION "0.8.1"
typedef HRESULT (STDAPICALLTYPE FNCOCREATEINSTANCEEX)
(REFCLSID, IUnknown*, DWORD, COSERVERINFO*, DWORD, MULTI_QI*);
@ -210,7 +210,6 @@ static HRESULT ole_docinfo_from_type(ITypeInfo *, BSTR *, BSTR *, DWORD *, BSTR
static char *ole_wc2mb(LPWSTR);
static VALUE ole_variant2val(VARIANT*);
static void ole_val2variant(VALUE, VARIANT*);
static VALUE create_property_object(VALUE, VALUE, HRESULT, VALUE);
typedef struct _Win32OLEIDispatch
{
@ -2475,26 +2474,8 @@ ole_invoke(int argc, VALUE *argv, VALUE self, USHORT wFlags, BOOL is_bracket)
if (FAILED(hr)) {
v = ole_excepinfo2msg(&excepinfo);
if (is_bracket) {
ole_raise(hr, eWIN32OLE_RUNTIME_ERROR, "%s",
StringValuePtr(v));
} else {
/*
* This is the trick to save following script.
*
* installer = WIN32OLE.new("WindowsInstaller.Installer")
* record = installer.CreateRecord(2)
* record.StringData[1] = 'ffff'
*
* record.StringData failed, but we expect [] or []=
* method called next, so we use this trick.
*
* If this trick may be confused.
* If so, we should raise WIN32OLERuntimeError here...
* And we give up saving the above script.
*/
return create_property_object(self, cmd, hr, v);
}
ole_raise(hr, eWIN32OLE_RUNTIME_ERROR, "%s",
StringValuePtr(v));
}
obj = ole_variant2val(&result);
VariantClear(&result);
@ -6870,48 +6851,6 @@ folevariant_value(VALUE self)
return val;
}
static VALUE
create_property_object(VALUE oleobj, VALUE propname, HRESULT prehr, VALUE premsg)
{
VALUE prop = rb_funcall(cWIN32OLE_PROPERTY, rb_intern("new"), 0);
rb_ivar_set(prop, rb_intern("oleobj"), oleobj);
rb_ivar_set(prop, rb_intern("property"), propname);
rb_ivar_set(prop, rb_intern("prehresult"), INT2NUM(prehr));
rb_ivar_set(prop, rb_intern("premsg"), premsg);
return prop;
}
static VALUE
foleproperty_getproperty(VALUE self, VALUE args)
{
VALUE oleobj = rb_ivar_get(self, rb_intern("oleobj"));
VALUE params = rb_ary_new();
rb_ary_push(params, rb_ivar_get(self, rb_intern("property")));
rb_ary_concat(params, args);
return rb_apply(oleobj, rb_intern("[]"), params);
}
static VALUE
foleproperty_setproperty(VALUE self, VALUE args)
{
VALUE oleobj = rb_ivar_get(self, rb_intern("oleobj"));
VALUE params = rb_ary_new();
rb_ary_push(params, rb_ivar_get(self, rb_intern("property")));
rb_ary_concat(params, args);
return rb_apply(oleobj, rb_intern("setproperty"), params);
}
static VALUE
foleproperty_method_missing(VALUE self, VALUE args)
{
HRESULT hr = NUM2INT(rb_ivar_get(self, rb_intern("prehresult")));
VALUE prop = rb_ivar_get(self, rb_intern("property"));
VALUE msg = rb_ivar_get(self, rb_intern("premsg"));
ole_raise(hr, eWIN32OLE_RUNTIME_ERROR, "%s%s",
StringValuePtr(prop), StringValuePtr(msg));
return Qnil;
}
void
Init_win32ole()
{
@ -7105,8 +7044,4 @@ Init_win32ole()
eWIN32OLE_RUNTIME_ERROR = rb_define_class("WIN32OLERuntimeError", rb_eRuntimeError);
cWIN32OLE_PROPERTY = rb_define_class_under(cWIN32OLE, "PROPERTY", rb_cObject);
rb_define_method(cWIN32OLE_PROPERTY, "[]", foleproperty_getproperty, -2);
rb_define_method(cWIN32OLE_PROPERTY, "[]=", foleproperty_setproperty, -2);
rb_define_method(cWIN32OLE_PROPERTY, "method_missing", foleproperty_method_missing, -2);
}