system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-09-15 05:57:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

jscript: Use standard list for the queued code.

Browse source 
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 2019-11-07 18:17:06 +01:00 committed by Alexandre Julliard
parent 9294823a7b
commit 5e4f0f4086
2 changed files with 9 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
dlls/jscript/engine.h
View file

@ -185,7 +185,7 @@ typedef struct _bytecode_t {
unsigned str_pool_size;
unsigned str_cnt;
struct _bytecode_t *next;
struct list entry;
} bytecode_t;
HRESULT compile_script(script_ctx_t*,const WCHAR*,const WCHAR*,const WCHAR*,BOOL,BOOL,bytecode_t**) DECLSPEC_HIDDEN;

27
dlls/jscript/jscript.c
View file

@ -60,8 +60,7 @@ typedef struct {
IActiveScriptSite *site;
bytecode_t *queue_head;
bytecode_t *queue_tail;
struct list queued_code;
} JScript;
void script_release(script_ctx_t *ctx)
@ -117,27 +116,19 @@ static HRESULT exec_global_code(JScript *This, bytecode_t *code)
static void clear_script_queue(JScript *This)
{
bytecode_t *iter, *iter2;
if(!This->queue_head)
return;
iter = This->queue_head;
while(iter) {
iter2 = iter->next;
iter->next = NULL;
while(!list_empty(&This->queued_code))
{
bytecode_t *iter = LIST_ENTRY(list_head(&This->queued_code), bytecode_t, entry);
list_remove(&iter->entry);
release_bytecode(iter);
iter = iter2;
}
This->queue_head = This->queue_tail = NULL;
}
static void exec_queued_code(JScript *This)
{
bytecode_t *iter;
for(iter = This->queue_head; iter; iter = iter->next)
LIST_FOR_EACH_ENTRY(iter, &This->queued_code, bytecode_t, entry)
exec_global_code(This, iter);
clear_script_queue(This);
@ -793,10 +784,7 @@ static HRESULT WINAPI JScriptParse_ParseScriptText(IActiveScriptParse *iface,
* script is executed immediately, even if it's not in started state yet.
*/
if(!pvarResult && !is_started(This->ctx)) {
if(This->queue_tail)
This->queue_tail = This->queue_tail->next = code;
else
This->queue_head = This->queue_tail = code;
list_add_tail(&This->queued_code, &code->entry);
return S_OK;
}
@ -1089,6 +1077,7 @@ HRESULT create_jscript_object(BOOL is_encode, REFIID riid, void **ppv)
ret->ref = 1;
ret->safeopt = INTERFACE_USES_DISPEX;
ret->is_encode = is_encode;
list_init(&ret->queued_code);
hres = IActiveScript_QueryInterface(&ret->IActiveScript_iface, riid, ppv);
IActiveScript_Release(&ret->IActiveScript_iface);