From 0aa4340d81c673bdf093c3a3691dea28bda82bd5 Mon Sep 17 00:00:00 2001 From: suke Date: Tue, 26 Dec 2006 12:09:57 +0000 Subject: The argument of Shell.NameSpace should not be file path. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@11423 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 5 +++++ test/win32ole/test_folderitem2_invokeverb.rb | 15 +++++++++------ 2 files changed, 14 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index 537dbb863e..47675cf2c1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Tue Dec 26 21:02:14 2006 Masaki Suketa + + * test/win32ole/test_folderitem2_invokeverb.rb: The argument + of Shell.NameSpace should not be file path. + Tue Dec 26 06:13:08 2006 Minero Aoki * ext/bigdecimal/bigdecimal.c: remove useless method diff --git a/test/win32ole/test_folderitem2_invokeverb.rb b/test/win32ole/test_folderitem2_invokeverb.rb index 974c500776..a4e90fb66b 100644 --- a/test/win32ole/test_folderitem2_invokeverb.rb +++ b/test/win32ole/test_folderitem2_invokeverb.rb @@ -16,14 +16,16 @@ if defined?(WIN32OLE) # @fso = WIN32OLE.new('Scripting.FileSystemObject') - @dummy_path = @fso.GetTempName + @dummy_file = @fso.GetTempName @cfolder = @fso.getFolder(".") - f = @cfolder.CreateTextFile(@dummy_path) + f = @cfolder.CreateTextFile(@dummy_file) f.close - @dummy_path = @cfolder.path + "\\" + @dummy_path + @dummy_path = @cfolder.path + "\\" + @dummy_file @shell=WIN32OLE.new('Shell.Application') - @fi2 = @shell.NameSpace(@dummy_path).ParentFolder.ParseName(@shell.NameSpace(@dummy_path).Title) + @nsp = @shell.NameSpace(@cfolder.path) + @fi2 = @nsp.parseName(@dummy_file) + @shortcut = nil # @@ -44,7 +46,7 @@ if defined?(WIN32OLE) arlink = [] @cfolder.files.each do |f| if /\.lnk$/ =~ f.path - linkinfo = @shell.NameSpace(f.path).self.getlink + linkinfo = @nsp.parseName(f.name).getLink arlink.push f if linkinfo.path == path end end @@ -55,8 +57,9 @@ if defined?(WIN32OLE) links = find_link(@dummy_path) assert(0, links.size) - # Now create shortcut to @dummy_path assert(@shortcut) + + # Now create shortcut to @dummy_path arg = WIN32OLE_VARIANT.new(@shortcut) @fi2.InvokeVerb(arg) -- cgit v1.2.3