[PATCH v2 07/11] jscript: Inline prop_put.

[Gabriel Ivăncescu]

From: Gabriel Ivăncescu

Signed-off-by: Gabriel Ivăncescu 
---
 dlls/jscript/dispex.c | 114 ++++++++++++++++++++----------------------
 1 file changed, 55 insertions(+), 59 deletions(-)

diff --git a/dlls/jscript/dispex.c b/dlls/jscript/dispex.c
index 297e1d0d673..55adb9206e2 100644
--- a/dlls/jscript/dispex.c
+++ b/dlls/jscript/dispex.c
@@ -457,13 +457,58 @@ static HRESULT convert_params(script_ctx_t *ctx, const DISPPARAMS *dp, jsval_t *
     return S_OK;
 }

-static HRESULT prop_put(jsdisp_t *This, dispex_prop_t *prop, jsval_t val)
+HRESULT dispex_prop_get(jsdisp_t *jsdisp, IDispatch *jsthis, DISPID id, jsval_t *r)
 {
+    dispex_prop_t *prop = &jsdisp->props[prop_id_to_idx(id)];
+    jsdisp_t *prop_obj = jsdisp;
+    HRESULT hres;
+
+    while(prop->type == PROP_PROTREF) {
+        prop_obj = prop_obj->prototype;
+        prop = prop_obj->props + prop->u.ref;
+    }
+
+    switch(prop->type) {
+    case PROP_BUILTIN:
+        hres = prop->u.p->getter(jsdisp->ctx, prop_obj, r);
+        break;
+    case PROP_JSVAL:
+        hres = jsval_copy(prop->u.val, r);
+        break;
+    case PROP_ACCESSOR:
+        if(prop->u.accessor.getter) {
+            hres = jsdisp_call_value(prop->u.accessor.getter, jsval_disp(jsthis),
+                                     DISPATCH_METHOD, 0, NULL, r);
+        }else {
+            *r = jsval_undefined();
+            hres = S_OK;
+        }
+        break;
+    case PROP_IDX:
+        hres = prop_obj->builtin_info->idx_get(prop_obj, prop->u.idx, r);
+        break;
+    default:
+        ERR("type %d\n", prop->type);
+        return E_FAIL;
+    }
+
+    if(FAILED(hres)) {
+        TRACE("fail %08lx\n", hres);
+        return hres;
+    }
+
+    TRACE("%p.%s ret %s\n", jsdisp, debugstr_w(prop->name), debugstr_jsval(*r));
+    return hres;
+}
+
+HRESULT dispex_prop_put(jsdisp_t *jsdisp, DISPID id, jsval_t val)
+{
+    dispex_prop_t *prop = &jsdisp->props[prop_id_to_idx(id)];
     HRESULT hres;

if(prop->type == PROP_PROTREF) {
         dispex_prop_t *prop_iter = prop;
-        jsdisp_t *prototype_iter = This;
+        jsdisp_t *prototype_iter = jsdisp;

do {
             prototype_iter = prototype_iter->prototype;
@@ -480,10 +525,10 @@ static HRESULT prop_put(jsdisp_t *This, dispex_prop_t *prop, jsval_t val)
             TRACE("getter with no setter\n");
             return S_OK;
         }
-        return prop->u.p->setter(This->ctx, This, val);
+        return prop->u.p->setter(jsdisp->ctx, jsdisp, val);
     case PROP_PROTREF:
     case PROP_DELETED:
-        if(!This->extensible)
+        if(!jsdisp->extensible)
             return S_OK;
         prop->type = PROP_JSVAL;
         prop->flags = PROPF_ENUMERABLE | PROPF_CONFIGURABLE | PROPF_WRITABLE;
@@ -500,79 +545,30 @@ static HRESULT prop_put(jsdisp_t *This, dispex_prop_t *prop, jsval_t val)
             TRACE("no setter\n");
             return S_OK;
         }
-        return jsdisp_call_value(prop->u.accessor.setter, jsval_obj(This), DISPATCH_METHOD, 1, &val, NULL);
+        return jsdisp_call_value(prop->u.accessor.setter, jsval_obj(jsdisp), DISPATCH_METHOD, 1, &val, NULL);
     case PROP_IDX:
-        if(!This->builtin_info->idx_put) {
+        if(!jsdisp->builtin_info->idx_put) {
             TRACE("no put_idx\n");
             return S_OK;
         }
-        return This->builtin_info->idx_put(This, prop->u.idx, val);
+        return jsdisp->builtin_info->idx_put(jsdisp, prop->u.idx, val);
     default:
         ERR("type %d\n", prop->type);
         return E_FAIL;
     }

-    TRACE("%p.%s = %s\n", This, debugstr_w(prop->name), debugstr_jsval(val));
+    TRACE("%p.%s = %s\n", jsdisp, debugstr_w(prop->name), debugstr_jsval(val));

hres = jsval_copy(val, &prop->u.val);
     if(FAILED(hres))
         return hres;

-    if(This->builtin_info->on_put)
-        This->builtin_info->on_put(This, prop->name);
+    if(jsdisp->builtin_info->on_put)
+        jsdisp->builtin_info->on_put(jsdisp, prop->name);

return S_OK;
 }

-HRESULT dispex_prop_get(jsdisp_t *jsdisp, IDispatch *jsthis, DISPID id, jsval_t *r)
-{
-    dispex_prop_t *prop = &jsdisp->props[prop_id_to_idx(id)];
-    jsdisp_t *prop_obj = jsdisp;
-    HRESULT hres;
-
-    while(prop->type == PROP_PROTREF) {
-        prop_obj = prop_obj->prototype;
-        prop = prop_obj->props + prop->u.ref;
-    }
-
-    switch(prop->type) {
-    case PROP_BUILTIN:
-        hres = prop->u.p->getter(jsdisp->ctx, prop_obj, r);
-        break;
-    case PROP_JSVAL:
-        hres = jsval_copy(prop->u.val, r);
-        break;
-    case PROP_ACCESSOR:
-        if(prop->u.accessor.getter) {
-            hres = jsdisp_call_value(prop->u.accessor.getter, jsval_disp(jsthis),
-                                     DISPATCH_METHOD, 0, NULL, r);
-        }else {
-            *r = jsval_undefined();
-            hres = S_OK;
-        }
-        break;
-    case PROP_IDX:
-        hres = prop_obj->builtin_info->idx_get(prop_obj, prop->u.idx, r);
-        break;
-    default:
-        ERR("type %d\n", prop->type);
-        return E_FAIL;
-    }
-
-    if(FAILED(hres)) {
-        TRACE("fail %08lx\n", hres);
-        return hres;
-    }
-
-    TRACE("%p.%s ret %s\n", jsdisp, debugstr_w(prop->name), debugstr_jsval(*r));
-    return hres;
-}
-
-HRESULT dispex_prop_put(jsdisp_t *jsdisp, DISPID id, jsval_t val)
-{
-    return prop_put(jsdisp, &jsdisp->props[prop_id_to_idx(id)], val);
-}
-
 HRESULT dispex_prop_invoke(jsdisp_t *jsdisp, IDispatch *jsthis, DISPID id, WORD flags,
                                   unsigned argc, jsval_t *argv, jsval_t *r, IServiceProvider *caller)
 {