October 2017 - Wine-Commits

Zebediah Figura : d3dcompiler: Fix a buffer size computation.
by Alexandre Julliard Oct. 9, 2017

Oct. 9, 2017

Module: wine Branch: master Commit: 63d6dce04746237c1cb39c22914ed666c55178e1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=63d6dce04746237c1cb39c229… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sat Oct 7 11:38:58 2017 -0500 d3dcompiler: Fix a buffer size computation. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dcompiler_43/hlsl.y | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/d3dcompiler_43/hlsl.y b/dlls/d3dcompiler_43/hlsl.y index c5f66d6..c2c415f 100644 --- a/dlls/d3dcompiler_43/hlsl.y +++ b/dlls/d3dcompiler_43/hlsl.y @@ -1151,7 +1151,7 @@ preproc_directive: PRE_LINE STRING hlsl_ctx.line_no = $1; if (strcmp($2, hlsl_ctx.source_file)) new_array = d3dcompiler_realloc(hlsl_ctx.source_files, - sizeof(*hlsl_ctx.source_files) * hlsl_ctx.source_files_count + 1); + sizeof(*hlsl_ctx.source_files) * (hlsl_ctx.source_files_count + 1)); if (new_array) {

1 0

Alexandre Julliard : opengl32/tests: Fix wglCreatePbufferARB prototype.
by Alexandre Julliard Oct. 9, 2017

Oct. 9, 2017

Module: wine Branch: master Commit: fd7fbc922afa2d347628faeaa2f353eefc27f74c URL: http://source.winehq.org/git/wine.git/?a=commit;h=fd7fbc922afa2d347628faeaa… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Oct 9 19:55:54 2017 +0200 opengl32/tests: Fix wglCreatePbufferARB prototype. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/opengl32/tests/opengl.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/opengl32/tests/opengl.c b/dlls/opengl32/tests/opengl.c index fd68a99..dc15147 100644 --- a/dlls/opengl32/tests/opengl.c +++ b/dlls/opengl32/tests/opengl.c @@ -24,7 +24,7 @@ #include "wine/wgl.h" #define MAX_FORMATS 256 -typedef void* HPBUFFERARB; +DECLARE_HANDLE(HPBUFFERARB); /* WGL_ARB_create_context */ static HGLRC (WINAPI *pwglCreateContextAttribsARB)(HDC hDC, HGLRC hShareContext, const int *attribList); @@ -64,7 +64,7 @@ static BOOL (WINAPI *pwglGetPixelFormatAttribivARB)(HDC, int, int, UINT, const i /* WGL_ARB_pbuffer */ #define WGL_DRAW_TO_PBUFFER_ARB 0x202D -static HPBUFFERARB* (WINAPI *pwglCreatePbufferARB)(HDC, int, int, int, const int *); +static HPBUFFERARB (WINAPI *pwglCreatePbufferARB)(HDC, int, int, int, const int *); static HDC (WINAPI *pwglGetPbufferDCARB)(HPBUFFERARB); /* WGL_EXT_swap_control */

1 0

Jacek Caban : ntdll: Remove no longer needed handling of FD_TYPE_PIPE.
by Alexandre Julliard Oct. 9, 2017

Oct. 9, 2017

Module: wine Branch: master Commit: f449146ae3154d14150159f7f21cf9dbaf2ba6df URL: http://source.winehq.org/git/wine.git/?a=commit;h=f449146ae3154d14150159f7f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Oct 9 14:28:56 2017 +0200 ntdll: Remove no longer needed handling of FD_TYPE_PIPE. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/file.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c index 35fd2c1..ca2afa0 100644 --- a/dlls/ntdll/file.c +++ b/dlls/ntdll/file.c @@ -711,7 +711,6 @@ static NTSTATUS get_io_timeouts( HANDLE handle, enum server_fd_type type, ULONG } break; case FD_TYPE_SOCKET: - case FD_TYPE_PIPE: case FD_TYPE_CHAR: if (is_read) timeouts->interval = 0; /* return as soon as we got something */ break; @@ -764,7 +763,6 @@ static NTSTATUS get_io_avail_mode( HANDLE handle, enum server_fd_type type, BOOL break; case FD_TYPE_MAILSLOT: case FD_TYPE_SOCKET: - case FD_TYPE_PIPE: case FD_TYPE_CHAR: *avail_mode = TRUE; break; @@ -1128,7 +1126,7 @@ static NTSTATUS FILE_AsyncWriteService( void *user, IO_STATUS_BLOCK *iosb, NTSTA &needs_close, &type, NULL ))) break; - if (!fileio->count && (type == FD_TYPE_MAILSLOT || type == FD_TYPE_PIPE || type == FD_TYPE_SOCKET)) + if (!fileio->count && (type == FD_TYPE_MAILSLOT || type == FD_TYPE_SOCKET)) result = send( fd, fileio->buffer, 0, 0 ); else result = write( fd, &fileio->buffer[fileio->already], fileio->count - fileio->already ); @@ -1308,7 +1306,7 @@ NTSTATUS WINAPI NtWriteFile(HANDLE hFile, HANDLE hEvent, for (;;) { /* zero-length writes on sockets may not work with plain write(2) */ - if (!length && (type == FD_TYPE_MAILSLOT || type == FD_TYPE_PIPE || type == FD_TYPE_SOCKET)) + if (!length && (type == FD_TYPE_MAILSLOT || type == FD_TYPE_SOCKET)) result = send( unix_handle, buffer, 0, 0 ); else result = write( unix_handle, (const char *)buffer + total, length - total );

1 0

Jacek Caban : ntdll/tests: Remove no longer needed Sleep calls.
by Alexandre Julliard Oct. 9, 2017

Oct. 9, 2017

Module: wine Branch: master Commit: 4e17ff7c98a654e11c06c4ac742065ae3e6ed9d8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4e17ff7c98a654e11c06c4ac7… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Oct 9 14:28:21 2017 +0200 ntdll/tests: Remove no longer needed Sleep calls. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/pipe.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/dlls/ntdll/tests/pipe.c b/dlls/ntdll/tests/pipe.c index 9628cc2..a619fee 100644 --- a/dlls/ntdll/tests/pipe.c +++ b/dlls/ntdll/tests/pipe.c @@ -811,7 +811,6 @@ static void read_pipe_test(ULONG pipe_flags, ULONG pipe_type) ret = WriteFile( write, buffer, 1, &written, NULL ); ok(ret && written == 1, "WriteFile error %d\n", GetLastError()); /* iosb updated here by async i/o */ - Sleep(1); /* FIXME: needed for wine to run the i/o apc */ ok( U(iosb).Status == 0, "wrong status %x\n", U(iosb).Status ); ok( iosb.Information == 1, "wrong info %lu\n", iosb.Information ); ok( !is_signaled( read ), "read handle is signaled\n" ); @@ -837,7 +836,6 @@ static void read_pipe_test(ULONG pipe_flags, ULONG pipe_type) ret = WriteFile( write, buffer, 1, &written, NULL ); ok(ret && written == 1, "WriteFile error %d\n", GetLastError()); /* iosb updated here by async i/o */ - Sleep(1); /* FIXME: needed for wine to run the i/o apc */ ok( U(iosb).Status == 0, "wrong status %x\n", U(iosb).Status ); ok( iosb.Information == 1, "wrong info %lu\n", iosb.Information ); ok( is_signaled( read ), "read handle is not signaled\n" );

1 0

Huw Davies : ntdll: Add free list buckets for every arena size up to 0x100.
by Alexandre Julliard Oct. 9, 2017

Oct. 9, 2017

Module: wine Branch: master Commit: 2175852f5a45eebef5dcbbad9906509e736d596a URL: http://source.winehq.org/git/wine.git/?a=commit;h=2175852f5a45eebef5dcbbad9… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Oct 9 13:15:52 2017 +0100 ntdll: Add free list buckets for every arena size up to 0x100. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/heap.c | 22 ++++++++++++++++------ 1 file changed, 16 insertions(+), 6 deletions(-) diff --git a/dlls/ntdll/heap.c b/dlls/ntdll/heap.c index f928ebf..ca08f9d 100644 --- a/dlls/ntdll/heap.c +++ b/dlls/ntdll/heap.c @@ -105,6 +105,7 @@ C_ASSERT( sizeof(ARENA_LARGE) % LARGE_ALIGNMENT == 0 ); /* minimum data size (without arenas) of an allocated block */ /* make sure that it's larger than a free list entry */ #define HEAP_MIN_DATA_SIZE ROUND_SIZE(2 * sizeof(struct list)) +#define HEAP_MIN_ARENA_SIZE (HEAP_MIN_DATA_SIZE + sizeof(ARENA_INUSE)) /* minimum size that must remain to shrink an allocated block */ #define HEAP_MIN_SHRINK_SIZE (HEAP_MIN_DATA_SIZE+sizeof(ARENA_FREE)) /* minimum size to start allocating large blocks */ @@ -113,12 +114,17 @@ C_ASSERT( sizeof(ARENA_LARGE) % LARGE_ALIGNMENT == 0 ); #define HEAP_TAIL_EXTRA_SIZE(flags) \ ((flags & HEAP_TAIL_CHECKING_ENABLED) || RUNNING_ON_VALGRIND ? ALIGNMENT : 0) -/* Max size of the blocks on the free lists */ +/* There will be a free list bucket for every arena size up to and including this value */ +#define HEAP_MAX_SMALL_FREE_LIST 0x100 +C_ASSERT( HEAP_MAX_SMALL_FREE_LIST % ALIGNMENT == 0 ); +#define HEAP_NB_SMALL_FREE_LISTS (((HEAP_MAX_SMALL_FREE_LIST - HEAP_MIN_ARENA_SIZE) / ALIGNMENT) + 1) + +/* Max size of the blocks on the free lists above HEAP_MAX_SMALL_FREE_LIST */ static const SIZE_T HEAP_freeListSizes[] = { - 0x10, 0x20, 0x30, 0x40, 0x60, 0x80, 0x100, 0x200, 0x400, 0x1000, ~0UL + 0x200, 0x400, 0x1000, ~0UL }; -#define HEAP_NB_FREE_LISTS (sizeof(HEAP_freeListSizes)/sizeof(HEAP_freeListSizes[0])) +#define HEAP_NB_FREE_LISTS (sizeof(HEAP_freeListSizes) / sizeof(HEAP_freeListSizes[0]) + HEAP_NB_SMALL_FREE_LISTS) typedef union { @@ -303,8 +309,11 @@ static inline unsigned int get_freelist_index( SIZE_T size ) { unsigned int i; - size -= sizeof(ARENA_FREE); - for (i = 0; i < HEAP_NB_FREE_LISTS - 1; i++) if (size <= HEAP_freeListSizes[i]) break; + if (size <= HEAP_MAX_SMALL_FREE_LIST) + return (size - HEAP_MIN_ARENA_SIZE) / ALIGNMENT; + + for (i = HEAP_NB_SMALL_FREE_LISTS; i < HEAP_NB_FREE_LISTS - 1; i++) + if (size <= HEAP_freeListSizes[i - HEAP_NB_SMALL_FREE_LISTS]) break; return i; } @@ -338,7 +347,8 @@ static void HEAP_Dump( HEAP *heap ) DPRINTF( "\nFree lists:\n Block Stat Size Id\n" ); for (i = 0; i < HEAP_NB_FREE_LISTS; i++) DPRINTF( "%p free %08lx prev=%p next=%p\n", - &heap->freeList[i].arena, HEAP_freeListSizes[i], + &heap->freeList[i].arena, i < HEAP_NB_SMALL_FREE_LISTS ? + HEAP_MIN_ARENA_SIZE + i * ALIGNMENT : HEAP_freeListSizes[i - HEAP_NB_SMALL_FREE_LISTS], LIST_ENTRY( heap->freeList[i].arena.entry.prev, ARENA_FREE, entry ), LIST_ENTRY( heap->freeList[i].arena.entry.next, ARENA_FREE, entry ));

1 0

Andrey Gusev : quartz: Remove redundant comparison.
by Alexandre Julliard Oct. 9, 2017

Oct. 9, 2017

Module: wine Branch: master Commit: 8273fc88c9a31728d910b6e6b281a30b0fc7c1f6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8273fc88c9a31728d910b6e6b… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Mon Oct 9 14:45:13 2017 +0300 quartz: Remove redundant comparison. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/avisplit.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/quartz/avisplit.c b/dlls/quartz/avisplit.c index b6fd9f1..f3ecced 100644 --- a/dlls/quartz/avisplit.c +++ b/dlls/quartz/avisplit.c @@ -1115,8 +1115,7 @@ static HRESULT AVISplitter_InputPin_PreConnect(IPin * iface, IPin * pConnectPin, pos += sizeof(RIFFCHUNK) + list.cb; hr = IAsyncReader_SyncRead(This->pReader, pos, sizeof(list), (BYTE *)&list); } - while (hr == S_OK && (list.fcc != FOURCC_LIST || - (list.fcc == FOURCC_LIST && list.fccListType != listtypeAVIMOVIE))); + while (hr == S_OK && (list.fcc != FOURCC_LIST || list.fccListType != listtypeAVIMOVIE)); if (hr != S_OK) {

1 0

Hugh McMaster : regedit/tests: Add REG_BINARY to the empty hex data import tests.
by Alexandre Julliard Oct. 9, 2017

Oct. 9, 2017

Module: wine Branch: master Commit: 1e6bf7d996c6013e0a0fa3baa104811605720527 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1e6bf7d996c6013e0a0fa3baa… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Mon Oct 9 11:46:58 2017 +0000 regedit/tests: Add REG_BINARY to the empty hex data import tests. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/tests/regedit.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/programs/regedit/tests/regedit.c b/programs/regedit/tests/regedit.c index 79640a5..3e949a5 100644 --- a/programs/regedit/tests/regedit.c +++ b/programs/regedit/tests/regedit.c @@ -652,7 +652,8 @@ static void test_basic_import(void) "\"Wine22d\"=hex(4):\n" "\"Wine22e\"=hex(7):\n" "\"Wine22f\"=hex(100):\n" - "\"Wine22g\"=hex(abcd):\n\n"); + "\"Wine22g\"=hex(abcd):\n" + "\"Wine22h\"=hex:\n\n"); verify_reg(hkey, "Wine22a", REG_SZ, NULL, 0, 0); verify_reg(hkey, "Wine22b", REG_EXPAND_SZ, NULL, 0, TODO_REG_SIZE); verify_reg(hkey, "Wine22c", REG_BINARY, NULL, 0, 0); @@ -660,6 +661,7 @@ static void test_basic_import(void) verify_reg(hkey, "Wine22e", REG_MULTI_SZ, NULL, 0, TODO_REG_SIZE); verify_reg(hkey, "Wine22f", 0x100, NULL, 0, 0); verify_reg(hkey, "Wine22g", 0xabcd, NULL, 0, 0); + verify_reg(hkey, "Wine22h", REG_BINARY, NULL, 0, 0); RegCloseKey(hkey); @@ -1066,7 +1068,8 @@ static void test_basic_import_unicode(void) "\"Wine22d\"=hex(4):\n" "\"Wine22e\"=hex(7):\n" "\"Wine22f\"=hex(100):\n" - "\"Wine22g\"=hex(abcd):\n\n"); + "\"Wine22g\"=hex(abcd):\n" + "\"Wine22h\"=hex:\n\n"); verify_reg(hkey, "Wine22a", REG_SZ, NULL, 0, 0); verify_reg(hkey, "Wine22b", REG_EXPAND_SZ, NULL, 0, TODO_REG_SIZE); verify_reg(hkey, "Wine22c", REG_BINARY, NULL, 0, 0); @@ -1074,6 +1077,7 @@ static void test_basic_import_unicode(void) verify_reg(hkey, "Wine22e", REG_MULTI_SZ, NULL, 0, TODO_REG_SIZE); verify_reg(hkey, "Wine22f", 0x100, NULL, 0, 0); verify_reg(hkey, "Wine22g", 0xabcd, NULL, 0, 0); + verify_reg(hkey, "Wine22h", REG_BINARY, NULL, 0, 0); RegCloseKey(hkey);

1 0

Jacek Caban : mshtml.idl: Added IDocumentEvent declaration.
by Alexandre Julliard Oct. 9, 2017

Oct. 9, 2017

Module: wine Branch: master Commit: 4c412e4a44cc55227c03763d5438555e34e1e848 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4c412e4a44cc55227c03763d5… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Oct 9 17:52:13 2017 +0200 mshtml.idl: Added IDocumentEvent declaration. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/mshtmdid.h | 3 +++ include/mshtml.idl | 16 ++++++++++++++++ 2 files changed, 19 insertions(+) diff --git a/include/mshtmdid.h b/include/mshtmdid.h index 5423216..22b3f20 100644 --- a/include/mshtmdid.h +++ b/include/mshtmdid.h @@ -3518,6 +3518,9 @@ #define DISPID_IDOMPROCESSINGINSTRUCTION_TARGET DISPID_PROCESSINGINSTRUCTION #define DISPID_IDOMPROCESSINGINSTRUCTION_DATA DISPID_PROCESSINGINSTRUCTION+1 +/* IDocumentEvent */ +#define DISPID_IDOCUMENTEVENT_CREATEEVENT DISPID_OMDOCUMENT+108 + /* IDocumentSelector */ #define DISPID_IDOCUMENTSELECTOR_QUERYSELECTOR DISPID_OMDOCUMENT+105 #define DISPID_IDOCUMENTSELECTOR_QUERYSELECTORALL DISPID_OMDOCUMENT+106 diff --git a/include/mshtml.idl b/include/mshtml.idl index b5cd1e9..45feb09 100644 --- a/include/mshtml.idl +++ b/include/mshtml.idl @@ -16019,6 +16019,21 @@ interface IHTMLDocument8 : IDispatch } /***************************************************************************** + * IDocumentEvent interface + */ +[ + odl, + oleautomation, + dual, + uuid(305104bc-98b5-11cf-bb82-00aa00bdce0b) +] +interface IDocumentEvent : IDispatch +{ + [id(DISPID_IDOCUMENTEVENT_CREATEEVENT)] + HRESULT createEvent([in] BSTR eventType, [out, retval] IDOMEvent **ppEvent); +} + +/***************************************************************************** * IDocumentSelector interface */ [ @@ -16667,6 +16682,7 @@ coclass HTMLDocument interface IHTMLDocument6; interface IHTMLDOMNode; interface IHTMLDOMNode2; + interface IDocumentEvent; } /*****************************************************************************

1 0

Jacek Caban : mshtml/tests: Fixed typo in iface_cmp helper.
by Alexandre Julliard Oct. 9, 2017

Oct. 9, 2017

Module: wine Branch: master Commit: becc92a814f0e9691c92d2dc1d30f8f71cafa6c4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=becc92a814f0e9691c92d2dc1… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Oct 9 15:10:41 2017 +0200 mshtml/tests: Fixed typo in iface_cmp helper. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/tests/events.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/dlls/mshtml/tests/events.c b/dlls/mshtml/tests/events.c index 5e2f8c7..ea2b6d0 100644 --- a/dlls/mshtml/tests/events.c +++ b/dlls/mshtml/tests/events.c @@ -159,7 +159,7 @@ static BOOL iface_cmp(IUnknown *iface1, IUnknown *iface2) IUnknown_QueryInterface(iface1, &IID_IUnknown, (void**)&unk1); IUnknown_Release(unk1); - IUnknown_QueryInterface(iface1, &IID_IUnknown, (void**)&unk2); + IUnknown_QueryInterface(iface2, &IID_IUnknown, (void**)&unk2); IUnknown_Release(unk2); return unk1 == unk2; @@ -407,7 +407,8 @@ static void _test_attached_event_args(unsigned line, DISPID id, WORD wFlags, DIS ok(V_DISPATCH(pdp->rgvarg) != NULL, "V_DISPATCH(pdp->rgvarg) = %p\n", V_DISPATCH(pdp->rgvarg)); event = _get_event_obj(line); - ok(iface_cmp((IUnknown*)event, (IUnknown*)V_DISPATCH(pdp->rgvarg)), "event != arg0\n"); + todo_wine + ok(!iface_cmp((IUnknown*)event, (IUnknown*)V_DISPATCH(pdp->rgvarg)), "event != arg0\n"); IHTMLEventObj_Release(event); } @@ -1376,7 +1377,8 @@ static void _test_cp_eventarg(unsigned line, REFIID riid, WORD flags, DISPPARAMS ok(V_DISPATCH(dp->rgvarg) != NULL, "V_DISPATCH(dp->rgvarg) = %p\n", V_DISPATCH(dp->rgvarg)); event = _get_event_obj(line); - ok(iface_cmp((IUnknown*)event, (IUnknown*)V_DISPATCH(dp->rgvarg)), "event != arg0\n"); + todo_wine + ok(!iface_cmp((IUnknown*)event, (IUnknown*)V_DISPATCH(dp->rgvarg)), "event != arg0\n"); IHTMLEventObj_Release(event); }

1 0

Jacek Caban : jscript: Fixed visit_function_expression error handling.
by Alexandre Julliard Oct. 9, 2017

Oct. 9, 2017

Module: wine Branch: master Commit: 8f89e142eca5b042ad915d90daaccd2d7e1a83aa URL: http://source.winehq.org/git/wine.git/?a=commit;h=8f89e142eca5b042ad915d90d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Oct 9 14:35:48 2017 +0200 jscript: Fixed visit_function_expression error handling. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/compile.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/jscript/compile.c b/dlls/jscript/compile.c index cbc360f..8691595 100644 --- a/dlls/jscript/compile.c +++ b/dlls/jscript/compile.c @@ -1874,12 +1874,13 @@ static BOOL alloc_variable(compiler_ctx_t *ctx, const WCHAR *name) return alloc_local(ctx, ident, ctx->func->var_cnt++); } -static BOOL visit_function_expression(compiler_ctx_t *ctx, function_expression_t *expr) +static HRESULT visit_function_expression(compiler_ctx_t *ctx, function_expression_t *expr) { expr->func_id = ctx->func->func_cnt++; ctx->func_tail = ctx->func_tail ? (ctx->func_tail->next = expr) : (ctx->func_head = expr); - return !expr->identifier || expr->event_target || alloc_variable(ctx, expr->identifier); + return !expr->identifier || expr->event_target || alloc_variable(ctx, expr->identifier) + ? S_OK : E_OUTOFMEMORY; } static HRESULT visit_expression(compiler_ctx_t *ctx, expression_t *expr) @@ -1992,7 +1993,7 @@ static HRESULT visit_expression(compiler_ctx_t *ctx, expression_t *expr) break; } case EXPR_FUNC: - visit_function_expression(ctx, (function_expression_t*)expr); + hres = visit_function_expression(ctx, (function_expression_t*)expr); break; case EXPR_MEMBER: hres = visit_expression(ctx, ((member_expression_t*)expr)->expression);

1 0