1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

avoid some warnings

Browse Source 
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@2562 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
suke 2002-06-12 12:23:10 +00:00
parent 5838e5bc4e
commit 698e61aaa7
2 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
ext/win32ole/win32ole.c
View File

@ -956,7 +956,7 @@ reg_enum_key(hkey, i)
DWORD i; DWORD i;
{ {
char buf[BUFSIZ]; char buf[BUFSIZ];
LONG size_buf = sizeof(buf); DWORD size_buf = sizeof(buf);
FILETIME ft; FILETIME ft;
LONG err = RegEnumKeyEx(hkey, i, buf, &size_buf, LONG err = RegEnumKeyEx(hkey, i, buf, &size_buf,
NULL, NULL, NULL, &ft); NULL, NULL, NULL, &ft);
@ -2278,7 +2278,7 @@ ole_methods_sub(pOwnerTypeInfo, pTypeInfo, methods, mask)
char *pstr; char *pstr;
FUNCDESC *pFuncDesc; FUNCDESC *pFuncDesc;
VALUE method; VALUE method;
DWORD i; WORD i;
hr = OLE_GET_TYPEATTR(pTypeInfo, &pTypeAttr); hr = OLE_GET_TYPEATTR(pTypeInfo, &pTypeAttr);
if (FAILED(hr)) { if (FAILED(hr)) {
ole_raise(hr, eWIN32OLE_RUNTIME_ERROR, "Fail to GetTypeAttr"); ole_raise(hr, eWIN32OLE_RUNTIME_ERROR, "Fail to GetTypeAttr");
@ -2345,8 +2345,8 @@ ole_methods(self,mask)
VALUE self; VALUE self;
int mask; int mask;
{ {
int iVar; UINT iVar;
int count; UINT count;
ITypeInfo *pTypeInfo; ITypeInfo *pTypeInfo;
HRESULT hr; HRESULT hr;
VALUE methods; VALUE methods;
@ -2661,7 +2661,6 @@ ole_typedesc2val(pTypeInfo, pTypeDesc, typedetails)
rb_str_concat(str, rb_fix2str(INT2FIX(pTypeDesc->vt), 10)); rb_str_concat(str, rb_fix2str(INT2FIX(pTypeDesc->vt), 10));
return str; return str;
} }
return Qnil;
} }
/* /*
@ -3573,7 +3572,7 @@ ole_method_sub(self, pOwnerTypeInfo, pTypeInfo, name)
TYPEATTR *pTypeAttr; TYPEATTR *pTypeAttr;
BSTR bstr; BSTR bstr;
FUNCDESC *pFuncDesc; FUNCDESC *pFuncDesc;
DWORD i; WORD i;
VALUE fname; VALUE fname;
VALUE method = Qnil; VALUE method = Qnil;
hr = OLE_GET_TYPEATTR(pTypeInfo, &pTypeAttr); hr = OLE_GET_TYPEATTR(pTypeInfo, &pTypeAttr);
@ -3912,7 +3911,7 @@ static ole_method_event(pTypeInfo, method_index, method_name)
{ {
TYPEATTR *pTypeAttr; TYPEATTR *pTypeAttr;
HRESULT hr; HRESULT hr;
DWORD i; WORD i;
int flags; int flags;
HREFTYPE href; HREFTYPE href;
ITypeInfo *pRefTypeInfo; ITypeInfo *pRefTypeInfo;
@ -4640,7 +4639,7 @@ ary2ptr_dispparams(ary, pdispparams)
int i; int i;
VALUE v; VALUE v;
VARIANT *pvar; VARIANT *pvar;
for(i = 0; i < RARRAY(ary)->len && i < pdispparams->cArgs; i++) { for(i = 0; i < RARRAY(ary)->len && (unsigned int) i < pdispparams->cArgs; i++) {
v = rb_ary_entry(ary, i); v = rb_ary_entry(ary, i);
pvar = &pdispparams->rgvarg[pdispparams->cArgs-i-1]; pvar = &pdispparams->rgvarg[pdispparams->cArgs-i-1];
val2ptr_variant(v, pvar); val2ptr_variant(v, pvar);
@ -4766,7 +4765,7 @@ find_iid(ole, pitf, piid, ppTypeInfo)
struct oledata *pole; struct oledata *pole;
unsigned int index; unsigned int index;
unsigned int count; unsigned int count;
unsigned int type; int type;
BSTR bstr; BSTR bstr;
char *pstr; char *pstr;
@ -4875,7 +4874,7 @@ find_default_source(ole, piid, ppTypeInfo)
IDispatch *pDispatch; IDispatch *pDispatch;
ITypeInfo *pTypeInfo; ITypeInfo *pTypeInfo;
TYPEATTR *pTypeAttr; TYPEATTR *pTypeAttr;
unsigned int i; int i;
int iFlags; int iFlags;
HREFTYPE hRefType; HREFTYPE hRefType;