Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-07-04 11:44:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

[JSCRIPT] Sync with Wine Staging 1.9.23. Dedicated to Ged. CORE-12409

Browse source 
7af3f65 jscript: Add more jsdisp_t to Instance helpers.
55f6e3c jscript: Use the existing helpers to get from a jsdisp_t to an Instance.
0f21353 jscript: Use wine_rb_tree to store local variables in compiler_ctx_t.
fc1ae4f jscript: Use CONTAINING_RECORD() to get from a field to a struct.
57291c4 jscript: Simplify create_utc_string and add basic tests.
20d5bba jscript: Simplify date_to_string and add basic tests.
4d67ffd jscript: Allocate string of correct size in Date toLocaleDateString method.
79f18d0 jscript: Properly handle \0 characters in Array join method.
fd07a15 jscript: Allocate string of correct size in Date toTimeString method.
1c3e0dd jscript: Properly handle \0 characters in String indexOf method.
54e6736 jscript: Properly handle \0 characters in String to{Lower,Upper}Case methods.
1842082 jscript: Do not include terminating \0 in result returned by Date_toLocale{Date,Time}String.
69437af jscript: Change prototype of jsstr_alloc_buf and fix some error handling issues.
d36ae56 jscript: Fix definition of JSSTR_MAX_LENGTH.
7369836 jscript: Simplify jsstr_release implementation.

svn path=/trunk/; revision=73354
This commit is contained in:
Amine Khaldi 2016-11-23 10:06:56 +00:00
parent e98102ef8a
commit a7a057e3a2
15 changed files with 205 additions and 240 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
reactos/dll/win32/jscript/array.c
View file

@ -93,7 +93,7 @@ static HRESULT get_length(script_ctx_t *ctx, vdisp_t *vdisp, jsdisp_t **jsthis,
static HRESULT set_length(jsdisp_t *obj, DWORD length) static HRESULT set_length(jsdisp_t *obj, DWORD length)
{ {
if(is_class(obj, JSCLASS_ARRAY)) { if(is_class(obj, JSCLASS_ARRAY)) {
((ArrayInstance*)obj)->length = length; array_from_jsdisp(obj)->length = length;
return S_OK; return S_OK;
} }
@ -181,7 +181,7 @@ static HRESULT concat_obj(jsdisp_t *array, IDispatch *obj, DWORD *len)
jsobj = iface_to_jsdisp(obj); jsobj = iface_to_jsdisp(obj);
if(jsobj) { if(jsobj) {
if(is_class(jsobj, JSCLASS_ARRAY)) { if(is_class(jsobj, JSCLASS_ARRAY)) {
hres = concat_array(array, (ArrayInstance*)jsobj, len); hres = concat_array(array, array_from_jsdisp(jsobj), len);
jsdisp_release(jsobj); jsdisp_release(jsobj);
return hres; return hres;
} }
@ -228,9 +228,10 @@ static HRESULT Array_concat(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsi
return S_OK; return S_OK;
} }
static HRESULT array_join(script_ctx_t *ctx, jsdisp_t *array, DWORD length, const WCHAR *sep, jsval_t *r) static HRESULT array_join(script_ctx_t *ctx, jsdisp_t *array, DWORD length, const WCHAR *sep,
unsigned seplen, jsval_t *r)
{ {
jsstr_t **str_tab, *ret; jsstr_t **str_tab, *ret = NULL;
jsval_t val; jsval_t val;
DWORD i; DWORD i;
HRESULT hres = E_FAIL; HRESULT hres = E_FAIL;
@ -262,9 +263,7 @@ static HRESULT array_join(script_ctx_t *ctx, jsdisp_t *array, DWORD length, cons
} }
if(SUCCEEDED(hres)) { if(SUCCEEDED(hres)) {
DWORD seplen = 0, len = 0; DWORD len = 0;
seplen = strlenW(sep);
if(str_tab[0]) if(str_tab[0])
len = jsstr_length(str_tab[0]); len = jsstr_length(str_tab[0]);
@ -281,8 +280,8 @@ static HRESULT array_join(script_ctx_t *ctx, jsdisp_t *array, DWORD length, cons
if(SUCCEEDED(hres)) { if(SUCCEEDED(hres)) {
WCHAR *ptr = NULL; WCHAR *ptr = NULL;
ptr = jsstr_alloc_buf(len, &ret); ret = jsstr_alloc_buf(len, &ptr);
if(ptr) { if(ret) {
if(str_tab[0]) if(str_tab[0])
ptr += jsstr_flush(str_tab[0], ptr); ptr += jsstr_flush(str_tab[0], ptr);
@ -340,11 +339,11 @@ static HRESULT Array_join(script_ctx_t *ctx, vdisp_t *vthis, WORD flags, unsigne
if(FAILED(hres)) if(FAILED(hres))
return hres; return hres;
hres = array_join(ctx, jsthis, length, sep, r); hres = array_join(ctx, jsthis, length, sep, jsstr_length(sep_str), r);
jsstr_release(sep_str); jsstr_release(sep_str);
}else { }else {
hres = array_join(ctx, jsthis, length, default_separatorW, r); hres = array_join(ctx, jsthis, length, default_separatorW, strlenW(default_separatorW), r);
} }
return hres; return hres;
@ -928,7 +927,8 @@ static HRESULT Array_toString(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, un
if(!array) if(!array)
return throw_type_error(ctx, JS_E_ARRAY_EXPECTED, NULL); return throw_type_error(ctx, JS_E_ARRAY_EXPECTED, NULL);
return array_join(ctx, &array->dispex, array->length, default_separatorW, r); return array_join(ctx, &array->dispex, array->length, default_separatorW,
strlenW(default_separatorW), r);
} }
static HRESULT Array_toLocaleString(script_ctx_t *ctx, vdisp_t *vthis, WORD flags, unsigned argc, jsval_t *argv, static HRESULT Array_toLocaleString(script_ctx_t *ctx, vdisp_t *vthis, WORD flags, unsigned argc, jsval_t *argv,
@ -1004,7 +1004,8 @@ static HRESULT Array_get_value(script_ctx_t *ctx, jsdisp_t *jsthis, jsval_t *r)
TRACE("\n"); TRACE("\n");
return array_join(ctx, &array->dispex, array->length, default_separatorW, r); return array_join(ctx, &array->dispex, array->length, default_separatorW,
strlenW(default_separatorW), r);
} }
static void Array_destructor(jsdisp_t *dispex) static void Array_destructor(jsdisp_t *dispex)
@ -1014,7 +1015,7 @@ static void Array_destructor(jsdisp_t *dispex)
static void Array_on_put(jsdisp_t *dispex, const WCHAR *name) static void Array_on_put(jsdisp_t *dispex, const WCHAR *name)
{ {
ArrayInstance *array = (ArrayInstance*)dispex; ArrayInstance *array = array_from_jsdisp(dispex);
const WCHAR *ptr = name; const WCHAR *ptr = name;
DWORD id = 0; DWORD id = 0;

14
reactos/dll/win32/jscript/bool.c
View file

@ -28,15 +28,25 @@ typedef struct {
static const WCHAR toStringW[] = {'t','o','S','t','r','i','n','g',0}; static const WCHAR toStringW[] = {'t','o','S','t','r','i','n','g',0};
static const WCHAR valueOfW[] = {'v','a','l','u','e','O','f',0}; static const WCHAR valueOfW[] = {'v','a','l','u','e','O','f',0};
static inline BoolInstance *bool_from_jsdisp(jsdisp_t *jsdisp)
{
return CONTAINING_RECORD(jsdisp, BoolInstance, dispex);
}
static inline BoolInstance *bool_from_vdisp(vdisp_t *vdisp)
{
return bool_from_jsdisp(vdisp->u.jsdisp);
}
static inline BoolInstance *bool_this(vdisp_t *jsthis) static inline BoolInstance *bool_this(vdisp_t *jsthis)
{ {
return is_vclass(jsthis, JSCLASS_BOOLEAN) ? (BoolInstance*)jsthis->u.jsdisp : NULL; return is_vclass(jsthis, JSCLASS_BOOLEAN) ? bool_from_vdisp(jsthis) : NULL;
} }
BOOL bool_obj_value(jsdisp_t *obj) BOOL bool_obj_value(jsdisp_t *obj)
{ {
assert(is_class(obj, JSCLASS_BOOLEAN)); assert(is_class(obj, JSCLASS_BOOLEAN));
return ((BoolInstance*)obj)->val; return bool_from_jsdisp(obj)->val;
} }
/* ECMA-262 3rd Edition 15.6.4.2 */ /* ECMA-262 3rd Edition 15.6.4.2 */

78
reactos/dll/win32/jscript/compile.c
View file

@ -18,6 +18,8 @@
#include "jscript.h" #include "jscript.h"
#include <wine/rbtree.h>
WINE_DECLARE_DEBUG_CHANNEL(jscript_disas); WINE_DECLARE_DEBUG_CHANNEL(jscript_disas);
typedef struct _statement_ctx_t { typedef struct _statement_ctx_t {
@ -33,6 +35,12 @@ typedef struct _statement_ctx_t {
struct _statement_ctx_t *next; struct _statement_ctx_t *next;
} statement_ctx_t; } statement_ctx_t;
typedef struct {
struct wine_rb_entry entry;
BSTR name;
int ref;
} function_local_t;
typedef struct { typedef struct {
parser_ctx_t *parser; parser_ctx_t *parser;
bytecode_t *code; bytecode_t *code;
@ -46,8 +54,7 @@ typedef struct {
unsigned labels_size; unsigned labels_size;
unsigned labels_cnt; unsigned labels_cnt;
local_ref_t *locals_buf; struct wine_rb_tree locals;
unsigned locals_buf_size;
unsigned locals_cnt; unsigned locals_cnt;
statement_ctx_t *stat_ctx; statement_ctx_t *stat_ctx;
@ -55,6 +62,8 @@ typedef struct {
function_expression_t *func_head; function_expression_t *func_head;
function_expression_t *func_tail; function_expression_t *func_tail;
heap_pool_t heap;
} compiler_ctx_t; } compiler_ctx_t;
static const struct { static const struct {
@ -1804,42 +1813,29 @@ static HRESULT compile_statement(compiler_ctx_t *ctx, statement_ctx_t *stat_ctx,
return hres; return hres;
} }
static int local_cmp(const void *key, const void *ref) static int function_local_cmp(const void *key, const struct wine_rb_entry *entry)
{ {
return strcmpW((const WCHAR*)key, ((const local_ref_t*)ref)->name); function_local_t *local = WINE_RB_ENTRY_VALUE(entry, function_local_t, entry);
return strcmpW(key, local->name);
} }
static inline local_ref_t *find_local(compiler_ctx_t *ctx, const WCHAR *name) static inline function_local_t *find_local(compiler_ctx_t *ctx, const WCHAR *name)
{ {
return bsearch(name, ctx->locals_buf, ctx->locals_cnt, sizeof(*ctx->locals_buf), local_cmp); struct wine_rb_entry *entry = wine_rb_get(&ctx->locals, name);
return entry ? WINE_RB_ENTRY_VALUE(entry, function_local_t, entry) : NULL;
} }
static BOOL alloc_local(compiler_ctx_t *ctx, BSTR name, int ref) static BOOL alloc_local(compiler_ctx_t *ctx, BSTR name, int ref)
{ {
unsigned i; function_local_t *local;
if(!ctx->locals_buf_size) { local = heap_pool_alloc(&ctx->heap, sizeof(*local));
ctx->locals_buf = heap_alloc(4 * sizeof(*ctx->locals_buf)); if(!local)
if(!ctx->locals_buf) return FALSE;
return FALSE;
ctx->locals_buf_size = 4;
}else if(ctx->locals_buf_size == ctx->locals_cnt) {
local_ref_t *new_buf = heap_realloc(ctx->locals_buf, ctx->locals_buf_size * 2 * sizeof(*ctx->locals_buf));
if(!new_buf)
return FALSE;
ctx->locals_buf = new_buf;
ctx->locals_buf_size *= 2;
}
for(i = 0; i < ctx->locals_cnt; i++) { local->name = name;
if(strcmpW(ctx->locals_buf[i].name, name) > 0) { local->ref = ref;
memmove(ctx->locals_buf + i+1, ctx->locals_buf + i, (ctx->locals_cnt - i) * sizeof(*ctx->locals_buf)); wine_rb_put(&ctx->locals, name, &local->entry);
break;
}
}
ctx->locals_buf[i].name = name;
ctx->locals_buf[i].ref = ref;
ctx->locals_cnt++; ctx->locals_cnt++;
return TRUE; return TRUE;
} }
@ -2256,7 +2252,8 @@ static HRESULT compile_function(compiler_ctx_t *ctx, source_elements_t *source,
BOOL from_eval, function_code_t *func) BOOL from_eval, function_code_t *func)
{ {
function_expression_t *iter; function_expression_t *iter;
unsigned off, i, j; function_local_t *local;
unsigned off, i;
HRESULT hres; HRESULT hres;
TRACE("\n"); TRACE("\n");
@ -2265,6 +2262,7 @@ static HRESULT compile_function(compiler_ctx_t *ctx, source_elements_t *source,
ctx->from_eval = from_eval; ctx->from_eval = from_eval;
ctx->func = func; ctx->func = func;
ctx->locals_cnt = 0; ctx->locals_cnt = 0;
wine_rb_init(&ctx->locals, function_local_cmp);
if(func_expr) { if(func_expr) {
parameter_t *param_iter; parameter_t *param_iter;
@ -2311,21 +2309,22 @@ static HRESULT compile_function(compiler_ctx_t *ctx, source_elements_t *source,
if(!func->locals) if(!func->locals)
return E_OUTOFMEMORY; return E_OUTOFMEMORY;
func->locals_cnt = ctx->locals_cnt; func->locals_cnt = ctx->locals_cnt;
memcpy(func->locals, ctx->locals_buf, func->locals_cnt * sizeof(*func->locals));
func->variables = compiler_alloc(ctx->code, func->var_cnt * sizeof(*func->variables)); func->variables = compiler_alloc(ctx->code, func->var_cnt * sizeof(*func->variables));
if(!func->variables) if(!func->variables)
return E_OUTOFMEMORY; return E_OUTOFMEMORY;
for(i = 0, j = 0; i < func->locals_cnt; i++) { i = 0;
if(func->locals[i].ref < 0) WINE_RB_FOR_EACH_ENTRY(local, &ctx->locals, function_local_t, entry) {
continue; /* skip arguments */ func->locals[i].name = local->name;
func->variables[func->locals[i].ref].name = func->locals[i].name; func->locals[i].ref = local->ref;
func->variables[func->locals[i].ref].func_id = -1; if(local->ref >= 0) {
j++; func->variables[local->ref].name = local->name;
func->variables[local->ref].func_id = -1;
}
i++;
} }
assert(i == ctx->locals_cnt);
assert(j == func->var_cnt);
func->funcs = compiler_alloc(ctx->code, func->func_cnt * sizeof(*func->funcs)); func->funcs = compiler_alloc(ctx->code, func->func_cnt * sizeof(*func->funcs));
if(!func->funcs) if(!func->funcs)
@ -2468,9 +2467,10 @@ HRESULT compile_script(script_ctx_t *ctx, const WCHAR *code, const WCHAR *args,
return hres; return hres;
} }
heap_pool_init(&compiler.heap);
hres = compile_function(&compiler, compiler.parser->source, NULL, from_eval, &compiler.code->global_code); hres = compile_function(&compiler, compiler.parser->source, NULL, from_eval, &compiler.code->global_code);
heap_pool_free(&compiler.heap);
parser_release(compiler.parser); parser_release(compiler.parser);
heap_free(compiler.locals_buf);
if(FAILED(hres)) { if(FAILED(hres)) {
release_bytecode(compiler.code); release_bytecode(compiler.code);
return hres; return hres;

152
reactos/dll/win32/jscript/date.c
View file

@ -483,8 +483,9 @@ static inline HRESULT date_to_string(DOUBLE time, BOOL show_offset, int offset,
BOOL formatAD = TRUE; BOOL formatAD = TRUE;
WCHAR week[64], month[64]; WCHAR week[64], month[64];
WCHAR buf[192];
jsstr_t *date_jsstr; jsstr_t *date_jsstr;
int len, size, year, day; int year, day;
DWORD lcid_en; DWORD lcid_en;
WCHAR sign = '-'; WCHAR sign = '-';
@ -495,66 +496,45 @@ static inline HRESULT date_to_string(DOUBLE time, BOOL show_offset, int offset,
} }
if(r) { if(r) {
WCHAR *date_str;
len = 21;
lcid_en = MAKELCID(MAKELANGID(LANG_ENGLISH,SUBLANG_ENGLISH_US),SORT_DEFAULT); lcid_en = MAKELCID(MAKELANGID(LANG_ENGLISH,SUBLANG_ENGLISH_US),SORT_DEFAULT);
size = GetLocaleInfoW(lcid_en, week_ids[(int)week_day(time)], week, sizeof(week)/sizeof(*week)); week[0] = 0;
assert(size); GetLocaleInfoW(lcid_en, week_ids[(int)week_day(time)], week, sizeof(week)/sizeof(*week));
len += size-1;
size = GetLocaleInfoW(lcid_en, month_ids[(int)month_from_time(time)], month, sizeof(month)/sizeof(*month)); month[0] = 0;
len += size-1; GetLocaleInfoW(lcid_en, month_ids[(int)month_from_time(time)], month, sizeof(month)/sizeof(*month));
year = year_from_time(time);
if(year<0)
year = -year+1;
do {
year /= 10;
len++;
} while(year);
year = year_from_time(time); year = year_from_time(time);
if(year<0) { if(year<0) {
formatAD = FALSE; formatAD = FALSE;
year = -year+1; year = -year+1;
len += 5;
} }
day = date_from_time(time);
do {
day /= 10;
len++;
} while(day);
day = date_from_time(time); day = date_from_time(time);
if(!show_offset) len -= 9; if(offset < 0) {
else if(offset == 0) len -= 5;
else if(offset < 0) {
sign = '+'; sign = '+';
offset = -offset; offset = -offset;
} }
date_str = jsstr_alloc_buf(len, &date_jsstr);
if(!date_str)
return E_OUTOFMEMORY;
if(!show_offset) if(!show_offset)
sprintfW(date_str, formatNoOffsetW, week, month, day, sprintfW(buf, formatNoOffsetW, week, month, day,
(int)hour_from_time(time), (int)min_from_time(time), (int)hour_from_time(time), (int)min_from_time(time),
(int)sec_from_time(time), year, formatAD?ADW:BCW); (int)sec_from_time(time), year, formatAD?ADW:BCW);
else if(offset) else if(offset)
sprintfW(date_str, formatW, week, month, day, sprintfW(buf, formatW, week, month, day,
(int)hour_from_time(time), (int)min_from_time(time), (int)hour_from_time(time), (int)min_from_time(time),
(int)sec_from_time(time), sign, offset/60, offset%60, (int)sec_from_time(time), sign, offset/60, offset%60,
year, formatAD?ADW:BCW); year, formatAD?ADW:BCW);
else else
sprintfW(date_str, formatUTCW, week, month, day, sprintfW(buf, formatUTCW, week, month, day,
(int)hour_from_time(time), (int)min_from_time(time), (int)hour_from_time(time), (int)min_from_time(time),
(int)sec_from_time(time), year, formatAD?ADW:BCW); (int)sec_from_time(time), year, formatAD?ADW:BCW);
date_jsstr = jsstr_alloc(buf);
if(!date_jsstr)
return E_OUTOFMEMORY;
*r = jsval_string(date_jsstr); *r = jsval_string(date_jsstr);
} }
return S_OK; return S_OK;
@ -616,7 +596,7 @@ static HRESULT Date_toLocaleString(script_ctx_t *ctx, vdisp_t *jsthis, WORD flag
date_len = GetDateFormatW(ctx->lcid, DATE_LONGDATE, &st, NULL, NULL, 0); date_len = GetDateFormatW(ctx->lcid, DATE_LONGDATE, &st, NULL, NULL, 0);
time_len = GetTimeFormatW(ctx->lcid, 0, &st, NULL, NULL, 0); time_len = GetTimeFormatW(ctx->lcid, 0, &st, NULL, NULL, 0);
ptr = jsstr_alloc_buf(date_len+time_len-1, &date_str); date_str = jsstr_alloc_buf(date_len+time_len-1, &ptr);
if(!date_str) if(!date_str)
return E_OUTOFMEMORY; return E_OUTOFMEMORY;
@ -663,9 +643,10 @@ static inline HRESULT create_utc_string(script_ctx_t *ctx, vdisp_t *jsthis, jsva
BOOL formatAD = TRUE; BOOL formatAD = TRUE;
WCHAR week[64], month[64]; WCHAR week[64], month[64];
WCHAR buf[192];
DateInstance *date; DateInstance *date;
jsstr_t *date_str; jsstr_t *date_str;
int len, size, year, day; int year, day;
DWORD lcid_en; DWORD lcid_en;
if(!(date = date_this(jsthis))) if(!(date = date_this(jsthis)))
@ -678,48 +659,30 @@ static inline HRESULT create_utc_string(script_ctx_t *ctx, vdisp_t *jsthis, jsva
} }
if(r) { if(r) {
WCHAR *ptr;
len = 17;
lcid_en = MAKELCID(MAKELANGID(LANG_ENGLISH,SUBLANG_ENGLISH_US),SORT_DEFAULT); lcid_en = MAKELCID(MAKELANGID(LANG_ENGLISH,SUBLANG_ENGLISH_US),SORT_DEFAULT);
size = GetLocaleInfoW(lcid_en, week_ids[(int)week_day(date->time)], week, sizeof(week)/sizeof(*week)); week[0] = 0;
len += size-1; GetLocaleInfoW(lcid_en, week_ids[(int)week_day(date->time)], week, sizeof(week)/sizeof(*week));
size = GetLocaleInfoW(lcid_en, month_ids[(int)month_from_time(date->time)], month, sizeof(month)/sizeof(*month)); month[0] = 0;
len += size-1; GetLocaleInfoW(lcid_en, month_ids[(int)month_from_time(date->time)], month, sizeof(month)/sizeof(*month));
year = year_from_time(date->time);
if(year<0)
year = -year+1;
do {
year /= 10;
len++;
} while(year);
year = year_from_time(date->time); year = year_from_time(date->time);
if(year<0) { if(year<0) {
formatAD = FALSE; formatAD = FALSE;
year = -year+1; year = -year+1;
len += 5;
} }
day = date_from_time(date->time);
do {
day /= 10;
len++;
} while(day);
day = date_from_time(date->time); day = date_from_time(date->time);
ptr = jsstr_alloc_buf(len, &date_str); sprintfW(buf, formatAD ? formatADW : formatBCW, week, day, month, year,
if(!date_str)
return E_OUTOFMEMORY;
sprintfW(ptr, formatAD?formatADW:formatBCW, week, day, month, year,
(int)hour_from_time(date->time), (int)min_from_time(date->time), (int)hour_from_time(date->time), (int)min_from_time(date->time),
(int)sec_from_time(date->time)); (int)sec_from_time(date->time));
date_str = jsstr_alloc(buf);
if(!date_str)
return E_OUTOFMEMORY;
*r = jsval_string(date_str); *r = jsval_string(date_str);
} }
return S_OK; return S_OK;
@ -758,9 +721,10 @@ static HRESULT dateobj_to_date_string(DateInstance *date, jsval_t *r)
BOOL formatAD = TRUE; BOOL formatAD = TRUE;
WCHAR week[64], month[64]; WCHAR week[64], month[64];
WCHAR buf[192];
jsstr_t *date_str; jsstr_t *date_str;
DOUBLE time; DOUBLE time;
int len, size, year, day; int year, day;
DWORD lcid_en; DWORD lcid_en;
if(isnan(date->time)) { if(isnan(date->time)) {
@ -772,46 +736,27 @@ static HRESULT dateobj_to_date_string(DateInstance *date, jsval_t *r)
time = local_time(date->time, date); time = local_time(date->time, date);
if(r) { if(r) {
WCHAR *ptr;
len = 5;
lcid_en = MAKELCID(MAKELANGID(LANG_ENGLISH,SUBLANG_ENGLISH_US),SORT_DEFAULT); lcid_en = MAKELCID(MAKELANGID(LANG_ENGLISH,SUBLANG_ENGLISH_US),SORT_DEFAULT);
size = GetLocaleInfoW(lcid_en, week_ids[(int)week_day(time)], week, sizeof(week)/sizeof(*week)); week[0] = 0;
assert(size); GetLocaleInfoW(lcid_en, week_ids[(int)week_day(time)], week, sizeof(week)/sizeof(*week));
len += size-1;
size = GetLocaleInfoW(lcid_en, month_ids[(int)month_from_time(time)], month, sizeof(month)/sizeof(*month)); month[0] = 0;
assert(size); GetLocaleInfoW(lcid_en, month_ids[(int)month_from_time(time)], month, sizeof(month)/sizeof(*month));
len += size-1;
year = year_from_time(time);
if(year<0)
year = -year+1;
do {
year /= 10;
len++;
} while(year);
year = year_from_time(time); year = year_from_time(time);
if(year<0) { if(year<0) {
formatAD = FALSE; formatAD = FALSE;
year = -year+1; year = -year+1;
len += 5;
} }
day = date_from_time(time);
do {
day /= 10;
len++;
} while(day);
day = date_from_time(time); day = date_from_time(time);
ptr = jsstr_alloc_buf(len, &date_str); sprintfW(buf, formatAD ? formatADW : formatBCW, week, month, day, year);
if(!ptr)
date_str = jsstr_alloc(buf);
if(!date_str)
return E_OUTOFMEMORY; return E_OUTOFMEMORY;
sprintfW(ptr, formatAD?formatADW:formatBCW, week, month, day, year);
*r = jsval_string(date_str); *r = jsval_string(date_str);
} }
@ -839,6 +784,7 @@ static HRESULT Date_toTimeString(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags,
':','%','0','2','d',' ','U','T','C',0 }; ':','%','0','2','d',' ','U','T','C',0 };
DateInstance *date; DateInstance *date;
jsstr_t *date_str; jsstr_t *date_str;
WCHAR buf[32];
DOUBLE time; DOUBLE time;
WCHAR sign; WCHAR sign;
int offset; int offset;
@ -857,12 +803,6 @@ static HRESULT Date_toTimeString(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags,
time = local_time(date->time, date); time = local_time(date->time, date);
if(r) { if(r) {
WCHAR *ptr;
ptr = jsstr_alloc_buf(17, &date_str);
if(!date_str)
return E_OUTOFMEMORY;
offset = date->bias + offset = date->bias +
daylight_saving_ta(time, date); daylight_saving_ta(time, date);
@ -873,13 +813,17 @@ static HRESULT Date_toTimeString(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags,
else sign = '-'; else sign = '-';
if(offset) if(offset)
sprintfW(ptr, formatW, (int)hour_from_time(time), sprintfW(buf, formatW, (int)hour_from_time(time),
(int)min_from_time(time), (int)sec_from_time(time), (int)min_from_time(time), (int)sec_from_time(time),
sign, offset/60, offset%60); sign, offset/60, offset%60);
else else
sprintfW(ptr, formatUTCW, (int)hour_from_time(time), sprintfW(buf, formatUTCW, (int)hour_from_time(time),
(int)min_from_time(time), (int)sec_from_time(time)); (int)min_from_time(time), (int)sec_from_time(time));
date_str = jsstr_alloc(buf);
if(!date_str)
return E_OUTOFMEMORY;
*r = jsval_string(date_str); *r = jsval_string(date_str);
} }
return S_OK; return S_OK;
@ -914,8 +858,8 @@ static HRESULT Date_toLocaleDateString(script_ctx_t *ctx, vdisp_t *jsthis, WORD
WCHAR *ptr; WCHAR *ptr;
len = GetDateFormatW(ctx->lcid, DATE_LONGDATE, &st, NULL, NULL, 0); len = GetDateFormatW(ctx->lcid, DATE_LONGDATE, &st, NULL, NULL, 0);
ptr = jsstr_alloc_buf(len, &date_str); date_str = jsstr_alloc_buf(len-1, &ptr);
if(!ptr) if(!date_str)
return E_OUTOFMEMORY; return E_OUTOFMEMORY;
GetDateFormatW(ctx->lcid, DATE_LONGDATE, &st, NULL, ptr, len); GetDateFormatW(ctx->lcid, DATE_LONGDATE, &st, NULL, ptr, len);
@ -953,8 +897,8 @@ static HRESULT Date_toLocaleTimeString(script_ctx_t *ctx, vdisp_t *jsthis, WORD
WCHAR *ptr; WCHAR *ptr;
len = GetTimeFormatW(ctx->lcid, 0, &st, NULL, NULL, 0); len = GetTimeFormatW(ctx->lcid, 0, &st, NULL, NULL, 0);
ptr = jsstr_alloc_buf(len, &date_str); date_str = jsstr_alloc_buf(len-1, &ptr);
if(!ptr) if(!date_str)
return E_OUTOFMEMORY; return E_OUTOFMEMORY;
GetTimeFormatW(ctx->lcid, 0, &st, NULL, ptr, len); GetTimeFormatW(ctx->lcid, 0, &st, NULL, ptr, len);
@ -2469,7 +2413,7 @@ static HRESULT DateConstr_value(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags,
if(FAILED(hres)) if(FAILED(hres))
return hres; return hres;
di = (DateInstance*)date; di = date_from_jsdisp(date);
di->time = utc(di->time, di); di->time = utc(di->time, di);
} }
} }

4
reactos/dll/win32/jscript/error.c
View file

@ -76,8 +76,8 @@ static HRESULT Error_toString(script_ctx_t *ctx, vdisp_t *vthis, WORD flags,
if(name_len && msg_len) { if(name_len && msg_len) {
WCHAR *ptr; WCHAR *ptr;
ptr = jsstr_alloc_buf(name_len + msg_len + 2, &ret); ret = jsstr_alloc_buf(name_len + msg_len + 2, &ptr);
if(ptr) { if(ret) {
jsstr_flush(name, ptr); jsstr_flush(name, ptr);
ptr[name_len] = ':'; ptr[name_len] = ':';
ptr[name_len+1] = ' '; ptr[name_len+1] = ' ';

18
reactos/dll/win32/jscript/function.c
View file

@ -74,7 +74,7 @@ static HRESULT Arguments_value(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, u
static void Arguments_destructor(jsdisp_t *jsdisp) static void Arguments_destructor(jsdisp_t *jsdisp)
{ {
ArgumentsInstance *arguments = (ArgumentsInstance*)jsdisp; ArgumentsInstance *arguments = arguments_from_jsdisp(jsdisp);
TRACE("(%p)\n", arguments); TRACE("(%p)\n", arguments);
@ -91,7 +91,7 @@ static void Arguments_destructor(jsdisp_t *jsdisp)
static unsigned Arguments_idx_length(jsdisp_t *jsdisp) static unsigned Arguments_idx_length(jsdisp_t *jsdisp)
{ {
ArgumentsInstance *arguments = (ArgumentsInstance*)jsdisp; ArgumentsInstance *arguments = arguments_from_jsdisp(jsdisp);
return arguments->argc; return arguments->argc;
} }
@ -106,7 +106,7 @@ static jsval_t *get_argument_ref(ArgumentsInstance *arguments, unsigned idx)
static HRESULT Arguments_idx_get(jsdisp_t *jsdisp, unsigned idx, jsval_t *r) static HRESULT Arguments_idx_get(jsdisp_t *jsdisp, unsigned idx, jsval_t *r)
{ {
ArgumentsInstance *arguments = (ArgumentsInstance*)jsdisp; ArgumentsInstance *arguments = arguments_from_jsdisp(jsdisp);
jsval_t *ref; jsval_t *ref;
TRACE("%p[%u]\n", arguments, idx); TRACE("%p[%u]\n", arguments, idx);
@ -120,7 +120,7 @@ static HRESULT Arguments_idx_get(jsdisp_t *jsdisp, unsigned idx, jsval_t *r)
static HRESULT Arguments_idx_put(jsdisp_t *jsdisp, unsigned idx, jsval_t val) static HRESULT Arguments_idx_put(jsdisp_t *jsdisp, unsigned idx, jsval_t val)
{ {
ArgumentsInstance *arguments = (ArgumentsInstance*)jsdisp; ArgumentsInstance *arguments = arguments_from_jsdisp(jsdisp);
jsval_t *ref; jsval_t *ref;
HRESULT hres; HRESULT hres;
@ -295,8 +295,8 @@ static HRESULT function_to_string(FunctionInstance *function, jsstr_t **ret)
WCHAR *ptr; WCHAR *ptr;
name_len = strlenW(function->name); name_len = strlenW(function->name);
ptr = jsstr_alloc_buf((sizeof(native_prefixW)+sizeof(native_suffixW))/sizeof(WCHAR) + name_len, &str); str = jsstr_alloc_buf((sizeof(native_prefixW)+sizeof(native_suffixW))/sizeof(WCHAR) + name_len, &ptr);
if(!ptr) if(!str)
return E_OUTOFMEMORY; return E_OUTOFMEMORY;
memcpy(ptr, native_prefixW, sizeof(native_prefixW)); memcpy(ptr, native_prefixW, sizeof(native_prefixW));
@ -320,7 +320,7 @@ HRESULT Function_invoke(jsdisp_t *func_this, IDispatch *jsthis, WORD flags, unsi
TRACE("func %p this %p\n", func_this, jsthis); TRACE("func %p this %p\n", func_this, jsthis);
assert(is_class(func_this, JSCLASS_FUNCTION)); assert(is_class(func_this, JSCLASS_FUNCTION));
function = (FunctionInstance*)func_this; function = function_from_jsdisp(func_this);
flags &= ~DISPATCH_JSCRIPT_INTERNAL_MASK; flags &= ~DISPATCH_JSCRIPT_INTERNAL_MASK;
if(function->value_proc) if(function->value_proc)
@ -523,7 +523,7 @@ HRESULT Function_value(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned
return E_FAIL; return E_FAIL;
} }
function = (FunctionInstance*)jsthis->u.jsdisp; function = function_from_jsdisp(jsthis->u.jsdisp);
assert(function->value_proc != NULL); assert(function->value_proc != NULL);
return invoke_value_proc(ctx, function, NULL, flags, argc, argv, r); return invoke_value_proc(ctx, function, NULL, flags, argc, argv, r);
@ -570,7 +570,7 @@ static HRESULT Function_get_arguments(script_ctx_t *ctx, jsdisp_t *jsthis, jsval
static void Function_destructor(jsdisp_t *dispex) static void Function_destructor(jsdisp_t *dispex)
{ {
FunctionInstance *This = (FunctionInstance*)dispex; FunctionInstance *This = function_from_jsdisp(dispex);
if(This->code) if(This->code)
release_bytecode(This->code); release_bytecode(This->code);

22
reactos/dll/win32/jscript/global.c
View file

@ -140,8 +140,8 @@ static HRESULT JSGlobal_escape(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, u
len += 3; len += 3;
} }
ret = jsstr_alloc_buf(len, &ret_str); ret_str = jsstr_alloc_buf(len, &ret);
if(!ret) { if(!ret_str) {
jsstr_release(str); jsstr_release(str);
return E_OUTOFMEMORY; return E_OUTOFMEMORY;
} }
@ -500,8 +500,8 @@ static HRESULT JSGlobal_unescape(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags,
len++; len++;
} }
ret = jsstr_alloc_buf(len, &ret_str); ret_str = jsstr_alloc_buf(len, &ret);
if(!ret) { if(!ret_str) {
jsstr_release(str); jsstr_release(str);
return E_OUTOFMEMORY; return E_OUTOFMEMORY;
} }
@ -639,8 +639,8 @@ static HRESULT JSGlobal_encodeURI(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags
} }
} }
rptr = jsstr_alloc_buf(len, &ret); ret = jsstr_alloc_buf(len, &rptr);
if(!rptr) { if(!ret) {
jsstr_release(str); jsstr_release(str);
return E_OUTOFMEMORY; return E_OUTOFMEMORY;
} }
@ -718,8 +718,8 @@ static HRESULT JSGlobal_decodeURI(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags
} }
} }
ret = jsstr_alloc_buf(len, &ret_str); ret_str = jsstr_alloc_buf(len, &ret);
if(!ret) { if(!ret_str) {
jsstr_release(str); jsstr_release(str);
return E_OUTOFMEMORY; return E_OUTOFMEMORY;
} }
@ -789,8 +789,8 @@ static HRESULT JSGlobal_encodeURIComponent(script_ctx_t *ctx, vdisp_t *jsthis, W
} }
} }
ret = jsstr_alloc_buf(len, &ret_str); ret_str = jsstr_alloc_buf(len, &ret);
if(!ret) { if(!ret_str) {
jsstr_release(str); jsstr_release(str);
return E_OUTOFMEMORY; return E_OUTOFMEMORY;
} }
@ -889,7 +889,7 @@ static HRESULT JSGlobal_decodeURIComponent(script_ctx_t *ctx, vdisp_t *jsthis, W
} }
} }
out_ptr = jsstr_alloc_buf(len, &ret); ret = jsstr_alloc_buf(len, &out_ptr);
if(!ret) { if(!ret) {
jsstr_release(str); jsstr_release(str);
return E_OUTOFMEMORY; return E_OUTOFMEMORY;

14
reactos/dll/win32/jscript/jsregexp.c
View file

@ -118,7 +118,7 @@ static HRESULT do_regexp_match_next(script_ctx_t *ctx, RegExpInstance *regexp,
HRESULT regexp_match_next(script_ctx_t *ctx, jsdisp_t *dispex, HRESULT regexp_match_next(script_ctx_t *ctx, jsdisp_t *dispex,
DWORD rem_flags, jsstr_t *jsstr, match_state_t **ret) DWORD rem_flags, jsstr_t *jsstr, match_state_t **ret)
{ {
RegExpInstance *regexp = (RegExpInstance*)dispex; RegExpInstance *regexp = regexp_from_jsdisp(dispex);
match_state_t *match; match_state_t *match;
heap_pool_t *mark; heap_pool_t *mark;
const WCHAR *str; const WCHAR *str;
@ -175,7 +175,7 @@ HRESULT regexp_match_next(script_ctx_t *ctx, jsdisp_t *dispex,
static HRESULT regexp_match(script_ctx_t *ctx, jsdisp_t *dispex, jsstr_t *jsstr, BOOL gflag, static HRESULT regexp_match(script_ctx_t *ctx, jsdisp_t *dispex, jsstr_t *jsstr, BOOL gflag,
match_result_t **match_result, DWORD *result_cnt) match_result_t **match_result, DWORD *result_cnt)
{ {
RegExpInstance *This = (RegExpInstance*)dispex; RegExpInstance *This = regexp_from_jsdisp(dispex);
match_result_t *ret = NULL; match_result_t *ret = NULL;
match_state_t *result; match_state_t *result;
DWORD i=0, ret_size = 0; DWORD i=0, ret_size = 0;
@ -367,8 +367,8 @@ static HRESULT RegExp_toString(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, u
if(f & REG_MULTILINE) if(f & REG_MULTILINE)
len++; len++;
ptr = jsstr_alloc_buf(len, &ret); ret = jsstr_alloc_buf(len, &ptr);
if(!ptr) if(!ret)
return E_OUTOFMEMORY; return E_OUTOFMEMORY;
*ptr++ = '/'; *ptr++ = '/';
@ -589,7 +589,7 @@ static HRESULT RegExp_value(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsi
static void RegExp_destructor(jsdisp_t *dispex) static void RegExp_destructor(jsdisp_t *dispex)
{ {
RegExpInstance *This = (RegExpInstance*)dispex; RegExpInstance *This = regexp_from_jsdisp(dispex);
if(This->jsregexp) if(This->jsregexp)
regexp_destroy(This->jsregexp); regexp_destroy(This->jsregexp);
@ -701,7 +701,7 @@ HRESULT create_regexp_var(script_ctx_t *ctx, jsval_t src_arg, jsval_t *flags_arg
obj = iface_to_jsdisp(get_object(src_arg)); obj = iface_to_jsdisp(get_object(src_arg));
if(obj) { if(obj) {
if(is_class(obj, JSCLASS_REGEXP)) { if(is_class(obj, JSCLASS_REGEXP)) {
RegExpInstance *regexp = (RegExpInstance*)obj; RegExpInstance *regexp = regexp_from_jsdisp(obj);
hres = create_regexp(ctx, regexp->str, regexp->jsregexp->flags, ret); hres = create_regexp(ctx, regexp->str, regexp->jsregexp->flags, ret);
jsdisp_release(obj); jsdisp_release(obj);
@ -747,7 +747,7 @@ HRESULT regexp_string_match(script_ctx_t *ctx, jsdisp_t *re, jsstr_t *jsstr, jsv
static const WCHAR inputW[] = {'i','n','p','u','t',0}; static const WCHAR inputW[] = {'i','n','p','u','t',0};
static const WCHAR lastIndexW[] = {'l','a','s','t','I','n','d','e','x',0}; static const WCHAR lastIndexW[] = {'l','a','s','t','I','n','d','e','x',0};
RegExpInstance *regexp = (RegExpInstance*)re; RegExpInstance *regexp = regexp_from_jsdisp(re);
match_result_t *match_result; match_result_t *match_result;
unsigned match_cnt, i; unsigned match_cnt, i;
const WCHAR *str; const WCHAR *str;

17
reactos/dll/win32/jscript/jsstr.c
View file

@ -62,7 +62,7 @@ static inline void jsstr_init(jsstr_t *str, unsigned len, jsstr_tag_t tag)
str->ref = 1; str->ref = 1;
} }
WCHAR *jsstr_alloc_buf(unsigned len, jsstr_t **r) jsstr_t *jsstr_alloc_buf(unsigned len, WCHAR **buf)
{ {
jsstr_inline_t *ret; jsstr_inline_t *ret;
@ -75,8 +75,8 @@ WCHAR *jsstr_alloc_buf(unsigned len, jsstr_t **r)
jsstr_init(&ret->str, len, JSSTR_INLINE); jsstr_init(&ret->str, len, JSSTR_INLINE);
ret->buf[len] = 0; ret->buf[len] = 0;
*r = &ret->str; *buf = ret->buf;
return ret->buf; return &ret->str;
} }
jsstr_t *jsstr_alloc_len(const WCHAR *buf, unsigned len) jsstr_t *jsstr_alloc_len(const WCHAR *buf, unsigned len)
@ -84,8 +84,8 @@ jsstr_t *jsstr_alloc_len(const WCHAR *buf, unsigned len)
jsstr_t *ret; jsstr_t *ret;
WCHAR *ptr; WCHAR *ptr;
ptr = jsstr_alloc_buf(len, &ret); ret = jsstr_alloc_buf(len, &ptr);
if(ptr) if(ret)
memcpy(ptr, buf, len*sizeof(WCHAR)); memcpy(ptr, buf, len*sizeof(WCHAR));
return ret; return ret;
@ -243,7 +243,7 @@ jsstr_t *jsstr_concat(jsstr_t *str1, jsstr_t *str2)
} }
} }
ptr = jsstr_alloc_buf(len1+len2, &ret); ret = jsstr_alloc_buf(len1+len2, &ptr);
if(!ret) if(!ret)
return NULL; return NULL;
@ -305,14 +305,15 @@ BOOL init_strings(void)
{ {
static const WCHAR NaNW[] = { 'N','a','N',0 }; static const WCHAR NaNW[] = { 'N','a','N',0 };
static const WCHAR undefinedW[] = {'u','n','d','e','f','i','n','e','d',0}; static const WCHAR undefinedW[] = {'u','n','d','e','f','i','n','e','d',0};
WCHAR *ptr;
if(!jsstr_alloc_buf(0, &empty_str)) if(!(empty_str = jsstr_alloc_buf(0, &ptr)))
return FALSE; return FALSE;
if(!(nan_str = jsstr_alloc(NaNW))) if(!(nan_str = jsstr_alloc(NaNW)))
return FALSE; return FALSE;
if(!(undefined_str = jsstr_alloc(undefinedW))) if(!(undefined_str = jsstr_alloc(undefinedW)))
return FALSE; return FALSE;
if(!jsstr_alloc_buf(0, &null_bstr_str)) if(!(null_bstr_str = jsstr_alloc_buf(0, &ptr)))
return FALSE; return FALSE;
return TRUE; return TRUE;
} }

16
reactos/dll/win32/jscript/jsstr.h
View file

@ -42,7 +42,7 @@ struct _jsstr_t {
}; };
#define JSSTR_LENGTH_SHIFT 4 #define JSSTR_LENGTH_SHIFT 4
#define JSSTR_MAX_LENGTH (1 << (32-JSSTR_LENGTH_SHIFT)) #define JSSTR_MAX_LENGTH ((1 << (32-JSSTR_LENGTH_SHIFT))-1)
#define JSSTR_FLAGS_MASK ((1 << JSSTR_LENGTH_SHIFT)-1) #define JSSTR_FLAGS_MASK ((1 << JSSTR_LENGTH_SHIFT)-1)
#define JSSTR_FLAG_LBIT 1 #define JSSTR_FLAG_LBIT 1
@ -98,7 +98,7 @@ typedef struct {
} jsstr_rope_t; } jsstr_rope_t;
jsstr_t *jsstr_alloc_len(const WCHAR*,unsigned) DECLSPEC_HIDDEN; jsstr_t *jsstr_alloc_len(const WCHAR*,unsigned) DECLSPEC_HIDDEN;
WCHAR *jsstr_alloc_buf(unsigned,jsstr_t**) DECLSPEC_HIDDEN; jsstr_t *jsstr_alloc_buf(unsigned,WCHAR**) DECLSPEC_HIDDEN;
static inline jsstr_t *jsstr_alloc(const WCHAR *str) static inline jsstr_t *jsstr_alloc(const WCHAR *str)
{ {
@ -109,12 +109,8 @@ void jsstr_free(jsstr_t*) DECLSPEC_HIDDEN;
static inline void jsstr_release(jsstr_t *str) static inline void jsstr_release(jsstr_t *str)
{ {
if(!--str->ref) { if(!--str->ref)
if(jsstr_is_inline(str)) jsstr_free(str);
heap_free(str);
else
jsstr_free(str);
}
} }
static inline jsstr_t *jsstr_addref(jsstr_t *str) static inline jsstr_t *jsstr_addref(jsstr_t *str)
@ -169,8 +165,8 @@ static inline jsstr_t *jsstr_substr(jsstr_t *str, unsigned off, unsigned len)
jsstr_t *ret; jsstr_t *ret;
WCHAR *ptr; WCHAR *ptr;
ptr = jsstr_alloc_buf(len, &ret); ret = jsstr_alloc_buf(len, &ptr);
if(ptr) if(ret)
jsstr_extract(str, off, len, ptr); jsstr_extract(str, off, len, ptr);
return ret; return ret;
} }

4
reactos/dll/win32/jscript/number.c
View file

@ -120,7 +120,7 @@ static inline jsstr_t *number_to_fixed(double val, int prec)
if(prec) if(prec)
size += prec+1; size += prec+1;
str = jsstr_alloc_buf(size, &ret); ret = jsstr_alloc_buf(size, &str);
if(!ret) if(!ret)
return NULL; return NULL;
@ -187,7 +187,7 @@ static inline jsstr_t *number_to_exponential(double val, int prec)
if(neg) if(neg)
size++; size++;
str = jsstr_alloc_buf(size, &ret); ret = jsstr_alloc_buf(size, &str);
if(!ret) if(!ret)
return NULL; return NULL;

4
reactos/dll/win32/jscript/object.c
View file

@ -67,8 +67,8 @@ static HRESULT Object_toString(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, u
jsstr_t *ret; jsstr_t *ret;
WCHAR *ptr; WCHAR *ptr;
ptr = jsstr_alloc_buf(9+strlenW(str), &ret); ret = jsstr_alloc_buf(9+strlenW(str), &ptr);
if(!ptr) if(!ret)
return E_OUTOFMEMORY; return E_OUTOFMEMORY;
sprintfW(ptr, formatW, str); sprintfW(ptr, formatW, str);

62
reactos/dll/win32/jscript/string.c
View file

@ -103,7 +103,7 @@ static HRESULT get_string_flat_val(script_ctx_t *ctx, vdisp_t *jsthis, jsstr_t *
static HRESULT String_get_length(script_ctx_t *ctx, jsdisp_t *jsthis, jsval_t *r) static HRESULT String_get_length(script_ctx_t *ctx, jsdisp_t *jsthis, jsval_t *r)
{ {
StringInstance *string = (StringInstance*)jsthis; StringInstance *string = string_from_jsdisp(jsthis);
TRACE("%p\n", jsthis); TRACE("%p\n", jsthis);
@ -167,7 +167,7 @@ static HRESULT do_attributeless_tag_format(script_ctx_t *ctx, vdisp_t *jsthis, j
tagname_len = strlenW(tagname); tagname_len = strlenW(tagname);
ptr = jsstr_alloc_buf(jsstr_length(str) + 2*tagname_len + 5, &ret); ret = jsstr_alloc_buf(jsstr_length(str) + 2*tagname_len + 5, &ptr);
if(!ret) { if(!ret) {
jsstr_release(str); jsstr_release(str);
return E_OUTOFMEMORY; return E_OUTOFMEMORY;
@ -217,8 +217,8 @@ static HRESULT do_attribute_tag_format(script_ctx_t *ctx, vdisp_t *jsthis, unsig
jsstr_t *ret; jsstr_t *ret;
WCHAR *ptr; WCHAR *ptr;
ptr = jsstr_alloc_buf(2*tagname_len + attrname_len + jsstr_length(attr_value) + jsstr_length(str) + 9, &ret); ret = jsstr_alloc_buf(2*tagname_len + attrname_len + jsstr_length(attr_value) + jsstr_length(str) + 9, &ptr);
if(ptr) { if(ret) {
*ptr++ = '<'; *ptr++ = '<';
memcpy(ptr, tagname, tagname_len*sizeof(WCHAR)); memcpy(ptr, tagname, tagname_len*sizeof(WCHAR));
ptr += tagname_len; ptr += tagname_len;
@ -368,7 +368,7 @@ static HRESULT String_charCodeAt(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags,
static HRESULT String_concat(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv, static HRESULT String_concat(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv,
jsval_t *r) jsval_t *r)
{ {
jsstr_t *ret, *str; jsstr_t *ret = NULL, *str;
HRESULT hres; HRESULT hres;
TRACE("\n"); TRACE("\n");
@ -425,8 +425,8 @@ static HRESULT String_concat(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, uns
} }
if(SUCCEEDED(hres)) { if(SUCCEEDED(hres)) {
ptr = jsstr_alloc_buf(len, &ret); ret = jsstr_alloc_buf(len, &ptr);
if(ptr) { if(ret) {
for(i=0; i < str_cnt; i++) for(i=0; i < str_cnt; i++)
ptr += jsstr_flush(strs[i], ptr); ptr += jsstr_flush(strs[i], ptr);
}else { }else {
@ -478,9 +478,9 @@ static HRESULT String_fontsize(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, u
static HRESULT String_indexOf(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv, static HRESULT String_indexOf(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv,
jsval_t *r) jsval_t *r)
{ {
unsigned pos = 0, search_len, length;
jsstr_t *search_jsstr, *jsstr; jsstr_t *search_jsstr, *jsstr;
const WCHAR *search_str, *str; const WCHAR *search_str, *str;
int length, pos = 0;
INT ret = -1; INT ret = -1;
HRESULT hres; HRESULT hres;
@ -490,7 +490,6 @@ static HRESULT String_indexOf(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, un
if(FAILED(hres)) if(FAILED(hres))
return hres; return hres;
length = jsstr_length(jsstr);
if(!argc) { if(!argc) {
if(r) if(r)
*r = jsval_number(-1); *r = jsval_number(-1);
@ -504,6 +503,9 @@ static HRESULT String_indexOf(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, un
return hres; return hres;
} }
search_len = jsstr_length(search_jsstr);
length = jsstr_length(jsstr);
if(argc >= 2) { if(argc >= 2) {
double d; double d;
@ -512,14 +514,16 @@ static HRESULT String_indexOf(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, un
pos = is_int32(d) ? min(length, d) : length; pos = is_int32(d) ? min(length, d) : length;
} }
if(SUCCEEDED(hres)) { if(SUCCEEDED(hres) && length >= search_len) {
const WCHAR *end = str+length-search_len;
const WCHAR *ptr; const WCHAR *ptr;
ptr = strstrW(str+pos, search_str); for(ptr = str+pos; ptr <= end; ptr++) {
if(ptr) if(!memcmp(ptr, search_str, search_len*sizeof(WCHAR))) {
ret = ptr - str; ret = ptr-str;
else break;
ret = -1; }
}
} }
jsstr_release(search_jsstr); jsstr_release(search_jsstr);
@ -1394,17 +1398,19 @@ static HRESULT String_toLowerCase(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags
return hres; return hres;
if(r) { if(r) {
unsigned len = jsstr_length(str);
jsstr_t *ret; jsstr_t *ret;
WCHAR *buf; WCHAR *buf;
buf = jsstr_alloc_buf(jsstr_length(str), &ret); ret = jsstr_alloc_buf(len, &buf);
if(!buf) { if(!ret) {
jsstr_release(str); jsstr_release(str);
return E_OUTOFMEMORY; return E_OUTOFMEMORY;
} }
jsstr_flush(str, buf); jsstr_flush(str, buf);
strlwrW(buf); for (; len--; buf++) *buf = tolowerW(*buf);
*r = jsval_string(ret); *r = jsval_string(ret);
} }
jsstr_release(str); jsstr_release(str);
@ -1424,17 +1430,19 @@ static HRESULT String_toUpperCase(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags
return hres; return hres;
if(r) { if(r) {
unsigned len = jsstr_length(str);
jsstr_t *ret; jsstr_t *ret;
WCHAR *buf; WCHAR *buf;
buf = jsstr_alloc_buf(jsstr_length(str), &ret); ret = jsstr_alloc_buf(len, &buf);
if(!buf) { if(!ret) {
jsstr_release(str); jsstr_release(str);
return E_OUTOFMEMORY; return E_OUTOFMEMORY;
} }
jsstr_flush(str, buf); jsstr_flush(str, buf);
struprW(buf); for (; len--; buf++) *buf = toupperW(*buf);
*r = jsval_string(ret); *r = jsval_string(ret);
} }
jsstr_release(str); jsstr_release(str);
@ -1464,7 +1472,7 @@ static HRESULT String_localeCompare(script_ctx_t *ctx, vdisp_t *jsthis, WORD fla
static HRESULT String_get_value(script_ctx_t *ctx, jsdisp_t *jsthis, jsval_t *r) static HRESULT String_get_value(script_ctx_t *ctx, jsdisp_t *jsthis, jsval_t *r)
{ {
StringInstance *This = (StringInstance*)jsthis; StringInstance *This = string_from_jsdisp(jsthis);
TRACE("\n"); TRACE("\n");
@ -1474,7 +1482,7 @@ static HRESULT String_get_value(script_ctx_t *ctx, jsdisp_t *jsthis, jsval_t *r)
static void String_destructor(jsdisp_t *dispex) static void String_destructor(jsdisp_t *dispex)
{ {
StringInstance *This = (StringInstance*)dispex; StringInstance *This = string_from_jsdisp(dispex);
jsstr_release(This->str); jsstr_release(This->str);
heap_free(This); heap_free(This);
@ -1482,7 +1490,7 @@ static void String_destructor(jsdisp_t *dispex)
static unsigned String_idx_length(jsdisp_t *jsdisp) static unsigned String_idx_length(jsdisp_t *jsdisp)
{ {
StringInstance *string = (StringInstance*)jsdisp; StringInstance *string = string_from_jsdisp(jsdisp);
/* /*
* NOTE: For invoke version < 2, indexed array is not implemented at all. * NOTE: For invoke version < 2, indexed array is not implemented at all.
@ -1496,7 +1504,7 @@ static unsigned String_idx_length(jsdisp_t *jsdisp)
static HRESULT String_idx_get(jsdisp_t *jsdisp, unsigned idx, jsval_t *r) static HRESULT String_idx_get(jsdisp_t *jsdisp, unsigned idx, jsval_t *r)
{ {
StringInstance *string = (StringInstance*)jsdisp; StringInstance *string = string_from_jsdisp(jsdisp);
jsstr_t *ret; jsstr_t *ret;
ret = jsstr_substr(string->str, idx, 1); ret = jsstr_substr(string->str, idx, 1);
@ -1580,8 +1588,8 @@ static HRESULT StringConstr_fromCharCode(script_ctx_t *ctx, vdisp_t *jsthis, WOR
TRACE("\n"); TRACE("\n");
ret_str = jsstr_alloc_buf(argc, &ret); ret = jsstr_alloc_buf(argc, &ret_str);
if(!ret_str) if(!ret)
return E_OUTOFMEMORY; return E_OUTOFMEMORY;
for(i=0; i<argc; i++) { for(i=0; i<argc; i++) {

9
reactos/dll/win32/jscript/vbarray.c
View file

@ -30,9 +30,14 @@ static const WCHAR lboundW[] = {'l','b','o','u','n','d',0};
static const WCHAR toArrayW[] = {'t','o','A','r','r','a','y',0}; static const WCHAR toArrayW[] = {'t','o','A','r','r','a','y',0};
static const WCHAR uboundW[] = {'u','b','o','u','n','d',0}; static const WCHAR uboundW[] = {'u','b','o','u','n','d',0};
static inline VBArrayInstance *vbarray_from_jsdisp(jsdisp_t *jsdisp)
{
return CONTAINING_RECORD(jsdisp, VBArrayInstance, dispex);
}
static inline VBArrayInstance *vbarray_from_vdisp(vdisp_t *vdisp) static inline VBArrayInstance *vbarray_from_vdisp(vdisp_t *vdisp)
{ {
return (VBArrayInstance*)vdisp->u.jsdisp; return vbarray_from_jsdisp(vdisp->u.jsdisp);
} }
static inline VBArrayInstance *vbarray_this(vdisp_t *jsthis) static inline VBArrayInstance *vbarray_this(vdisp_t *jsthis)
@ -232,7 +237,7 @@ static HRESULT VBArray_value(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, uns
static void VBArray_destructor(jsdisp_t *dispex) static void VBArray_destructor(jsdisp_t *dispex)
{ {
VBArrayInstance *vbarray = (VBArrayInstance*)dispex; VBArrayInstance *vbarray = vbarray_from_jsdisp(dispex);
SafeArrayDestroy(vbarray->safearray); SafeArrayDestroy(vbarray->safearray);
heap_free(vbarray); heap_free(vbarray);

2
reactos/media/doc/README.WINE
View file

@ -85,7 +85,7 @@ reactos/dll/win32/inseng # Synced to WineStaging-1.9.23
reactos/dll/win32/iphlpapi # Out of sync reactos/dll/win32/iphlpapi # Out of sync
reactos/dll/win32/itircl # Synced to WineStaging-1.9.11 reactos/dll/win32/itircl # Synced to WineStaging-1.9.11
reactos/dll/win32/itss # Synced to WineStaging-1.9.11 reactos/dll/win32/itss # Synced to WineStaging-1.9.11
reactos/dll/win32/jscript # Synced to WineStaging-1.9.16 reactos/dll/win32/jscript # Synced to WineStaging-1.9.23
reactos/dll/win32/jsproxy # Synced to WineStaging-1.9.11 reactos/dll/win32/jsproxy # Synced to WineStaging-1.9.11
reactos/dll/win32/loadperf # Synced to WineStaging-1.9.11 reactos/dll/win32/loadperf # Synced to WineStaging-1.9.11
reactos/dll/win32/lz32 # Synced to WineStaging-1.9.11 reactos/dll/win32/lz32 # Synced to WineStaging-1.9.11