diff options
| author | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2007-02-19 08:16:34 +0000 |
|---|---|---|
| committer | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2007-02-19 08:16:34 +0000 |
| commit | 45d282aeb06dc76904c4c2e13807fc315e0e0911 (patch) | |
| tree | 082d04f3eeebd86bb9d78c69868b0de2c2eec12f /ext/win32ole | |
| parent | ac5565317c406c227a439f01174ed165b67d89f9 (diff) | |
* ext/socket/socket.c (unix_peeraddr): wrong syscall name in error
message for #peeraddr. a patch from Sam Roberts
<sroberts at uniserve.com>. [ruby-core:10366]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@11777 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ext/win32ole')
| -rw-r--r-- | ext/win32ole/win32ole.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/ext/win32ole/win32ole.c b/ext/win32ole/win32ole.c index 950ff21fd9..f0fcc11fe0 100644 --- a/ext/win32ole/win32ole.c +++ b/ext/win32ole/win32ole.c @@ -79,7 +79,7 @@ #define WC2VSTR(x) ole_wc2vstr((x), TRUE) -#define WIN32OLE_VERSION "0.7.1" +#define WIN32OLE_VERSION "0.7.0" typedef HRESULT (STDAPICALLTYPE FNCOCREATEINSTANCEEX) (REFCLSID, IUnknown*, DWORD, COSERVERINFO*, DWORD, MULTI_QI*); @@ -921,13 +921,8 @@ ole_variant2val(pvar) VARIANT variant; VALUE val; VALUE val2; - int dim = 0; - - if (!psa) { - return obj; - } - dim = SafeArrayGetDim(psa); + int dim = SafeArrayGetDim(psa); VariantInit(&variant); V_VT(&variant) = (V_VT(pvar) & ~VT_ARRAY) | VT_BYREF; |