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.c (installed_code_page_proc,

Browse source 
ole_variant2val): small refactoring.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@11805 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
suke 2007-02-20 12:25:40 +00:00
parent 9f6cd833e6
commit 975ce3add3
2 changed files with 11 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
Tue Feb 20 21:19:29 2007 Masaki Suketa <masaki.suketa@nifty.ne.jp>
* ext/win32ole/win32ole.c (installed_code_page_proc,
ole_variant2val): small refactoring.
Tue Feb 20 15:11:42 2007 Koichi Sasada <ko1@atdot.net>
* eval.c, vm.c, yarvcore.h: move definition of rb_call_super() to

11
ext/win32ole/win32ole.c
View file

@ -80,7 +80,7 @@
#define WC2VSTR(x) ole_wc2vstr((x), TRUE)
#define WIN32OLE_VERSION "0.9.7"
#define WIN32OLE_VERSION "0.9.8"
typedef HRESULT (STDAPICALLTYPE FNCOCREATEINSTANCEEX)
(REFCLSID, IUnknown*, DWORD, COSERVERINFO*, DWORD, MULTI_QI*);
@ -1535,7 +1535,7 @@ ole_variant2val(VARIANT *pvar)
if(V_ISARRAY(pvar)) {
SAFEARRAY *psa = V_ISBYREF(pvar) ? *V_ARRAYREF(pvar) : V_ARRAY(pvar);
long i;
UINT i = 0;
long *pid, *plb, *pub;
VARIANT variant;
VALUE val;
@ -1566,14 +1566,15 @@ ole_variant2val(VARIANT *pvar)
hr = SafeArrayLock(psa);
if (SUCCEEDED(hr)) {
obj = rb_ary_new();
while (i >= 0) {
i = 0;
while (i < dim) {
ary_new_dim(obj, pid, plb, dim);
hr = SafeArrayPtrOfIndex(psa, pid, &V_BYREF(&variant));
if (SUCCEEDED(hr)) {
val = ole_variant2val(&variant);
ary_store_dim(obj, pid, plb, dim, val);
}
for (i = dim-1 ; i >= 0 ; --i) {
for (i = 0; i < dim; ++i) {
if (++pid[i] <= pub[i])
break;
pid[i] = plb[i];
@ -2396,7 +2397,7 @@ fole_s_get_code_page(VALUE self)
static BOOL CALLBACK
installed_code_page_proc(LPTSTR str) {
if (atol(str) == g_cp_to_check) {
if (strtoul(str, NULL, 10) == g_cp_to_check) {
g_cp_installed = TRUE;
return FALSE;
}