system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-09-02 09:13:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

jscript: Set a map entry using a helper function.

Browse source 
So it can be re-used by Set objects.

Signed-off-by: Gabriel Ivăncescu <gabrielopcode@gmail.com>
Signed-off-by: Jacek Caban <jacek@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Gabriel Ivăncescu 2022-04-14 19:24:41 +03:00 committed by Alexandre Julliard
parent ce644eedae
commit 477026a55b
1 changed files with 37 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

67
dlls/jscript/set.c
View file

@ -127,6 +127,42 @@ static void delete_map_entry(MapInstance *map, struct jsval_map_entry *entry)
release_map_entry(entry);
}
static HRESULT set_map_entry(MapInstance *map, jsval_t key, jsval_t value, jsval_t *r)
{
struct jsval_map_entry *entry;
HRESULT hres;
if((entry = get_map_entry(map, key))) {
jsval_t val;
hres = jsval_copy(value, &val);
if(FAILED(hres))
return hres;
jsval_release(entry->value);
entry->value = val;
}else {
if(!(entry = heap_alloc_zero(sizeof(*entry)))) return E_OUTOFMEMORY;
hres = jsval_copy(key, &entry->key);
if(SUCCEEDED(hres)) {
hres = jsval_copy(value, &entry->value);
if(FAILED(hres))
jsval_release(entry->key);
}
if(FAILED(hres)) {
heap_free(entry);
return hres;
}
grab_map_entry(entry);
wine_rb_put(&map->map, &entry->key, &entry->entry);
list_add_tail(&map->entries, &entry->list_entry);
map->size++;
}
if(r) *r = jsval_undefined();
return S_OK;
}
static HRESULT iterate_map(MapInstance *map, script_ctx_t *ctx, unsigned argc, jsval_t *argv, jsval_t *r)
{
struct jsval_map_entry *entry;
@ -243,7 +279,6 @@ static HRESULT Map_set(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned ar
{
jsval_t key = argc >= 1 ? argv[0] : jsval_undefined();
jsval_t value = argc >= 2 ? argv[1] : jsval_undefined();
struct jsval_map_entry *entry;
MapInstance *map;
HRESULT hres;
@ -253,35 +288,7 @@ static HRESULT Map_set(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned ar
TRACE("%p (%s %s)\n", map, debugstr_jsval(key), debugstr_jsval(value));
if((entry = get_map_entry(map, key))) {
jsval_t val;
hres = jsval_copy(value, &val);
if(FAILED(hres))
return hres;
jsval_release(entry->value);
entry->value = val;
}else {
if(!(entry = heap_alloc_zero(sizeof(*entry)))) return E_OUTOFMEMORY;
hres = jsval_copy(key, &entry->key);
if(SUCCEEDED(hres)) {
hres = jsval_copy(value, &entry->value);
if(FAILED(hres))
jsval_release(entry->key);
}
if(FAILED(hres)) {
heap_free(entry);
return hres;
}
grab_map_entry(entry);
wine_rb_put(&map->map, &entry->key, &entry->entry);
list_add_tail(&map->entries, &entry->list_entry);
map->size++;
}
if(r) *r = jsval_undefined();
return S_OK;
return set_map_entry(map, key, value, r);
}
static HRESULT Map_has(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv,