Jacek Caban : mshtml: Move builtin function info lookup to separated function.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 6767b740328ee8cc18de8323bd51ad11260e3bc0
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=6767b740328ee8cc18de8323bd...

Author: Jacek Caban 
Date:   Sun Sep  6 18:51:39 2009 +0200

mshtml: Move builtin function info lookup to separated function.

---

dlls/mshtml/dispex.c |   60 ++++++++++++++++++++++++++++++--------------------
 1 files changed, 36 insertions(+), 24 deletions(-)

diff --git a/dlls/mshtml/dispex.c b/dlls/mshtml/dispex.c
index b8937e7..6307428 100644
--- a/dlls/mshtml/dispex.c
+++ b/dlls/mshtml/dispex.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2008 Jacek Caban for CodeWeavers
+ * Copyright 2008-2009 Jacek Caban for CodeWeavers
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -607,6 +607,34 @@ static HRESULT function_invoke(DispatchEx *This, func_info_t *func, WORD flags,
     return hres;
 }

+static HRESULT get_builtin_func(dispex_data_t *data, DISPID id, func_info_t **ret)
+{
+    int min, max, n;
+
+    min = 0;
+    max = data->func_cnt-1;
+
+    while(min <= max) {
+        n = (min+max)/2;
+
+        if(data->funcs[n].id == id)
+            break;
+
+        if(data->funcs[n].id < id)
+            min = n+1;
+        else
+            max = n-1;
+    }
+
+    if(min > max) {
+        WARN("invalid id %x\n", id);
+        return DISP_E_UNKNOWNNAME;
+    }
+
+    *ret = data->funcs+n;
+    return S_OK;
+}
+
 #define DISPATCHEX_THIS(iface) DEFINE_THIS(DispatchEx, IDispatchEx, iface)

static HRESULT WINAPI DispatchEx_QueryInterface(IDispatchEx *iface, REFIID riid, void **ppv)
@@ -748,7 +776,7 @@ static HRESULT WINAPI DispatchEx_InvokeEx(IDispatchEx *iface, DISPID id, LCID lc
 {
     DispatchEx *This = DISPATCHEX_THIS(iface);
     dispex_data_t *data;
-    int min, max, n;
+    func_info_t *func;
     HRESULT hres;

TRACE("(%p)->(%x %x %x %p %p %p %p)\n", This, id, lcid, wFlags, pdp, pvarRes, pei, pspCaller);
@@ -828,30 +856,14 @@ static HRESULT WINAPI DispatchEx_InvokeEx(IDispatchEx *iface, DISPID id, LCID lc
     if(!data)
         return E_FAIL;

-    min = 0;
-    max = data->func_cnt-1;
-
-    while(min <= max) {
-        n = (min+max)/2;
-
-        if(data->funcs[n].id == id)
-            break;
-
-        if(data->funcs[n].id < id)
-            min = n+1;
-        else
-            max = n-1;
-    }
-
-    if(min > max) {
-        WARN("invalid id %x\n", id);
-        return DISP_E_UNKNOWNNAME;
-    }
+    hres = get_builtin_func(data, id, &func);
+    if(FAILED(hres))
+        return hres;

-    if(data->funcs[n].func_disp_idx == -1)
-        hres = typeinfo_invoke(This, data->funcs+n, wFlags, pdp, pvarRes, pei);
+    if(func->func_disp_idx == -1)
+        hres = typeinfo_invoke(This, func, wFlags, pdp, pvarRes, pei);
     else
-        hres = function_invoke(This, data->funcs+n, wFlags, pdp, pvarRes, pei);
+        hres = function_invoke(This, func, wFlags, pdp, pvarRes, pei);

return hres;
 }