From 81fe4bd8a50b427f1421781f0b53eb894cb41982 Mon Sep 17 00:00:00 2001 From: Jacek Caban Date: Thu, 29 Mar 2012 12:06:20 +0200 Subject: [PATCH] vbscript: Use to_int in InStr implementation. --- dlls/vbscript/global.c | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/dlls/vbscript/global.c b/dlls/vbscript/global.c index 2e45d8f7e08..eaf4383e56b 100644 --- a/dlls/vbscript/global.c +++ b/dlls/vbscript/global.c @@ -603,6 +603,7 @@ static HRESULT Global_InStr(vbdisp_t *This, VARIANT *args, unsigned args_cnt, VA VARIANT *startv, *str1v, *str2v; BSTR str1, str2; int start, ret; + HRESULT hres; TRACE("\n"); @@ -625,18 +626,9 @@ static HRESULT Global_InStr(vbdisp_t *This, VARIANT *args, unsigned args_cnt, VA } if(startv) { - /* FIXME: Move to helper */ - switch(V_VT(startv)) { - case VT_I2: - start = V_I2(startv); - break; - case VT_I4: - start = V_I4(startv); - break; - default: - FIXME("unsupported start %s\n", debugstr_variant(startv)); - return E_NOTIMPL; - } + hres = to_int(startv, &start); + if(FAILED(hres)) + return hres; if(--start < 0) { FIXME("start %d\n", start); return E_FAIL;