Alexandre Julliard : jscript: Reorganize StringConstr_value slightly to avoid confusing gcc.
Alexandre Julliard
julliard at winehq.org
Mon Oct 21 14:58:25 CDT 2013
Module: wine
Branch: master
Commit: 82c4fa35aad73b328b59e9c39444f03ca4814032
URL: http://source.winehq.org/git/wine.git/?a=commit;h=82c4fa35aad73b328b59e9c39444f03ca4814032
Author: Alexandre Julliard <julliard at winehq.org>
Date: Mon Oct 21 16:26:35 2013 +0200
jscript: Reorganize StringConstr_value slightly to avoid confusing gcc.
---
dlls/jscript/string.c | 17 ++++++-----------
1 files changed, 6 insertions(+), 11 deletions(-)
diff --git a/dlls/jscript/string.c b/dlls/jscript/string.c
index 8ef1656..3ca29af 100644
--- a/dlls/jscript/string.c
+++ b/dlls/jscript/string.c
@@ -1645,26 +1645,21 @@ static HRESULT StringConstr_value(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags
break;
}
case DISPATCH_CONSTRUCT: {
+ jsstr_t *str;
jsdisp_t *ret;
if(argc) {
- jsstr_t *str;
-
hres = to_string(ctx, argv[0], &str);
if(FAILED(hres))
return hres;
-
- hres = create_string(ctx, str, &ret);
- jsstr_release(str);
}else {
- hres = create_string(ctx, jsstr_empty(), &ret);
+ str = jsstr_empty();
}
- if(FAILED(hres))
- return hres;
-
- *r = jsval_obj(ret);
- break;
+ hres = create_string(ctx, str, &ret);
+ if (SUCCEEDED(hres)) *r = jsval_obj(ret);
+ jsstr_release(str);
+ return hres;
}
default:
More information about the wine-cvs
mailing list